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

This commit is contained in:
GAOANG
2024-07-26 18:17:42 +08:00
parent c6ff986f61
commit e12a265559

View File

@ -136,14 +136,13 @@ export const useUserStore = defineStore({
const { token } = data;
// save 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) {
return Promise.reject(error);
}
},
async afterLoginAction(goHome?: boolean): Promise<GetUserInfoModel | null> {
async afterLoginAction(goHome?: boolean, redirect?): Promise<GetUserInfoModel | null> {
if (!this.getToken) return null;
// get user info
@ -166,6 +165,7 @@ export const useUserStore = defineStore({
});
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));
}