!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
This commit is contained in:
ahaos
2023-12-13 10:35:55 +00:00
parent b06f6a316b
commit f32a7105c3
22 changed files with 172 additions and 203 deletions

View File

@ -16,13 +16,13 @@ const whiteList = ['/login', '/register', '/social-callback'];
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;