-
-
-
@@ -167,8 +165,5 @@ useStartKeyboardEventListener()
transform: translateX(var(--practice-wrapper-translateX));
}
-.left{
- background: white;
-}
\ No newline at end of file
diff --git a/src/pages/pc/practice/practice-article/TypingArticle.vue b/src/pages/pc/practice/practice-article/TypingArticle.vue
index 8f94c3ca..5141904d 100644
--- a/src/pages/pc/practice/practice-article/TypingArticle.vue
+++ b/src/pages/pc/practice/practice-article/TypingArticle.vue
@@ -1,18 +1,12 @@
+
+
+
+asdf
+
+
+
+
\ No newline at end of file
diff --git a/src/router.ts b/src/router.ts
index a180766f..f390a669 100644
--- a/src/router.ts
+++ b/src/router.ts
@@ -17,8 +17,16 @@ import About from "@/pages/mobile/my/About.vue";
import Feedback from "@/pages/mobile/my/Feedback.vue";
import MusicSetting from "@/pages/mobile/my/setting/MusicSetting.vue";
import OtherSetting from "@/pages/mobile/my/setting/OtherSetting.vue";
+import WordHome from "@/pages/pc/word/WordHome.vue";
+import PC from "@/pages/pc/index.vue";
export const routes: RouteRecordRaw[] = [
+ {
+ path: '/', component: PC,
+ children: [
+ {path: '/word', component: WordHome},
+ ]
+ },
{path: '/pc/practice', component: Practice},
{path: '/pc/dict', component: Dict},
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index 37d4b83c..d30cfe16 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -1,3 +1,6 @@
+///
+///
+
import {ElMessageBox} from "element-plus";
diff --git a/tsconfig.json b/tsconfig.json
index f426e7c2..60d13dce 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -27,10 +27,9 @@
"./node_modules"
],
"types": [
- "vue/ref-macros",
"vite/client",
"element-plus/global",
- "unplugin-vue-define-options"
+ "unplugin-vue-macros/macros-global"
],
"baseUrl": "src",
//This is because TypeScript does not resolve webpack aliases automatically.
diff --git a/vite.config.ts b/vite.config.ts
index 98cca4dc..047bb480 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,13 +1,13 @@
import {defineConfig} from 'vite'
-import vue from '@vitejs/plugin-vue'
-import vueJsx from "@vitejs/plugin-vue-jsx";
+import Vue from '@vitejs/plugin-vue'
+import VueJsx from '@vitejs/plugin-vue-jsx'
import {resolve} from 'path'
import {visualizer} from "rollup-plugin-visualizer";
import {ElementPlusResolver} from "unplugin-vue-components/resolvers";
import AutoImport from 'unplugin-auto-import/vite'
import Components from 'unplugin-vue-components/vite'
import {getLastCommit} from "git-last-commit";
-import DefineOptions from 'unplugin-vue-define-options/vite' // 引入插件
+import VueMacros from 'unplugin-vue-macros/vite'
function pathResolve(dir: string) {
return resolve(__dirname, ".", dir)
@@ -23,8 +23,15 @@ export default defineConfig(async () => {
})
return {
plugins: [
- vue({
- reactivityTransform: true
+ VueMacros({
+ plugins: {
+ vue: Vue(),
+ vueJsx: VueJsx() // if needed
+ }
+ // betterDefine: true,
+ // reactivityTransform: {
+ // exclude: [/node_modules/, /jQuery\.js/]
+ // }
}),
AutoImport({
resolvers: [ElementPlusResolver()],
@@ -33,8 +40,7 @@ export default defineConfig(async () => {
resolvers: [ElementPlusResolver()],
}),
//用于给setup组件定义名字的，keep-alive需要name才能正常工作
- DefineOptions(),
- vueJsx(),
+ // DefineOptions(),
lifecycle === 'report' ?
visualizer({
gzipSize: true,