lilei 1 year ago
parent
commit
2b47645838
1 changed files with 17 additions and 16 deletions
  1. 17 16
      api/request.js

+ 17 - 16
api/request.js

@@ -33,22 +33,23 @@ function request(options,hasNoToken) {
       if (_obj.url.indexOf('checkLogin') > -1) {
         resolve(res.data);
       } else if (res.data.status === '900010' || isCloseUser) {
-        setTimeout(function() {
-          wx.showToast({
-            title: isCloseUser ? closeMsg : '登录已过期,请重新登录',
-            icon: 'none',
-            duration: 1000
-          });
-        }, 50);
-		setTimeout(function() {
-		  uni.removeStorageSync('token')
-		  uni.removeStorageSync('userInfo')
-		  uni.removeStorageSync('permCodes')
-		  uni.removeStorageSync('userPhoto')
-		  uni.reLaunch({
-		  	url: `/pages/login/login`
-		  })
-		}, 1000);
+		uni.showModal({
+			title: '提示',
+			content: isCloseUser ? closeMsg : '登录已过期,请重新登录',
+			confirmText: '知道了',
+			showCancel: false,
+			success(res) {
+				if(res.confirm){
+					uni.removeStorageSync('token')
+					uni.removeStorageSync('userInfo')
+					uni.removeStorageSync('permCodes')
+					uni.removeStorageSync('userPhoto')
+					uni.reLaunch({
+						url: `/pages/login/login`
+					})
+				}
+			}
+		})
       } else {
         resolve(res.data);
       }