Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages_order/kepp/keepAccountsDetail.vue

pages_order/work/jobPosting.vue

@@ -24,7 +24,7 @@
 			<uv-cell
 			title="工作地点"
 			rightIconStyle="fontSize: 30rpx;"
-			:value="form.address||'请选择招工地点'"
+			:value="form.workAddress||'请选择招工地点'"
 			@click="selectAddr"
 			isLink
 			></uv-cell>
@@ -198,7 +198,7 @@
 				form : {
 					// jobContext : '',
 					phone : '',
-					address:'',
+					workAddress:'',
 					title : '',
 					workAge : '',
 					natureId : 0,
@@ -251,7 +251,7 @@
 				this.pickerKey = key
 				if(picker){
 					picker.open()
-				}else{
+				}else{ 
 					this.$refs.picker.open()
 				}
 			},
@@ -276,7 +276,7 @@
 				
 				if (this.$utils.verificationAll(this.form, {
 						title: '请输入招工标题',
-						// address : '请选择工作地点',
+						workAddress : '请选择工作地点',
 						workAge : '请选择工龄要求',
 						// company : '请输入招聘公司',
 						salaryLow : '请输入薪资范围',
@@ -321,13 +321,13 @@
 				this.form.longitude = res.longitude
 			
 				// if (res.name) { //用户直接选择城市的逻辑
-				if (!res.address && res.name) { //用户直接选择城市的逻辑
-					return this.form.address = res.name
+				if (!res.workAddress && res.name) { //用户直接选择城市的逻辑
+					return this.form.workAddress = res.name
 				}
-				if (res.address || res.name) {
-					return this.form.address = res.address + res.name
+				if (res.workAddress || res.name) {
+					return this.form.workAddress = res.workAddress + res.name
 				}
-				this.form.address = '' //用户啥都没选就点击勾选
+				this.form.workAddress = '' //用户啥都没选就点击勾选
 				this.form.latitude = ''
 				this.form.longitude = ''
 			},