diff --git a/pages/team/team_ping/team_ping.js b/pages/team/team_ping/team_ping.js
index 31f2a5b..dbee1f7 100644
--- a/pages/team/team_ping/team_ping.js
+++ b/pages/team/team_ping/team_ping.js
@@ -131,7 +131,15 @@ Page({
})
-
+ //获取预存使用金额
+ await getApp().request.promiseGet("/api/weshop/orderMore/get/" + os.stoid + "/" + order[i].order_sn, {
+ }).then(res => {
+ if (res.data.code == 0 && res.data.data) {
+ // data[ind].use_commission = res.data.data.use_commission;
+ order[i].pre_cut = res.data.data.pre_cut; //是否使用预存,如果是使用预存不能单品退,只能整单退
+ order[i].pre_json = res.data.data.pre_json; //是否使用预存,如果是使用预存不能单品退,只能整单退
+ }
+ })
if (order[i].is_zsorder== 4) {
diff --git a/pages/team/team_ping/team_ping.wxml b/pages/team/team_ping/team_ping.wxml
index a2df4ec..2c428b1 100644
--- a/pages/team/team_ping/team_ping.wxml
+++ b/pages/team/team_ping/team_ping.wxml
@@ -8,7 +8,7 @@
拼团失败
-
+
@@ -65,12 +65,12 @@
金额:¥
-
+
金额:¥
-
+
diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml
index 1e93d2a..2863a9e 100644
--- a/pages/user/order_detail/order_detail.wxml
+++ b/pages/user/order_detail/order_detail.wxml
@@ -142,7 +142,7 @@
订单总价
- ¥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money+order.use_commission,2)}}元
+ ¥ {{filters.toFix(order.order_amount+order.user_money+order.pt_tail_money+order.use_commission+order.pre_cut,2)}}元
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 1da7ff8..997f92e 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -352,6 +352,7 @@ Page({
if (res.data.code == 0 && res.data.data) {
data[ind].use_commission = res.data.data.use_commission;
data[ind].pre_cut = res.data.data.pre_cut; //是否使用预存,如果是使用预存不能单品退,只能整单退
+ data[ind].pre_json = res.data.data.pre_json; //是否使用预存,如果是使用预存不能单品退,只能整单退
}
})
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index d18f91e..75c3025 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -198,7 +198,7 @@
合计(改):
¥
- {{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money+item.use_commission,2)}}
+ {{filters.toFix(item.order_amount+item.user_money+item.pt_tail_money+item.use_commission+item.pre_cut,2)}}
@@ -214,7 +214,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)}}
+{{item.coupon_price}}元优惠券
+{{item.integral}}积分