From fb48777cd4c3f086f77b5b26e1d03aebf995f4f5 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 12 九月 2024 18:40:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-2.0' into master-2.0
---
pages/order/order-detail.vue | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index bc12076..c93affa 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -200,6 +200,7 @@
tmp.$message.hideLoading()
if (code === 0) {
tmp.getDetail()
+ tmp.$store.dispatch('getCurrentInfo')
}
},
fail(e) {
@@ -584,29 +585,29 @@
</view>
</view>
<view class="info-container bg-white br-4 m-t-12" v-if="!showSales">
- <view class="form-item">
+ <view class="form-item flex">
<view class="label">订单金额:</view>
- <view class="value">+{{ dto.totalAmount || '0' }}</view>
+ <view class="value m-l-a m-r-0 text-right">+{{ dto.totalAmount || '0' }}</view>
</view>
- <view class="form-item">
+ <view class="form-item flex">
<view class="label">运费:</view>
- <view class="value">+{{ dto.transportFee || '0' }}</view>
+ <view class="value m-l-a m-r-0 text-right">+{{ dto.transportFee || '0' }}</view>
</view>
- <view class="form-item">
+ <view class="form-item flex">
<view class="label">打包费:</view>
- <view class="value">+{{ dto.packingFee || '0' }}</view>
+ <view class="value m-l-a m-r-0 text-right">+{{ dto.packingFee || '0' }}</view>
</view>
- <view class="form-item t-red">
+ <view class="form-item flex t-red">
<view class="label">优惠:</view>
- <view class="value">-{{ dto.memberCouponAmount || '0' }}</view>
+ <view class="value m-l-a m-r-0 text-right">-{{ dto.memberCouponAmount || '0' }}</view>
</view>
- <view class="form-item t-red">
+ <view class="form-item flex t-red">
<view class="label">实际支付:</view>
- <view class="value">￥{{ dto.paymentAmount || '0' }}</view>
+ <view class="value m-l-a m-r-0 text-right">￥{{ dto.paymentAmount || '0' }}</view>
</view>
-
-
- <!-- <view class="form-item">
+
+
+ <!-- <view class="form-item">
<view class="label">支付金额:</view>
<view class="value">{{ dto.paymentAmount || '-' }}</view>
</view>
@@ -627,7 +628,7 @@
<view class="label">优惠券:</view>
<view class="value">{{ dto.memberCouponName || '-' }}</view>
</view> -->
- <!-- <view class="form-item">
+ <!-- <view class="form-item">
<view class="label">优惠金额:</view>
<view class="value">{{ dto.memberCouponAmount || '-' }}</view>
</view> -->
--
Gitblit v1.9.3