From 383c8c08b53df48a5f91551908daf98681d80964 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期五, 13 九月 2024 11:07:49 +0800
Subject: [PATCH] 1
---
pages/order/order-detail.vue | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 8a31a49..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,11 +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 || '-' }}</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 m-l-a m-r-0 text-right">+{{ dto.transportFee || '0' }}</view>
+ </view>
+ <view class="form-item flex">
+ <view class="label">打包费:</view>
+ <view class="value m-l-a m-r-0 text-right">+{{ dto.packingFee || '0' }}</view>
+ </view>
+ <view class="form-item flex t-red">
+ <view class="label">优惠:</view>
+ <view class="value m-l-a m-r-0 text-right">-{{ dto.memberCouponAmount || '0' }}</view>
+ </view>
+ <view class="form-item flex t-red">
+ <view class="label">实际支付:</view>
+ <view class="value m-l-a m-r-0 text-right">￥{{ dto.paymentAmount || '0' }}</view>
+ </view>
+
+
+ <!-- <view class="form-item">
<view class="label">支付金额:</view>
<view class="value">{{ dto.paymentAmount || '-' }}</view>
</view>
@@ -596,10 +615,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 +627,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