拉取代码

pages/homePage/homePage.vue

@@ -54,7 +54,21 @@
 			        confirmColor: defaultColor,
 			        confirmText: '取消',
 			      });
-			    } else if (res.status == 555) {
+			    } else if (res.status == 508){
+						uni.showModal({
+							title: '提示',
+							content: res.remarks,
+							showCancel: false,
+							confirmColor: '#49b856',
+							success: function(res1) {
+								if (res1.confirm) {
+									console.log('用户点击确定');
+								} else if (res1.cancel) {
+									console.log('用户点击取消');
+								}
+							}
+						});
+					}else if (res.status == 555) {
 			      uni.reLaunch({
 			        url: `/pages/initBind/initBind?wechat=${res.wechat}`
 			      })
@@ -92,7 +106,21 @@
 			        confirmColor: defaultColor,
 			        confirmText: '取消',
 			      });
-			    } else if (res.status == 555) {
+			    } else if (res.status == 508){
+						uni.showModal({
+							title: '提示',
+							content: res.remarks,
+							showCancel: false,
+							confirmColor: '#49b856',
+							success: function(res1) {
+								if (res1.confirm) {
+									console.log('用户点击确定');
+								} else if (res1.cancel) {
+									console.log('用户点击取消');
+								}
+							}
+						});
+					}else if (res.status == 555) {
 			      uni.reLaunch({
 			        url: `/pages/initBind/initBind?wechat=${res.wechat}`
 			      })

share/useWechatAuth.js

@@ -14,10 +14,8 @@ export function useWechatAuth() {
       redirectUrl: location.origin + location.pathname
     }).then(res => {
       uni.hideLoading();
-      if (res.url) {
-        window.location.href = res.url;
-      } else {
-        loginSuccess(res.user);
+			if (res.state == "200"){
+				loginSuccess(res.user);
 				transform(res.user);
 				api_systemConfiguration({
 					idx: 0,
@@ -33,7 +31,23 @@ export function useWechatAuth() {
 				api_getDictionary(postData).then((data) => {
 					uni.setStorageSync('groupData',JSON.stringify(data))
 				});
-      }
+			} else if (res.state == "501"){
+				uni.showModal({
+				  title: '提示',
+				  content: res.remarks,
+				  showCancel: false,
+				  confirmColor: '#49b856',
+				  success: function(res1) {
+				    if (res1.confirm) {
+				      console.log('用户点击确定');
+				    } else if (res1.cancel) {
+				      console.log('用户点击取消');
+				    }
+				  }
+				});
+			}else if (res.url){
+				window.location.href = res.url;
+			}
     });
   }