From ed6674f3ffb904780204f6b128080c97ce4ba5fb Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Thu, 13 Aug 2020 16:21:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E5=88=86=E4=B9=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/index.vue | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1f7e47e..308c4e7 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -39,9 +39,9 @@
 					</scroll-view>
 				</swiper-item>
 				<swiper-item>
-					<scroll-view style="width:100%;height:100%" scroll-y="true">
+					<scroll-view style="width:100%;height:100%" scroll-y="true" @scrolltolower="swiperBottom">
 						<view class="box">
-							<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @scrolltolower="swiperBottom" @click="clickSImage($event, 2)"></u-swiper>
+							<u-swiper mode="dot" :list="zhiboImageSwiper" name="adv_code" @click="clickSImage($event, 2)"></u-swiper>
 							<view class="list">
 								<view>
 									<zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :zid="item.live_id" :rid="item.chatroom_id"
@@ -303,6 +303,9 @@
             },
             // 直播列表
 			tabLiveList() {
+				uni.showLoading({
+                    title: "loading..."
+                })
 				this.$u.api.tabLiveList({page:this.page}).then((res) => {
 					 // uni.stopPullDownRefresh();
                     this.status = "loading";
@@ -311,18 +314,20 @@
                         if (this.page == 1) {
                         	this.tabLiveLists = res.data.data;
                             this.status = "loadmore";
-                        } else if (res.data.length == 0 && this.page > 1) {
+                        } else if (res.data.data.length == 0 && this.page > 1) {
                             this.status = "nomore";
                         } else {
-                            this.tabLiveLists  = this.tabLiveLists.push(...res.data.data);
+							this.tabLiveLists  = this.tabLiveLists.concat(res.data.data);
+							console.log(this.tabLiveLists)
                         }
-                        if (res.data.length == 0 && this.page > 1) {
+                        if (res.data.data.length == 0 && this.page > 1) {
                         } else {
                             this.page++;
                         }
                     } else {
                         this.status = "nomore"
-                    }
+					}
+					
 				})
 			},
             // 轮播图
@@ -425,6 +430,7 @@
 	                this.getArticlelist();
 
 				}else if(this.num == 1){
+					console.log(123)
 					this.tabLiveList()
 				}
                 // console.log(e);
-- 
2.45.2