电脑端登录处理 样式修改

components/auth/index.vue

@@ -43,21 +43,28 @@
 		},
 		methods: {
 			getoldUser(){//旧的 兼容电脑端
-				var that = this;
-				uni.login({
-				  provider: 'weixin',
-				  success: function (loginRes) {
-				    console.log(loginRes.authResult);
-				    // 获取用户信息
-				    uni.getUserInfo({
-				      provider: 'weixin',
-				      success: function (infoRes) {
-				        console.log(infoRes,'infoRes')
-						that.getUserInfo(infoRes)
-				      }
-				    });
-				  }
+				//4.27注释掉 给予新的提示不能在电脑端登录
+				// var that = this;
+				// uni.login({
+				//   provider: 'weixin',
+				//   success: function (loginRes) {
+				//     console.log(loginRes.authResult);
+				//     // 获取用户信息
+				//     uni.getUserInfo({
+				//       provider: 'weixin',
+				//       success: function (infoRes) {
+				//         console.log(infoRes,'infoRes')
+				// 		that.getUserInfo(infoRes)
+				//       }
+				//     });
+				//   }
+				// });
+				uni.showToast({
+					title: '电脑端暂时不能获取用户信息,请转到手机端使用！',
+					icon: 'none'
 				});
+				this.showDialog = false;
+				this.$emit('gbAuth');
 			},
 			getUserProfile(){//新的获取用户资料
 				var that = this;
@@ -192,7 +199,11 @@
 							uni.removeStorageSync("KeyWord");
 							let uid = uni.getStorageSync("mall_UserInfo").UserId;
 							that.msg.Id = uid
-							// that.updateuserinfo(that.msg);//更新用户头像
+							let IsOpenMiAi = uni.getStorageSync("basedata")?uni.getStorageSync("basedata").mall.setting.is_show_miai:0;//是否开启相亲模式
+							if(IsOpenMiAi==0){//不是相亲模式的时候去更新头像和昵称
+								that.updateuserinfo(that.msg);//更新用户头像
+							}
+							
 						}
 						 
 					}

pages/friendcircle/mydetails.vue

@@ -563,7 +563,7 @@
 					}
 				);
 			},
-			goUserinfo(x){
+			goUserinfo(x,type){
 				let  UserId  = x.createEmpId
 				if(type==2){
 					UserId = x.empId

pages/share/index/index.vue

@@ -237,7 +237,7 @@
 				IsEducation: 0,
 				orderPopupdata:{},//离线收益的弹窗
 				showorder:false,//显示弹出
-				topHeight:500,//头部高度
+				topHeight:510,//头部高度
 			}
 		},
 		created() {