diff --git a/src/components/LockScreen/index.vue b/src/components/LockScreen/index.vue index ca085457..5e7f9339 100644 --- a/src/components/LockScreen/index.vue +++ b/src/components/LockScreen/index.vue @@ -61,19 +61,15 @@ onMounted(() => { timeoutDuration = res.data * 1000; } }) - .finally(() => { + .then(() => { if (timeoutDuration !== 0) { resetTimeout(); // 监听用户的操作,重置超时时间 window.addEventListener('mousemove', resetTimeout); window.addEventListener('keydown', resetTimeout); } - // 本地锁定同时是登录状态 - if (lockedStore.type === 'lock' && getToken()) { - lockedStore.fnLock('lock'); - } else if (lockedStore.type === 'reload') { - lockedStore.relaodWait(); - } + // 本地锁定同时是登录状态 + lockedStore.fnLock(lockedStore.type); }); }); diff --git a/src/store/modules/locked.ts b/src/store/modules/locked.ts index 3e0cdde7..25f87cb9 100644 --- a/src/store/modules/locked.ts +++ b/src/store/modules/locked.ts @@ -27,7 +27,7 @@ const useLockedStore = defineStore('locked', { this.fnLock('none'); window.location.reload(); } - } catch (e) { + } catch (error) { // 延迟5秒 setTimeout(() => { this.relaodWait(); @@ -35,7 +35,7 @@ const useLockedStore = defineStore('locked', { } }, // 设置锁定 - async fnLock(type: 'none' | 'lock' | 'reload') { + async fnLock(type: 'none' | 'lock' | 'reload' | string) { this.type = type; localSet(CACHE_LOCAL_LOCK, type); if (type === 'reload') {