diff --git a/src/components/_base/navbar/index.vue b/src/components/_base/navbar/index.vue index dc53209..35c8fdb 100644 --- a/src/components/_base/navbar/index.vue +++ b/src/components/_base/navbar/index.vue @@ -25,11 +25,9 @@ onMounted(() => { const appStore = useAppStore(); function setServerMenu() { - appStore.fetchServerMenuConfig(); - console.log(appStore.serverMenu); + console.log('setServerMenu'); } const handleSelect = (index: any) => { - console.log(index); if (index === 0) { router.push('/workplace'); } else { diff --git a/src/router/guard/index.ts b/src/router/guard/index.ts index 9b89dc2..5bfcf4e 100644 --- a/src/router/guard/index.ts +++ b/src/router/guard/index.ts @@ -2,13 +2,13 @@ * @Author: 田鑫 * @Date: 2023-03-05 18:14:17 * @LastEditors: Please set LastEditors - * @LastEditTime: 2025-06-23 02:08:22 + * @LastEditTime: 2025-06-23 04:10:41 * @Description: */ import type { Router } from 'vue-router'; import { setRouteEmitter } from '@/utils/route-listener'; import setupUserLoginInfoGuard from './userLoginInfo'; -import setupPermissionGuard from './permission'; +// import setupPermissionGuard from './permission'; function setupPageGuard(router: Router) { router.beforeEach(async (to) => { @@ -20,5 +20,5 @@ function setupPageGuard(router: Router) { export default function createRouteGuard(router: Router) { setupPageGuard(router); setupUserLoginInfoGuard(router); - setupPermissionGuard(router); + // setupPermissionGuard(router); } diff --git a/src/router/guard/permission.ts b/src/router/guard/permission.ts index 85690cb..9b32487 100644 --- a/src/router/guard/permission.ts +++ b/src/router/guard/permission.ts @@ -1,29 +1,29 @@ /* * @Author: 田鑫 * @Date: 2023-03-05 14:46:43 - * @LastEditors: 田鑫 - * @LastEditTime: 2023-03-05 15:55:36 + * @LastEditors: Please set LastEditors + * @LastEditTime: 2025-06-23 04:07:43 * @Description: 路由权限守卫 */ -import type { Router, RouteRecordNormalized } from 'vue-router'; -import NProgress from 'nprogress'; // progress bar -import { useAppStore } from '@/stores'; +// import type { Router, RouteRecordNormalized } from 'vue-router'; +// import NProgress from 'nprogress'; // progress bar +// import { useAppStore } from '@/stores'; -export default function setupPermissionGuard(router: Router) { - router.beforeEach(async (to, from, next) => { - console.log('access permission router guard'); - const appStore = useAppStore(); - //* 菜单是否为服务端渲染 - if (appStore.menuFromServer) { - //* 没有服务端渲染的菜单 - if(!appStore.appAsyncMenus) { - // todo 请求服务端渲染菜单的接口,当前为mock数据 - await appStore.fetchServerMenuConfig(); - } - next(); - } else { - next(); - } - NProgress.done(); - }); -} +// export default function setupPermissionGuard(router: Router) { +// router.beforeEach(async (to, from, next) => { +// console.log('access permission router guard'); +// const appStore = useAppStore(); +// //* 菜单是否为服务端渲染 +// if (appStore.menuFromServer) { +// //* 没有服务端渲染的菜单 +// if (!appStore.appAsyncMenus) { +// // todo 请求服务端渲染菜单的接口,当前为mock数据 +// // await appStore.fetchServerMenuConfig(); +// } +// next(); +// } else { +// next(); +// } +// NProgress.done(); +// }); +// } diff --git a/src/router/guard/userLoginInfo.ts b/src/router/guard/userLoginInfo.ts index 1f8cf94..2503e64 100644 --- a/src/router/guard/userLoginInfo.ts +++ b/src/router/guard/userLoginInfo.ts @@ -24,4 +24,7 @@ export default function setupUserLoginInfoGuard(router: Router) { next(); }); + router.afterEach((to) => { + NProgress.done(); + }); } diff --git a/src/stores/modules/app/index.ts b/src/stores/modules/app/index.ts index 0922c73..4637a63 100644 --- a/src/stores/modules/app/index.ts +++ b/src/stores/modules/app/index.ts @@ -1,3 +1,7 @@ +/* + * @Author: RenXiaoDong + * @Date: 2025-06-23 03:56:22 + */ import { defineStore } from 'pinia'; import type { AppState, RouteRecordNormalized, NotificationReturn } from './types'; @@ -43,56 +47,6 @@ export const useAppStore = defineStore('app', { this.hideMenu = value; }, async fetchServerMenuConfig() { - this.serverMenu = [ - { - path: '/enterprise', - name: 'enterprise', - meta: { - locale: '企业票夹', - requiresAuth: true, - roles: ['*'], - }, - children: [ - { - path: 'input', - name: 'input', - meta: { - icon: IconImport, - locale: '进项管理', - requiresAuth: true, - roles: ['*'], - }, - }, - { - path: 'output', - name: 'output', - meta: { - locale: '销项管理', - requiresAuth: true, - roles: ['*'], - }, - }, - { - path: 'red-invoice', - name: 'red-invoice', - meta: { - locale: '全电红字确认单管理', - requiresAuth: true, - roles: ['*'], - }, - }, - { - path: 'information', - name: 'information', - meta: { - locale: '企业信息', - requiresAuth: true, - roles: ['*'], - }, - }, - ], - }, - ]; this.menuFromServer = true; }, clearServerMenu() {