5-23-1

pages/index/index.vue

@@ -231,8 +231,22 @@
 			getWorkerList() {
 				try {
 					getWorkerList().then(res => {
-						// console.log(res)
-						this.jxList = res.data.list
+						let arr = []
+						console.log(res,'basa');
+						res.data.list.forEach(item => {
+							let cc = false
+							arr.forEach(itemt => {
+								if(itemt.uid == item.uid) {
+									cc = true
+								}
+							})
+							if(!cc) {
+								arr.push(item)
+								console.log(item,arr);
+							}
+						})
+						this.jxList = arr
+						console.log(arr,this.jxList,'dddddd');
 					})
 				} catch (e) {
 					//TODO handle the exception

pages/user/model/model.vue

@@ -393,6 +393,9 @@
 						if(item.length == 3) {
 							arr.push(item[0].name + item[1].name + item[2].name)
 						}
+						if(item.length == 2) {
+							arr.push(item[0].name + item[1].name + '市辖区')
+						}
 					})
 					res.data.service_area_all = arr
 					// 保存用户模板数据

pages/user/model/modelrz.vue

@@ -64,8 +64,11 @@
 						</pickerAddress>
 					</view> -->
 					<view class="right flex">
-						<input class="input" v-model="updata.ancestral_place" type="text" placeholder="请填写籍贯"
-							placeholder-class="placeholder" />
+						<picker class="input" :range='jgList' mode="selector" @change="changeAncestralPlace" range-key="name">
+							<view>
+								{{updata.ancestral_place||'选择籍贯'}}
+							</view>
+						</picker>
 					</view>
 				</view>
 				<view class="flex listItem">
@@ -272,6 +275,7 @@
 </template>
 
 <script>
+	import AllAddress from '@/components/wangding-pickerAddress/data.js'
 	import {
 		getServiceTimeTypeList,
 		getServiceTypeList,
@@ -299,6 +303,7 @@
 		},
 		data() {
 			return {
+				jgList: AllAddress,
 				// 上传数据
 				updata: {
 					is_wm: '', //是否海外
@@ -350,6 +355,7 @@
 				this.type = 0
 			}
 			this.init()
+			console.log(this.jgList); 
 		},
 		computed: {
 			// #ifdef H5
@@ -517,7 +523,7 @@
 									return {
 										province: arr[0].name,
 										city: arr[1].name,
-										district: arr[2].name
+										district: arr[2] ? arr[2].name : '市辖区'
 									}
 								}): [], //选中的城市
 								mymask: res.service_intro_content, //自评
@@ -563,10 +569,8 @@
 				console.log(time);
 			},
 			// 选择籍贯
-			changeAncestralPlace({
-				data
-			}) {
-				this.updata.ancestral_place = data[2];
+			changeAncestralPlace(val) {
+				this.updata.ancestral_place = this.jgList[val.detail.value].name;
 			},
 			// 选择省市区
 			onCityClick({