From e00e659e417fc646f17e1938ef0ee92ac7549da6 Mon Sep 17 00:00:00 2001 From: xieyonghong <18010623010@163.com> Date: Sat, 4 Mar 2023 10:53:07 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E8=B7=AF=E7=94=B1?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Layout/BasicLayoutPage.vue | 2 +- src/router/menu.ts | 57 ++++++++++++++++++----- src/store/menu.ts | 4 +- yarn.lock | 4 +- 4 files changed, 51 insertions(+), 16 deletions(-) diff --git a/src/components/Layout/BasicLayoutPage.vue b/src/components/Layout/BasicLayoutPage.vue index 7d00fd37..e27d2920 100644 --- a/src/components/Layout/BasicLayoutPage.vue +++ b/src/components/Layout/BasicLayoutPage.vue @@ -50,7 +50,7 @@ const layoutConf = reactive({ siderWidth: DefaultSetting.layout.siderWidth, logo: DefaultSetting.layout.logo, title: DefaultSetting.layout.title, - menuData: clearMenuItem(menu.siderMenus), + menuData: menu.siderMenus, splitMenus: true, }); diff --git a/src/router/menu.ts b/src/router/menu.ts index f849eee7..e8dfd1cf 100644 --- a/src/router/menu.ts +++ b/src/router/menu.ts @@ -1,5 +1,49 @@ export const LoginPath = '/login' +export const AccountMenu = { + path: '/account', + component: () => import('@/components/Layout/BasicLayoutPage.vue'), + redirect: '/account/center', + name: 'account', + meta: { + title: '个人中心', + icon: '', + hideInMenu: true + }, + children: [ + { + path: '/account/center', + name: 'account/center', + meta: { + title: '基本设置', + icon: '', + hideInMenu: false + }, + component: () => import('@/views/account/Center/index.vue') + }, + { + path: '/account/NotificationSubscription', + name: 'account/NotificationSubscription', + meta: { + title: '通知订阅', + icon: '', + hideInMenu: false + }, + component: () => import('@/views/account/NotificationSubscription/index.vue') + }, + { + path: '/account/NotificationRecord', + name: 'account/NotificationRecord', + meta: { + title: '通知记录', + icon: '', + hideInMenu: false + }, + component: () => import('@/views/account/NotificationRecord/index.vue') + }, + ] +} + export default [ { path: '/*', redirect: '/'}, // start: 测试用, 可删除 @@ -27,18 +71,7 @@ export default [ path: '/system/Api', component: () => import('@/views/system/Platforms/index.vue') }, - { - path: '/account/center', - component: () => import('@/views/account/Center/index.vue') - }, - { - path: '/account/NotificationSubscription', - component: () => import('@/views/account/NotificationSubscription/index.vue') - }, - { - path: '/account/NotificationRecord', - component: () => import('@/views/account/NotificationRecord/index.vue') - }, + AccountMenu, // end: 测试用, 可删除 // 初始化 diff --git a/src/store/menu.ts b/src/store/menu.ts index 49445fb8..6cc0c625 100644 --- a/src/store/menu.ts +++ b/src/store/menu.ts @@ -4,8 +4,8 @@ import { filterAsnycRouter, MenuItem } from '@/utils/menu' import { isArray } from 'lodash-es' import { usePermissionStore } from './permission' import router from '@/router' -import { message } from 'ant-design-vue' import { onlyMessage } from '@/utils/comm' +import { AccountMenu } from '@/router/menu' const defaultOwnParams = [ { @@ -115,8 +115,10 @@ export const useMenuStore = defineStore({ hideInMenu: true } }) + silderMenus.push(AccountMenu) this.siderMenus = silderMenus console.log('menusData', menusData) + console.log('silderMenus', silderMenus) res(menusData) } }) diff --git a/yarn.lock b/yarn.lock index 4fad3a08..e15c1d65 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3903,8 +3903,8 @@ jetlinks-store@^0.0.3: jetlinks-ui-components@^1.0.3: version "1.0.3" - resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.3.tgz#08a35ebfa016574affcfd11204359cdccf8e139f" - integrity sha512-kA/AxzdfNy+Sl8En8raMwIh3stofgElkUuJ+oRJMpQVTGbrOk29DifRsHJJFNvtEvclmLdKZkOkthOuEdG2mnw== + resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.3.tgz#303ca83cf6096721e49e72d1a3a73b054b0aa7fa" + integrity sha512-Jm7tP/CtnK2GIRSPTjd/UOw8emZ3C7/i9af8m+XCM8wi/J1SZh4cZGc487vR1DPxyWZfJjG87Zdy45DZ5EMw2w== dependencies: "@vueuse/core" "^9.12.0" ant-design-vue "^3.2.15"