lrf 1 jaar geleden
bovenliggende
commit
10c47ae199
2 gewijzigde bestanden met toevoegingen van 25 en 21 verwijderingen
  1. 15 13
      src/router/guard.js
  2. 10 8
      src/utils/axios-wrapper.js

+ 15 - 13
src/router/guard.js

@@ -143,19 +143,21 @@ export const registerBeforeRouter = async (router) => {
       NProgress.inc()
       const { menus, errcode, errmsg } = await getUserMeta(token)
       // 登录信息有问题
-      if (errcode.includes('FRAMEERROR_401')) {
-        await ElMessageBox.alert(errmsg, i18n.global.t('common.user_confirm'), {
-          confirmButtonText: i18n.global.t('common.re_login'),
-          type: 'error',
-        })
-        next('/login')
-        return
-      } else if (errcode !== 0) {
-        await ElMessageBox.alert(errmsg, i18n.global.t('common.user_confirm'), {
-          confirmButtonText: i18n.global.t('common.re_login'),
-          type: 'error'
-        })
-        location.reload()
+      if (errcode !== 0) {
+        if (errcode.includes('FRAMEERROR_401')) {
+          await ElMessageBox.alert(errmsg, i18n.global.t('common.user_confirm'), {
+            confirmButtonText: i18n.global.t('common.re_login'),
+            type: 'error',
+          })
+          next('/login')
+          return
+        } else {
+          await ElMessageBox.alert(errmsg, i18n.global.t('common.user_confirm'), {
+            confirmButtonText: i18n.global.t('common.re_login'),
+            type: 'error'
+          })
+          location.reload()
+        }
       }
       // 菜单格式不正确
       if (!menus) {

+ 10 - 8
src/utils/axios-wrapper.js

@@ -96,14 +96,16 @@ export class AxiosWrapper {
       const { errcode, errmsg, details } = returnRes
       if (errcode) {
         console.warn(`[${uri}] fail: ${errcode}-${errmsg} ${details}`)
-        if (errcode.includes('FRAMEERROR_401')) {
-          await ElMessageBox.alert(errmsg, i18n.global.t('common.user_confirm'), {
-            confirmButtonText: i18n.global.t('common.re_login'),
-            type: 'error',
-            callback: (act) => {
-              router.replace('/login')
-            }
-          })
+        if(errcode!==0) {
+          if (errcode.includes('FRAMEERROR_401')) {
+            await ElMessageBox.alert(errmsg, i18n.global.t('common.user_confirm'), {
+              confirmButtonText: i18n.global.t('common.re_login'),
+              type: 'error',
+              callback: (act) => {
+                router.replace('/login')
+              }
+            })
+          }
         }
         return returnRes
       }