From 3286323c8cb6f5e8d1a6862e9a5069dae781569d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期五, 17 三月 2023 14:24:54 +0800
Subject: [PATCH] 优化弹窗后导航栏偏移的问题(I3YMWW)
---
src/permission.js | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 11c27ed..2a4f871 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,28 +1,33 @@
import router from './router'
-import store from './store'
import { ElMessage } from 'element-plus'
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import { getToken } from '@/utils/auth'
import { isHttp } from '@/utils/validate'
+import { isRelogin } from '@/utils/request'
+import useUserStore from '@/store/modules/user'
+import useSettingsStore from '@/store/modules/settings'
+import usePermissionStore from '@/store/modules/permission'
NProgress.configure({ showSpinner: false });
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register'];
+const whiteList = ['/login', '/register'];
router.beforeEach((to, from, next) => {
NProgress.start()
if (getToken()) {
- to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
+ to.meta.title && useSettingsStore().setTitle(to.meta.title)
/* has token*/
if (to.path === '/login') {
next({ path: '/' })
NProgress.done()
} else {
- if (store.getters.roles.length === 0) {
+ if (useUserStore().roles.length === 0) {
+ isRelogin.show = true
// 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁宸叉媺鍙栧畬user_info淇℃伅
- store.dispatch('GetInfo').then(() => {
- store.dispatch('GenerateRoutes').then(accessRoutes => {
+ useUserStore().getInfo().then(() => {
+ isRelogin.show = false
+ usePermissionStore().generateRoutes().then(accessRoutes => {
// 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛�
accessRoutes.forEach(route => {
if (!isHttp(route.path)) {
@@ -32,7 +37,7 @@
next({ ...to, replace: true }) // hack鏂规硶 纭繚addRoutes宸插畬鎴�
})
}).catch(err => {
- store.dispatch('LogOut').then(() => {
+ useUserStore().logOut().then(() => {
ElMessage.error(err)
next({ path: '/' })
})
--
Gitblit v1.9.3