修改订单详情优惠逻辑

pagesOrder/detail/components/list.vue

@@ -58,7 +58,12 @@
 								<view class="u-text-right u-m-t-28">
 									<template v-if="isTui(item)">
 										<view>￥0.00</view>
-										<view class="line-th color-666 ">￥{{returnTotalMoney(item)}}
+										<template
+											v-if="user.isVip&&item.isMember&&returnVipMoney(item)>0&&returnVipMoney(item)!=returnTotalMoney(item)">
+											<view class="line-th color-666 ">{{returnVipMoney(item)}}</view>
+											
+										</template>
+										<view class="line-th color-666 " v-else>￥{{returnTotalMoney(item)}}
 										</view>
 									</template>
 									<template v-else-if="isGift(item)||item.userCouponId">
@@ -67,7 +72,8 @@
 										</view>
 									</template>
 									<template v-else>
-										<template v-if="user.isVip&&item.isMember&&returnVipMoney(item)>0&&returnVipMoney(item)!=returnTotalMoney(item)">
+										<template
+											v-if="user.isVip&&item.isMember&&returnVipMoney(item)>0&&returnVipMoney(item)!=returnTotalMoney(item)">
 											<view>￥{{returnVipMoney(item)}}</view>
 											<view class=" color-666 line-th">
 												￥{{returnTotalMoney(item)}}</view>
@@ -134,7 +140,7 @@
 				</view>
 			</view>
 
-			<template v-if="orderInfo.status=='refund'">
+			<template v-if="orderInfo.refundAmount">
 				<view class="u-flex u-row-between u-m-t-32">
 					<view>退款金额</view>
 					<view class="color-999">
@@ -190,7 +196,8 @@
 							<text>{{orderInfo.fullCouponDiscountAmount}}</text>
 						</view>
 					</view>
-					<view class="u-flex u-row-between u-m-t-18" v-if="orderInfo.productCouponDiscountAmount||productCoupPrice">
+					<view class="u-flex u-row-between u-m-t-18"
+						v-if="orderInfo.productCouponDiscountAmount||productCoupPrice">
 						<view>商品券抵扣</view>
 						<view class="color-red">
 							<text>￥</text>
@@ -213,14 +220,16 @@
 
 <script setup>
 	import {
-		computed, reactive
+		computed,
+		reactive
 	} from 'vue';
 	import color from '@/commons/color.js'
 	import {
 		hasPermission
 	} from '@/commons/utils/hasPermission.js'
 	import {
-		isTui,isGift,
+		isTui,isTuiCai,
+		isGift,
 		canTuiKuan,
 		canTuicai,
 		numSum
@@ -228,9 +237,11 @@
 	const pop = reactive({
 		youhui: false
 	})
+
 	function youhuiDetailShow() {
 		pop.youhui = true
 	}
+
 	function youhuiDetailHide() {
 		pop.youhui = false
 	}
@@ -314,9 +325,10 @@
 
 	const freePrice = computed(() => {
 		const goodsPrice = props.data.reduce((prve, cur) => {
-			const curTotal = cur.info.filter(v => v.gift == true || isTui(v)).reduce((a,
+			const curTotal = cur.info.filter(v => v.gift == true || isGift(v)).reduce((a,
 				b) => {
-				return a + (b.num * b.price)
+					const price=(b.isMember && b.memberPrice)?b.memberPrice:b.price
+				return a + (b.num * price)
 			}, 0)
 			return prve + curTotal
 		}, 0)
@@ -327,7 +339,9 @@
 			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((a,
+			const curTotal = cur.info.filter(v => v.gift != true && v.status !== "return" && !v
+				.userCouponId && (v.isMember && v.memberPrice) && (v.memberPrice != v.price)).reduce((
+				a,
 				b) => {
 				return a + (b.num * (b.price - b.memberPrice))
 			}, 0)
@@ -355,7 +369,11 @@
 	})
 
 	const youhuiAllPrice = computed(() => {
-		return (freePrice.value*1+vipDiscountPrice.value*1+props.orderInfo.fullCouponDiscountAmount+props.orderInfo.pointsDiscountAmount+productCoupPrice.value*1+(props.orderInfo.discountAmount||0)).toFixed(2)
+		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)
 	})
 	const packFee = computed(() => {
 		const goodsPrice = props.data.reduce((prve, cur) => {