fix(request,permission): 修复：登录凭证过期后，点击重新登录按钮，不回调登录页面问题

src/permission.js

@@ -50,10 +50,7 @@ router.beforeEach((to, from, next) => {
             })
           })
         }).catch(err => {
-          useUserStore().logOut().then(() => {
-            ElMessage.error(err)
-            next({ path: '/' })
-          })
+          ElMessage.error(err)
         })
       } else {
         next()

src/utils/request.js

@@ -7,6 +7,7 @@ import cache from '@/plugins/cache'
 import { saveAs } from 'file-saver'
 import useUserStore from '@/store/modules/user'
 import { fsClientAuth } from '@/api'
+import router from '@/router'
 
 let downloadLoadingInstance;
 // 是否显示重新登录
@@ -106,7 +107,8 @@ service.interceptors.response.use(async res => {
     ElMessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', { confirmButtonText: '重新登录', cancelButtonText: '取消', type: 'warning' }).then(() => {
       isRelogin.show = false;
       useUserStore().logOut().then(() => {
-        location.href = '#/login';
+        // location.href = '#/login';
+        router.push({ path: '/login' })
       })
     }).catch(() => {
       isRelogin.show = false;