xiangshan
/
yxxh5
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gx

This commit is contained in:
lnn19986213 2022-11-15 14:31:37 +08:00
parent eea0658e74
commit f7e980ec73
10 changed files with 194 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.js
View File

@ -26,5 +26,5 @@ app.$mount()
import http from "@/request/index.js"
Vue.prototype.http=http
Vue.prototype.socketUrl = "ws://61.130.44.231/webSocket"
// Vue.prototype.socketUrl = "wss://yxx.ydool.net/webSocket"
// Vue.prototype.socketUrl = "ws://61.130.44.231/webSocket"
Vue.prototype.socketUrl = "wss://yxx.ydool.net/webSocket"

5
src/pages/ActivitiesDetail/ActivitiesDetail.vue
View File

@ -81,6 +81,7 @@
</view>
</view>
</view>
<u-gap height="80" bgColor="#fff"></u-gap>
<view v-if="hdStatus == '0'" >
<view class="operation" v-if="userType == 'fws'">
<button type="default" class="apply" v-if="serveList.isGm && serveList.gmState == 0">已申请，审核中</button>
@ -105,7 +106,7 @@
</view>
<view class="operation" v-else>
<button type="default" class="apply-A" >活动报名</button>
<button type="default" class="collection-A">报名志愿者</button>
<button type="default" class="collection-A">志愿者报名</button>
</view>
</view>
<!-- 取消报名-原因 -->
@ -342,7 +343,7 @@
}
.activityDetails {
margin-bottom: 160rpx;
// margin-bottom: 160rpx;
.item_ul {
.title {

22
src/pages/ArtWorks/ArtWorks.vue
View File

@ -28,12 +28,15 @@
<scroll-view class="gprTop" scroll-x="true">
<view class="gprtItem_C" v-if="fil == 1">
热销商品
<view class="line"></view>
</view>
<view class="gprtItem_C" v-else-if="typeO == 0">
全部商品
<view class="line"></view>
</view>
<view v-for="(item,index) in list2" :key="index" @click="chooseTwoType(item.value,index)" :class="typeT == index?'gprtItem_C':'gprtItem'">
{{item.name}}
<view class="line"></view>
</view>
</scroll-view>
<scroll-view class="artworks" scroll-y="true" @scrolltolower="lower">
@ -414,7 +417,7 @@
.gprTop {
width: 100%;
height: 32px;
height: 70rpx;
padding: 10px 0;
overflow: hidden;
@ -424,6 +427,12 @@
padding: 0 30rpx;
margin: 0 10rpx;
float: left;
.line{
width: calc(100% - 40rpx);
min-width: 36rpx;
margin: 0 auto;
height: 6rpx;
}
}
.gprtItem_C {
height: 64rpx;
@ -431,8 +440,15 @@
padding: 0 30rpx;
margin: 0 10rpx;
float: left;
background: url(../../static/shop/bg2.png) no-repeat;
background-size:100% 100%;
// background: url(../../static/shop/bg2.png) no-repeat;
// background-size:100% 100%;
.line{
width: calc(100% - 40rpx);
min-width: 36rpx;
margin: 0 auto;
height: 6rpx;
background-color: #99241B;
}
}
}
.artworks {

4
src/pages/PersonalCenter/PersonalCenter.vue
View File

@ -27,13 +27,13 @@
</view>
</view>
<view class="person_itm_sign" @click="goChangeInfo('身份证号码',userInfoObj.idCard)">
<!-- <view class="person_itm_sign" @click="goChangeInfo('身份证号码',userInfoObj.idCard)">
<text class="person_itm_sign_tit">身份证号码</text>
<view class="person_itm_sign_right">
<text> {{userInfoObj.idCard}}</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
</view> -->
</view>

197
src/pages/SelectId/SelectId.vue
View File

@ -1,52 +1,84 @@
<template>
<view>
<!-- 导航栏 -->
<view class="navbar">
<view class="status_bar" :style="{'height':statusHeight+'px'}"></view>
<view class="apptitle" :style="{'height':titleHeight+'px'}">
<image src="../../static/blackArrow.png" mode="" class="backImg" @click="back"></image>
</view>
</view>
<!--导航栏ed -->
<view class="select_bg">
<image src="../../static/selectID/selectIdBG.png" mode=""></image>
<view class="tips">
<view class="selct_tips">
请选择您的身份
</view>
<view class="select_sm_tips">
选择身份后不能修改哦！
<view class="">
<view v-if="show">
<!-- 导航栏 -->
<view class="navbar">
<view class="status_bar" :style="{'height':statusHeight+'px'}"></view>
<view class="apptitle" :style="{'height':titleHeight+'px'}">
<image src="../../static/blackArrow.png" mode="" class="backImg" @click="back"></image>
</view>
</view>
</view>
<!--导航栏ed -->
<view class="select_bg">
<image src="../../static/selectID/selectIdBG.png" mode=""></image>
<view class="tips">
<view class="selct_tips">
请选择您的身份
</view>
<view class="itm_id_contain" v-for="(v,k,i) in selectList" :key="i">
<view :class=" id === k ? ' itm_id_selected' :'itm_id'" @click="confirm_id(k)">
<view>
<!-- 政协委员 -->
{{v}}
</view>
<view class="gou">
<image src="../../static/selectID/gouXuan.png" mode=""></image>
<view class="select_sm_tips">
选择身份后不能修改哦！
</view>
</view>
</view>
<view class="itm_id_contain" v-for="(v,k,i) in selectList" :key="i">
<view :class=" id === k ? ' itm_id_selected' :'itm_id'" @click="confirm_id(k)">
<view>
<!-- 政协委员 -->
{{v}}
</view>
<view class="gou">
<image src="../../static/selectID/gouXuan.png" mode=""></image>
</view>
</view>
</view>
<view class="operation">
<button type="default" class="next" @click="next">下一步</button>
</view>
<view class="zhan">
<!-- zhanwei -->
</view>
</view>
<view v-else>
<!-- 导航栏 -->
<view class="navbar">
<view class="status_bar" :style="{'height':statusHeight+'px'}"></view>
<view class="apptitle" :style="{'height':titleHeight+'px'}">
<image src="../../static/blackArrow.png" mode="" class="backImg" @click="back"></image>
</view>
</view>
<!--导航栏ed -->
<view class="select_bg">
<image src="../../static/selectID/selectIdBG.png" mode=""></image>
<view class="tips">
<view class="selct_tips">
请选择您的身份
</view>
<view class="select_sm_tips">
选择身份后不能修改哦！
</view>
</view>
</view>
<view class="itm_id_contain" v-for="(j,t) in rcList" :key="t">
<view :class="wyrc == j.value ? ' itm_id_selected' :'itm_id'" @click="confirm_wyrc(j.value)">
<view>
{{j.name}}
</view>
<view class="gou">
<image src="../../static/selectID/gouXuan.png" mode=""></image>
</view>
</view>
</view>
<view class="operation">
<button type="default" class="next" @click="nextT">下一步</button>
</view>
<view class="operation">
<button type="default" class="next" @click="next">下一步</button>
<view class="zhan">
<!-- zhanwei -->
</view>
</view>
<view class="zhan">
<!-- zhanwei -->
</view>
</view>
</template>
@ -54,37 +86,71 @@
export default {
data() {
return {
id:null,
id: null,
wyrc: null,
show: true,
statusHeight: 0,
titleHeight: 50,
selectList: {xhhy:"协会会员",wyrc: "文艺人才",zyz:"文艺志愿者",fws:"服务商"},
selectList: {
xhhy: "协会会员",
wyrc: "文艺人才",
zyz: "文艺志愿者",
fws: "服务商"
},
rcList: [{
name: "文艺名家",
value: 'wymj',
},{
name: "文艺工作者",
value: 'wygzz',
}
]
};
},
methods: {
next() {
console.log("下一步");
if(this.id||this.id==0){
var that=this
uni.navigateTo({
url:`/pages/improveData/improveData?id=${that.id}`
})
}else{
uni.showToast({
title: '请选择身份',
duration: 2000,
icon:'error'
});
let _this = this
if (this.id || this.id == 0) {
if (this.id == 'wyrc') {
this.show = false
}
else{
this.wyrc = ''
uni.navigateTo({
url:`/pages/improveData/improveData?id=` + this.id + '&wyrc=' + this.wyrc
})
}
} else {
uni.showToast({
title: '请选择身份',
duration: 2000,
icon: 'error'
});
}
},
nextT(){
if (this.wyrc) {
uni.navigateTo({
url:`/pages/improveData/improveData?id=` + this.id + '&wyrc=' + this.wyrc
})
}else {
uni.showToast({
title: '请选择身份',
duration: 2000,
icon: 'error'
});
}
},
back() {
uni.navigateBack()
},
confirm_id(id){
this.id=id
}
confirm_id(id) {
this.id = id
},
confirm_wyrc(val) {
this.wyrc = val
},
},
onReady() {
const systemMsg = uni.getSystemInfoSync();
@ -109,9 +175,11 @@
width: 100%;
height: 100%;
}
.zhan{
height: 160rpx;
}
.zhan {
height: 160rpx;
}
.select_bg {
height: 408rpx;
position: relative;
@ -210,13 +278,6 @@
}
}
}
.navbar {
position: fixed;
top: 0;

15
src/pages/improveData/improveData.vue
View File

@ -381,6 +381,7 @@
xiehuiId: '',
showJionmeet: false,
pageTypeId: '',
wyrc: '',
isJioned: false,
renCaiShow: false,
zhengzhiShow: false,
@ -560,8 +561,8 @@
};
},
onLoad(option) {
console.log(option.id);
this.pageTypeId = option.id
this.wyrc = option.wyrc
},
onReady() {
this.$refs.form1.setRules(this.rules);
@ -764,14 +765,10 @@
})
},
submit() {
if (this.fileList3) {
var fl3 = JSON.stringify(this.fileList3.map((v, i) => {
return v.url
// return v.thumb
}))
var fl3 = this.fileList3[0].url
} else {
var fl3 = '[]'
var fl3 = ''
}
// 营业执照
if (this.fileList4) {
@ -822,7 +819,6 @@
} else {
rongyujx = JSON.stringify(this.honorList)
}
let that = this.model1.userInfo
let data = {
// "phone": that.phoneNum,
@ -851,7 +847,8 @@
"timeStart": that.serveTime,
"userName": that.name,
"userType": this.pageTypeId,
"fzr": that.DutyPeopleName
"fzr": that.DutyPeopleName,
"wyrc": this.wyrc,
}
console.log("dataddddddddd", data);
this.$refs.form1.validate().then(res => {

6
src/pages/literHelp/literHelp.vue
View File

@ -131,13 +131,14 @@
.backImg {
width: 20px;
height: 20px;
margin-right: 16px;
// margin-right: 16px;
}
.barLabel {
flex: 1;
text-align: center;
font-size: 16px;
margin-left: -20px;
}
}
}
@ -162,13 +163,14 @@
.backImg {
width: 20px;
height: 20px;
margin-right: 16px;
// margin-right: 16px;
}
.barLabel {
flex: 1;
text-align: center;
font-size: 16px;
margin-left: -20px;
}
}
}

5
src/pages/my/My.vue
View File

@ -1,5 +1,5 @@
<template>
<view style="padding-bottom:5px;">
<view>
<view class="">
<u-loading-page :loading="load"></u-loading-page>
</view>
@ -142,7 +142,8 @@
</view>
</view>
</view>
<tabbar tabbarId='5'></tabbar>
<u-gap height="50" bgColor="#fff"></u-gap>
<tabbar tabbarId='5'></tabbar>
</view>
</view>
</template>

25
src/pages/shop/Shop.vue
View File

@ -1,5 +1,5 @@
<template>
<view style="padding-bottom:5px;">
<view>
<view class="">
<u-loading-page :loading="load"></u-loading-page>
</view>
@ -29,12 +29,15 @@
<scroll-view class="gprTop" scroll-x="true">
<view class="gprtItem_C" v-if="fil == 1">
热销商品
<view class="line"></view>
</view>
<view class="gprtItem_C" v-else-if="typeO == 0">
全部商品
<view class="line"></view>
</view>
<view v-for="(item,index) in list2" :key="index" @click="chooseTwoType(item.value,index)" :class="typeT == index?'gprtItem_C':'gprtItem'">
{{item.name}}
<view class="line"></view>
</view>
</scroll-view>
<scroll-view class="artworks" scroll-y="true" @scrolltolower="lower">
@ -67,6 +70,7 @@
</scroll-view>
</view>
</view>
<u-gap height="50" bgColor="#fff"></u-gap>
<tabbar tabbarId='4'></tabbar>
</view>
</view>
@ -352,7 +356,7 @@
.gprTop {
width: 100%;
height: 32px;
height: 70rpx;
padding: 10px 0;
overflow: hidden;
@ -362,6 +366,12 @@
padding: 0 30rpx;
margin: 0 10rpx;
float: left;
.line{
width: calc(100% - 40rpx);
min-width: 36rpx;
margin: 0 auto;
height: 6rpx;
}
}
.gprtItem_C {
height: 64rpx;
@ -369,8 +379,15 @@
padding: 0 30rpx;
margin: 0 10rpx;
float: left;
background: url(../../static/shop/bg2.png) no-repeat;
background-size:100% 100%;
// background: url(../../static/shop/bg2.png) no-repeat;
// background-size:100% 100%;
.line{
width: calc(100% - 40rpx);
min-width: 36rpx;
margin: 0 auto;
height: 6rpx;
background-color: #99241B;
}
}
}
.artworks {

2
src/pagesA/addArtActivity/addArtActivity.vue
View File

@ -196,7 +196,7 @@
let yy = new Date().getFullYear();
let mm = new Date().getMonth() + 1;
let dd = new Date().getDate();
let gettime = yy + '-' + mm + '-' + dd;
let gettime = yy + '-' + mm + '-' + dd + ' 00:00:00';
this.startTime = gettime
this.endTime = gettime
this.bmTime = gettime