Merge remote-tracking branch 'origin/branch' into branch

chenbiao
2 parents 98538603 b51d6d28
Showing 2 changed files with 14 additions and 4 deletions
App.vue
common/requestServer.js
@@ -25,7 +25,16 @@
 				checkUpdate()
 			}
-			// 一键登录预登陆，可以显著提高登录速度
+      let token = getGlobalUser("globalUser").token
+      if(!token){
+        //不存在则跳转至登录页
+        uni.reLaunch({
+          url: "/pages/index/index"
+        })
+      }
+
+
+      // 一键登录预登陆，可以显著提高登录速度
 			uni.preLogin({
 				provider: 'univerify',
 				success: (res) => {
@@ -31,8 +31,9 @@ export const myRequest = (options) =&gt; {
 				console.log(result);
 				if (result.code == 0) {
+
 					resolve(result)
-				} else if (result.code == -10000) {
+				} else if (result.code === '-10000') {
 					uni.showModal({
 						title: '提示',
 						content: result.message,
@@ -41,8 +42,8 @@ export const myRequest = (options) =&gt; {
 							if (res.confirm) {
 								console.log('登录失效');
 								uni.clearStorageSync();
-								uni.reLaunch({
-									url: "../pages/index/index"
+								uni.navigateTo({
+									url: "/pages/index/index"
 								})
 								uni.hideLoading();
 							}