From b06f6a316b6a8293bb8aba6bfff33336b66c032a Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 09:01:52 +0800
Subject: [PATCH] !64 版本升级 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance

---
 src/permission.ts |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/permission.ts b/src/permission.ts
index c819ff4..402fdec 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -8,6 +8,7 @@
 import useUserStore from '@/store/modules/user';
 import useSettingsStore from '@/store/modules/settings';
 import usePermissionStore from '@/store/modules/permission';
+import { RouteRecordRaw } from 'vue-router';
 
 NProgress.configure({ showSpinner: false });
 const whiteList = ['/login', '/register', '/social-callback'];
@@ -35,7 +36,7 @@
           isRelogin.show = false;
           const accessRoutes = await usePermissionStore().generateRoutes();
           // 鏍规嵁roles鏉冮檺鐢熸垚鍙闂殑璺敱琛�
-          accessRoutes.forEach((route) => {
+          accessRoutes.forEach((route: RouteRecordRaw) => {
             if (!isHttp(route.path)) {
               router.addRoute(route); // 鍔ㄦ�佹坊鍔犲彲璁块棶璺敱琛�
             }
@@ -48,7 +49,7 @@
     }
   } else {
     // 娌℃湁token
-    if (whiteList.indexOf(to.path) !== -1) {
+    if (whiteList.indexOf(to.path as string) !== -1) {
       // 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆
       next();
     } else {

--
Gitblit v1.9.3