Commit 5f7bcaa1 authored by heduo's avatar heduo

fix(hd):处理系统路由问题

parent 9e9e4f8f
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
const { getShowDoc, getUseLockPage } = useHeaderSetting(); const { getShowDoc, getUseLockPage } = useHeaderSetting();
const userStore = useUserStore(); const userStore = useUserStore();
const getUserInfo = computed(() => { const getUserInfo = computed(() => {
console.log('------------', userStore.getUserInfo); // console.log('------------', userStore.getUserInfo);
const { userName: realName = '', avatar, desc } = userStore.getUserInfo || {}; const { userName: realName = '', avatar, desc } = userStore.getUserInfo || {};
return { realName, avatar: avatar || headerImg, desc }; return { realName, avatar: avatar || headerImg, desc };
}); });
......
...@@ -8,6 +8,8 @@ import { useUserStoreWithOut } from '/@/store/modules/user'; ...@@ -8,6 +8,8 @@ import { useUserStoreWithOut } from '/@/store/modules/user';
import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic'; import { PAGE_NOT_FOUND_ROUTE } from '/@/router/routes/basic';
import { RootRoute } from '/@/router/routes'; import { RootRoute } from '/@/router/routes';
import { getAuthCache } from '/@/utils/auth';
import { USER_INFO_KEY } from '/@/enums/cacheEnum';
const LOGIN_PATH = PageEnum.BASE_LOGIN; const LOGIN_PATH = PageEnum.BASE_LOGIN;
...@@ -83,7 +85,7 @@ export function createPermissionGuard(router: Router) { ...@@ -83,7 +85,7 @@ export function createPermissionGuard(router: Router) {
// get userinfo while last fetch time is empty // get userinfo while last fetch time is empty
if (userStore.getLastUpdateTime === 0) { if (userStore.getLastUpdateTime === 0) {
try { try {
await userStore.getUserInfoAction(); await userStore.getUserInfoAction(getAuthCache(USER_INFO_KEY));
} catch (err) { } catch (err) {
next(); next();
return; return;
......
...@@ -7,7 +7,7 @@ import { PageEnum } from '/@/enums/pageEnum'; ...@@ -7,7 +7,7 @@ import { PageEnum } from '/@/enums/pageEnum';
import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY, TMALLAB_TOKEN_KEY } from '/@/enums/cacheEnum'; import { ROLES_KEY, TOKEN_KEY, USER_INFO_KEY, TMALLAB_TOKEN_KEY } from '/@/enums/cacheEnum';
import { getAuthCache, setAuthCache } from '/@/utils/auth'; import { getAuthCache, setAuthCache } from '/@/utils/auth';
import { GetUserInfoModel, LoginParams } from '/@/api/sys/model/userModel'; import { GetUserInfoModel, LoginParams } from '/@/api/sys/model/userModel';
import { doLogout, getUserInfo, loginApi, tmallabLoginApi } from '/@/api/sys/user'; import { loginApi, tmallabLoginApi } from '/@/api/sys/user';
import { useI18n } from '/@/hooks/web/useI18n'; import { useI18n } from '/@/hooks/web/useI18n';
import { useMessage } from '/@/hooks/web/useMessage'; import { useMessage } from '/@/hooks/web/useMessage';
import { router } from '/@/router'; import { router } from '/@/router';
...@@ -174,14 +174,15 @@ export const useUserStore = defineStore({ ...@@ -174,14 +174,15 @@ export const useUserStore = defineStore({
* @description: logout * @description: logout
*/ */
async logout(goLogin = false) { async logout(goLogin = false) {
if (this.getToken) { // if (this.getToken) {
try { // try {
await doLogout(); // await doLogout();
} catch { // } catch {
console.log('注销Token失败'); // console.log('注销Token失败');
} // }
} // }
this.setToken(undefined); this.setToken(undefined);
this.setTmallabToken(undefined);
this.setSessionTimeout(false); this.setSessionTimeout(false);
this.setUserInfo({}); this.setUserInfo({});
goLogin && router.push(PageEnum.BASE_LOGIN); goLogin && router.push(PageEnum.BASE_LOGIN);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment