diff --git a/src/App.vue b/src/App.vue index b9f33869..76fa4610 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,15 +1,10 @@ + + + + \ No newline at end of file diff --git a/src/components/Toolbar/Toolbar.vue b/src/components/Toolbar/Toolbar.vue index d7b50427..36d3b52b 100644 --- a/src/components/Toolbar/Toolbar.vue +++ b/src/components/Toolbar/Toolbar.vue @@ -130,9 +130,9 @@ watch(() => store.setting.showToolbar, n => { @import "@/assets/css/colors.scss"; header { + width: var(--toolbar-width); margin-top: 10rem; min-height: 60rem; - width: 100%; background: var(--color-header-bg); display: flex; justify-content: space-between; diff --git a/src/components/Type.vue b/src/components/Type.vue index 7796fcd5..609f4cd4 100644 --- a/src/components/Type.vue +++ b/src/components/Type.vue @@ -39,6 +39,21 @@ const [playCorrect] = useSound([correct], 1) const [playAudio] = usePlayWordAudio() +interface IProps { + total: number, + startDate: number + inputNumber: number + wrongNumber: number + correctRate: number +} + +const props = withDefaults(defineProps(), { + total: 0, + startDate: Date.now(), + inputNumber: 0, + wrongNumber: 0, + correctRate: 0, +}) const resetWord = $computed(() => { return store.word.name.slice(input.length + wrong.length) diff --git a/src/components/Type2.vue b/src/components/Type2.vue new file mode 100644 index 00000000..6ff39343 --- /dev/null +++ b/src/components/Type2.vue @@ -0,0 +1,281 @@ + + + + + \ No newline at end of file diff --git a/src/components/TypeArticle.vue b/src/components/TypeArticle.vue index e5fada8d..3bdecbe7 100644 --- a/src/components/TypeArticle.vue +++ b/src/components/TypeArticle.vue @@ -1,7 +1,7 @@