diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 8e80c81..df36eac 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -1001,9 +1001,9 @@ Page({ //-- 搭配促销的门店配送方式的修复 -- et = 1; - distr_t = 0; + distr_t = 0; // 配送方式 0=用户自选 1=自提 2=物流 for (var hi in narr) { - var dis_t = narr[hi].distr_type; + var dis_t = narr[hi].distr_type; if (dis_t == 2) { th.setData({is_all_zt: 0}); et = 0; @@ -1012,10 +1012,9 @@ Page({ distr_t = dis_t; } } - //自选的时候,系统配置了默认的配送方式是物流的时候 if (distr_t == 0 && th.data.json_d.pickupway && th.data.json_d.pickupway == 1) { - et = 0; + et = 2; } @@ -2255,6 +2254,7 @@ Page({ this.data.is_summit_ing = 1; var th = this, pdata = new Array(); var ff = true; + //------------立即购买------------- if (th.data.is_b_now == 1 && th.data.bn_goods.prom_type != 5) { if (th.data.bn_exp_type == 0 && th.data.user_addr == null) { @@ -2265,14 +2265,13 @@ Page({ if (!ff) return false; var addr = th.data.user_addr; if (th.data.bn_exp_type == 1) addr = null; - if (th.data.bn_exp_type == 0) if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { getApp().my_warnning("读取物流失败", 0, th); th.data.is_summit_ing = 0; return false; } - + var item = { 'user_id': to.globalData.user_id, 'consignee': addr == null ? "" : addr.consignee, @@ -2492,6 +2491,7 @@ Page({ } pdata.push(item); } else { + //---------购物车的结算--------- if (th.data.is_all_zt == 0 && th.data.user_addr == null) { th.data.is_summit_ing = 0; @@ -2501,6 +2501,7 @@ Page({ if (!ff) return false; var addr = th.data.user_addr; + // 自提,地址数据清空 exp_type设置为1 if (th.data.is_all_zt == 1) addr = null; var val_arr = th.data.user_note; @@ -2511,8 +2512,8 @@ Page({ return false; } - var order_prom_list_cart = th.data.order_prom_list_cart; - + var order_prom_list_cart =  th.data.order_prom_list_cart;; + console.log('xxxxxxxxxxxxxxxx', order_prom_list_cart) //--组装推送数据-- for (var i = 0; i < order_prom_list_cart.length; i++) { var t_item = order_prom_list_cart[i]; @@ -2740,7 +2741,7 @@ Page({ } - + if (pdata.length == 0) return; var str = JSON.stringify(pdata);