From 1662622ce7b81ff40cf277adaf75bd80f40d53bf Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 22 Oct 2024 14:55:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BB=A5=E5=8F=8A=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E6=98=BE=E7=A4=BA=E4=BB=B7=E6=A0=BC?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=94=B9=E4=B8=BA=E6=80=BB=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesOrder/detail/components/list.vue     | 13 +++++++++++--
 pagesOrder/index/compoents/order-item.vue |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 3d43056..38b85a3 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -40,7 +40,13 @@
 										<view class="line-th color-666 ">￥{{item.salePrice||item.price}}</view>
 									</template>
 									<template v-else>
-										<view>￥{{item.salePrice||item.price}}</view>
+										<template v-if="item.priceAmount<=0">
+											<view>￥0.00</view>
+											<view class="line-th color-666 ">￥{{returnTotalMoney(item)}}</view>
+										</template>
+										<template v-else>
+											<view>￥{{item.priceAmount}}</view>
+										</template>
 									</template>
 									<view class="u-m-t-22 color-999 u-font-24">X{{item.number||item.num}}</view>
 								</view>
@@ -130,6 +136,9 @@
 	import color from '@/commons/color.js'
 	const emits = defineEmits(['tuicai', 'tuikuan', 'printOrder'])
 	
+	function returnTotalMoney(item){
+		return (item.price*item.num).toFixed(2)
+	}
 	function to2(n){
 		if(!n){
 			return 0
@@ -175,7 +184,7 @@
 		const goodsPrice = props.data.reduce((prve, cur) => {
 			const curTotal = cur.info.filter(v => v.isGift !== "true" && v.status !== "return").reduce((a,
 				b) => {
-				return a + (b.salePrice || b.price) * (b.number || b.num)
+				return a + b.priceAmount*1
 			}, 0)
 			return prve + curTotal
 		}, 0)
diff --git a/pagesOrder/index/compoents/order-item.vue b/pagesOrder/index/compoents/order-item.vue
index c9dcd6d..5a8bc8c 100644
--- a/pagesOrder/index/compoents/order-item.vue
+++ b/pagesOrder/index/compoents/order-item.vue
@@ -40,7 +40,7 @@
 						</view>
 						<view class="u-flex u-flex-1 u-row-right">
 							<view>×{{item.num}}</view>
-							<view class="u-text-right" :style="computedPriceStyle()">￥{{item.price}}</view>
+							<view class="u-text-right" :style="computedPriceStyle()">￥{{item.priceAmount}}</view>
 						</view>
 					</view>
 				</view>