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/router/index.ts | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/router/index.ts b/src/router/index.ts
index 76a81bc..0792d8e 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,4 +1,4 @@
-import { createWebHistory, createRouter, RouteOption } from 'vue-router';
+import { createWebHistory, createRouter, RouteRecordRaw } from 'vue-router';
/* Layout */
import Layout from '@/layout/index.vue';
@@ -25,7 +25,7 @@
*/
// 鍏叡璺敱
-export const constantRoutes: RouteOption[] = [
+export const constantRoutes: RouteRecordRaw[] = [
{
path: '/redirect',
component: Layout,
@@ -38,9 +38,9 @@
]
},
{
- path: '/social-login',
+ path: '/social-callback',
hidden: true,
- component: () => import('@/layout/components/SocialLogin/index.vue')
+ component: () => import('@/layout/components/SocialCallback/index.vue')
},
{
path: '/login',
@@ -92,7 +92,7 @@
];
// 鍔ㄦ�佽矾鐢憋紝鍩轰簬鐢ㄦ埛鏉冮檺鍔ㄦ�佸幓鍔犺浇
-export const dynamicRoutes: RouteOption[] = [
+export const dynamicRoutes: RouteRecordRaw[] = [
{
path: '/system/user-auth',
component: Layout,
@@ -139,7 +139,7 @@
path: '/system/oss-config',
component: Layout,
hidden: true,
- permissions: ['system:oss:list'],
+ permissions: ['system:ossConfig:list'],
children: [
{
path: 'index',
--
Gitblit v1.9.3