From b125d5a522681d2e52557e098282a17a35c98759 Mon Sep 17 00:00:00 2001 From: zyronon Date: Fri, 8 Dec 2023 16:19:11 +0800 Subject: [PATCH 1/3] add mobile --- src/App.vue | 7 +++ src/pages/mobile/index.vue | 96 ++++++++++++++++++++++++++++++++++++++ src/router.ts | 4 +- 3 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 src/pages/mobile/index.vue diff --git a/src/App.vue b/src/App.vue index c019d1e0..b42bf5ef 100644 --- a/src/App.vue +++ b/src/App.vue @@ -14,6 +14,7 @@ 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 router from "@/router.ts"; const store = useBaseStore() const runtimeStore = useRuntimeStore() @@ -69,6 +70,12 @@ async function init() { onMounted(() => { init() + + if (/Mobi|Android|iPhone/i.test(navigator.userAgent)) { + // 当前设备是移动设备 + console.log('当前设备是移动设备') + router.replace('/mobile') + } }) diff --git a/src/pages/mobile/index.vue b/src/pages/mobile/index.vue new file mode 100644 index 00000000..f0396c46 --- /dev/null +++ b/src/pages/mobile/index.vue @@ -0,0 +1,96 @@ + + + + + \ No newline at end of file diff --git a/src/router.ts b/src/router.ts index 897b76f5..4d98a37b 100644 --- a/src/router.ts +++ b/src/router.ts @@ -1,11 +1,13 @@ import * as VueRouter from 'vue-router' import Practice from "@/pages/practice/index.vue"; -import Dict from '@/pages/dict' +import Dict from '@/pages/dict/index.vue' +import Mobile from '@/pages/mobile/index.vue' import Test from "@/pages/test.vue"; const routes: any[] = [ {path: '/practice', component: Practice}, {path: '/dict', name: 'dict', component: Dict}, + {path: '/mobile', name: 'dict', component: Mobile}, {path: '/test', name: 'test', component: Test}, {path: '/', redirect: '/practice'}, ] From 48094eae91885b2c145bb58d3f8bb70820e1004f Mon Sep 17 00:00:00 2001 From: zyronon Date: Sun, 10 Dec 2023 14:06:13 +0800 Subject: [PATCH 2/3] Fixed bug where the load field has always been true --- src/utils/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/utils/index.ts b/src/utils/index.ts index 0c0b0358..7bbc0c25 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -32,6 +32,7 @@ export function checkAndUpgradeSaveDict(val: string) { if (!data.version) { return {} } + state.load = false let version = Number(data.version) // console.log('state', state) let defaultBaseState = DefaultBaseState() @@ -74,8 +75,8 @@ export function checkAndUpgradeSaveSetting(val: string) { if (!data.version) { return {} } + state.load = false let version = Number(data.version) - let defaultSettingState = DefaultSettingState() if (version === SAVE_SETTING_KEY.version) { //防止人为删除数据,导致数据不完整报错 From 9a283cfdcaae222f6db8ae069578342bd1a21a53 Mon Sep 17 00:00:00 2001 From: zyronon Date: Sun, 10 Dec 2023 16:40:26 +0800 Subject: [PATCH 3/3] save --- src/App.vue | 6 +- src/components/Slide.vue | 2 +- src/components/dialog/SettingDialog.vue | 2 +- src/components/toolbar/index.vue | 35 +-- src/pages/mobile/components/MobilePanel.vue | 252 ++++++++++++++++++ src/pages/mobile/index.vue | 239 ++++++++++++++++- .../practice/practice-word/TypingWord.vue | 11 +- src/router.ts | 14 +- 8 files changed, 505 insertions(+), 56 deletions(-) create mode 100644 src/pages/mobile/components/MobilePanel.vue diff --git a/src/App.vue b/src/App.vue index b42bf5ef..15c9f388 100644 --- a/src/App.vue +++ b/src/App.vue @@ -59,7 +59,7 @@ watch(store.wrong.originWords, (n) => { }) async function init() { - console.time() + // console.time() store.init().then(() => { store.load = true // console.timeEnd() @@ -74,11 +74,9 @@ onMounted(() => { if (/Mobi|Android|iPhone/i.test(navigator.userAgent)) { // 当前设备是移动设备 console.log('当前设备是移动设备') - router.replace('/mobile') + // router.replace('/mobile') } }) - -