From 21bab1f7c30611fe59dc91c7a73050ccb49a4658 Mon Sep 17 00:00:00 2001 From: Soybean Date: Sat, 22 Jan 2022 14:05:19 +0800 Subject: [PATCH] =?UTF-8?q?fix(projects):=20=E4=BF=AE=E5=A4=8D=E6=9C=AA?= =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=E4=BC=9A=E8=B0=83=E7=94=A8=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E7=94=A8=E6=88=B7=E8=B7=AF=E7=94=B1=E7=9A=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/api/auth.ts | 2 +- src/store/modules/route/index.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/service/api/auth.ts b/src/service/api/auth.ts index b6dab27c..3b66bab1 100644 --- a/src/service/api/auth.ts +++ b/src/service/api/auth.ts @@ -32,7 +32,7 @@ export function fetchUserInfo() { * @param userId - 用户id * @description 后端根据用户id查询到对应的角色类型,并将路由筛选出对应角色的路由数据返回前端 */ -export function fetchUserRoutes(userId: string = 'soybean') { +export function fetchUserRoutes(userId: string) { return mockRequest.post('/getUserRoutes', { userId }); } diff --git a/src/store/modules/route/index.ts b/src/store/modules/route/index.ts index 4f2d515b..1f094510 100644 --- a/src/store/modules/route/index.ts +++ b/src/store/modules/route/index.ts @@ -1,7 +1,7 @@ import type { Router } from 'vue-router'; import { defineStore } from 'pinia'; import { fetchUserRoutes } from '@/service'; -import { transformAuthRouteToMenu, transformAuthRoutesToVueRoutes, getCacheRoutes } from '@/utils'; +import { getUserInfo, transformAuthRouteToMenu, transformAuthRoutesToVueRoutes, getCacheRoutes } from '@/utils'; import type { GlobalMenuOption } from '@/interface'; import { useTabStore } from '../tab'; @@ -31,7 +31,9 @@ export const useRouteStore = defineStore('route-store', { async initDynamicRoute(router: Router) { const { initHomeTab } = useTabStore(); - const { data } = await fetchUserRoutes(); + const { userId } = getUserInfo(); + if (!userId) return; + const { data } = await fetchUserRoutes(userId); if (data) { this.routeHomeName = data.home; this.menus = transformAuthRouteToMenu(data.routes);