From 3bb8a9fd66c6e807562af3b65c1fd649275f1a46 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 16 Mar 2024 19:55:31 +0800
Subject: [PATCH] 定金显示的优化

---
 packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js | 1 +
 packageG/pages/user/order_detail/order_detail.wxml    | 2 +-
 pages/user/order_list/order_list.wxml                 | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
index 35144f8..510a2fa 100644
--- a/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
+++ b/packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
@@ -316,6 +316,7 @@ Page({
 
     //--------立即支付----------
     async jumpToCart4(e) {
+        var th=this;
 
 			// 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id}
 			if (parseInt(this.data.order.order_goods['0']['prom_type']) == 9) {
diff --git a/packageG/pages/user/order_detail/order_detail.wxml b/packageG/pages/user/order_detail/order_detail.wxml
index db86c44..8fd9206 100644
--- a/packageG/pages/user/order_detail/order_detail.wxml
+++ b/packageG/pages/user/order_detail/order_detail.wxml
@@ -103,7 +103,7 @@
 
            <view class="item pnew" wx:if="{{order.is_zsorder==4}}">
                 <view>定金金额</view>
-                <view>￥ {{filters.toFix(order.order_amount+order.user_money,2)}}元</view>
+                <view>￥ {{filters.toFix(order.order_amount+order.user_money+order.pre_cut,2)}}元</view>
            </view>
            <view class="item pnew" wx:if="{{order.pt_tail_money>0}}">
               <view>尾款金额</view>
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 3682702..c3466f5 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -224,7 +224,7 @@
 	                <view wx:if="{{item.is_zsorder==4}}" class="commodity_money flex baseline">
 	                  <view>定金<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view>
 	                  <view class="fs24 c-r">￥</view>
-	                  <view class="c-r">{{filters.toFix(item.order_amount+item.user_money+item.use_commission,2)}}
+	                  <view class="c-r">{{filters.toFix(item.order_amount+item.user_money+item.use_commission+item.pre_cut,2)}}
 	                  </view>
 	                </view>
 	                <view class="commodity_money flex baseline" wx:else>
--
libgit2 0.21.4