From b0986065f457afffa42b875cdb5ccfffdc9e4f13 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 20 Nov 2024 15:06:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=BC=98=E6=83=A0=E8=AE=A1=E7=AE=97=E5=85=AC=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesOrder/detail/components/list.vue | 30 +++++++++++++--------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 3ef1731..9e9912f 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -58,12 +58,7 @@
 								<view class="u-text-right u-m-t-28">
 									<template v-if="isTui(item)">
 										<view>￥0.00</view>
-										<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 class="line-th color-666 " >￥{{returnTotalMoney(item)}}
 										</view>
 									</template>
 									<template v-else-if="isGift(item)||item.userCouponId">
@@ -175,25 +170,25 @@
 			<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 u-m-b-18">
+					<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>
 					<view class="u-flex u-row-between u-m-b-18" v-if="orderInfo.discountAmount*1>0">
 						<view>打折</view>
 						<view class="color-red">
 							<text>￥</text>
-							<text>{{orderInfo.discountAmount}}</text>
+							<text>{{to2(orderInfo.discountAmount) }}</text>
 						</view>
 					</view>
 					<view class="u-flex u-row-between " v-if="orderInfo.fullCouponDiscountAmount*1>0">
 						<view>满减券抵扣</view>
 						<view class="color-red">
 							<text>￥</text>
-							<text>{{orderInfo.fullCouponDiscountAmount}}</text>
+							<text>{{to2(orderInfo.fullCouponDiscountAmount) }}</text>
 						</view>
 					</view>
 					<view class="u-flex u-row-between u-m-t-18"
@@ -201,14 +196,14 @@
 						<view>商品券抵扣</view>
 						<view class="color-red">
 							<text>￥</text>
-							<text>{{orderInfo.productCouponDiscountAmount||productCoupPrice}}</text>
+							<text> {{to2(orderInfo.productCouponDiscountAmount||productCoupPrice) }}</text>
 						</view>
 					</view>
 					<view class="u-flex u-row-between u-m-t-18" v-if="orderInfo.pointsDiscountAmount">
 						<view>积分抵扣</view>
 						<view class="color-red">
 							<text>￥</text>
-							<text>{{orderInfo.pointsDiscountAmount}}</text>
+							<text>{{to2(orderInfo.pointsDiscountAmount) }}</text>
 						</view>
 					</view>
 
@@ -228,7 +223,8 @@
 		hasPermission
 	} from '@/commons/utils/hasPermission.js'
 	import {
-		isTui,isTuiCai,
+		isTui,
+		isTuiCai,
 		isGift,
 		canTuiKuan,
 		canTuicai,
@@ -327,7 +323,7 @@
 		const goodsPrice = props.data.reduce((prve, cur) => {
 			const curTotal = cur.info.filter(v => v.gift == true || isGift(v)).reduce((a,
 				b) => {
-					const price=(b.isMember && b.memberPrice)?b.memberPrice:b.price
+				const price = (b.isMember && b.memberPrice) ? b.memberPrice : b.price
 				return a + (b.num * price)
 			}, 0)
 			return prve + curTotal
@@ -369,11 +365,13 @@
 	})
 
 	const youhuiAllPrice = computed(() => {
-		console.log(freePrice.value * 1 , vipDiscountPrice.value * 1 , props.orderInfo.fullCouponDiscountAmount ,props
-			.orderInfo.pointsDiscountAmount , productCoupPrice.value * 1 , props.orderInfo.discountAmount);
+		// 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) => {