From 080b6163f1d2d74b653a59ce572afb81a3664d65 Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Wed, 13 May 2026 13:32:25 +0800 Subject: [PATCH] 1 --- package1/group/groupBuySingle.vue | 20 ++++-------- package1/order/returnOrder.vue | 3 +- package1/runErrand/runErrand.vue | 54 +++++++++++++++---------------- 3 files changed, 34 insertions(+), 43 deletions(-) diff --git a/package1/group/groupBuySingle.vue b/package1/group/groupBuySingle.vue index b55cba8..4df8026 100644 --- a/package1/group/groupBuySingle.vue +++ b/package1/group/groupBuySingle.vue @@ -822,8 +822,7 @@ methods: { // 页面touchmove事件:吸顶后阻止页面整体滑动(让goods-list接管滚动) onPageTouchMove(e) { - // 吸顶状态下不需要额外处理,scroll-view会自己处理 - console.log(e) + }, // goods-list滚动事件:检测分类切换 + 滚回顶部取消吸顶 onGoodsListScroll(e) { @@ -905,7 +904,7 @@ if (this.productItem[i].sellBeginTime != '' && this.productItem[i].sellEndTime != '') { let isEndTime = this.isWithinBusinessHours(this.productItem[i].sellBeginTime, this .productItem[i].sellEndTime) - console.log(isEndTime) + this.productItem[i].status = isEndTime ? 0 : 1 } if (that.productItem[i].isMoreBuy == 1) { @@ -1034,9 +1033,7 @@ }); } } - } catch (e) { - console.log(e); - } + } catch (e) {} } this.isPintuan = true; @@ -1169,9 +1166,7 @@ }); } } - } catch (e) { - console.log(e); - } + } catch (e) {} } if (index == 'pintuan') { @@ -1454,7 +1449,6 @@ const startMinutes = parseTime(begin); const endMinutes = parseTime(end); - console.log(currentMinutes + ',' + startMinutes + ',' + endMinutes) // 判断是否在区间内(包含端点) return currentMinutes >= startMinutes && currentMinutes <= endMinutes; @@ -1501,9 +1495,9 @@ }, goDetail(type) { if (type == 'goodsDetail') { - uni.navigateTo({ - url: '/package1/goods/goodsDetail' - }) + // uni.navigateTo({ + // url: '/package1/goods/goodsDetail' + // }) } else if (type == 'shopDetail') { uni.navigateTo({ url: '/package1/group/groupBuyDetail?item=' + JSON.stringify(this.shopItem) diff --git a/package1/order/returnOrder.vue b/package1/order/returnOrder.vue index 2e6cf54..66fd9f0 100644 --- a/package1/order/returnOrder.vue +++ b/package1/order/returnOrder.vue @@ -890,8 +890,7 @@ background: #fff; max-height: 1200rpx; width: 100%; - border-top-left-radius: 20rpx; - border-top-right-radius: 20rpx; + border-radius: 20rpx; padding: 20rpx; overflow: scroll; } diff --git a/package1/runErrand/runErrand.vue b/package1/runErrand/runErrand.vue index 5aa761d..53e5da4 100644 --- a/package1/runErrand/runErrand.vue +++ b/package1/runErrand/runErrand.vue @@ -207,41 +207,39 @@ 订单备注 - + - - - - - 优惠券 - - - -¥{{selectedCoupon.discountAmount.toFixed(2)}} - - - 有 {{availableCoupons.length}} 张可用 - - - 无可用券 + + + 优惠券 + + + -¥{{selectedCoupon.discountAmount.toFixed(2)}} + + + 有 {{availableCoupons.length}} 张可用 + + + 无可用券 + + - - - - - {{isKuaidi?'代取配送费':'跑腿费'}} + + + {{isKuaidi?'代取配送费':'跑腿费'}} + + + ¥{{deliveryFeeCalc.toFixed(2)}} + - - ¥{{deliveryFeeCalc.toFixed(2)}} + + + 合计 + ¥{{totalAmountCalc.toFixed(2)}} - - - 合计 - ¥{{totalAmountCalc.toFixed(2)}} - -