diff --git a/src/App.vue b/src/App.vue index 15c9f388..b8f1cded 100644 --- a/src/App.vue +++ b/src/App.vue @@ -13,7 +13,7 @@ import SettingDialog from "@/components/dialog/SettingDialog.vue"; import ArticleContentDialog from "@/components/dialog/ArticleContentDialog.vue"; import CollectNotice from "@/components/CollectNotice.vue"; import {SAVE_SETTING_KEY, SAVE_DICT_KEY} from "@/utils/const.ts"; -import {shakeCommonDict} from "@/utils"; +import {isMobile, shakeCommonDict} from "@/utils"; import router from "@/router.ts"; const store = useBaseStore() @@ -71,7 +71,7 @@ async function init() { onMounted(() => { init() - if (/Mobi|Android|iPhone/i.test(navigator.userAgent)) { + if (isMobile()) { // 当前设备是移动设备 console.log('当前设备是移动设备') // router.replace('/mobile') diff --git a/src/assets/css/style.scss b/src/assets/css/style.scss index 82c2f9ba..4bd0735f 100644 --- a/src/assets/css/style.scss +++ b/src/assets/css/style.scss @@ -4,7 +4,6 @@ @import "anim"; @import 'element-plus/theme-chalk/dark/css-vars'; - :root { --color-background: #E6E8EB; --color-main-bg: #E6E8EB; @@ -138,7 +137,6 @@ html.dark { transition: background var(--anim-time), color var(--anim-time), border var(--anim-time); } - html, body { font-size: 1px; padding: 0; @@ -152,6 +150,14 @@ html, body { -moz-osx-font-smoothing: grayscale; } +.page{ + position: relative; + z-index: 1; + height: 100%; + width: 100%; + font-size: 14rem; +} + #app { width: 100%; height: 100%; diff --git a/src/components/CollectNotice.vue b/src/components/CollectNotice.vue index 2b944d4a..1d6d09f4 100644 --- a/src/components/CollectNotice.vue +++ b/src/components/CollectNotice.vue @@ -5,12 +5,16 @@ import Close from "@/components/icon/Close.vue"; import BaseButton from "@/components/BaseButton.vue"; import {watch} from "vue"; import {useSettingStore} from "@/stores/setting.ts"; +import {$ref} from "vue/macros"; +import {isMobile} from "@/utils"; let settingStore = useSettingStore() let showNotice = $ref(false) let show = $ref(false) let num = $ref(5) let timer = -1 +let mobile = $ref(isMobile()) +const isMac = /macintosh|mac os x/i.test(navigator.userAgent); function toggleNotice() { showNotice = true @@ -32,17 +36,18 @@ watch(() => settingStore.load, (n) => { } }) -const isMac = /macintosh|mac os x/i.test(navigator.userAgent);