From b331ba531a81c3c60d26eba856b5b3905153aba8 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 23 九月 2024 14:46:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-2.0' into master-2.0

---
 pages/order/order-detail.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 8feb5ab..2ee8c07 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -613,8 +613,8 @@
 		</view>
 		<view class="info-container bg-white br-4 m-t-12" v-if="!showSales">
 			<view class="form-item flex">
-				<view class="label">订单金额:</view>
-				<view class="value m-l-a m-r-0 text-right">+{{ dto.totalAmount || '0' }}</view>
+				<view class="label">商品金额:</view>
+				<view class="value m-l-a m-r-0 text-right">+{{ dto.flowerAmount || '0' }}</view>
 			</view>
 			<view class="form-item flex">
 				<view class="label">运费:</view>

--
Gitblit v1.9.3