From b186adff6ad90788f0efc27df4972a0319c56d5d Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Wed, 15 Feb 2023 15:24:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8B=E6=8B=89=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/massif/collectList.vue | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/pages/massif/collectList.vue b/pages/massif/collectList.vue
index 453bb25..b9eb2bd 100644
--- a/pages/massif/collectList.vue
+++ b/pages/massif/collectList.vue
@@ -54,7 +54,7 @@
 	<view class="container flex">
 		<d-search v-model="searchVal.search" @search="clean();search()"/>
 
-		<scroll-view scroll-y>
+		<scroll-view scroll-y @scrolltolower="search">
 			<view class="card" v-for="(v,k) in list" :key="k" @click="toSpecs(v)">
 				<view class="name">
 					<text>{{v.goodsType}}</text> <text>{{v.substanceName}}</text> <text class="plant-youbian"/>
@@ -76,7 +76,7 @@ export default {
 				baseId: this.$store.state.plantBaseInfoId,
 				pageNo:1,
 				flagGroupBy:'y',
-				pageSize:6,
+				pageSize:7,
 				search:"",
 			},
 			list:[],
@@ -95,21 +95,23 @@ export default {
 			this.searchVal.pageNo=1
 		},
 		async search(){
-			var res=await request("/api/Inventory/queryCollectingList",{
-				method:"post",
-				body: this.searchVal
-			})
-			if(res.statu){
-				this.list=this.list.concat(res.data.records)
-				this.total=res.data.total
-				this.searchVal.pageNo++
-				if(this.list.length==this.total)uni.showToast({title:"加载完成！",icon:"none"})
-			}else{
-				uni.showModal({
-					title:"提示",
-					content:res.msg||"获取领用农资失败！",
-					showCancel:false,
+			if(this.total==0 || this.list.length<this.total){
+				var res=await request("/api/Inventory/queryCollectingList",{
+					method:"post",
+					body: this.searchVal
 				})
+				if(res.statu){
+					this.list=this.list.concat(res.data.records)
+					this.total=res.data.total
+					this.searchVal.pageNo++
+					if(this.list.length==this.total)uni.showToast({title:"加载完成！",icon:"none"})
+				}else{
+					uni.showModal({
+						title:"提示",
+						content:res.msg||"获取领用农资失败！",
+						showCancel:false,
+					})
+				}
 			}
 		},
 		toSpecs(e){