From a117f28f890f89bfef46b0920b4861b542cd395b Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 26 五月 2025 13:46:27 +0800
Subject: [PATCH] 回款登记功能修改
---
src/permission.js | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 2a4f871..a7d9f87 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,15 +3,19 @@
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', '/register'];
+const whiteList = ['/login', '/register']
+
+const isWhiteList = (path) => {
+ return whiteList.some(pattern => isPathMatch(pattern, path))
+}
router.beforeEach((to, from, next) => {
NProgress.start()
@@ -21,6 +25,8 @@
if (to.path === '/login') {
next({ path: '/' })
NProgress.done()
+ } else if (isWhiteList(to.path)) {
+ next()
} else {
if (useUserStore().roles.length === 0) {
isRelogin.show = true
@@ -48,7 +54,7 @@
}
} else {
// 娌℃湁token
- if (whiteList.indexOf(to.path) !== -1) {
+ if (isWhiteList(to.path)) {
// 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆
next()
} else {
--
Gitblit v1.9.3