From 72906b8443b7fbb4c48b7515791005677605c9ac Mon Sep 17 00:00:00 2001 From: xream Date: Sun, 21 Jan 2024 01:34:47 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=A2=9E=E5=8A=A0=E5=BB=B6=E6=97=B6?= =?UTF-8?q?=20=E9=98=B2=E6=AD=A2=E9=A2=91=E7=B9=81=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- src/router/index.ts | 4 ++-- src/store/subs.ts | 2 +- src/utils/initApp.ts | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 780e6a1ec..c64647edf 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sub-store-front-end", - "version": "2.14.93", + "version": "2.14.94", "private": true, "scripts": { "dev": "vite --host", diff --git a/src/router/index.ts b/src/router/index.ts index 16f7e7e0d..f6e141f14 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -237,7 +237,7 @@ router.beforeResolve(async (to, from) => { // 路由跳转时查询环境,决定是否更新数据 if (globalStore !== null) { const storeEnv = toRaw(globalStore.env); - if (storeEnv?.backend && storeEnv?.version) { + // if (storeEnv?.backend && storeEnv?.version) { useEnvApi() .getEnv() .then(async res => { @@ -257,7 +257,7 @@ router.beforeResolve(async (to, from) => { } } }); - } + // } } else { globalStore = useGlobalStore(); } diff --git a/src/store/subs.ts b/src/store/subs.ts index 1450eb485..bba88c165 100644 --- a/src/store/subs.ts +++ b/src/store/subs.ts @@ -37,7 +37,7 @@ export const useSubsStore = defineStore('subsStore', { }, actions: { async fetchSubsData() { - Promise.all([subsApi.getSubs(), subsApi.getCollections(), filesApi.getWholeFiles()]).then(res => { + await Promise.all([subsApi.getSubs(), subsApi.getCollections(), filesApi.getWholeFiles()]).then(res => { if ('data' in res[0].data) { this.subs = res[0].data.data; } diff --git a/src/utils/initApp.ts b/src/utils/initApp.ts index 19ee5d30e..c0394ded3 100644 --- a/src/utils/initApp.ts +++ b/src/utils/initApp.ts @@ -35,6 +35,7 @@ export const initStores = async ( try { localStorage.removeItem("envCache"); await subsStore.fetchSubsData(); + await new Promise((resolve) => setTimeout(resolve, 50)); await artifactsStore.fetchArtifactsData(); await settingsStore.fetchSettings(); await globalStore.setEnv();