From 22f0f3052aff6a58717064942a501a0724d6fa82 Mon Sep 17 00:00:00 2001 From: Megghy Date: Wed, 13 Mar 2024 00:46:43 +0800 Subject: [PATCH] try fix bili-auth load --- src/main.ts | 15 +++++++++++---- src/store/useAuthStore.ts | 1 + src/views/manage/DashboardView.vue | 2 +- src/views/manage/HistoryView.vue | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main.ts b/src/main.ts index b29d6ec..906a952 100644 --- a/src/main.ts +++ b/src/main.ts @@ -5,7 +5,7 @@ import { NButton, NFlex, NText, createDiscreteApi } from 'naive-ui' import { createPinia } from 'pinia' import { createApp, h } from 'vue' import App from './App.vue' -import { GetSelfAccount, UpdateAccountLoop } from './api/account' +import { GetSelfAccount, UpdateAccountLoop, useAccount } from './api/account' import { GetNotifactions } from './data/notifactions' import router from './router' import { useAuthStore } from './store/useAuthStore' @@ -77,11 +77,18 @@ QueryGetAPI(BASE_API + 'vtsuru/version') apiFail.value = true console.log('默认API调用失败, 切换至故障转移节点') }) - .finally(() => { + .finally(async () => { //加载其他数据 - GetSelfAccount() + await GetSelfAccount() + const account = useAccount() + const useAuth = useAuthStore() + if (account.value.id) { + if (account.value.biliUserAuthInfo && !useAuth.currentToken) { + useAuth.currentToken = account.value.biliUserAuthInfo.token + } + } + useAuth.getAuthInfo() GetNotifactions() - useAuthStore().getAuthInfo() UpdateAccountLoop() InitTTS() }) diff --git a/src/store/useAuthStore.ts b/src/store/useAuthStore.ts index 5480185..718f58d 100644 --- a/src/store/useAuthStore.ts +++ b/src/store/useAuthStore.ts @@ -127,6 +127,7 @@ export const useAuthStore = defineStore('BiliAuth', () => { biliTokens, isLoading, isAuthed, + currentToken, getAuthInfo, QueryBiliAuthGetAPI, QueryBiliAuthPostAPI, diff --git a/src/views/manage/DashboardView.vue b/src/views/manage/DashboardView.vue index a746310..4419658 100644 --- a/src/views/manage/DashboardView.vue +++ b/src/views/manage/DashboardView.vue @@ -394,7 +394,7 @@ onUnmounted(() => { - 用于进行积分兑换等操作, 如果你是主播可以不用管 + 用于进行积分兑换等操作, 如果你是主播可以不用管, 并且即使不绑定也可以直接用认证完成给出的链接查看和使用积分 diff --git a/src/views/manage/HistoryView.vue b/src/views/manage/HistoryView.vue index 03a9568..1f350a9 100644 --- a/src/views/manage/HistoryView.vue +++ b/src/views/manage/HistoryView.vue @@ -577,7 +577,7 @@ onMounted(async () => { 粉丝数: 200粉以下: 每3天一次, 200-1000粉: 每24小时一次, 1000-10000粉: 每6小时一次, 10000粉以上: 每小时一次 舰长数: 10舰以下: 每24小时一次, 10-50舰: 每12小时一次, 50舰以上: 每6小时一次 - 投稿数据: 每天一次 + 投稿数据: 500粉以上: 每天一次