diff --git a/pagesOrder/detail/components/extra.vue b/pagesOrder/detail/components/extra.vue index deb262b..f22585b 100644 --- a/pagesOrder/detail/components/extra.vue +++ b/pagesOrder/detail/components/extra.vue @@ -98,10 +98,10 @@ } console.log(item); if (props.orderInfo.pointsDiscountAmount > 0 || props.orderInfo.fullCouponDiscountAmount > 0) { - const shengyuKeTui=(props.orderInfo.refundAmount||0)-canTuiKuanPrice.value + const shengyuKeTui=canTuiKuanPrice.value const bili = Math.floor((item.priceAmount / shengyuKeTui) * 100) / 100 console.log(bili); - return Math.floor(props.orderInfo.amount * bili * 100) / 100 + return Math.floor((props.orderInfo.amount-props.orderInfo.refundAmount) * bili * 100) / 100 } else { return item.priceAmount } @@ -141,7 +141,7 @@ } function tuikuan() { - emits('tuikuan', props.data) + emits('tuikuan', {...props.data,priceAmount:seatFeePrice.value}) } function tuicai() { diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue index be42227..e98026d 100644 --- a/pagesOrder/detail/components/list.vue +++ b/pagesOrder/detail/components/list.vue @@ -384,10 +384,10 @@ return returnTotalMoney(item) } else { if(props.orderInfo.pointsDiscountAmount>0||props.orderInfo.fullCouponDiscountAmount>0){ - const shengyuKeTui=(props.orderInfo.refundAmount||0)-canTuiKuanPrice.value + const shengyuKeTui=canTuiKuanPrice.value const bili=Math.floor((item.priceAmount/shengyuKeTui )*100)/100 console.log(bili); - return Math.floor(props.orderInfo.amount*bili*100)/100 + return Math.floor((props.orderInfo.amount-props.orderInfo.refundAmount)*bili*100)/100 // return (item.priceAmount / (canTuiKuanPrice.value + seatFeePrice.value * 1) * props.orderInfo.amount).toFixed( // 2) }else{ @@ -523,10 +523,10 @@ const n = goodsOriginAllPrice.value - youhuiAllPrice.value return (n < 0 ? 0 : n).toFixed(2) } - const seatFee=props.orderInfo.seatInfo?(props.orderInfo.seatInfo.priceAmount||props.orderInfo.seatInfo.returnAmount):0 - console.log('seatFee'); - console.log(seatFee); - const total=props.orderInfo.amount-seatFee + let seatFee=props.orderInfo.seatInfo?(props.orderInfo.seatInfo.priceAmount):0 + const bili = Math.floor((seatFee / canTuiKuanPrice.value) * 100) / 100 + seatFee= Math.floor((props.orderInfo.amount-props.orderInfo.refundAmount) * bili * 100) / 100 + const total=props.orderInfo.amount-(props.orderInfo.seatInfo.returnAmount?props.orderInfo.seatInfo.returnAmount:seatFee) return (total<=0?0:total).toFixed(2) })