sunlupeng před 1 rokem
rodič
revize
b9af843b95
4 změnil soubory, kde provedl 19 přidání a 15 odebrání
  1. 6 3
      pages.json
  2. 1 2
      permission.js
  3. 6 5
      utils/request.js
  4. 6 5
      utils/upload.js

+ 6 - 3
pages.json

@@ -14,17 +14,20 @@
   }, {
     "path": "pages/work/index",
     "style": {
-      "navigationBarTitleText": "审批中心"
+      "navigationBarTitleText": "审批中心",
+      "navigationStyle": "custom"
     }
   }, {
     "path": "pages/message/index",
     "style": {
-      "navigationBarTitleText": "消息"
+      "navigationBarTitleText": "消息",
+      "navigationStyle": "custom"
     }
   },  {
     "path": "pages/mine/index",
     "style": {
-      "navigationBarTitleText": "我的"
+      "navigationBarTitleText": "我的",
+      "navigationStyle": "custom"
     }
   }, {
     "path": "pages/mine/avatar/index",

+ 1 - 2
permission.js

@@ -64,10 +64,9 @@ list.forEach(item => {
                     console.log("===登录授权=", res);
                     setToken(res.data);
                     setTenantId(res.msg)
-                    uni.reLaunch({ url: "/" })
                     // 设置用户信息
                     store.dispatch('GetInfo').then(res => {
-                      that.$tab.reLaunch('/pages/index')
+                      uni.reLaunch({ url: "/" })
                     })
                     resolve();
                   })

+ 6 - 5
utils/request.js

@@ -41,11 +41,12 @@ const request = config => {
         const code = res.data.code || 200
         const msg = errorCode[code] || res.data.msg || errorCode['default']
         if (code === 401) {
-          showConfirm('登录状态已过期,您可以继续留在该页面,或者重新登录?').then(res => {
-            if (res.confirm) {
-              uni.reLaunch({ url: '/' })
-            }
-          })
+          uni.reLaunch({ url: '/' })
+          // showConfirm('登录状态已过期,您可以继续留在该页面,或者重新登录?').then(res => {
+          //   if (res.confirm) {
+          //     uni.reLaunch({ url: '/' })
+          //   }
+          // })
           reject('无效的会话,或者会话已过期,请重新登录。')
         } else if (code === 500) {
           toast(msg)

+ 6 - 5
utils/upload.js

@@ -38,11 +38,12 @@ const upload = config => {
           if (code === 200) {
             resolve(result)
           } else if (code == 401) {
-            showConfirm("登录状态已过期,您可以继续留在该页面,或者重新登录?").then(res => {
-              if (res.confirm) {
-                uni.reLaunch({ url: '/' })
-              }
-            })
+            uni.reLaunch({ url: '/' })
+            // showConfirm("登录状态已过期,您可以继续留在该页面,或者重新登录?").then(res => {
+            //   if (res.confirm) {
+            //     uni.reLaunch({ url: '/' })
+            //   }
+            // })
             reject('无效的会话,或者会话已过期,请重新登录。')
           } else if (code === 500) {
             toast(msg)