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/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/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 @@
定金金额
- ¥ {{filters.toFix(order.order_amount+order.user_money,2)}}元
+ ¥ {{filters.toFix(order.order_amount+order.user_money+order.pre_cut,2)}}元
尾款金额
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 3682702..7aff9c6 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -224,7 +224,7 @@
定金(改):
¥
- {{filters.toFix(item.order_amount+item.user_money+item.use_commission,2)}}
+ {{filters.toFix(item.order_amount+item.user_money+item.use_commission+item.pre_cut,2)}}
@@ -239,7 +239,7 @@
待支付尾款:
¥
- {{filters.toFix(item.pt_tail_money+item.use_commission-item.shipping_price,2)}}
+ {{filters.toFix(item.pt_tail_money+item.use_commission,2)}}