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

pages/index/index.vue

@@ -84,7 +84,7 @@
 								<view class="topbg-sx-box-r flex align-center">
 									<!-- 城市 -->
 									<view class="topbg-sx-box-r-i flex align-center" style=""
-										@click="goNav('/package/screen/city?city='+city+'&county='+county+'&type='+'search')">
+										@click="getLocalJobs">
 										<text style="margin-right: 10rpx;">{{county?county:city?city:'选择城市'}}</text>
 										<u-icon name="arrow-down" color="#016bf6" size="16"></u-icon>
 									</view>
@@ -662,8 +662,9 @@
 				that.directionList = prefer
 			})
 
-
-			this.getLocalJobs();
+			//#ifdef H5
+			/* this.getLocalJobs(); */
+			//#endif
 			this.getDomWidth()
 			this.$Request.getT('/app/common/type/255').then(res => {
 				if (res.code === 0) {
@@ -908,6 +909,7 @@
 							that.getSelectCity(that.longitude, that.latitude);
 							// #endif
 						}
+						that.goNav('/package/screen/city?city='+that.city+'&county='+that.county+'&type='+'search')
 					},
 					fail: function() {
 						console.log('获取地址失败');
@@ -919,6 +921,7 @@
 						} else {
 							that.getCompanyClassify()
 						}
+						that.goNav('/package/screen/city?city='+that.city+'&county='+that.county+'&type='+'search')
 					}
 				})
 			},

pages/my/VIP/benefits.vue

@@ -733,10 +733,10 @@
 				        console.error("获取VIP详情失败", err);
 				        this.remainingDays = 0;
 				        this.vipStatus = "未开通VIP";
-				        uni.showToast({
-				            title: "获取VIP信息失败，请重试",
-				            icon: "none"
-				        });
+				        // uni.showToast({
+				        //     title: "获取VIP信息失败，请重试",
+				        //     icon: "none"
+				        // });
 				    });
 			},
 			

pages/my/attachment.vue

@@ -411,6 +411,9 @@
 	}
 	.contain{
 		padding-top: 120rpx; /* 为固定导航栏留出空间 */
+		/* #ifdef APP*/
+		padding-top: calc(120rpx + var(--status-bar-height));
+		/* #endif*/
 		height: 100vh;
 	}
 	.usermain {

pages/my/switchRoles.vue

@@ -79,8 +79,15 @@ export default {
 					confirmColor: "#016BF6",
 					complete(ret) {
 						if (ret.confirm) {
-							 uni.$emit('changeRole',{userType:index})
-							 uni.navigateBack()
+							let data = {
+							  userType: 2,
+							};
+							 that.$Request.postT("/app/user/updateUserEntity", data).then((res) => {
+							   if (res.code == 0) {
+							 	  uni.$emit('changeRole',{userType:index})
+							 	  uni.navigateBack()
+							   }
+							 });
 						}
 					},
 				});