From 5227ce05a36d16fc32691b73e4d75c8aee9cea51 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Mon, 11 Jan 2021 16:46:37 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app

---
 hive-app/pages/mine/knowledge.vue |   48 ++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/hive-app/pages/mine/knowledge.vue b/hive-app/pages/mine/knowledge.vue
index f06e7a0..4d32b07 100644
--- a/hive-app/pages/mine/knowledge.vue
+++ b/hive-app/pages/mine/knowledge.vue
@@ -10,7 +10,7 @@
 						<text>{{item.articleTypeName}}</text>
 				</view>
 			</scroll-view>
-			<scroll-view class="list-right" scroll-y="true">
+			<scroll-view class="list-right" scroll-y="true" @scrolltolower="scrolltolower()">
 				<navigator :url="'./knowledgeDetail?id='+item.id" hover-class="none" v-for="item in list">
 					<view class="list-right-row">
 						<image class="product-img" :src="item.image?item.image:'../../static/images/no-img.png'"></image>
@@ -23,24 +23,50 @@
 					</view>
 				</navigator>
 				<no-record :isShow="!list.length"></no-record>
+				<view v-if="list.length">
+					<uni-load-more :status="loadStatus" color="#a5abaf"></uni-load-more>
+				</view>
 			</scroll-view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
 	export default {
+		components: {
+			uniLoadMore
+		},
 		data(){
 			return{
 				typeList: [], 
 				list: [],
-				typeId: ''
+				typeId: '',
+				loadStatus: 'more',
+				pageNum: 1
 			}
 		},
 		onLoad(options) {
 			this.loadTypeList()
 		},
+		onPullDownRefresh(){
+			this.reloadData();
+			let timer = setTimeout(function () {
+				uni.startPullDownRefresh();
+				clearTimeout(timer);
+				timer = null;
+			}, 800);
+		},
 		methods:{
+			reloadData(){
+				this.list = [];
+				this.pageNum = 1;
+				this.loadStatus = 'more';
+				this.loadList();
+			},
+			scrolltolower(){
+				this.loadList()
+			},
 			loadTypeList(){
 				this.$httpUtils.request('/api/know/findKnowledgeType').then((res) => {
 					if(res.status == 200){
@@ -54,19 +80,29 @@
 				})
 			},
 			loadList(){
+				if(this.loadStatus!=='more'){
+					return;
+				}
 				this.$httpUtils.request('/api/know/findArticleList', {
-					pageNum: 1,
-					pageSize: 100,
+					pageNum: this.pageNum,
+					pageSize: 10,
 					typeId: this.typeId
 				}, 'POST').then((res) => {
 					if(res.status == 200){
-						this.list = res.rows;
+						let result = res.rows;
+						if(result.length < 10){
+							this.loadStatus = 'noMore';
+						} else {
+							this.pageNum ++ ;
+							this.loadStatus = 'more';
+						}
+						this.list = this.list.concat(result);
 					}
 				})
 			},
 			changeType(id){
 				this.typeId = id;
-				this.loadList()
+				this.reloadData()
 			}
 		}
 	}

--
Gitblit v1.9.1