From cbc2571057ca6543139a3bf2520e9eefdec960a6 Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Mon, 21 Aug 2023 18:11:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/css/base.css              |  6 ++-
 src/layouts/index.vue                | 79 +++++++++++++++++-----------
 src/views/home/components/layout.vue |  1 +
 src/views/home/index.vue             |  2 +-
 4 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/src/assets/css/base.css b/src/assets/css/base.css
index 72abe2b..229d55d 100644
--- a/src/assets/css/base.css
+++ b/src/assets/css/base.css
@@ -57,9 +57,11 @@
   margin: 0;
   font-weight: normal;
 }
-
+html{
+  height: 100%;
+}
 body {
-  height: 100vh;
+  height: 100%;
   /* min-height: 100vh; */
   color: var(--color-text);
   background: var(--color-background);
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 92cc625..aab9078 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,43 +1,58 @@
 <template>
-    <div class="layout">
-        <Header />
-        <div class="layoutContent">
-            <Content />
-            <Footer v-if="isFooter" />
-        </div>
+  <div class="layout">
+    <Header />
+    <div class="layoutContent">
+      <Content />
+      <Footer v-if="isFooter" />
     </div>
+  </div>
+  <!-- <div class="h-full flex flex-col">
+    <div class="h-90px w-full"></div>
+    <div class="fixed h-90px w-full z-99">
+      <Header />
+    </div>
+    <div class="relative min-h-[calc(100vh-90px)]">
+        <Content />
+    </div>
+    <div class="w-full">
+        <Footer v-if="isFooter" />
+    </div>
+  </div> -->
 </template>
 
 <script setup>
-import Header from './Header.vue';
-import Content from './Content.vue';
-import Footer from './Footer.vue';
-import { useRouter } from 'vue-router';
-import { watch,ref } from 'vue'
-const router = useRouter();
-
-const isFooter = ref(true);
-watch(router.currentRoute, (to) => {
-    isFooter.value = to.meta?.footer ?? true;
-},{
-    immediate: true
-})
+import Header from './Header.vue'
+import Content from './Content.vue'
+import Footer from './Footer.vue'
+import { useRouter } from 'vue-router'
+import { watch, ref } from 'vue'
+const router = useRouter()
 
+const isFooter = ref(true)
+watch(
+  router.currentRoute,
+  (to) => {
+    isFooter.value = to.meta?.footer ?? true
+  },
+  {
+    immediate: true,
+  }
+)
 </script>
 
 <style lang="scss" scoped>
-.layout{
+.layout {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  .layoutContent {
+    flex: 1;
     width: 100%;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden;
-    .layoutContent{
-        flex: 1;
-        width: 100%;
-        overflow-y: auto;
-        position: relative;
-        z-index: 1;
-    }
+    overflow-y: auto;
+    position: relative;
+    z-index: 1;
+  }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/home/components/layout.vue b/src/views/home/components/layout.vue
index de8126a..895f74a 100644
--- a/src/views/home/components/layout.vue
+++ b/src/views/home/components/layout.vue
@@ -10,6 +10,7 @@
         立即体验
       </div>
     </div>
+    <!-- <div class="h-200px w-full"></div> -->
   </div>
 </template>
 <script setup>
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 3563ef8..c98684e 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -31,7 +31,7 @@
           >
             <component :is="item.component" />
           </swiper-slide>
-          <swiper-slide class="!h-690px">
+          <swiper-slide>
             <Footer></Footer>
           </swiper-slide>
         </swiper>