From 7ecb29937a79b715569559baea22c39c510b4a49 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Tue, 7 Feb 2023 17:57:36 +0800 Subject: [PATCH] 天天拼团的优化完成 --- pages/cart/cart2_pt/cart2_pt.js | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------- 1 file changed, 50 insertions(+), 40 deletions(-) diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 53edef6..70cdd8a 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -69,6 +69,9 @@ Page({ dis_config: null, bn_use_commission: 0, //是不是使用佣金 is_pre_cut:0, //是否可以使用预存 0是不可以1的可以 + + bn_is_order_yh:1, //是不是订单优惠 + bn_is_post_temp:1, //是不是进行计算包邮模板 }, onLoad: function (t) { console.log("onLoad_pt_cart"); @@ -445,17 +448,7 @@ Page({ t.data.data.thi_rate = tt.data.data.thi_rate; t.data.data.commission = tt.data.data.commission; - if(e.is_order_yh){ - th.data.bn_is_order_yh=1; - }else{ - th.data.bn_is_order_yh=0; - } - if(e.is_post_temp){ - th.data.bn_is_post_temp=1; - }else{ - th.data.bn_is_post_temp=0; - } if (pt_data.kttype == 3) { t.data.data.shop_price = tt.data.data.yf_price; //用定金来购买 @@ -464,6 +457,18 @@ Page({ t.data.data.prom_id = gd.prom_id; t.data.data.prom_type = 6; + if(tt.data.data.is_order_yh){ + th.data.bn_is_order_yh=1; + }else{ + th.data.bn_is_order_yh=0; + } + + if(tt.data.data.is_post_temp){ + th.data.bn_is_post_temp=1; + }else{ + th.data.bn_is_post_temp=0; + } + } } else { @@ -678,7 +683,7 @@ Page({ } var back_data = null; - if(!ord_prom || ord_prom.bn_is_post_temp) { + if(!ord_prom || ord_prom.is_post_temp) { if (th.data.bn_is_post_temp || th.data.bn_goods.is_normal == 1) { await getApp().request.promisePost("/api/weshop/order/areaFreight", { is_json: 1, data: req_d @@ -833,11 +838,44 @@ Page({ if (!is_next) return false } + //-- 如果是订单优惠的时候,allpice要拿来减掉一些 -- + var order_prom_id=0; + var order_prom_amount=0; + if(ord_prom){ + order_prom_id = ord_prom['id']; + switch (ord_prom['type']) { + case 0: + allpice = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 + order_prom_amount = (o_condition - allpice).toFixed(2); + break; + case 1: + //-- 如果有优惠促销倍减的时候 -- + var bs = 1; + if (ord_prom.is_bz) { + bs = Math.floor(o_condition / ord_prom.money); + } + allpice = o_condition - bs * ord_prom['expression'];//满额优惠金额 + order_prom_amount = ord_prom['expression']; + break; + } + } + + //--订单优惠的显示-- + var order_prom_txt1 = "formData.order_prom_id"; + var order_prom_txt2 = "formData.order_prom_amount"; + if (order_prom_amount > 0) { + th.setData({ [order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount }) + } else { + th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 }) + } + + //-----------------总价----------------- var total_m = parseFloat(allpice) + parseFloat(th.data.formData.shipping_price); total_m = parseFloat(total_m).toFixed(2); + var atxt = "formData.total_amount"; th.setData({ [atxt]: total_m, }) var order_m = total_m; @@ -945,36 +983,8 @@ Page({ - //-- 如果是订单优惠的时候,allpice要拿来减掉一些 -- - var order_prom_id=0; - var order_prom_amount=0; - if(ord_prom){ - order_prom_id = ord_prom['id']; - switch (ord_prom['type']) { - case 0: - allpice = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折 - order_prom_amount = (o_condition - order_m).toFixed(2); - break; - case 1: - //-- 如果有优惠促销倍减的时候 -- - var bs = 1; - if (ord_prom.is_bz) { - bs = Math.floor(o_condition / ord_prom.money); - } - allpice = o_condition - bs * ord_prom['expression'];//满额优惠金额 - order_prom_amount = ord_prom['expression']; - break; - } - } - //--订单优惠的显示-- - var order_prom_txt1 = "formData.order_prom_id"; - var order_prom_txt2 = "formData.order_prom_amount"; - if (order_prom_id > 0) { - th.setData({ [order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount }) - } else { - th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 }) - } + //-----------------总价----------------- var total_m = parseFloat(allpice) + parseFloat(th.data.formData.shipping_price); -- libgit2 0.21.4