From aaa476929a2748f61804a23677d402e940c451b1 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 11 九月 2024 17:36:44 +0800
Subject: [PATCH] 1

---
 sub_pages/customer/shopping/confirm.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sub_pages/customer/shopping/confirm.vue b/sub_pages/customer/shopping/confirm.vue
index 49dbcc1..8be6896 100644
--- a/sub_pages/customer/shopping/confirm.vue
+++ b/sub_pages/customer/shopping/confirm.vue
@@ -25,7 +25,7 @@
 					if (this.cache_coupon.couponDiscountType === 'zero') {
 						return this.cache_coupon.couponDiscountValue || 0
 					} else if (this.cache_coupon.minOrderAmount && this.cache_coupon.minOrderAmount > 0) {
-						var total = ((this.dto.totalAmount || 0) + (this.dto.packing || 0) + (this.current_transport.fee ||
+						var total = (( this.dto.totalMemberAmount ||  this.dto.totalAmount || 0) + (this.dto.packing || 0) + (this.current_transport.fee ||
 								0) || 0)
 							.toFixed(2)
 						if (total >= this.cache_coupon.minOrderAmount) {
@@ -343,7 +343,7 @@
 				</view>
 				<view class="price">
 					<view class="m-l-a m-r-0 text-right">
-						共{{ dto.flowers.length }}件,小计<span class="t-red">¥{{ dto.totalAmount || 0 }}</span>
+						共{{ dto.flowers.length }}件,小计<span class="t-red">¥{{ dto.totalMemberAmount ||  dto.totalAmount || 0 }}</span>
 					</view>
 				</view>
 			</view>
@@ -455,7 +455,7 @@
 			<view class="desc flex">
 				<view>商品金额:</view>
 				<view class="m-l-a m-r-0 text-right">
-					{{ (dto.totalAmount || 0)  || 0 }}
+					{{ ( dto.totalMemberAmount || dto.totalAmount || 0)  || 0 }}
 				</view>
 			</view>
 			<view class="desc flex">
@@ -486,7 +486,7 @@
 		<view class="bottom-price flex">
 			<view class="m-t-12 m-l-0 m-r-a">
 				合计 <span class="t-red">¥
-					{{ ((dto.totalAmount || 0) + (dto.packing || 0) + (current_transport.fee || 0) - coupon_fee || 0).toFixed(2) }}
+					{{ (( dto.totalMemberAmount || dto.totalAmount || 0) + (dto.packing || 0) + (current_transport.fee || 0) - coupon_fee || 0).toFixed(2) }}
 				</span>元
 			</view>
 			<view class="button-green-1 m-l-a m-r-0" style="min-width: 240rpx" @click="submitOrder">

--
Gitblit v1.9.3