From 546c2a468cc02b377380e6d3d86e6a86c9371b91 Mon Sep 17 00:00:00 2001
From: besscroft <besscroft@foxmail.com>
Date: Tue, 12 Sep 2023 21:12:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(page):=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=20bug=20=E4=BF=AE=E5=A4=8D=20-=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E9=94=99=E9=A2=98=E6=9C=AC=E7=BB=83=E4=B9=A0=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20-=20=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=9A=84=20page=20transition=20=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=20dom=20=E6=9B=BF=E6=8D=A2=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 heming-web/components/Work.vue |  3 +-
 heming-web/layouts/learn.vue   | 71 ++++++++++++++++++----------------
 heming-web/pages/[...all].vue  |  1 +
 heming-web/pages/index.vue     |  3 +-
 heming-web/pages/learn.vue     |  3 +-
 heming-web/pages/login.vue     |  1 +
 heming-web/pages/practise.vue  | 27 +++++++++++++
 7 files changed, 73 insertions(+), 36 deletions(-)
 create mode 100644 heming-web/pages/practise.vue

diff --git a/heming-web/components/Work.vue b/heming-web/components/Work.vue
index 11059a8..f45c82e 100644
--- a/heming-web/components/Work.vue
+++ b/heming-web/components/Work.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 const nuxtApp = useNuxtApp()
+const router = useRouter()
 
 const wrongBook = ref({})
 
@@ -34,7 +35,7 @@ onMounted(async () => {
 
     <v-card-text flex items-center>
       <p w-full>{{ wrongBook.count || 0 }} 题</p>
-      <v-btn>
+      <v-btn @click="router.push('/practise')">
         复习
       </v-btn>
     </v-card-text>
diff --git a/heming-web/layouts/learn.vue b/heming-web/layouts/learn.vue
index cddaada..ca2e784 100644
--- a/heming-web/layouts/learn.vue
+++ b/heming-web/layouts/learn.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { breakpointsTailwind, useBreakpoints } from '@vueuse/core'
 
+const router = useRouter()
 const breakpoints = useBreakpoints(breakpointsTailwind)
 const smAndLarger = breakpoints.greaterOrEqual('sm')
 const choiceLoading = ref<boolean>(false)
@@ -12,39 +13,43 @@ const handleChoiceLoading = (val: boolean) => {
 </script>
 
 <template>
-  <Header />
-  <div v-if="smAndLarger" p2 grid sm:px16 md:px20 lg:24 grid-cols-1 gap-4 lg:grid-cols-3 lg:gap-8>
-    <Today />
-    <Dictionary :choiceLoading="choiceLoading" @handleChoiceLoading="handleChoiceLoading" />
-    <Work />
-  </div>
-  <div sm:hidden p2>
-    <v-card>
-      <v-tabs
-          v-model="tab"
-          color="deep-purple-accent-4"
-          align-tabs="center"
-      >
-        <v-tab :value="1">今日概览</v-tab>
-        <v-tab :value="2">单词进度</v-tab>
-        <v-tab :value="3">错题本</v-tab>
-      </v-tabs>
-      <v-window v-model="tab">
-        <v-window-item :value="1">
-          <Today />
-        </v-window-item>
-        <v-window-item :value="2">
-          <Dictionary :choiceLoading="choiceLoading" @handleChoiceLoading="handleChoiceLoading" />
-        </v-window-item>
-        <v-window-item :value="3">
-          <Work />
-        </v-window-item>
-      </v-window>
-    </v-card>
-  </div>
-  <div p-2 w-full v-if="!choiceLoading">
-    <slot />
-  </div>
+  <v-app>
+    <div v-if="router.currentRoute.value.path === '/learn'">
+      <Header />
+      <div v-if="smAndLarger" p2 grid sm:px16 md:px20 lg:24 grid-cols-1 gap-4 lg:grid-cols-3 lg:gap-8>
+        <Today />
+        <Dictionary :choiceLoading="choiceLoading" @handleChoiceLoading="handleChoiceLoading" />
+        <Work />
+      </div>
+      <div sm:hidden p2>
+        <v-card>
+          <v-tabs
+            v-model="tab"
+            color="deep-purple-accent-4"
+            align-tabs="center"
+          >
+            <v-tab :value="1">今日概览</v-tab>
+            <v-tab :value="2">单词进度</v-tab>
+            <v-tab :value="3">错题本</v-tab>
+          </v-tabs>
+          <v-window v-model="tab">
+            <v-window-item :value="1">
+              <Today />
+            </v-window-item>
+            <v-window-item :value="2">
+              <Dictionary :choiceLoading="choiceLoading" @handleChoiceLoading="handleChoiceLoading" />
+            </v-window-item>
+            <v-window-item :value="3">
+              <Work />
+            </v-window-item>
+          </v-window>
+        </v-card>
+      </div>
+    </div>
+    <div w-full v-if="!choiceLoading">
+      <slot />
+    </div>
+  </v-app>
 </template>
 
 <style scoped>
diff --git a/heming-web/pages/[...all].vue b/heming-web/pages/[...all].vue
index 22811b4..0eb1084 100644
--- a/heming-web/pages/[...all].vue
+++ b/heming-web/pages/[...all].vue
@@ -3,6 +3,7 @@ const router = useRouter()
 
 definePageMeta({
   layout: 'layout',
+  pageTransition: false,
 })
 </script>
 
diff --git a/heming-web/pages/index.vue b/heming-web/pages/index.vue
index e518beb..8b09dc4 100644
--- a/heming-web/pages/index.vue
+++ b/heming-web/pages/index.vue
@@ -2,7 +2,8 @@
 const router = useRouter()
 
 definePageMeta({
-  layout: 'layout',
+  layout: 'default',
+  pageTransition: false,
 })
 </script>
 
diff --git a/heming-web/pages/learn.vue b/heming-web/pages/learn.vue
index 53f916b..e4842d0 100644
--- a/heming-web/pages/learn.vue
+++ b/heming-web/pages/learn.vue
@@ -72,11 +72,12 @@ onMounted(() => {
 
 definePageMeta({
   layout: 'learn',
+  pageTransition: false,
 })
 </script>
 
 <template>
-  <div>
+  <div p-2>
     <v-no-ssr>
       <v-card
         :loading="loading"
diff --git a/heming-web/pages/login.vue b/heming-web/pages/login.vue
index 5d27713..5d23e42 100644
--- a/heming-web/pages/login.vue
+++ b/heming-web/pages/login.vue
@@ -65,6 +65,7 @@ onUnmounted(() => {
 
 definePageMeta({
   layout: 'default',
+  pageTransition: false,
 })
 </script>
 
diff --git a/heming-web/pages/practise.vue b/heming-web/pages/practise.vue
new file mode 100644
index 0000000..6c5fa32
--- /dev/null
+++ b/heming-web/pages/practise.vue
@@ -0,0 +1,27 @@
+<script setup lang="ts">
+const router = useRouter()
+
+definePageMeta({
+  layout: 'learn',
+  pageTransition: false,
+})
+</script>
+
+<template>
+  <div>
+    <v-app-bar color="primary" w-full>
+      <template v-slot:prepend>
+        <v-app-bar-nav-icon icon="mdi-arrow-left" @click="router.push('/learn')"></v-app-bar-nav-icon>
+      </template>
+
+      <v-app-bar-title>错题训练</v-app-bar-title>
+    </v-app-bar>
+    <div pt18 px2>
+      开发中...
+    </div>
+  </div>
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file