diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 71c4829..c12b343 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -811,10 +811,11 @@ Page({ //如果是购物车的时候, if (arr) { - var idx = th.data.allsto.findIndex(function (e) { - return e.pickup_id == arr[index].pick_id - }) - pick = th.data.allsto[idx]; + // var idx = th.data.allsto.findIndex(function (e) { + // return e.pickup_id == arr[index].pick_id + // }) + // pick = th.data.allsto[idx]; + var get_gd = null; await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + gd.goods_id, { @@ -823,7 +824,7 @@ Page({ get_gd = res1.data.data; } }) - distr_t = pick.distr_type || get_gd.distr_type; + distr_t = gd.pickup_distr_type || get_gd.distr_type; } else { var gg = to.get_b_now(); @@ -1343,9 +1344,7 @@ Page({ let c_act=element.cur_act; delete c_act.goods; } - if(element.ch_map){ - delete element.ch_map; - } + if(element.act_arr && element.act_arr.length>0){ for (var ij = 0; ij < element.act_arr.length; ij++) { var act_ite = element.act_arr[ij]; @@ -2509,7 +2508,7 @@ Page({ newd.is_past=1; } - //ord_goods.splice(pos+1,0,newd); + ord_goods.splice(pos+1,0,newd); th.data.old_cartlist[i].goods.splice(pos2+1,0,newd); var txt9 = "cartlist[" + i + "].goods["+(pos+1)+"]";