🐛 修复验证码登录-100,刷新后切换登录逻辑调整

This commit is contained in:
目棃
2024-11-15 14:28:46 +08:00
parent f655b6b235
commit 76f8bc3c16

View File

@@ -183,6 +183,7 @@ async function tryCaptchaLogin(): Promise<void> {
emits("loadOuter", { show: false }); emits("loadOuter", { show: false });
return; return;
} }
showSnackbar.success("获取LToken成功");
ck.ltoken = ltokenRes; ck.ltoken = ltokenRes;
emits("loadOuter", { show: true, title: "正在获取 cookieToken " }); emits("loadOuter", { show: true, title: "正在获取 cookieToken " });
const cookieTokenRes = await TGRequest.User.bySToken.getCookieToken(ck.mid, ck.stoken); const cookieTokenRes = await TGRequest.User.bySToken.getCookieToken(ck.mid, ck.stoken);
@@ -195,6 +196,7 @@ async function tryCaptchaLogin(): Promise<void> {
emits("loadOuter", { show: false }); emits("loadOuter", { show: false });
return; return;
} }
showSnackbar.success("获取CookieToken成功");
ck.cookie_token = cookieTokenRes; ck.cookie_token = cookieTokenRes;
emits("loadOuter", { show: true, title: "正在获取用户信息" }); emits("loadOuter", { show: true, title: "正在获取用户信息" });
const briefRes = await TGRequest.User.byCookie.getUserInfo(ck.cookie_token, ck.account_id); const briefRes = await TGRequest.User.byCookie.getUserInfo(ck.cookie_token, ck.account_id);
@@ -205,6 +207,7 @@ async function tryCaptchaLogin(): Promise<void> {
emits("loadOuter", { show: false }); emits("loadOuter", { show: false });
return; return;
} }
showSnackbar.success("获取用户信息成功");
const briefInfo: TGApp.App.Account.BriefInfo = { const briefInfo: TGApp.App.Account.BriefInfo = {
nickname: briefRes.nickname, nickname: briefRes.nickname,
uid: briefRes.uid, uid: briefRes.uid,
@@ -223,13 +226,15 @@ async function tryCaptchaLogin(): Promise<void> {
userStore.cookie.value = ck; userStore.cookie.value = ck;
appStore.isLogin.value = true; appStore.isLogin.value = true;
emits("loadOuter", { show: true, title: "正在获取游戏账号" }); emits("loadOuter", { show: true, title: "正在获取游戏账号" });
const gameRes = await TGRequest.User.bySToken.getAccounts(ck.stoken, ck.stuid); const gameRes = await TGRequest.User.byCookie.getAccounts(ck.cookie_token, ck.account_id);
if (!Array.isArray(gameRes)) { if (!Array.isArray(gameRes)) {
loading.value = false; loading.value = false;
emits("loadOuter", { show: false }); emits("loadOuter", { show: false });
showSnackbar.error(`[${gameRes.retcode}]${gameRes.message}`); showSnackbar.error(`[${gameRes.retcode}]${gameRes.message}`);
await TGLogger.Error(`获取游戏账号失败:${gameRes.retcode}-${gameRes.message}`);
return; return;
} }
showSnackbar.success("获取游戏账号成功");
await TSUserAccount.game.saveAccounts(briefInfo.uid, gameRes); await TSUserAccount.game.saveAccounts(briefInfo.uid, gameRes);
const curAccount = await TSUserAccount.game.getCurAccount(briefInfo.uid); const curAccount = await TSUserAccount.game.getCurAccount(briefInfo.uid);
if (!curAccount) { if (!curAccount) {
@@ -366,6 +371,7 @@ async function confirmRefreshUser(uid: string): Promise<void> {
return; return;
} }
await refreshUser(uid); await refreshUser(uid);
if (userStore.uid.value === uid) showSnackbar.success("成功刷新用户信息");
const confirm = await showConfirm({ title: "是否切换用户?", text: `将切换到用户${uid}` }); const confirm = await showConfirm({ title: "是否切换用户?", text: `将切换到用户${uid}` });
if (!confirm) return; if (!confirm) return;
await loadAccount(uid); await loadAccount(uid);