From e21319acd8851c04dcd08eb098a326b525c7f023 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 4 Jan 2022 17:01:31 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9A=E4=B8=8D=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=B6=88=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/src/pages/tabBar/dir/index.vue   |  9 ++++++---
 mobile/src/pages/tabBar/home/index.nvue | 26 ++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/mobile/src/pages/tabBar/dir/index.vue b/mobile/src/pages/tabBar/dir/index.vue
index a055251ce9..0e2df49164 100644
--- a/mobile/src/pages/tabBar/dir/index.vue
+++ b/mobile/src/pages/tabBar/dir/index.vue
@@ -1,8 +1,8 @@
 <template>
-	<view class="page">
-		<swiper indicator-dots="true">
+	<view class="page de-main">
+		<!-- <swiper indicator-dots="true">
 			<swiper-item v-for="(img, key) in imgUrls" :key="key"><image :src="img" /></swiper-item>
-		</swiper>
+		</swiper> -->
 		<view class=" ">
 			<view class="uni-title">
 				
@@ -100,4 +100,7 @@ swiper,
 .page-section-title {
 	margin-top: 50rpx;
 }
+.de-main {
+	padding-top: 60rpx;
+}
 </style>
diff --git a/mobile/src/pages/tabBar/home/index.nvue b/mobile/src/pages/tabBar/home/index.nvue
index cb0c9230bb..28a61b0528 100644
--- a/mobile/src/pages/tabBar/home/index.nvue
+++ b/mobile/src/pages/tabBar/home/index.nvue
@@ -14,11 +14,28 @@
 					<view v-for="(newsitem,index2) in tab.data" :key="newsitem.id">
 						<media-item :options="newsitem" @close="close(index1,index2)" @click="goDetail(newsitem)"></media-item>
 					</view>
-					<view class="loading-more" v-if="tab.isLoading || tab.data.length > 12">
+					<view class="loading-more" v-if="tab.isLoading">
 						<text class="loading-more-text">{{tab.loadingText}}</text>
 					</view>
 				</scroll-view>
+				
 				<!-- #endif -->
+				<!-- <uni-list>
+				
+				    <uni-list-item 
+				      v-for="(node, i) in tab.data" 
+				      :key="i"
+				      clickable
+				      @click="goDetail(node)"
+				      :title="node.title"   
+				      thumb="../../../static/yibiaobans.png" 
+				      thumb-size="base" 
+				      :rightText="node.rightText" 
+				    />
+				
+				    
+				    
+				</uni-list> -->
             </swiper-item>
         </swiper>
     </view>
@@ -112,6 +129,7 @@
 						}
 						
 					}
+					activeTab.isLoading = false
 			        
 			        uni.stopPullDownRefresh()
 			    })            
@@ -170,10 +188,12 @@
                     }
                 })
             },
-            loadMore(e) {
+            loadMore(index) {
+				let activeTab = this.newsList[index]
+				activeTab.isLoading = true
                 setTimeout(() => {
                     this.getList(this.tabIndex);
-                }, 500)
+                }, 1000)
             },
             ontabtap(e) {
                 let index = e.target.dataset.current || e.currentTarget.dataset.current;