diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 22b58ff..3ec51be 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -16,7 +16,11 @@ -
+
{ // state - const userInfo = ref(null) - function setEmail(params) { - email.value = params - } + const userInfo = ref({ + avatarUrl: null + }) + // 登录获取用户信息 async function getUserInfo() { const res = await getUserInfoApi() @@ -16,9 +16,11 @@ export const userInfoModules = defineStore("userInfo", () => { } // 退出清除用户信息 function loginOut(params) { - userInfo.value = null + userInfo.value = { + avatarUrl: null + } } - return { userInfo, setEmail, getUserInfo, loginOut }; + return { userInfo, getUserInfo, loginOut }; }, { persist: true, diff --git a/src/types/components.d.ts b/src/types/components.d.ts index f5f10bc..49867c9 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -8,7 +8,6 @@ export {} declare module '@vue/runtime-core' { export interface GlobalComponents { Breadcrumb: typeof import('./../components/Breadcrumb/index.vue')['default'] - copy: typeof import('./../components/myLoading copy.vue')['default'] ElAlert: typeof import('element-plus/es')['ElAlert'] ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb'] ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem'] diff --git a/src/utils/request.js b/src/utils/request.js index ff81ee4..9a13562 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -1,12 +1,16 @@ import axios from 'axios' import router from '@/router/index' import { ElMessage } from 'element-plus' -ElMessage - +// ElMessage +import { userInfoModules } from "@/store/modules/userInfo"; +// import stores from '@/store/index' +import { store } from '@/store/index'; // 因为不是在setup环境而是js中,必须重新初始化加载store +const userInfoPinia = userInfoModules(store); //pinia // 开发环境需以 "/api" 拼接,其他环境需以 "/C" 拼接 const env = process.env.NODE_ENV == 'development' ? "/api" : "/C" // console.log(process.env.NODE_ENV, 'env') + /** * @description:发送Axios请求 */