Merge branch 'master' of https://gitee.com/beiwu/jobslink-user-clent

components/vertical-menu/classifyData.js

@@ -95,7 +95,7 @@ export default [
     ],
   },
   {
-    name: "省市区县",
+    name: "区域",
     data: [
       {
         name: "薪资不限",

components/vertical-menu/vertical-menu.vue

@@ -16,7 +16,7 @@
                             <text>{{ item.name }}</text>
                         </view>
                         <view class="item-container">
-                            <view @click="clickFunc({ 'type': 'address' })" v-if="item.name === `省市区县`"
+                            <view @click="clickFunc({ 'type': 'address' })" v-if="item.name === `区域`"
                                 class="thumb-box thumb-box1">
                                 <u-cell-group>
                                     <u-cell icon="map" :title="areaModal.address" :isLink="true"
@@ -388,10 +388,11 @@ export default {
 
 .page-view {
     padding: 8rpx;
+    padding-left: 4rpx;
 }
 
 .class-item {
-    margin-bottom: 30rpx;
+    margin-bottom: 10rpx;
     background-color: #fff;
     padding: 16rpx;
     border-radius: 8rpx;

pageMy/my/resume/index.vue

@@ -19,7 +19,7 @@
 			<view class="title_text">
 				我的职业技能
 			</view>
-			<image v-if="mySkills.length < 5" src="../../../static/img/add.gray.svg" mode="" @click="goAdd"></image>
+			<image v-if="mySkills.length < 2" src="../../../static/img/add.gray.svg" mode="" @click="goAdd"></image>
 		</view>
 
 		<view class="listBody">
@@ -34,14 +34,28 @@
 				</view>
 			</m-slide-list>
 		</view>
-		<view class="jobcontent" @click="goSetCity">
+		<!-- <view class="jobcontent" @click="goSetCity">
 			<view class="jobinfo">
 				<view
-					v-bind:class="['jobAddress', { 'input-error': (!myResume.city.id || !myResume.city.workplace) && isShowBorder }]">
+					v-bind:class="['jobAddress', { 'input-error': !myResume.city.id && !myResume.city.workplace && isShowBorder }]">
 					您想工作的地点
 				</view>
 				<view v-bind:class="['jobText']">
-					{{ myResume.city == {} ? myResume.city.id ? getCity(myResume.city.id) : myResume.city.workplace : '请选择'
+					{{ myResume.city !== "{}" ? myResume.city.id ? getCity(myResume.city.id) : myResume.city.workplace : '请选择'
+					}}
+				</view>
+			</view>
+			<image src="../../../static/img/right.svg" mode=""></image>
+		</view> -->
+		<view class="jobcontent" @click="areaModal.addressShow = true">
+			<view class="jobinfo">
+				<view
+					v-bind:class="['jobAddress', { 'input-error': !myResume.city.id && !myResume.city.workplace && isShowBorder }]">
+					您想工作的地点
+				</view>
+				<view v-bind:class="['jobText']">
+					{{ myResume.city !== "{}" ? myResume.city.id ? getCity(myResume.city.id) : myResume.city.workplace :
+						'请选择'
 					}}
 				</view>
 			</view>
@@ -53,7 +67,7 @@
 					您的学历
 				</view>
 				<view v-bind:class="['jobText']">
-					{{ myResume.education == {} ? myResume.education.label : '请选择' }}
+					{{ myResume.education !== "{}" ? myResume.education.label : '请选择' }}
 				</view>
 			</view>
 			<image src="../../../static/img/right.svg" mode=""></image>
@@ -89,6 +103,12 @@
 			keyName="label"></u-picker>
 
 		<u-toast ref="uToast"></u-toast>
+
+		<!-- 省市 -->
+		<data-picker :show="areaModal.addressShow" @confirm='confirmAddress' @cancel='areaModal.addressShow = false'
+			@close='areaModal.addressShow = false' :defaultNames="areaModal.defaultNames" :indexs="areaModal.indexs"
+			:defaultIds="areaModal.defaultIds" :showToolbar="false" :showBottombar="true"
+			:labelName="areaModal.labelName"></data-picker>
 	</view>
 </template>
 
@@ -135,7 +155,18 @@ export default {
 			canSubMit: false,
 			isShowButton: false,
 			isShowBorder: false,
-			isShowAddSkill: true
+			isShowAddSkill: true,
+
+			areaModal: {
+				address: '',
+				addressShow: false,
+				title: 'Hello',
+				// indexs: [0, 0, 8],
+				// defaultIds: [1, 110000, 110106],
+				defaultNames: ['北京市', '北京市', '东城区'],
+				labelName: "areaName"
+
+			},
 		}
 	},
 	onShow() {
@@ -217,6 +248,7 @@ export default {
 			})
 		},
 		goAdd: function () {
+
 			uni.navigateTo({
 				url: './addSkill'
 			})
@@ -306,7 +338,7 @@ export default {
 				// 电话号码格式正确
 				console.log(phone, "电话号码格式正确");
 				setResume({
-					id: this.id, education: education.label, workplace: city.parentLabel + '-' + city.label, telephone: phone, wage
+					id: this.id, education: education.label, workplace: city.workplace ? city.workplace : city.parentLabel + '-' + city.label, telephone: phone, wage
 				}).then(res => {
 					this.isShowButton = false;
 					this.getResume()
@@ -321,7 +353,17 @@ export default {
 
 
 
-		}
+		},
+
+		confirmAddress(val) {
+			console.log(val);
+			var valArr = val.value;
+			// this.areaModal.address = [...new Set(val.value)].join(' / ')
+			this.isShowButton = true
+			this.myResume.city.workplace = [...new Set(val.value)].join('/')
+			console.log(this.areaModal.address);
+			this.areaModal.addressShow = false
+		},
 	}
 }
 </script>