From f32a7105c38ee455c4b165d48651ef19fc6948db Mon Sep 17 00:00:00 2001 From: ahaos <8406649+lhailgl@user.noreply.gitee.com> Date: 星期三, 13 十二月 2023 18:35:55 +0800 Subject: [PATCH] !68 修复升级依赖带来的问题 * Merge remote-tracking branch 'origin/dev' into dev * 升级依赖 * Merge remote-tracking branch 'origin/ts' into ts * 升级依赖 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance --- src/permission.ts | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/permission.ts b/src/permission.ts index 402fdec..2fc105b 100644 --- a/src/permission.ts +++ b/src/permission.ts @@ -16,13 +16,13 @@ router.beforeEach(async (to, from, next) => { NProgress.start(); if (getToken()) { - to.meta.title && useSettingsStore().setTitle(to.meta.title as string); + to.meta.title && useSettingsStore().setTitle(to.meta.title); /* has token*/ if (to.path === '/login') { next({ path: '/' }); NProgress.done(); - } else if (whiteList.indexOf(to.path) !== -1) { - next() + } else if (whiteList.indexOf(to.path as string) !== -1) { + next(); } else { if (useUserStore().roles.length === 0) { isRelogin.show = true; -- Gitblit v1.9.3