From cf1ee9d413456f37d1abc5d8ed23a9875aa15bb1 Mon Sep 17 00:00:00 2001 From: 张诺 <zhang_12370@163.com> Date: 星期一, 26 五月 2025 15:11:26 +0800 Subject: [PATCH] 销售管理>销售台站=》设置新增数据默认日期,添加子产品添加搜索逻辑更改为tree树形式,根据登录的账号匹配用户昵称默认选择当前用户昵称 --- src/permission.js | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/permission.js b/src/permission.js index 1afe9cd..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,7 +25,7 @@ if (to.path === '/login') { next({ path: '/' }) NProgress.done() - } else if (whiteList.indexOf(to.path) !== -1) { + } else if (isWhiteList(to.path)) { next() } else { if (useUserStore().roles.length === 0) { @@ -50,7 +54,7 @@ } } else { // 娌℃湁token - if (whiteList.indexOf(to.path) !== -1) { + if (isWhiteList(to.path)) { // 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆 next() } else { -- Gitblit v1.9.3