登录调整

src/permission.js

@@ -34,12 +34,14 @@ router.beforeEach(async (to, from, next) => {
   }
 
   try {
-    if (isRefreshToken) {
-      isRefreshToken = false
-      const { data } = await refreshToken()
-      setToken(data)
-    } else {
-      await checkToken()
+    if (from.path !== '/login-local') {
+      if (isRefreshToken) {
+        isRefreshToken = false
+        const { data } = await refreshToken()
+        setToken(data)
+      } else {
+        await checkToken()
+      }
     }
     onFilterRoutes(to, next)
   } catch (error) {

src/utils/request.js

@@ -67,13 +67,14 @@ service.interceptors.response.use(
       return Promise.reject(str)
     }
     if (res.code === 302) {
-      const str = '登陆过期，返回登录'
+      // const str = '登陆过期，返回登录'
       deleteToken()
       const url = res.data?.redirectUrl === 'local' ? `/login-local?redirect=${route.history.current.fullPath}` : (res.data?.redirectUrl || '/login-local')
-      setTimeout(() => {
-        window.location.href = url
-      }, 500)
-      return Promise.reject(str)
+      // setTimeout(() => {
+      //   Vue.prototype.$message.error(str)
+      // })
+      window.location.href = url
+      return
     }
     // 登录验证码过期
     if (res.code === 60902) {