diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index 872ddfab2..bdd061c7b 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -650,11 +650,16 @@ export default { this.appActivated && $A.eeuiAppHideWebviewSnapshot() }, 500) // APP进入前台 - window.__onAppActive = () => { + window.__onAppActive = async () => { this.appActivated = true + + // IndexedDB 测试失败时会自动刷新页面,这里提前返回防止后续代码执行 + if (!await $A.IDBTest()) { + return; + } + this.autoTheme() $A.updateTimezone() - $A.IDBTest() $A.eeuiAppHideWebviewSnapshot() this.$store.dispatch("safeAreaInsets") const nowYmd = $A.daytz().format('YYYY-MM-DD') diff --git a/resources/assets/js/functions/common.js b/resources/assets/js/functions/common.js index 9ecb6b95d..d97d71426 100755 --- a/resources/assets/js/functions/common.js +++ b/resources/assets/js/functions/common.js @@ -1574,6 +1574,7 @@ const timezone = require("dayjs/plugin/timezone"); await localforage.setItem('__test__', $A.dayjs().valueOf()) } $A.openLog && console.log('IDBTest OK') + return true; } catch (error) { if ($A.openLog) { console.error('IDBTest Error: ', error) @@ -1586,6 +1587,7 @@ const timezone = require("dayjs/plugin/timezone"); } else { $A.reloadUrl(); } + return false; } },