Merge branch 'master' of https://git.nanodreamtech.com/Boss/yizhizan-h5

package/jobIntention/city.vue

@@ -73,15 +73,17 @@
 				city: "",
 				latitude: "",
 				longitude: "",
+				type:''
 			};
 		},
 		components: {
 			navBar,
 		},
-		onLoad() {
+		onLoad(options) {
 			this.getLatOrLng(); //获取经纬度
 			this.getRmCityList(); //热门城市
 			this.getCitysList();
+			this.type=options&&options.type
 		},
 		methods: {
 			/**
@@ -174,7 +176,14 @@
 				uni.$emit("city", {
 					city: city,
 				});
-				uni.navigateBack();
+				let data = {
+					city: city=='全国'||city=='全部'?'':city,
+					county: ''
+				}
+				uni.$emit('filterCity', data)
+				uni.navigateBack({
+					delta: this.type=='search'?2:1,
+				});
 			},
 
 			bindToView(event) {

package/screen/city.vue

@@ -61,7 +61,7 @@
 			},
 			goTo(){
 				uni.navigateTo({
-					url:'/package/jobIntention/city'
+					url:'/package/jobIntention/city?type=search'
 				})
 			}
 		}