From 7cb97a8226cfad240af30bc830e0945519d9256b Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Thu, 12 Jan 2023 18:18:01 +0800 Subject: [PATCH] 优化OA单 --- packageE/pages/cart/cart2/cart2.js | 4 ++-- pages/cart/cart/cart.js | 2 +- pages/cart/cart2_inte/cart2_inte.js | 2 +- pages/cart/cart2_pt/cart2_pt.js | 2 +- pages/cart/cart_wk/cart_wk.js | 16 +++++++--------- 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index d7f77f8..a7f7c3b 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -1480,7 +1480,7 @@ Page({ if (getApp().globalData.userInfo.is_distribut && th.data.dis_config && th.data.dis_config.is_yongjin_dk) { - var c_num = getApp().get_commission(th.data.dis_config, t.data.data, gg.goods_num); + var c_num = getApp().get_commission2(th.data.dis_config, t.data.data, gg.goods_num); gd.use_commission = c_num; t.data.data.use_commission = c_num; @@ -1529,7 +1529,7 @@ Page({ if (getApp().globalData.userInfo.is_distribut && th.data.dis_config && th.data.dis_config.is_yongjin_dk) { - var c_num = getApp().get_commission(th.data.dis_config, t.data.data, gg.goods_num); + var c_num = getApp().get_commission2(th.data.dis_config, t.data.data, gg.goods_num); gd.use_commission = c_num; t.data.data.use_commission = c_num; diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 12d19f2..2db4bed 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -961,7 +961,7 @@ Page({ //如果有优惠活动，要更新活动 await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1" + "/" + getApp().globalData.user_id, {}).then(res => { - if (res.data.code == 0) { + if (res.data.code == 0 && res.data.data) { var r_data = res.data.data; if (r_data.promGoodsLists) { var url = '/api/weshop/cart/update'; diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js index 77e4081..65d5b87 100644 --- a/pages/cart/cart2_inte/cart2_inte.js +++ b/pages/cart/cart2_inte/cart2_inte.js @@ -407,7 +407,7 @@ Page({ //-- 计算获得佣金的金额 -- if (getApp().globalData.userInfo.is_distribut && th.data.dis_config && th.data.dis_config.is_yongjin_dk) { - var c_num = getApp().get_commission(th.data.dis_config,inte_data, gg.goods_num); + var c_num = getApp().get_commission2(th.data.dis_config,inte_data, gg.goods_num); t.data.data.use_commission = c_num; } diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 46cb45e..d900ec9 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -284,7 +284,7 @@ Page({ if (getApp().globalData.userInfo.is_distribut && th.data.dis_config && th.data.dis_config.is_yongjin_dk) { - var c_num = getApp().get_commission(th.data.dis_config, t.data.data, gg.goods_num); + var c_num = getApp().get_commission2(th.data.dis_config, t.data.data, gg.goods_num); gd.use_commission = c_num; t.data.data.use_commission = c_num; diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js index fe743b7..bd956f9 100644 --- a/pages/cart/cart_wk/cart_wk.js +++ b/pages/cart/cart_wk/cart_wk.js @@ -341,17 +341,16 @@ Page({ var sec_num = 0; var thi_num = 0; if (th.data.dis_config.pattern == 1) { - fir_num = (inte_data.fir_rate || 0) * order_goods.goods_num; - sec_num = (inte_data.sec_rate || 0) * order_goods.goods_num; - thi_num = (inte_data.thi_rate || 0) * order_goods.goods_num; + 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 = c_num; + goods.use_commission = parseFloat(c_num.toFixed(2)); } @@ -599,10 +598,9 @@ Page({ //--全部金额-- var allpice = th.data.order.order_amount + th.data.order.user_money + th.data.order.pt_tail_money; - if(th.data.bn_use_commission){ - allpice-=th.data.goods.use_commission; - } - + // if(th.data.bn_use_commission){ + // allpice-=th.data.goods.use_commission; + // } //-----------当地址不为空，且是物流时，计算物流费用---------- if (th.data.user_addr != null && th.data.exp_type == 0 && good.is_free_shipping == 0) { -- libgit2 0.21.4