From 3ee713b4feb3b1dba3b66f59c4bd25ecf69a791f Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 26 五月 2025 16:32:54 +0800
Subject: [PATCH] 开票台账功能修改
---
src/permission.js | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 82a8a59..a7d9f87 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -1,31 +1,39 @@
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 { isHttp, isPathMatch } 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 });
+NProgress.configure({ showSpinner: false })
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register'];
+const whiteList = ['/login', '/register']
+
+const isWhiteList = (path) => {
+ return whiteList.some(pattern => isPathMatch(pattern, path))
+}
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 (isWhiteList(to.path)) {
+ next()
} else {
- if (store.getters.roles.length === 0) {
+ if (useUserStore().roles.length === 0) {
isRelogin.show = true
// 鍒ゆ柇褰撳墠鐢ㄦ埛鏄惁宸叉媺鍙栧畬user_info淇℃伅
- store.dispatch('GetInfo').then(() => {
+ useUserStore().getInfo().then(() => {
isRelogin.show = false
- store.dispatch('GenerateRoutes').then(accessRoutes => {
+ usePermissionStore().generateRoutes().then(accessRoutes => {
// 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛�
accessRoutes.forEach(route => {
if (!isHttp(route.path)) {
@@ -35,7 +43,7 @@
next({ ...to, replace: true }) // hack鏂规硶 纭繚addRoutes宸插畬鎴�
})
}).catch(err => {
- store.dispatch('LogOut').then(() => {
+ useUserStore().logOut().then(() => {
ElMessage.error(err)
next({ path: '/' })
})
@@ -46,7 +54,7 @@
}
} else {
// 娌℃湁token
- if (whiteList.indexOf(to.path) !== -1) {
+ if (isWhiteList(to.path)) {
// 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆
next()
} else {
--
Gitblit v1.9.3