geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: pc端单点登录跳转到该系统 时而跳到主页修复

Browse Source
This commit is contained in:
GAOANG
2024-07-26 18:17:42 +08:00
parent c6ff986f61
commit e12a265559
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/store/modules/user.ts
View File

@ -136,14 +136,13 @@ export const useUserStore = defineStore({
const { token } = data; const { token } = data;
// save token // save token
this.setToken(token); this.setToken(token);
router.replace(params.targetURL || params.redirect || userInfo?.homePath || PageEnum.BASE_HOME)
return await this.afterLoginAction(false); return await this.afterLoginAction(false, params.targetURL || params.redirect);
} catch (error) { } catch (error) {
return Promise.reject(error); return Promise.reject(error);
} }
}, },
async afterLoginAction(goHome?: boolean): Promise<GetUserInfoModel | null> { async afterLoginAction(goHome?: boolean, redirect?): Promise<GetUserInfoModel | null> {
if (!this.getToken) return null; if (!this.getToken) return null;
// get user info // get user info
@ -166,6 +165,7 @@ export const useUserStore = defineStore({
}); });
router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw); router.addRoute(PAGE_NOT_FOUND_ROUTE as unknown as RouteRecordRaw);
} }
redirect && (await router.replace(decodeURIComponent(redirect)));
goHome && (await router.replace(userInfo?.homePath || PageEnum.BASE_HOME)); goHome && (await router.replace(userInfo?.homePath || PageEnum.BASE_HOME));
} }