From be27a5c4f804612784c482eb2d245296029f1672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Tue, 13 Dec 2022 17:27:55 +0800
Subject: [PATCH] up

---
 .../packageBuy/pages/shopDetail/shopDetail.vue     |  4 ++--
 packages/packageBuy/pages/shopList/shopList.vue    | 14 +++++++++-----
 pages/home/home.vue                                |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/packageBuy/pages/shopDetail/shopDetail.vue b/packages/packageBuy/pages/shopDetail/shopDetail.vue
index c2cefc2..98aef78 100644
--- a/packages/packageBuy/pages/shopDetail/shopDetail.vue
+++ b/packages/packageBuy/pages/shopDetail/shopDetail.vue
@@ -43,7 +43,7 @@
 			<view class="shop">
 				<image class="pic" src="../../static/shop-logo.png"></image>
 				<view class="infos">
-					<view class="name">{{info.merchant.name}}</view>
+					<view class="name">{{info.merchant.username}}</view>
 					<view class="date-txt">周一至周日 09:00-18:00</view>
 					<view class="txt">{{info.merchant.address}}</view>
 				</view>
@@ -51,7 +51,7 @@
 		</view>
 		<view class="details">
 			<view class="detail">
-				<view class="tit">商品详情</view>
+				<view class="tit" v-if="false">商品详情</view>
 				<view class="txts">
 					<u-parse :html="info.content"></u-parse>
 				</view>
diff --git a/packages/packageBuy/pages/shopList/shopList.vue b/packages/packageBuy/pages/shopList/shopList.vue
index 8e57b6a..580c794 100644
--- a/packages/packageBuy/pages/shopList/shopList.vue
+++ b/packages/packageBuy/pages/shopList/shopList.vue
@@ -52,7 +52,7 @@
 									</view>
 								</view>
 								<view class="subInfo">{{item.merchant.address}}</view>
-								<view class="menu"><text class="hui">惠</text>{{item.merchant.name}}</view>
+								<view class="menu"><text class="hui">惠</text>{{item.merchant.username}}</view>
 							</view>
 						</view>
 					</block>
@@ -97,13 +97,16 @@
 			}
 		},
 		onReachBottom: function(e) {
-			if (!isLoading)
+			if (!this.isLoading) {
 				console.log("onReachBottom", this.currentPage + 1)
-			this.loadPage(this.currentPage + 1);
+				this.loadPage(this.currentPage + 1);
+			}
 		},
 		onPullDownRefresh: function(e) {
 			console.log("onPullDownRefresh", this.currentPage + 1)
-			this.loadPage(1);
+			if (!this.isLoading) {
+				this.loadPage(this.currentPage + 1);
+			}
 		},
 		onLoad(options) {
 			//获取系统信息 具体信息请转至 https://uniapp.dcloud.io/api/system/info
@@ -172,7 +175,8 @@
 						var res = r.data.data;
 
 						that.isLoading = false;
-						var hasNoMore = that.dataList.length < 6 && page > 1;
+						var hasNoMore = r.data.total < 6 && page > 1;
+						console.log("hasNoMore", hasNoMore)
 						if (hasNoMore || res.length == 0 && page > 1) {
 
 							uni.stopPullDownRefresh(); // 服务器总条数 < 每页条数, 会将第一页的条数重新返回
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 2ade3c8..de4a58e 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -29,7 +29,7 @@
 						<view class="date">{{item.end_at}}</view>
 					</view>
 					<view class="title">{{item.name}}</view>
-					<view class="subTit">{{item.merchant.name}}</view>
+					<view class="subTit">{{item.merchant.username}}</view>
 					<view class="price">
 						<text class="font_red">{{item.price > 0 ? `￥${item.price}` : '免费'}}</text>
 					</view>