From 7b9fdbc31c3fbdbfbe2f0ef3143f8d01df01119c Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Sat, 3 Feb 2024 16:18:21 +0800
Subject: [PATCH] 11

---
 pages/index/index.vue          |  2 +-
 pages/index/waitStorage.vue    | 30 +++++++++++++++++++++++-------
 pages/inventory/goodsList1.vue |  2 +-
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index d2870e2..7a0db24 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -109,7 +109,7 @@
 								arrow-direction="left"></u-cell>
 							<u-cell icon="integral-fill" url="" title="电费缴纳" clickable isLink
 								arrow-direction="left"></u-cell>
-							<u-cell icon="integral-fill" url="" title="租金缴纳(已过期)" clickable isLink
+							<u-cell icon="integral-fill" url="" title="租金缴纳" clickable isLink
 								arrow-direction="left"></u-cell> 
 							<u-cell icon="integral-fill" url="/pages/rebate/rebateShare" title="邀请返佣" clickable isLink
 								arrow-direction="left"></u-cell>
diff --git a/pages/index/waitStorage.vue b/pages/index/waitStorage.vue
index d3495f6..b96b20a 100644
--- a/pages/index/waitStorage.vue
+++ b/pages/index/waitStorage.vue
@@ -28,9 +28,10 @@
 					</uni-card>
 				</li>
 			</ul>
-			<u-loadmore :status="status" />
-		</view>
-		<u-empty v-else mode="order" margin-top="200"></u-empty>
+			
+		</view>
+		<u-loadmore :status="status" />
+		<!-- <u-empty v-else mode="order" margin-top="200"></u-empty> -->
 	</view>
 </template>
 <script>
@@ -52,7 +53,9 @@
 				startDate: '',
 				endDate: '',
 				type: '',
-				page: 1,
+				pages: 1,
+				pageNum:1,
+				status: 'loadmore'
 			}
 		},
 		onShow(){
@@ -61,6 +64,12 @@
 		onLoad(option) {
 			this.inStorageStatus = option.inStorageStatus || ''
 			this.type = uni.getStorageSync('type')
+		},
+		onReachBottom() {
+			if (this.pageNum >= this.pages) return;
+			this.status = 'loading';
+			this.pageNum += 1;
+			this.getList();
 		},
 		methods: {
 			getList() {
@@ -68,10 +77,17 @@
 					inStorageStatus: this.inStorageStatus,
 					supplierName: this.supplierName,
 					startDate: this.startDate,
-					endDate: this.endDate
+					endDate: this.endDate,
+					pageNum:this.pageNum,
+					pageSize:10,
 				}, false, false).then((res) => {
-					if (res.code == 200) {
-						this.list = res.result
+					if (res.code == 200) {
+						this.pages = res.result.pages
+						if (this.pages == 1) {
+							this.list = res.result.records
+						} else {
+							this.list = [...this.list, ...res.result.records]
+						}
 					} else {
 						this.tui.toast(res.message)
 					}
diff --git a/pages/inventory/goodsList1.vue b/pages/inventory/goodsList1.vue
index b1edd7b..8cbd489 100644
--- a/pages/inventory/goodsList1.vue
+++ b/pages/inventory/goodsList1.vue
@@ -350,7 +350,7 @@
 				discountNum: 10, //整体折扣
 				priceCurrent: '',
 				goodsDetail: [],
-				noticeData:['您每发出一个包，使用拉包工和物流公司送货时，我们将从中拿出0.5元，捐入快拾帮帮公益基金中，帮助那些贫困儿童！我们的付出将让世界充满爱！'],
+				noticeData:['您每发出一个包，使用拉包工和物流公司送货时，我们将从中拿出XX元，捐入快拾帮帮公益基金中，帮助那些贫困儿童！我们的付出将让世界充满爱！'],
 				columns: [],
 				keyList: [],
 				temporaryList: [],