From 252243fa7b1b8578dde88e7a241656eaf9bbed5f Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Tue, 23 Dec 2025 13:33:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8B=BC=E5=9B=A2=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=95=86=E5=93=81=E4=B8=8B=E6=9E=B6=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=8F=90=E9=86=92=C2=B7=EF=BC=8C=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E5=92=8C=E7=BB=93=E7=AE=97=E6=88=90=E5=8A=9F=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BC=9A=E5=91=98=E6=8A=98=E6=89=A3=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=A7=AF=E5=88=86=E5=88=97=E8=A1=A8=E7=A7=AF?= =?UTF-8?q?=E5=88=86=E4=BD=99=E9=A2=9D=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E5=A5=97=E9=A4=90=E5=95=86=E5=93=81?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=95=86=E5=93=81=E6=98=BE=E7=A4=BA=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- groupBuying/detail/index.vue | 2 +- groupBuying/goodsDetail/goodsDetail.vue | 14 +++++ pages/order/components/orderInfo.vue | 7 ++- pages/order/components/orderInfoAfter.vue | 7 ++- pages/user/user.vue | 16 ++++-- userPackage/goodsDetail/goodsDetail.vue | 14 ++--- userPackage/index/index.vue | 63 +++++++++++++++++------ 7 files changed, 92 insertions(+), 31 deletions(-) diff --git a/groupBuying/detail/index.vue b/groupBuying/detail/index.vue index d6b8355..caed4ff 100644 --- a/groupBuying/detail/index.vue +++ b/groupBuying/detail/index.vue @@ -79,7 +79,7 @@ - + diff --git a/groupBuying/goodsDetail/goodsDetail.vue b/groupBuying/goodsDetail/goodsDetail.vue index 2203cca..d40fa20 100644 --- a/groupBuying/goodsDetail/goodsDetail.vue +++ b/groupBuying/goodsDetail/goodsDetail.vue @@ -353,6 +353,20 @@ function getDetail() { Api.wareDetail(query).then(res => { + console.log('res',res) + if(!res){ + uni.showModal({ + title:'提示', + content:'当前商品已下架', + showCancel:false, + success() { + uni.redirectTo({ + url:'/groupBuying/index/index' + }) + } + }) + } + res.wareCommentImgs = res.wareCommentImgs.split(',').filter(v => v) Object.assign(item, res) console.log(item) diff --git a/pages/order/components/orderInfo.vue b/pages/order/components/orderInfo.vue index f23ea7d..511f6b8 100644 --- a/pages/order/components/orderInfo.vue +++ b/pages/order/components/orderInfo.vue @@ -226,6 +226,11 @@ 新客立减 -{{listinfo.newCustomerDiscountAmount}} + + 会员折扣 + -{{listinfo.vipDiscountAmount}} + + @@ -451,7 +456,7 @@ const showDiscount = computed(() => { const keys = ['productCouponDiscountAmount', 'otherCouponDiscountAmount', - 'pointsDiscountAmount', 'discountActAmount', 'newCustomerDiscountAmount' + 'pointsDiscountAmount', 'discountActAmount', 'newCustomerDiscountAmount','vipDiscountAmount' ] if (isObjHasPropertyAndNotNull(props.listinfo, keys)) { return true diff --git a/pages/order/components/orderInfoAfter.vue b/pages/order/components/orderInfoAfter.vue index 2e156a5..18c2d6e 100644 --- a/pages/order/components/orderInfoAfter.vue +++ b/pages/order/components/orderInfoAfter.vue @@ -222,6 +222,11 @@ 新客立减 -{{listinfo.newCustomerDiscountAmount}} + + + 会员折扣 + -{{listinfo.vipDiscountAmount}} + @@ -402,7 +407,7 @@ const showDiscount = computed(() => { const keys = ['productCouponDiscountAmount', 'otherCouponDiscountAmount', - 'pointsDiscountAmount', 'discountActAmount', 'newCustomerDiscountAmount' + 'pointsDiscountAmount', 'discountActAmount', 'newCustomerDiscountAmount','vipDiscountAmount' ] if (isObjHasPropertyAndNotNull(props.listinfo, keys)) { return true diff --git a/pages/user/user.vue b/pages/user/user.vue index 90bb4cc..e44ccaa 100644 --- a/pages/user/user.vue +++ b/pages/user/user.vue @@ -124,7 +124,7 @@ 积分 - + {{ coinTotal }}家店 @@ -138,7 +138,7 @@ ¥ {{ - item.accountPoints || "0.00" + item.pointBalance || "0.00" }} {{ @@ -147,7 +147,7 @@ + @click="toCoin()"> 查看全部 @@ -163,7 +163,7 @@ {{ - userInfo.accountPoints || 0 + userInfo.pointBalance || 0 }} 查看 @@ -434,7 +434,13 @@ coinList.value = res3; } - function toCoin() { + function toCoin(item) { + if(item){ + uni.navigateTo({ + url: "/pages/user/member/billDetails?type=2&shopId="+item.shopId+"&id="+(item.id||''), + }); + return + } uni.navigateTo({ url: "/user/score/list", }); diff --git a/userPackage/goodsDetail/goodsDetail.vue b/userPackage/goodsDetail/goodsDetail.vue index 4248ee6..6891931 100644 --- a/userPackage/goodsDetail/goodsDetail.vue +++ b/userPackage/goodsDetail/goodsDetail.vue @@ -75,18 +75,18 @@ - - - - {{item.name}} + + + + {{item.name}} {{item.packageProducts.length}}选{{item.num}} - - + {{goods.name}} - {{goods.num}} + x{{goods.num}} ¥{{goods.price}} diff --git a/userPackage/index/index.vue b/userPackage/index/index.vue index 1a5d17e..4b0c684 100644 --- a/userPackage/index/index.vue +++ b/userPackage/index/index.vue @@ -52,7 +52,9 @@ 最低到手 ¥{{minPrice(item)}} ¥{{item.originPrice}} - + + + @@ -74,7 +76,7 @@ {{item.packageName}} - {{item.packageName}} + {{item.packageName}} @@ -92,23 +94,23 @@ ¥{{item.originPrice}} - +