From b69159d9658e817de46d9ff650b44ce7b15028c8 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Thu, 21 Nov 2024 18:10:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E8=AF=A6?= =?UTF-8?q?=E6=83=85=EF=BC=8C=E6=94=AF=E4=BB=98=E4=BB=B7=E6=A0=BC=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesOrder/detail/components/list.vue | 52 ++++++++++++++++++++++----- pagesOrder/detail/detail.vue | 5 +-- pagesOrder/pay-order/pay-order.vue | 23 +++++++++--- pagesOrder/quan/quan.vue | 5 +-- pagesOrder/quan_util.js | 6 ++-- pagesOrder/tuikuan/tuikuan.vue | 32 +++++++++-------- 6 files changed, 89 insertions(+), 34 deletions(-) diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue index 4a29f75..b26fd4f 100644 --- a/pagesOrder/detail/components/list.vue +++ b/pagesOrder/detail/components/list.vue @@ -38,7 +38,7 @@ - @@ -68,6 +68,15 @@ X{{item.number||item.num}} @@ -92,7 +101,7 @@ @@ -162,6 +171,20 @@ {{to2(allPrice*1+seatFeePrice*1+packFee*1) }} + + + + 实付￥ + {{to2(orderInfo.amount) }} + + + 重新打印 @@ -177,11 +200,11 @@ {{vipDiscountPrice}} - + 打折 ￥ - {{to2(orderInfo.discountAmount) }} + {{to2(discountAmount) }} @@ -308,6 +331,13 @@ const n = props.seatFee.priceAmount * (isTui(props.seatFee) ? 0 : 1) return n.toFixed(2) }) + const discountAmount=computed(()=>{ + if(props.orderInfo.discountAmount){ + return props.orderInfo.discountAmount + } + console.log(props.orderInfo.originAmount*(1-props.orderInfo.discountRatio)); + return (props.orderInfo.originAmount*(1-props.orderInfo.discountRatio)) + }) const goodsOriginAllPrice = computed(() => { const goodsPrice = props.data.reduce((prve, cur) => { const curTotal = cur.info.reduce((a, @@ -318,6 +348,13 @@ }, 0) return goodsPrice.toFixed(2) }) + + const canTuiKuanPrice=computed(()=>{ + const discountAmount=props.orderInfo.originAmount||(100-props.orderInfo.discountRatio)*props.orderInfo.originAmount/100 + const n= props.orderInfo.originAmount-discountAmount + console.log(n); + return m + }) const freePrice = computed(() => { const goodsPrice = props.data.reduce((prve, cur) => { @@ -335,8 +372,7 @@ return 0 } const goodsPrice = props.data.reduce((prve, cur) => { - const curTotal = cur.info.filter(v => v.gift != true && v.status !== "return" && !v - .userCouponId && (v.isMember && v.memberPrice) && (v.memberPrice != v.price)).reduce(( + const curTotal = cur.info.filter(v => v.gift != true && v.status !== "return" && (v.isMember && v.memberPrice) && (v.memberPrice != v.price)).reduce(( a, b) => { return a + (b.num * (b.price - b.memberPrice)) @@ -365,8 +401,6 @@ }) const youhuiAllPrice = computed(() => { - console.log(freePrice.value * 1 , vipDiscountPrice.value * 1 , props.orderInfo.fullCouponDiscountAmount ,props - .orderInfo.pointsDiscountAmount , productCoupPrice.value * 1 , props.orderInfo.discountAmount); return (freePrice.value * 1 + vipDiscountPrice.value * 1 + props.orderInfo.fullCouponDiscountAmount + props .orderInfo.pointsDiscountAmount + productCoupPrice.value * 1 + (props.orderInfo.discountAmount || 0)).toFixed(2) diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue index 4a41e58..a4dbfb4 100644 --- a/pagesOrder/detail/detail.vue +++ b/pagesOrder/detail/detail.vue @@ -177,7 +177,7 @@ orderId, num, priceAmount, - price + price,userCouponId } = goods go.to('PAGES_ORDER_TUIKUAN', { id, @@ -190,7 +190,8 @@ number: 0, productSkuName: productSkuName || '', priceAmount:priceAmount?priceAmount:(num*price).toFixed(2), - price + price, + userCouponId:userCouponId?userCouponId:'' }) } diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue index f6c8ac6..bc06916 100644 --- a/pagesOrder/pay-order/pay-order.vue +++ b/pagesOrder/pay-order/pay-order.vue @@ -47,9 +47,16 @@ x{{item.num}} - - -￥{{item.discountAmount}} - + + @@ -359,7 +366,8 @@ go.to('PAGES_ORDER_QUAN', { orderId: order.id, memberId: order.memberId, - orderPrice: payPrice.value * 1 + coupAllPrice.value * 1 + orderPrice: (payPrice.value * 1 + coupAllPrice.value * 1).toFixed(2), + discuount:discount.discount }) } async function discountShow() { @@ -472,6 +480,7 @@ coup.num = num coup.discountAmount = returnProductCoupAllPrice($goodsPayPriceMap[coup.proId], proCoupStartIndex, num).toFixed(2) + console.log(coup.discountAmount); } } productCoup = productCoup.filter(v => v.num >= 1) @@ -674,7 +683,11 @@ } const coupAllPrice = computed(() => { return pays.quan.reduce((prve, cur) => { - return prve + cur.discountAmount * 1 + if(cur.type==1){ + return prve + cur.discountAmount * 1 + }else{ + return prve + (cur.discountAmount * discount.discount/100) + } }, 0) }) const payPrice = computed(() => { diff --git a/pagesOrder/quan/quan.vue b/pagesOrder/quan/quan.vue index 79404d5..e71ac08 100644 --- a/pagesOrder/quan/quan.vue +++ b/pagesOrder/quan/quan.vue @@ -340,7 +340,8 @@ const option = reactive({ orderId: '', memberId: '', - orderPrice: 0 + orderPrice: 0, + discuount:100 }) function toEmitChooseQuan(item) { @@ -361,7 +362,7 @@ const goodsQuan = myQuan.res.productCoupon.filter(v => v.checked) const fullReductionCoupon = myQuan.fullReductionCouponSel.id ? [myQuan.fullReductionCouponSel] : [] let coupArr = [...fullReductionCoupon, ...goodsQuan] - return returnCouponAllPrice(coupArr, canDikouGoodsArr, user.value) + return returnCouponAllPrice(coupArr, canDikouGoodsArr, user.value,option.discuount) }) const payPrice = computed(() => { const pay = option.orderPrice - discountAmount.value diff --git a/pagesOrder/quan_util.js b/pagesOrder/quan_util.js index e447c12..5da42ac 100644 --- a/pagesOrder/quan_util.js +++ b/pagesOrder/quan_util.js @@ -206,8 +206,10 @@ export function returnFullReductionCouponAllPrice(coupArr) { } //计算优惠券总价格 -export function returnCouponAllPrice(coupArr, goodsArr, vipUser) { - const poductAllprice = returnProductCouponAllPrice(coupArr, goodsArr, vipUser) +export function returnCouponAllPrice(coupArr, goodsArr, vipUser,discount) { + console.log(discount); + const poductAllprice = (returnProductCouponAllPrice(coupArr, goodsArr, vipUser)*discount/100) + console.log(poductAllprice); const pointAllPrice = returnFullReductionCouponAllPrice(coupArr) return (poductAllprice * 1 + pointAllPrice * 1).toFixed(2); } diff --git a/pagesOrder/tuikuan/tuikuan.vue b/pagesOrder/tuikuan/tuikuan.vue index 04df108..6e5084e 100644 --- a/pagesOrder/tuikuan/tuikuan.vue +++ b/pagesOrder/tuikuan/tuikuan.vue @@ -20,7 +20,7 @@ - - 支付金额 - - {{to2(totalPrice)}}元 + + 退回优惠券 - + 该订单未使用优惠券 @@ -143,7 +146,8 @@ }) const tuikuanPrice = computed(() => { return orderDetail.goodsList.reduce((prve, cur) => { - return prve + cur.number * cur.price + const n=(cur.number/cur.num*100) * cur.priceAmount + return prve + (n/100).toFixed(2) }, 0) })