订单详情修改优惠计算公示

pagesOrder/detail/components/list.vue

@@ -169,7 +169,15 @@
 			<view class="u-p-30" style="width: 80vw;">
 				<view class="font-bold  u-text-center">优惠详情</view>
 				<view class="u-m-t-32">
-					<view class="u-flex u-row-between">
+					<!-- <view class="u-flex u-row-between u-m-b-18">
+						<view>会员优惠</view>
+						<view class="color-red">
+							<text>￥</text>
+							<text>{{vipDiscountPrice}}</text>
+						</view>
+					</view> -->
+					
+					<view class="u-flex u-row-between ">
 						<view>满减券抵扣</view>
 						<view class="color-red">
 							<text>￥</text>
@@ -323,6 +331,9 @@
 	})
 	
 	const productCoupPrice=computed(()=>{
+		if(props.orderInfo.status=='closed'){
+			return props.orderInfo.productCouponDiscountAmount
+		}
 		const goodsPrice = props.data.reduce((a, b) => {
 			const curTotal = b.info.filter(v => v.gift != true&& v.userCouponId).reduce((prve,
 				cur) => {
@@ -338,7 +349,7 @@
 	})
 	
 	const youhuiAllPrice=computed(()=>{
-		return (freePrice.value*1+vipDiscountPrice.value*1+props.orderInfo.fullCouponDiscountAmount+props.orderInfo.productCouponDiscountAmount+props.orderInfo.pointsDiscountAmount+productCoupPrice.value*1).toFixed(2)
+		return (freePrice.value*1+vipDiscountPrice.value*1+props.orderInfo.fullCouponDiscountAmount+props.orderInfo.pointsDiscountAmount+productCoupPrice.value*1).toFixed(2)
 	})
 	const packFee = computed(() => {
 		const goodsPrice = props.data.reduce((prve, cur) => {
@@ -352,7 +363,8 @@
 
 	})
 	const allPrice = computed(() => {
-		return (goodsOriginAllPrice.value-youhuiAllPrice.value).toFixed(2)
+		const n=goodsOriginAllPrice.value-youhuiAllPrice.value
+		return (n<0?0:n).toFixed(2)
 	})
 
 	const goodsNumber = computed(() => {