♻️ 完善扫码登录

*修复暗色模式无法识别二维码的问题
*扫码成功后自动刷新数据
*清除无用代码
This commit is contained in:
BTMuli
2023-12-29 15:46:24 +08:00
parent 17ca9fbde8
commit d50cb960f8
2 changed files with 21 additions and 23 deletions

View File

@@ -6,7 +6,13 @@
<div class="tog-subtitle">所需米游社版本 >= 2.57.1</div>
</div>
<div class="tog-mid">
<qrcode-vue class="tog-qr" :value="qrCode" render-as="svg" />
<qrcode-vue
class="tog-qr"
:value="qrCode"
render-as="svg"
:background="'var(--box-bg-1)'"
foreground="var(--box-text-1)"
/>
</div>
</div>
</TOverlay>
@@ -26,7 +32,10 @@ interface ToWebLoginProps {
modelValue: boolean;
}
type ToWebLoginEmits = (e: "update:modelValue", value: boolean) => void;
type ToWebLoginEmits = {
(e: "update:modelValue", value: boolean): void;
(e: "success"): void;
};
const props = withDefaults(defineProps<ToWebLoginProps>(), {
modelValue: false,
@@ -40,7 +49,6 @@ const visible = computed({
emits("update:modelValue", value);
},
});
const isCycle = ref<boolean>(false);
let cycleTimer: NodeJS.Timeout | null = null;
const qrCode = ref<string>("");
@@ -61,7 +69,6 @@ const userStore = storeToRefs(useUserStore());
watch(visible, async (value) => {
if (value) {
await freshQr();
isCycle.value = true;
cycleTimer = setInterval(cycleGetData, 1000);
}
});
@@ -97,10 +104,7 @@ async function freshQr(): Promise<void> {
}
async function cycleGetData() {
if (!isCycle.value) {
if (cycleTimer) clearInterval(cycleTimer);
return;
}
if (cycleTimer === null) return;
const res = await Mys.User.getData(ticket.value);
console.log(res);
if ("retcode" in res) {
@@ -113,7 +117,6 @@ async function cycleGetData() {
await freshQr();
} else {
// 取消轮询
isCycle.value = false;
if (cycleTimer) clearInterval(cycleTimer);
visible.value = false;
}
@@ -124,7 +127,6 @@ async function cycleGetData() {
}
if (res.stat === "Confirmed") {
// 取消轮询
isCycle.value = false;
if (cycleTimer) clearInterval(cycleTimer);
const data: TGApp.Plugins.Mys.GameLogin.StatusPayloadRaw = JSON.parse(res.payload.raw);
cookie.account_id = data.uid;
@@ -137,6 +139,9 @@ async function cycleGetData() {
color: "success",
});
visible.value = false;
setTimeout(() => {
emits("success");
}, 1000);
}
}
@@ -160,7 +165,6 @@ async function getTokens(): Promise<void> {
}
onUnmounted(() => {
isCycle.value = false;
if (cycleTimer) clearInterval(cycleTimer);
});
</script>
@@ -207,15 +211,4 @@ onUnmounted(() => {
width: 256px;
height: 256px;
}
.tog-bottom {
display: flex;
align-items: center;
justify-content: space-between;
}
.tog-btn {
background: var(--tgc-btn-1);
color: var(--btn-text);
}
</style>

View File

@@ -1,6 +1,6 @@
<template>
<ToLoading v-model="loading" :title="loadingTitle" :subtitle="loadingSub" />
<ToGameLogin v-model="scan" />
<ToGameLogin v-model="scan" @success="refreshUser" />
<div class="config-box">
<v-list class="config-list">
<v-list-subheader :inset="true" class="config-header" title="应用信息" />
@@ -263,6 +263,11 @@ async function confirmRefreshUser(): Promise<void> {
});
return;
}
await refreshUser();
}
// 刷新用户信息
async function refreshUser(): Promise<void> {
const ck = userStore.cookie.value;
if (ck === undefined || JSON.stringify(ck) === "{}") {
showSnackbar({