diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js
index 199d490..9bc5db1 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.js
+++ b/packageA/pages/details_serviceCard/details_serviceCard.js
@@ -73,6 +73,7 @@ Page({
var dd=res.data.data.pageData[0];
dd.prom_type=dd.list[0].prom_type;
dd.pt_status=dd.list[0].pt_status;
+ dd.pt_tail_money=dd.list[0].pt_tail_money;
this.setData({
details: dd,
@@ -568,7 +569,12 @@ Page({
// })
},
-
+ //-- 支付尾款 --
+ pay2(){
+ var url="/packageA/pages/serviceCard_pd/cart_wk/cart_wk?order_id="+this.data.details.order_id;
+ getApp().goto(url);
+ },
+
//------调起支付框--------
weixinPay: function(n, success, fail) {
if (!n) return false;
diff --git a/packageA/pages/details_serviceCard/details_serviceCard.wxml b/packageA/pages/details_serviceCard/details_serviceCard.wxml
index b86e499..c9da4ae 100644
--- a/packageA/pages/details_serviceCard/details_serviceCard.wxml
+++ b/packageA/pages/details_serviceCard/details_serviceCard.wxml
@@ -48,7 +48,9 @@
- 共{{filter.count(details.list)}}件商品,合计:{{details.account}}
+
+ 共{{filter.count(details.list)}}件商品,合计:{{filter.toFix(details.account+details.pt_tail_money,2) }}
+
@@ -89,6 +91,10 @@
立即支付
+
+ 支付尾款
+
+
再来一单
diff --git a/packageA/pages/serviceCard_pd/cart/cart.js b/packageA/pages/serviceCard_pd/cart/cart.js
index 75dbbd3..d96d0b8 100644
--- a/packageA/pages/serviceCard_pd/cart/cart.js
+++ b/packageA/pages/serviceCard_pd/cart/cart.js
@@ -63,7 +63,10 @@ Page({
rank_switch: 0, //是不是开同等级卡
show_card: null, //显示的等级卡
card_name: '', //显示的卡的名称
- card_cut_price: null,//减价多少钱
+ card_cut_price: null,//减价多少钱
+
+ //dis_config:null, //因为拼团有佣金抵扣
+ //bn_use_commission: 0, //是不是使用佣金
},
onLoad: function (t) {
console.log("onLoad_pt_cart");
@@ -84,6 +87,8 @@ Page({
th.data.param = t;
//先获取物流,再获取用户信息,再展示页面
//th.get_wuliu(th.get_info(th.show_page));
+ //getApp().is_distribut(this);
+
},
onUnload: function () { this.setData({ isclose: 1 }) },
@@ -188,6 +193,28 @@ Page({
if (pt_data.kttype == 3) {
t.data.data.shop_price = tt.data.data.yf_price; //用定金来购买
}
+
+ //-- 计算获得佣金的金额 --
+ if (getApp().globalData.userInfo.is_distribut
+ && th.data.dis_config && th.data.dis_config.is_yongjin_dk) {
+ var fir_num = 0;
+ var sec_num = 0;
+ var thi_num = 0;
+ if (th.data.dis_config.pattern == 1) {
+ fir_num = (teamlist.fir_rate || 0) * order_goods.goods_num;
+ sec_num = (teamlist.sec_rate || 0) * order_goods.goods_num;
+ thi_num = (teamlist.thi_rate || 0) * order_goods.goods_num;
+ } else {
+ fir_num = parseFloat((teamlist.commission || 0) * order_goods.goods_num * (th.data.dis_config.firstRate || 0) / 100).toFixed(2);
+ sec_num = parseFloat((teamlist.commission || 0) * order_goods.goods_num * (th.data.dis_config.secondRate || 0) / 100).toFixed(2);
+ thi_num = parseFloat((teamlist.commission || 0) * order_goods.goods_num * (th.data.dis_config.thirdRate || 0) / 100).toFixed(2);
+ }
+ var c_num = getApp().get_commission(fir_num, sec_num, thi_num, th);
+ goods.use_commission = parseFloat(c_num.toFixed(2));
+
+ }
+
+
}
} else {
t.data.data.prom_id = 0;
diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml
index 3a3b5c3..259b154 100644
--- a/pages/user/order_list/order_list.wxml
+++ b/pages/user/order_list/order_list.wxml
@@ -396,7 +396,7 @@
合计(改):
¥
- {{filters.toFix(item.account,2)}}
+ {{filters.toFix(item.account+item.pt_tail_money,2)}}
@@ -428,7 +428,7 @@
bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type==6 && item.pt_status==0 && item.order_status<2}}">立即支付
+ data-idx="{{index}}" wx:if="{{item.order_status<2 && item.pt_status==2 && item.pt_tail_money>0}}">支付尾款