diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index 25c507f..6ff6b5d 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -1917,7 +1917,7 @@ Page({ var back_data = null; //-- 判断是不是包邮 -- - if (this.data.pre_arr.is_post_temp && (!prom_ord || !prom_ord.is_ord_prom_post)) { + if (this.data.act.is_post_temp && (!prom_ord || prom_ord.is_post_temp)) { await getApp().request.promisePost("/api/weshop/order/areaFreight", { is_json: 1, data: req_d @@ -2104,6 +2104,7 @@ Page({ //如果同意参与订单优惠 if (ord_prom) { //th.check_is_order_prom(o_condition,async function (ord_price) { + var ord_price=o_condition; var bn_pick = th.data.pickup.pickup_id var order_prom_amount = 0; var order_prom_id = 0; diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index 1460580..5ab0e30 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -931,7 +931,7 @@ Page({ var order_prom_txt1 = "formData.order_prom_id"; var order_prom_txt2 = "formData.order_prom_amount"; - th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 }) + th.setData({ [order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount }) //判断是否同城配送,而且没有调用过 @@ -1133,12 +1133,12 @@ Page({ var order_prom_list = {}; //--判断有没有优惠活动-- - if (th.data.order_prom[item.pickup_id]) { + //if (th.data.order_prom[item.pickup_id]) { if (th.data.formData.order_prom_amount > 0) { order_prom_list.order_prom_id = th.data.formData.order_prom_id; order_prom_list.order_prom_amount = th.data.formData.order_prom_amount; } - } + //} //--判断优惠活动的提交-- if (th.data.formData.cut_price > 0) {