From 0b9141c17270d83b05d8b51139989644a4b84763 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 12 九月 2024 11:34:31 +0800
Subject: [PATCH] update 会员积分相关的优化

---
 pages/order/order-detail.vue |   31 +++++++++++++++++++++++--------
 1 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 8a31a49..bc12076 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -586,9 +586,27 @@
 		<view class="info-container bg-white br-4 m-t-12" v-if="!showSales">
 			<view class="form-item">
 				<view class="label">订单金额:</view>
-				<view class="value">{{ dto.totalAmount || '-' }}</view>
+				<view class="value">+{{ dto.totalAmount || '0' }}</view>
 			</view>
 			<view class="form-item">
+				<view class="label">运费:</view>
+				<view class="value">+{{ dto.transportFee || '0' }}</view>
+			</view>
+			<view class="form-item">
+				<view class="label">打包费:</view>
+				<view class="value">+{{ dto.packingFee || '0' }}</view>
+			</view>
+			<view class="form-item t-red">
+				<view class="label">优惠:</view>
+				<view class="value">-{{ dto.memberCouponAmount || '0' }}</view>
+			</view>
+			<view class="form-item t-red">
+				<view class="label">实际支付:</view>
+				<view class="value">¥{{ dto.paymentAmount || '0' }}</view>
+			</view>
+			
+			
+		<!-- 	<view class="form-item">
 				<view class="label">支付金额:</view>
 				<view class="value">{{ dto.paymentAmount || '-' }}</view>
 			</view>
@@ -596,10 +614,7 @@
 				<view class="label">商品金额:</view>
 				<view class="value">{{ dto.flowerAmount || '-' }}</view>
 			</view>
-			<view class="form-item">
-				<view class="label">运费:</view>
-				<view class="value">{{ dto.transportFee || '-' }}</view>
-			</view>
+		
 			<view class="form-item">
 				<view class="label">折扣类型:</view>
 				<view class="value">{{ dto.memberDiscountTypeStr || '-' }}</view>
@@ -611,11 +626,11 @@
 			<view class="form-item">
 				<view class="label">优惠券:</view>
 				<view class="value">{{ dto.memberCouponName || '-' }}</view>
-			</view>
-			<view class="form-item">
+			</view> -->
+		<!-- 	<view class="form-item">
 				<view class="label">优惠金额:</view>
 				<view class="value">{{ dto.memberCouponAmount || '-' }}</view>
-			</view>
+			</view> -->
 		</view>
 		<view class="info-container bg-white br-4 m-t-12"
 			v-if="!showSales&& dto.pointGoodsList&& dto.pointGoodsList.length>0">

--
Gitblit v1.9.3