From 91b33569b654b855a19e60788958639fff95631e Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 16 Mar 2024 22:18:07 +0800
Subject: [PATCH] 尾款的金额正确显示

---
 packageE/pages/cart/cart_wk/cart_wk.js | 12 ++++++++++++
 pages/user/order_list/order_list.wxml  |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packageE/pages/cart/cart_wk/cart_wk.js b/packageE/pages/cart/cart_wk/cart_wk.js
index e55b4b3..671dade 100644
--- a/packageE/pages/cart/cart_wk/cart_wk.js
+++ b/packageE/pages/cart/cart_wk/cart_wk.js
@@ -290,11 +290,19 @@ Page({
       teamgroup = null,
       teamlist=null,
       th = this;
+
+      let ord_m=null;
     //---获取订单---
     await getApp().request.promiseGet("/api/weshop/order/get/" + oo.stoid + "/" + ord, {}).then(res => {
       order = res.data.data;
     });
 
+    //-- 如果有数据的话 --
+    let od_m=await getApp().request.promiseGet("/api/weshop/orderMore/get/" + os.stoid + "/" + order.order_sn, {})
+    if(od_m && od_m.data.code==0 && od_m.data.data){
+      ord_m=od_m.data.data;
+    }
+
     //---获取订单从表---
     await getApp().request.promiseGet("/api/weshop/ordergoods/page", {
       data: {
@@ -368,6 +376,10 @@ Page({
 
     var tail_money = (price * order_goods.goods_num - order['order_amount'] - order['user_money']).toFixed(2);
 
+    if(ord_m && ord_m.pre_cut){
+      tail_money-=ord_m.pre_cut;
+    }
+
     tail_money = parseFloat(tail_money);
     order.tail_money = tail_money;
 
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index c3466f5..7aff9c6 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -239,7 +239,7 @@
 	                <view wx:if="{{item.pt_tail_money>0}}" class="commodity_money flex baseline">
 	                  <view>待支付尾款:</view>
 	                  <view class="fs24 c-r">￥</view>
-	                  <view class="c-r">{{filters.toFix(item.pt_tail_money+item.use_commission-item.shipping_price,2)}}
+	                  <view class="c-r">{{filters.toFix(item.pt_tail_money+item.use_commission,2)}}
 	                  </view>
 	                </view>
 	
--
libgit2 0.21.4