diff --git a/src/api/index.ts b/src/api/index.ts index 4dcb39b..664b74c 100644 --- a/src/api/index.ts +++ b/src/api/index.ts @@ -4,7 +4,6 @@ import { Message } from "@arco-design/web-vue"; // 是否开启本地mock const MOCK_FLAG = import.meta.env.VITE_APP_OPEN_MOCK === "true"; - // 创建axios实例 const service = axios.create({ baseURL: MOCK_FLAG ? "" : "/api" @@ -14,9 +13,13 @@ service.interceptors.request.use( function (config: any) { // 发送请求之前做什么 // 获取token鉴权 - if (localStorage.getItem("AdminToken")) { + let userInfo: any = {}; + if (localStorage.getItem("user-info")) { + userInfo = JSON.parse(localStorage.getItem("user-info") as string); + } + if (userInfo?.AdminToken) { // 有token,在请求头中携带token - config.headers.Authorization = localStorage.getItem("AdminToken"); + config.headers.Authorization = userInfo.AdminToken; } return config; }, diff --git a/src/api/modules/system/index.ts b/src/api/modules/system/index.ts new file mode 100644 index 0000000..9496ad5 --- /dev/null +++ b/src/api/modules/system/index.ts @@ -0,0 +1,9 @@ +import axios from "@/api"; + +// 获取菜单数据 +export const getMenuListAPI = () => { + return axios({ + url: "/mock/menu/list", + method: "get" + }); +}; diff --git a/src/api/modules/user/index.ts b/src/api/modules/user/index.ts index c3145e3..ddc31c7 100644 --- a/src/api/modules/user/index.ts +++ b/src/api/modules/user/index.ts @@ -9,12 +9,10 @@ export const loginAPI = (data: any) => { }); }; - // 获取用户信息 export const getUserInfoAPI = () => { - return axios({ - url: "/mock/user/info", - method: "get" - }); - }; - \ No newline at end of file + return axios({ + url: "/mock/user/info", + method: "get" + }); +}; diff --git a/src/hooks/useRoutingMethod.ts b/src/hooks/useRoutingMethod.ts index f2f8547..7804455 100644 --- a/src/hooks/useRoutingMethod.ts +++ b/src/hooks/useRoutingMethod.ts @@ -1,6 +1,6 @@ import pinia from "@/store/index"; import { storeToRefs } from "pinia"; -import { useRoutesListStore } from "@/store/modules/route-list"; +import { useRoutesConfigStore } from "@/store/modules/route-config"; /** * 路由处理hooks,内置多种路由处理场景 * @returns 路由方法 @@ -12,7 +12,7 @@ export const useRoutingMethod = () => { * @returns 查找到的路由,undefined则表示未找到 */ const findLinearArray = (key: string) => { - const routerStore = useRoutesListStore(pinia); + const routerStore = useRoutesConfigStore(pinia); const { routeList } = storeToRefs(routerStore); return routeList.value.find((item: Menu.MenuOptions) => item.name == key); }; @@ -23,7 +23,7 @@ export const useRoutingMethod = () => { * @returns 查找到的路由,undefined则表示未找到 */ const findTagsList = (key: string) => { - const routerStore = useRoutesListStore(pinia); + const routerStore = useRoutesConfigStore(pinia); const { tabsList } = storeToRefs(routerStore); return tabsList.value.find((item: Menu.MenuOptions) => item.name == key); }; diff --git a/src/layout/components/Aside/index.vue b/src/layout/components/Aside/index.vue index a073465..914b3a8 100644 --- a/src/layout/components/Aside/index.vue +++ b/src/layout/components/Aside/index.vue @@ -12,10 +12,10 @@ import Logo from "@/layout/components/Logo/index.vue"; import Menu from "@/layout/components/Menu/index.vue"; import { storeToRefs } from "pinia"; import { useThemeConfig } from "@/store/modules/theme-config"; -import { useRoutesListStore } from "@/store/modules/route-list"; +import { useRoutesConfigStore } from "@/store/modules/route-config"; const themeStore = useThemeConfig(); const { collapsed, asideDark } = storeToRefs(themeStore); -const routerStore = useRoutesListStore(); +const routerStore = useRoutesConfigStore(); const { routeTree } = storeToRefs(routerStore); diff --git a/src/layout/components/Header/components/system-settings/index.vue b/src/layout/components/Header/components/system-settings/index.vue index 0ebd5c9..213b991 100644 --- a/src/layout/components/Header/components/system-settings/index.vue +++ b/src/layout/components/Header/components/system-settings/index.vue @@ -62,11 +62,11 @@