p90524618
/
answer
mirror of https://gitee.com/answerdev/answer.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'github/feat/1.1.2/ui' into feat/1.1.2/user-center

This commit is contained in:
LinkinStars 2023-04-19 18:26:15 +08:00
parent 8fb303d024 24afb5e21b
commit 703e76ba7b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/src/utils/userCenter.ts
View File

@ -10,7 +10,11 @@ export const pullUcAgent = async () => {
export const getLoginUrl = (uca?: UcAgent) => {
let ret = RouteAlias.login;
uca ||= userCenterStore.getState().agent;
if (uca?.enabled && uca?.agent_info?.login_redirect_url) {
if (
uca?.enabled &&
!uca.agent_info?.enabled_original_user_system &&
uca.agent_info?.login_redirect_url
) {
ret = uca.agent_info.login_redirect_url;
}
return ret;