1

pages/verification/index.vue

@@ -56,7 +56,7 @@
 								<view class="label">订购数量:</view>
 								<view class="text">{{item.num}}</view>
 							</view>
-							<view class="flex">
+							<view class="flex" v-if="item.contact_num&&item.contact_num>0">
 								<view class="label">出行人数:</view>
 								<view class="text">{{item.contact_num}}</view>
 							</view>
@@ -70,7 +70,7 @@
 							</view>
 							<view class="flex">
 								<view class="label">联系电话:</view>
-								<view class="text">{{item.phone}}</view>
+								<view class="text">{{item.phone || item.contact_tel}}</view>
 							</view>
 							<!-- <view class="flex">
 								<view class="label">出行人:</view>

subPackages/user/infoFilling.vue

@@ -87,7 +87,7 @@
 						<view v-if="item.nameStr" class="text-overflow icon-select" >{{item.nameStr}}</view>
 						<view v-else class="empty-value icon-select" >请选择</view>
 					</view>
-					<view class="userinfo-item" @click="openRankOption(item)">
+					<view class="userinfo-item" @click="openRankOption(item)" v-show="item.name!=1">
 						<span>级别</span>
 						<view v-if="item.rankStr" class="text-overflow icon-select" >{{item.rankStr}}</view>
 						<view v-else class="empty-value icon-select" >请选择</view>
@@ -204,7 +204,7 @@
 				speakText: [],
 				
 				honor: [],
-				honorNameList: [{id: 1, name: "称号1"},{id: 2, name: "称号2"}],
+				honorNameList: [{id: 1, name: "导游资源库"},{id: 2, name: "文明导游"},{id: 3, name: "金牌导游"},{id: 4, name: "品牌导游"}],
 				honorRankList: [{id: 1, name: "全国级"}, {id: 2, name: "省级"}, {id:3,name:"市级"}],
 				
 				selectionItem: null, // 景点选中更改的值
@@ -215,16 +215,9 @@
 				
 				deleteMode: false, // 视频删除
 				
-				province: [
+				province: [],
-					{id: 1, name: '北京', children: [{id:2, name: '北京'}, {id:3, name: "h萨拉开放"}]},
-					{id: 4, name: '北京2', children: [{id:5, name: '北京2'}, {id:6, name: "h萨拉开放2"}]},
-				],
 				mulProvince : [
-					[
+					[],[]
-						{id: 1, name: '北京',children: [{id:2, name: '北京'}, {id:3, name: "h萨拉开放"}]},
-						{id: 4, name: '北京2',children: [{id:5, name: '北京2'}, {id:6, name: "h萨拉开放2"}]},
-					],
-					[{id:2, name: '北京'}, {id:3, name: "h萨拉开放"}]
 				]
 			}
 		},
@@ -359,7 +352,29 @@
 					]
 				}
 				this.honor = honor
+				this.initAddress()
+				
+			},
+			
+			initAddress () {
+				this.Post({id: 1},'/api/common/getAreaList').then(res => {
+					this.province = res.data || []
+					this.mulProvince[0] = res.data || [] 
+					let data = this.province[0]
+					if (data) {
+						this.initChildProvince(data.id)
+					}
+				})
+			},
+			
+			initChildProvince (parent_id) {
+				this.Post({id: parent_id},'/api/common/getAreaList').then(res => {
+					this.mulProvince[1] = res.data || [] 
+					this.$forceUpdate()
+				})
 			},
+			
+			
 			addHonor() {
 				this.honor.push({nameStr: '', name: null, rank: null,rankId: null, rankStr: '',fileList: []})
 			},
@@ -388,23 +403,26 @@
 				// 市级
 				if (Array.isArray(value)) {
 					this.selectionItem.rank = 3
-					this.selectionItem.rankId = value[1]
+					this.selectionItem.rankId = this.mulProvince[1][value[1]].id
 					let address = this.mulProvince[0][value[0]].name+this.mulProvince[1][value[1]].name
 					this.selectionItem.rankStr = `市级（${address}）`
 				} else {
 					this.selectionItem.rank = 2
-					this.selectionItem.rankId = value
+					this.selectionItem.rankId =this.mulProvince[0][value].id
 					let address = this.province[value].name
 					this.selectionItem.rankStr = `省级（${address}）`
 				}
+				console.log(this.selectionItem)
 				
 			},
+			// console.log('第一列滑动');
 			pickerColumnchange (e) {
 				if(e.detail.column === 0){
 					let index = e.detail.value
-					// console.log('第一列滑动');
+					let data = this.mulProvince[0][index]
-					// this.newProvinceDataList[1] = [];
+					if (data) {
-					this.mulProvince[1] = this.mulProvince[0][index].children || []
+						this.initChildProvince(data.id)
+					}
 				}
 			},
 
@@ -632,8 +650,16 @@
 				if (this.valueType == 'honor') {
 					// 过滤都没填的数据
 					let data = this.honor.filter(v=> !(!v.name&&!v.rank&&v.fileList.length<=0))
+					data.forEach(v=>{
+						if (v.name == 1) {
+							v.rank = null
+							v.rankId = null
+							v.rankStr = ''
+						}
+					})
+					
 					if (data.length>0) {
-						if (data.every(v=>(v.name&&v.rank&&v.fileList.length>0))) {
+						if (data.every(v=>(v.name&&(v.name==1 || v.name!=1&&v.rank)&&v.fileList.length>0))) {
 							this.inputValue = JSON.parse(JSON.stringify(data))
 							this.inputValueStr = data[0].nameStr
 						} else {
@@ -685,7 +711,7 @@
 		min-height: 100vh;
 		overflow-x: hidden;
 		background: white;
-		padding-bottom: 50rpx;
+		padding-bottom: 200rpx;
 	}
 	.bg.honorBG{
 		background: #F1F1F1;

subPackages/user/userInfo.vue

@@ -39,7 +39,7 @@
 				<view class="text-overflow" v-if="info.certificate_number">{{info.certificate_number}}</view>
 				<view v-else class="empty-value">请填写</view>
 			</view>
-			<view class="userinfo-item" >
+			<view class="userinfo-item edit" @click="changeValue('honor')">
 				<span>荣誉称号</span>
 				<view class="text-overflow" v-if="info.honorStr">{{info.honorStr}}</view>
 				<view v-else class="empty-value">请选择</view>
@@ -154,9 +154,11 @@
 					let resData = res.data
 					let lingo_idsFileList = []
 					let video_list = []
+					let honor = []
 					try {
 						lingo_idsFileList = (resData.lingo_image_list || '').split(',').filter(v=>v)
 						video_list = (resData.video_list || '').split(',').filter(v=>v)
+						honor = JSON.parse(resData.honor) || []
 					} catch(e){}
 					
 					this.info = {
@@ -178,7 +180,7 @@
 						sparkle_textStr:(resData.sparkle_text || []).map(v=>v.text).join(','),
 						
 						video_list: video_list,
-						honor: [], honorStr: ''
+						honor: honor, honorStr: honor&&honor.length>0?honor[0].nameStr:""
 					}
 				})
 			},
@@ -280,6 +282,9 @@
 				if (valueType == 'sparkle_text') {
 					inputValue = this.info.sparkle_textStr
 				}
+				if (valueType == 'honor') {
+					uni.setStorageSync("userHonor",JSON.stringify(this.info.honor))
+				}
 				
 				uni.navigateTo({
 					url: `/subPackages/user/infoFilling?valueType=${valueType}&inputValue=${inputValue}`
@@ -364,7 +369,8 @@
 					...this.info,
 					lingo_image_list: this.info.lingo_idsFileList.join(','),
 					video_list: this.info.video_list.join(','),
-					sparkle_text: JSON.stringify(this.info.sparkle_text)
+					sparkle_text: JSON.stringify(this.info.sparkle_text),
+					honor:  this.info.honor&&this.info.honor.length>0?JSON.stringify(this.info.honor):'',
 				}
 				delete param.nickname
 				delete param.gender

unpackage/dist/build/web/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>daoyou</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.2c1f3bb5.js></script><script src=/static/js/index.4b0630df.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.2c1f3bb5.js></script><script src=/static/js/index.4a619f61.js></script></body></html>