From d2f707e2936f0f2037db315c36abe0f0a19d49d8 Mon Sep 17 00:00:00 2001
From: Eratosici <ZL769@163.com>
Date: Tue, 18 Jan 2022 09:30:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=A6=81=E7=94=A8=E8=B4=A6?=
 =?UTF-8?q?=E6=88=B7=E8=B7=B3=E8=BD=AC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/accountLogin/accountLogin.vue |  6 +++---
 utils/http.js                       | 32 +++++++++++++++++++----------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/pages/accountLogin/accountLogin.vue b/pages/accountLogin/accountLogin.vue
index a860913..76439b9 100644
--- a/pages/accountLogin/accountLogin.vue
+++ b/pages/accountLogin/accountLogin.vue
@@ -164,9 +164,9 @@
 						},
 						callBack: res => {
 							console.log("login",res)
-							var loginResult = '';
-							uni.setStorageSync("loginResult",res);
-							uni.setStorageSync('token', 'bearer' + res.access_token);
+							// var loginResult = '';
+							// uni.setStorageSync("loginResult",res);
+							// uni.setStorageSync('token', 'bearer' + res.access_token);
 							// return
 							http.loginSuccess(res, () => {
 								uni.showToast({
diff --git a/utils/http.js b/utils/http.js
index 64e2248..f37745f 100644
--- a/utils/http.js
+++ b/utils/http.js
@@ -247,26 +247,36 @@ var getToken = function (fn) {
  * @param {Object} fn		登录成功后的回调
  */
 function loginSuccess (result, fn) {
-	// 保存登陆信息
-	wx.setStorageSync('loginResult', result)
-	// 保存成功登录标识,token过期判断
-	wx.setStorageSync('hadLogin', true)
-	// 没有获取到用户昵称，说明服务器没有保存用户的昵称，也就是用户授权的信息并没有传到服务器
-	// if (!result.pic) {
-	// 	updateUserInfo();
-	// }
 	if (!result.enabled) {
 		uni.showModal({
 			showCancel: false,
 			title: "提示",
 			content: "您已被禁用，不能购买，请联系客服",
 			cancelText: "取消",
-			confirmText: "确定"
+			confirmText: "确定",
+			success: function (res) {
+        if (res.confirm) {
+					uni.switchTab({
+						url: '/pages/index/index'
+					});
+        }
+			}
 		})
 		wx.setStorageSync('token', '');
-	} else {
-		wx.setStorageSync('token', 'bearer' + result.access_token); //把token存入缓存，请求接口数据时要用
+		return
 	}
+
+	// 保存登陆信息
+	wx.setStorageSync('loginResult', result)
+	// 保存成功登录标识,token过期判断
+	wx.setStorageSync('hadLogin', true)
+	// 没有获取到用户昵称，说明服务器没有保存用户的昵称，也就是用户授权的信息并没有传到服务器
+	// if (!result.pic) {
+	// 	updateUserInfo();
+	// }
+
+	wx.setStorageSync('token', 'bearer' + result.access_token); //把token存入缓存，请求接口数据时要用
+	
 	if (result.userId) {
 		wx.setStorageSync('hadBindUser', true);
 		getCartCount()