From 97676d75fb35283036fbc5aee8b0bc6bcb10bf8e Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Sat, 15 Aug 2020 18:32:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BE=BE=E4=BA=BA=E5=88=97=E8=A1=A8=208.15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api/shop.js     |   4 ++
 pageB/follow/index.vue | 109 +++++++++++++++++++++++++++--------------
 2 files changed, 75 insertions(+), 38 deletions(-)

diff --git a/common/api/shop.js b/common/api/shop.js
index 2034005..353f654 100644
--- a/common/api/shop.js
+++ b/common/api/shop.js
@@ -54,6 +54,10 @@ export default {
 			getRecommendList(){
                 return vm.$u.post('MemberExpert/recommendList');
 			},
+			// 获取所有达人
+			getAllRecommendList({ page }) {
+				return vm.$u.post('MemberExpert/getRecommendList', { page });
+			},
 			// 达人（搜索）列表
 			getExpertList({ page, store_id, live_status, like_nickname }){
                 return vm.$u.post('MemberExpert/expertList', {
diff --git a/pageB/follow/index.vue b/pageB/follow/index.vue
index f102ffb..d8b75e3 100644
--- a/pageB/follow/index.vue
+++ b/pageB/follow/index.vue
@@ -1,43 +1,49 @@
 <template>
     <view class="follow">
-        <view class="sosuo" @click="searchValue">
-            <image src="/static/image/common/10.png"></image>
-            <text>输入达人名称</text>
-        </view>
-        <view class="list" style="margin-left:-20rpx">
-            <darenItem style="margin-top:20rpx;margin-left:20rpx;" v-for="item in recommendList" :key="item.id" :info="item"  v-on:pChangeType="changeType"></darenItem>
-        </view>
+       <scroll-view scroll-y :style="{ height: viewHeight }" @scrolltolower="loadmore" class="container">
+		    <view class="sosuo" @click="searchValue">
+				<image src="/static/image/common/10.png"></image>
+				<text>输入达人名称</text>
+			</view>
+			<view class="list" style="margin-left:-20rpx">
+				<darenItem style="margin-top:20rpx;margin-left:20rpx;" v-for="item in recommendList" :key="item.id" :info="item"  v-on:pChangeType="changeType"></darenItem>
+			</view>
+			<u-loadmore :status="loadStatus" bgColor="#ECECEC" font-size="14" margin-top="40" margin-bottom="20" v-if="recommendList.length > pageSize" @loadmore="loadmore"></u-loadmore>
+	   </scroll-view>
     </view>
 </template>
 <style lang="scss" scoped>
 .follow{
     background-color: #ECECEC;
     min-height: calc(100vh - var(--window-top));
-    padding: 20rpx 30rpx;
-    .sosuo{
-        width: 100%;
-        height: 60rpx;
-        border-radius: 30rpx;
-        background-color: #fff;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        >image{
-            width: 29rpx;
-            height: 29rpx;
-        }
-        >text{
-            font-size: 24rpx;
-            color: #999;
-            margin-left: 15rpx;
-        }
-    }
-    .list{
-        display: flex;
-        flex-wrap: wrap;
-        width: calc(100% + 23rpx);
-        margin-right: -23rpx;
-    }
+	.container {
+		box-sizing: border-box;
+		padding: 20rpx 30rpx;
+		.sosuo{
+			width: 100%;
+			height: 60rpx;
+			border-radius: 30rpx;
+			background-color: #fff;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			>image{
+				width: 29rpx;
+				height: 29rpx;
+			}
+			>text{
+				font-size: 24rpx;
+				color: #999;
+				margin-left: 15rpx;
+			}
+		}
+		.list{
+			display: flex;
+			flex-wrap: wrap;
+			width: calc(100% + 23rpx);
+			margin-right: -23rpx;
+		}
+	}
 }
 </style>
 <script>
@@ -50,22 +56,45 @@ export default {
     },
     data(){
         return{
+			pageSize: 2,
 			recommendList: [], // 推荐达人
+			page: 1,
+			loadStatus: 'loadmore',
+			timer: true,
+			viewHeight: '',
         }
 	},
+	onLoad() {
+		this.setViewHeight();
+	},
 	onShow() {
 		this.getRecommendList();
 	},
 	methods: {
-		getRecommendList() {
-			this.$u.api.getRecommendList().then(res => {
-				if(res.errCode == 0) {
-					this.recommendList = res.data.list;
-				}
+		async getRecommendList({ load = 'reload' } = {}) {
+			const res = await this.$u.api.getAllRecommendList({ page: this.page });
+			this.timer = true;
+			if(res.errCode == 0) {
+				if(load == 'reload') this.recommendList = res.data.list;
+				if(load == 'loadmore') this.recommendList.push(...res.data.list);
+			}
+			return res.data.list.length;
+		},
+		loadmore() {
+			if(!this.timer) return false;
+			this.timer = false;
+			this.loadStatus = "loading";
+			this.page++;
+			this.getRecommendList({ load: "loadmore" }).then(length => {
+				this.loadStatus = "nomore";
+				if(length == 0) this.page--;
+			}).catch(() => {
+				this.loadStatus = "nomore";
+				this.page--;
 			})
 		},
 		changeType(member_id){
-			console.log(member_id);
+			// console.log(member_id);
 			this.$emit("pChangeType")
 			this.$u.api.attentionMember({
 				member_id: member_id
@@ -79,6 +108,10 @@ export default {
 				url: '/pageB/search/index?type=2&curent=1'
 			})
 		},
+		setViewHeight() {
+			const res = uni.getSystemInfoSync();
+			this.viewHeight = res.windowHeight + 'px';
+		}
 	},
 }
 </script>
\ No newline at end of file