From e6ecc71c81d7d520516c804ea8f8c5af4de808d2 Mon Sep 17 00:00:00 2001
From: zyronon <zyronon@163.com>
Date: Wed, 15 Feb 2023 02:01:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/slideHooks/Community.vue |  5 +++--
 src/pages/slideHooks/Shop.vue      |  6 ++++--
 src/pages/slideHooks/index.vue     | 20 +++++++++++---------
 src/pages/test/Test.vue            |  4 ++--
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/pages/slideHooks/Community.vue b/src/pages/slideHooks/Community.vue
index 57d90cb..986ffde 100644
--- a/src/pages/slideHooks/Community.vue
+++ b/src/pages/slideHooks/Community.vue
@@ -69,11 +69,12 @@ onMounted(() => {
 #Community {
   font-size: 14rem;
   color: white;
-  background: black;
+  padding-top: @header-height;
 
   .Scroll {
+    background: black;
     //height: calc(100vh - @header-height) !important;
-    height: calc(100vh - @header-height) !important;
+    height: calc(100vh - @header-height - @footer-height) !important;
   }
 
   .goods-list {
diff --git a/src/pages/slideHooks/Shop.vue b/src/pages/slideHooks/Shop.vue
index 44b1432..94f78db 100644
--- a/src/pages/slideHooks/Shop.vue
+++ b/src/pages/slideHooks/Shop.vue
@@ -97,11 +97,13 @@ onMounted(() => {
 #Shop {
   font-size: 14rem;
   color: white;
+  padding-top: @header-height;
 
   .search {
     display: flex;
     align-items: center;
-    padding: 20rem;
+    height: @header-height;
+    padding: 0 20rem;
 
     img {
       width: 20rem;
@@ -176,7 +178,7 @@ onMounted(() => {
 
   .Scroll {
     //height: calc(100vh - @header-height) !important;
-    height: calc(100vh - 90rem) !important;
+    height: calc(100vh - @header-height - @footer-height) !important;
   }
 
   .goods-list {
diff --git a/src/pages/slideHooks/index.vue b/src/pages/slideHooks/index.vue
index 1c5de21..bcb24bb 100644
--- a/src/pages/slideHooks/index.vue
+++ b/src/pages/slideHooks/index.vue
@@ -60,17 +60,17 @@
              id="slideHook"
              v-love="'slideHook'"
              v-model:index="state.navIndex">
-            <SlideItem class=" gray">
+            <SlideItem>
               <div class="big">热点</div>
             </SlideItem>
-            <SlideItem class=" gray">
-              <div class="big">社区</div>
+            <SlideItem>
+              <Community/>
             </SlideItem>
             <SlideItem class=" gray">
               <div class="big">关注</div>
             </SlideItem>
-            <SlideItem class=" gray">
-              <div class="big">商城</div>
+            <SlideItem>
+              <Shop/>
             </SlideItem>
             <SlideItem>
               <VInfinite
@@ -203,6 +203,8 @@ import Dom from "../../utils/dom";
 import ShareToFriend from "@/pages/home/components/ShareToFriend";
 import resource from "@/assets/data/resource";
 import UserPanel from "@/components/UserPanel.vue";
+import Community from "@/pages/slideHooks/Community.vue";
+import Shop from "@/pages/slideHooks/Shop.vue";
 
 const nav = useNav()
 
@@ -477,14 +479,14 @@ function render(item, itemIndex, play, position) {
   .slide-content {
     width: 100%;
     height: 100%;
-
   }
 }
 
 .first-horizontal-item {
-  width: 90vw;
-  height: 80vh;
-  //height: calc(100vh - @footer-height);
+  //width: 90vw;
+  //height: 80vh;
+  width: 100vw;
+  height: calc(100vh - @footer-height);
   overflow: hidden;
 
   .red {
diff --git a/src/pages/test/Test.vue b/src/pages/test/Test.vue
index 3ecd0bd..66fcb89 100644
--- a/src/pages/test/Test.vue
+++ b/src/pages/test/Test.vue
@@ -3,9 +3,9 @@
   <!--  <SlideUser></SlideUser>-->
   <!--  <SlideImgs></SlideImgs>-->
   <!--  <TestSwiperJs></TestSwiperJs>-->
-<!--  <slideHooks/>-->
+  <slideHooks/>
 <!--  <Shop/>-->
-  <Community/>
+<!--  <Community/>-->
 <!--  <UserPanel/>-->
 
   <!--  <div class="body">-->