From e531d211af321c48790146bf2626460bea2715c7 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Wed, 3 Apr 2024 17:39:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/category/index.vue  | 19 ++++++-------------
 pages/recommend/index.vue |  2 +-
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/pages/category/index.vue b/pages/category/index.vue
index d4209a7..7bc6425 100644
--- a/pages/category/index.vue
+++ b/pages/category/index.vue
@@ -17,8 +17,8 @@
       </view>
 		  </scroll-view>
 		  <!-- 右侧 二级分类 -->
+      <mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ native: true }" @down="downCallback" :up="upOption" @up="upCallback">
 		  <scroll-view v-if="list.length>0 && type==0" class="cate-right" :scroll-top="scrollTop" :scroll-y="true" :style="{ height: `${scrollHeight}px` }">
-        <mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ native: true }" @down="downCallback" :up="upOption" @up="upCallback">
         <!-- 有数据的时候  -->
         <view class="cate-right-cont">
           <view class="cate-two-box">
@@ -34,10 +34,8 @@
             </view>
           </view>
         </view>
-        </mescroll-body>
       </scroll-view>
       <scroll-view v-else-if="userList.length>0 && type==1"class="cate-right" :scroll-top="scrollTop" :scroll-y="true" :style="{ height: `${scrollHeight}px` }">
-        <mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ native: true }" @down="downCallback" :up="upOption" @up="upCallback">
         <view  class="cate-right-cont">
           <view class="cate-two-box">
             <view class="cate-cont-box">
@@ -57,10 +55,8 @@
             </view>
           </view>
         </view>
-        </mescroll-body>
       </scroll-view>
       <scroll-view v-else-if="informationList.length>0 && type==2"class="cate-right" :scroll-top="scrollTop" :scroll-y="true" :style="{ height: `${scrollHeight}px` }">
-        <mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ native: true }" @down="downCallback" :up="upOption" @up="upCallback">
         <view  class="cate-right-cont">
           <view class="cate-two-box">
             <view class="cate-cont-box">
@@ -73,10 +69,8 @@
             </view>
           </view>
         </view>
-        </mescroll-body>
       </scroll-view>
       <scroll-view v-else-if="serviceProvidersList.length>0 && type==3" class="cate-right" :scroll-top="scrollTop" :scroll-y="true" :style="{ height: `${scrollHeight}px` }">
-        <mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ native: true }" @down="downCallback" :up="upOption" @up="upCallback">
         <view class="cate-right-cont">
           <view class="cate-two-box">
             <view class="cate-cont-box">
@@ -91,10 +85,8 @@
             </view>
           </view>
         </view>
-        </mescroll-body>
       </scroll-view>
       <scroll-view v-else-if="transactionList.length>0 && type==4" class="cate-right" :scroll-top="scrollTop" :scroll-y="true" :style="{ height: `${scrollHeight}px` }">
-        <mescroll-body ref="mescrollRef" :sticky="true" @init="mescrollInit" :down="{ native: true }" @down="downCallback" :up="upOption" @up="upCallback">
         <view class="cate-right-cont">
           <view class="cate-two-box">
             <view class="cate-cont-box">
@@ -107,8 +99,8 @@
             </view>
           </view>
         </view>
-        </mescroll-body>
 		  </scroll-view>
+      </mescroll-body>
 		  
 		</view>
 		
@@ -210,7 +202,7 @@
      */
     onLoad(options) {
       // 加载页面数据
-      this.onRefreshPage()
+      //this.onRefreshPage()
       this.curIndex = options.curIndex ? options.curIndex : 0
     },
 
@@ -359,6 +351,7 @@
       async getHomeListImage() {
         this.list.forEach((item, key) => {
           if (item.goods_image === "") {
+            uni.hideLoading()
             GoodsApi.nbgoodsImage({"id": item.id}).then(res2 => {
               if (res2.code === 200) {
                 this.list[key].goods_image = res2.data.data[0].goods_image;
@@ -451,8 +444,8 @@
   .secondary{
 	  z-index: 19;
 	  border-top: 1rpx solid #444;
-	  // height: 100vh;
-	  height: 100%;
+	   height: 95vh;
+	  //height: 100%;
   }
   
   // 分类内容
diff --git a/pages/recommend/index.vue b/pages/recommend/index.vue
index 18f9ad6..60ce7e6 100644
--- a/pages/recommend/index.vue
+++ b/pages/recommend/index.vue
@@ -226,7 +226,7 @@ export default {
   .secondary {
     z-index: 19;
     border-top: 1rpx solid #444;
-    height: 100vh;
+    height: 95vh;
   }
 
   // 分类内容