diff --git a/src/api/account.ts b/src/api/account.ts index 6353064..190eef3 100644 --- a/src/api/account.ts +++ b/src/api/account.ts @@ -18,7 +18,12 @@ export async function GetSelfAccount() { if (cookie.value) { const result = await Self() if (result.code == 200) { - ACCOUNT.value = result.data + if (!ACCOUNT.value) { + ACCOUNT.value = result.data + } else { + result.data.settings = ACCOUNT.value.settings + ACCOUNT.value = result.data + } isLoadingAccount.value = false //console.log('[vtsuru] 已获取账户信息') if (!isSameDay(new Date(), cookieRefreshDate.value)) { diff --git a/src/main.ts b/src/main.ts index 474b68c..fb53b6c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -46,11 +46,12 @@ QueryGetAPI(BASE_API_URL + 'vtsuru/version') QueryGetAPI(BASE_API_URL + 'vtsuru/version').then((keepCheckData) => { if (keepCheckData.code == 200 && keepCheckData.data != currentVersion) { isHaveNewVersion = true - currentVersion = version.data + currentVersion = keepCheckData.data localStorage.setItem('Version', currentVersion) console.log('[vtsuru] 发现新版本: ' + currentVersion) - const route = useRoute() - if (!route.path.startsWith('/obs')) { + + //@ts-expect-error 这里获取不了 + if (!window.obsstudio) { const n = notification.info({ title: '发现新的版本更新', content: '是否现在刷新?',