From 6c5d9ee35d7f1c9ec1aac584c4f8a4ffa132a812 Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Thu, 23 Apr 2026 17:43:02 +0800 Subject: [PATCH 1/4] 11 --- package1/group/groupBuyList.vue | 14 +++++++++----- package1/order/orderDetail.vue | 2 ++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/package1/group/groupBuyList.vue b/package1/group/groupBuyList.vue index 238d6d2..f1ed19b 100644 --- a/package1/group/groupBuyList.vue +++ b/package1/group/groupBuyList.vue @@ -64,7 +64,7 @@ - @@ -128,7 +128,7 @@ - + 当前{{onlineWorkerTotal}}名配送员在线 @@ -265,9 +265,11 @@ } }, onReachBottom() { + if (this.searchForm.pageNumber >= this.totalPages) return; // this.status = 'loading'; - this.searchForm.pageNumber++; + this.searchForm.pageNumber+=1; + console.log('1111') this.getShopList(); }, @@ -376,6 +378,7 @@ }).catch(() => {}) }, getShopList() { + console.log("3333") this.loadStatus = 'loading' if (this.searchSale) { this.searchForm.sortSale = 'saleCount' @@ -391,6 +394,7 @@ } else { this.searchForm.sortScore = '' } + console.log("2222") let that = this that.tui.request("/app/shop/getByCondition", "GET", this.searchForm, false, true).then((res) => { that.loadStatus = 'nomore'; @@ -400,8 +404,8 @@ } else { that.shopList = [...that.shopList, ...res.result.content] } - this.judgeBusinessStatus() that.totalPages = res.result.totalPages + that.judgeBusinessStatus() that.isArea = false that.$forceUpdate() } else { @@ -413,7 +417,7 @@ }, judgeBusinessStatus() { for (let i = 0; i < this.shopList.length; i++) { - if (this.shopList[i].shopTakeaway != '') { + if (this.shopList[i].shopTakeaway != '' && this.shopList[i].shopTakeaway != null) { if (this.shopList[i].shopTakeaway.status == 0) { let isEndTime = this.isWithinBusinessHours(this.shopList[i].shopTakeaway.businessHourBegin,this.shopList[i].shopTakeaway.businessHourEnd) this.shopList[i].shopTakeaway.status = isEndTime ? 0 : 1 diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue index ef9051b..976305f 100644 --- a/package1/order/orderDetail.vue +++ b/package1/order/orderDetail.vue @@ -1254,6 +1254,8 @@ } .btn-box{ height: auto; + display: flex; + margin-bottom: 10px; } .btn{ width: 90%; From f959a9ce98577d82c2b8b227b71de84894eb88e2 Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Thu, 23 Apr 2026 17:43:18 +0800 Subject: [PATCH 2/4] 11 --- pages/index/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pages/index/index.vue b/pages/index/index.vue index a88e0e7..5aa7b68 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1200,7 +1200,7 @@ width: 100%; height: 160rpx; display: flex; - margin-top: 80rpx; + margin-top: 40rpx; } .menu-list { @@ -1469,6 +1469,7 @@ .qu-left { width: 80%; padding-left: 10rpx; + overflow: hidden; } .qu-right { From 7ede3013edbdfe7ec7967db2b6890d6d19417890 Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Thu, 23 Apr 2026 17:55:45 +0800 Subject: [PATCH 3/4] 11 --- components/tab-bar/delivery.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/tab-bar/delivery.vue b/components/tab-bar/delivery.vue index c861328..d276246 100644 --- a/components/tab-bar/delivery.vue +++ b/components/tab-bar/delivery.vue @@ -183,7 +183,8 @@ 用户申请 退款中 - 已到店 + From 71b708ef035a01880bd5405eec96e915edc6863a Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Thu, 23 Apr 2026 18:02:55 +0800 Subject: [PATCH 4/4] 11 --- components/tab-bar/delivery.vue | 2 +- components/tab-bar/tab-bar.vue | 39 ++++++++++++++++----------------- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/components/tab-bar/delivery.vue b/components/tab-bar/delivery.vue index d276246..218585e 100644 --- a/components/tab-bar/delivery.vue +++ b/components/tab-bar/delivery.vue @@ -187,7 +187,7 @@ alt="" style="width: 100%;height: 100rpx;background-size: 100%;" @tap="changeStatus(item,1)"/> + alt="" style="width: 100%;height: 100rpx;background-size: 100%;" @tap="changeStatus(item,2)"/> diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue index a9ca84a..5c39e13 100644 --- a/components/tab-bar/tab-bar.vue +++ b/components/tab-bar/tab-bar.vue @@ -122,29 +122,28 @@ let that = this let shopId = uni.getStorageSync('shopId') let worker = uni.getStorageSync('worker') - if(!shopId && !worker){ - return - } - this.tui.request("/mall/delivery/countOrderByStatus", "POST", {workerId:uni.getStorageSync('worker').workerId}, false, true).then((res) => { - if (res.code == 200) { - if(res.result != null){ - for(let i = 0;i { + if (res.code == 200) { + if(res.result != null){ + for(let i = 0;i {}); + uni.hideLoading(); + }).catch((res) => {}); + } } } }