From b7c79144e9956fffefe13d04ad2677c92581ea8e Mon Sep 17 00:00:00 2001
From: wangfukang <15630117759@163.com>
Date: Sun, 17 Mar 2024 09:36:49 +0800
Subject: [PATCH] 11

---
 pages/index/downStearmList.vue | 33 ++++++++++++++++++++++++---------
 pages/index/orderDetail.vue    |  2 +-
 pages/index/peopleList.vue     | 20 ++++++++++++--------
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/pages/index/downStearmList.vue b/pages/index/downStearmList.vue
index f50458a..ef5ed89 100644
--- a/pages/index/downStearmList.vue
+++ b/pages/index/downStearmList.vue
@@ -26,7 +26,8 @@
 					</view>
 				</view>
 			</view>
-		</view>
+		</view>
+		<u-loadmore :status="status" />
 		<view class="bottom-box">
 			<view class="bottom-left" @tap="toggle('carPopup')">
 				<view class="bottom-left-box">
@@ -179,7 +180,8 @@
 		data() {
 			return {
 				indexList: [],
-				pageNum: 1, //分页的页码
+				pages: 1, //分页的页码
+				totalPages: 0,
 				shopList: [],
 				info: 0,
 				categoryId: '', //分类id
@@ -212,7 +214,8 @@
 					city: '',
 					area: '',
 					id: ''
-				},
+				},
+				status: 'loadmore',
 				rules: {
 					consigneeName: {
 						rules: [{
@@ -244,6 +247,12 @@
 					},
 				},
 			}
+		},
+		onReachBottom() {
+			if (this.pages >= this.totalPages) return;
+			this.status = 'loading';
+			this.pages = ++this.pages;
+			this.getShareList();
 		},
 		onLoad(options) {
 			this.khid = options.khid;
@@ -601,17 +610,23 @@
 				}
 			},
 			//点击分类获取商品列表
-			getShareList(id) {
+			getShareList(id) {
+				this.status = 'loading';
 				this.tui.request("/app/productShare/getShareList", "POST", {
 					searchStr: this.searchName,
 					id: this.khid,
-					pageNum: this.pageNum,
+					pageNum: this.pages,
 					pageSize: '10'
-				}, false, true).then((res) => {
+				}, false, true).then((res) => {
+					this.status = 'nomore';
 					if (res.code == 200) {
-						this.shopList = res.result.shareList.records
 						this.priceType = res.result.share.priceType
-						this.shopId = res.result.shareList.records[0].shopId
+						this.shopId = res.result.shareList.records[0].shopId
+						if (this.pages == 1) {
+							this.shopList = res.result.shareList.records
+						} else {
+							this.shopList = [...this.shopList, ...res.result.shareList.records]
+						}
 						for (var i = 0; i < this.shopList.length; i++) {
 							if (res.result.share.priceType == 1) { //批发价
 								this.shopList[i].discountAmount = this.shopList[i].wholesalePrice
@@ -619,7 +634,7 @@
 								this.shopList[i].discountAmount = this.shopList[i].price
 							}
 						}
-
+						this.totalPages = res.result.shareList.pages
 					} else {
 						this.tui.toast(res.message)
 					}
diff --git a/pages/index/orderDetail.vue b/pages/index/orderDetail.vue
index 575de3e..8cdb038 100644
--- a/pages/index/orderDetail.vue
+++ b/pages/index/orderDetail.vue
@@ -594,7 +594,7 @@
 				strCmd += blesdk.addCPCLText('50', '890', '24', '0', 0, '地址：' + this.shopData.shopAddress)
 				strCmd += blesdk.addCPCLLocation(0);
 				strCmd += blesdk.addCPCLPrint();
-				this.bufferData = strCmd;
+				this.bufferData.push(strCmd);
 			},
 			//计算打印机当前行高度
 			countPrint(){
diff --git a/pages/index/peopleList.vue b/pages/index/peopleList.vue
index db05ad0..e6c6840 100644
--- a/pages/index/peopleList.vue
+++ b/pages/index/peopleList.vue
@@ -24,12 +24,15 @@
 					</view>
 					<view class="name-tel" style="width: 100%;display: flex;flex-direction: column;height:auto;font-size: 30rpx;">
 						<text>{{item.name == '散客'?'-':item.province + item.city + item.area}}</text>
-						<text style="font-size: 26rpx;color:#747474;height: auto;line-height: 30rpx;">{{item.name == '散客'?'-':item.address}}</text>
+						<text style="width:75%;font-size: 26rpx;color:#747474;height: auto;line-height: 30rpx;">{{item.name == '散客'?'-':item.address}}</text>
 					</view>
-					<view v-if="item.name != '散客'" class="name-edit" @tap.stop="goAddPeople('edit',item)" style="top: 25rpx;">
+					<view v-if="item.name != '散客'" style="color: red;position: absolute;top: 8px;right: 17px;font-size: 13px;">
+						欠款:{{item.noEarn?item.noEarn :0}}
+					</view>
+					<view v-if="item.name != '散客'" class="name-edit" @tap.stop="goAddPeople('edit',item)" style="top: 70rpx;">
 						编辑
 					</view>
-					<view v-if="item.name != '散客'" class="name-edit" @tap.stop="goDetail(item)" style="background: #FF9797;bottom:25rpx">
+					<view v-if="item.name != '散客'" class="name-edit" @tap.stop="goDetail(item)" style="background: #FF9797;bottom:16rpx">
 						查看明细
 					</view>
 				</view>
@@ -415,17 +418,18 @@
 		font-size: 15px;
 	}
 	.name-edit{
-		width: 120rpx;
-		height: 60rpx;
+		width: 110rpx;
+		height: 55rpx;
 		position: absolute;
 		right: 35rpx;
 		background: #088FEB;
 		color: #fff;
-		font-size: 24rpx;
-		line-height: 60rpx;
+		font-size: 22rpx;
+		line-height: 55rpx;
 		text-align: center;
 		border-radius: 5px;
-	}
+	}
+	
 	.standard-box {
 		color: #088FEB;
 		width: 30%;