diff --git a/src/composables/useHandleScreen.ts b/src/composables/useHandleScreen.ts index 25a8f20..24cb96e 100644 --- a/src/composables/useHandleScreen.ts +++ b/src/composables/useHandleScreen.ts @@ -67,6 +67,11 @@ export const useHandleScreen = (callback: () => void) => { await sleepToIndex() callback() } + + //没有屏保的话不允许弹出屏保弹框 TODO:后期由容器通知 + if (toWallpaperTime.value === -1) { + return + } await sleepToWallpaper() callback() }, DELAY_CHECK_TIME) @@ -84,7 +89,7 @@ export const useHandleScreen = (callback: () => void) => { onMounted(() => { //获取返回首页和进入屏保的具体时间 getBackTime().then(({ data }) => { - const noWallpaper = data[1] === 0 + const noWallpaper = data[1] totalTime.value = noWallpaper ? [data[0], -1] : data toIndexTime.value = data[0] toWallpaperTime.value = noWallpaper ? -1 : data[1]