From 3f9b9a6903715503adde235d3455ea029179f3f6 Mon Sep 17 00:00:00 2001
From: jxxghp <jxxghp@gmail.com>
Date: Tue, 22 Oct 2024 10:43:50 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=99=AE=E9=80=9A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/@layouts/types.d.ts                  |  2 +-
 src/layouts/components/DefaultLayout.vue |  2 +-
 src/router/menu.ts                       | 26 ++++++++++++------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/@layouts/types.d.ts b/src/@layouts/types.d.ts
index 83d2e244..0acdd517 100644
--- a/src/@layouts/types.d.ts
+++ b/src/@layouts/types.d.ts
@@ -123,7 +123,7 @@ export interface NavLink extends NavLinkProps, Partial<AclProperties> {
 export interface NavMenu extends NavLink {
   header: string
   description?: string
-  permission?: string
+  admin?: boolean
 }
 
 // 👉 Vertical nav group
diff --git a/src/layouts/components/DefaultLayout.vue b/src/layouts/components/DefaultLayout.vue
index 919618a6..ec0ec719 100644
--- a/src/layouts/components/DefaultLayout.vue
+++ b/src/layouts/components/DefaultLayout.vue
@@ -36,7 +36,7 @@ const systemMenus = ref<NavMenu[]>([])
 
 // 根据分类获取菜单列表
 const getMenuList = (header: string) => {
-  return SystemNavMenus.filter((item: NavMenu) => item.header === header && superUser)
+  return SystemNavMenus.filter((item: NavMenu) => item.header === header && (superUser || !item.admin))
 }
 
 // 返回上一页
diff --git a/src/router/menu.ts b/src/router/menu.ts
index 43ce4b04..38b48bd0 100644
--- a/src/router/menu.ts
+++ b/src/router/menu.ts
@@ -5,21 +5,21 @@ export const SystemNavMenus = [
     icon: 'mdi-home-outline',
     to: '/dashboard',
     header: '开始',
-    permission: 'dashboard',
+    admin: false,
   },
   {
     title: '推荐',
     icon: 'mdi-star-outline',
     to: '/ranking',
     header: '发现',
-    permission: 'ranking',
+    admin: false,
   },
   {
     title: '资源搜索',
     icon: 'mdi-magnify',
     to: '/resource',
     header: '发现',
-    permission: 'resource.search',
+    admin: false,
   },
   {
     title: '电影',
@@ -27,7 +27,7 @@ export const SystemNavMenus = [
     icon: 'mdi-movie-open-outline',
     to: '/subscribe/movie',
     header: '订阅',
-    permission: 'subscribe.movie',
+    admin: false,
   },
   {
     title: '电视剧',
@@ -35,7 +35,7 @@ export const SystemNavMenus = [
     icon: 'mdi-television',
     to: '/subscribe/tv',
     header: '订阅',
-    permission: 'subscribe.tv',
+    admin: false,
   },
   {
     title: '日历',
@@ -43,56 +43,56 @@ export const SystemNavMenus = [
     icon: 'mdi-calendar',
     to: '/calendar',
     header: '订阅',
-    permission: 'subscribe.calendar',
+    admin: false,
   },
   {
     title: '正在下载',
     icon: 'mdi-download-outline',
     to: '/downloading',
     header: '整理',
-    permission: 'downloading.view',
+    admin: false,
   },
   {
     title: '历史记录',
     icon: 'mdi-history',
     to: '/history',
     header: '整理',
-    permission: 'admin',
+    admin: true,
   },
   {
     title: '文件管理',
     icon: 'mdi-folder-multiple-outline',
     to: '/filemanager',
     header: '整理',
-    permission: 'admin',
+    admin: true,
   },
   {
     title: '插件',
     icon: 'mdi-apps',
     to: '/plugins',
     header: '系统',
-    permission: 'admin',
+    admin: true,
   },
   {
     title: '站点管理',
     icon: 'mdi-web',
     to: '/site',
     header: '系统',
-    permission: 'admin',
+    admin: true,
   },
   {
     title: '用户管理',
     icon: 'mdi-account-group',
     to: '/user',
     header: '系统',
-    permission: 'usermanage',
+    admin: true,
   },
   {
     title: '设定',
     icon: 'mdi-cog',
     to: '/setting',
     header: '系统',
-    permission: 'admin',
+    admin: true,
   },
 ]