Commit 7d364da67e0227af96e8701e344350c69d964d58
1 parent
63c20f64
优化后的bug优化
Showing
1 changed file
with
8 additions
and
9 deletions
packageE/pages/cart/cart2/cart2.js
@@ -811,10 +811,11 @@ Page({ | @@ -811,10 +811,11 @@ Page({ | ||
811 | 811 | ||
812 | //如果是购物车的时候, | 812 | //如果是购物车的时候, |
813 | if (arr) { | 813 | if (arr) { |
814 | - var idx = th.data.allsto.findIndex(function (e) { | ||
815 | - return e.pickup_id == arr[index].pick_id | ||
816 | - }) | ||
817 | - pick = th.data.allsto[idx]; | 814 | + // var idx = th.data.allsto.findIndex(function (e) { |
815 | + // return e.pickup_id == arr[index].pick_id | ||
816 | + // }) | ||
817 | + // pick = th.data.allsto[idx]; | ||
818 | + | ||
818 | var get_gd = null; | 819 | var get_gd = null; |
819 | await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + gd.goods_id, { | 820 | await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + gd.goods_id, { |
820 | 821 | ||
@@ -823,7 +824,7 @@ Page({ | @@ -823,7 +824,7 @@ Page({ | ||
823 | get_gd = res1.data.data; | 824 | get_gd = res1.data.data; |
824 | } | 825 | } |
825 | }) | 826 | }) |
826 | - distr_t = pick.distr_type || get_gd.distr_type; | 827 | + distr_t = gd.pickup_distr_type || get_gd.distr_type; |
827 | 828 | ||
828 | } else { | 829 | } else { |
829 | var gg = to.get_b_now(); | 830 | var gg = to.get_b_now(); |
@@ -1343,9 +1344,7 @@ Page({ | @@ -1343,9 +1344,7 @@ Page({ | ||
1343 | let c_act=element.cur_act; | 1344 | let c_act=element.cur_act; |
1344 | delete c_act.goods; | 1345 | delete c_act.goods; |
1345 | } | 1346 | } |
1346 | - if(element.ch_map){ | ||
1347 | - delete element.ch_map; | ||
1348 | - } | 1347 | + |
1349 | if(element.act_arr && element.act_arr.length>0){ | 1348 | if(element.act_arr && element.act_arr.length>0){ |
1350 | for (var ij = 0; ij < element.act_arr.length; ij++) { | 1349 | for (var ij = 0; ij < element.act_arr.length; ij++) { |
1351 | var act_ite = element.act_arr[ij]; | 1350 | var act_ite = element.act_arr[ij]; |
@@ -2509,7 +2508,7 @@ Page({ | @@ -2509,7 +2508,7 @@ Page({ | ||
2509 | newd.is_past=1; | 2508 | newd.is_past=1; |
2510 | } | 2509 | } |
2511 | 2510 | ||
2512 | - //ord_goods.splice(pos+1,0,newd); | 2511 | + ord_goods.splice(pos+1,0,newd); |
2513 | th.data.old_cartlist[i].goods.splice(pos2+1,0,newd); | 2512 | th.data.old_cartlist[i].goods.splice(pos2+1,0,newd); |
2514 | 2513 | ||
2515 | var txt9 = "cartlist[" + i + "].goods["+(pos+1)+"]"; | 2514 | var txt9 = "cartlist[" + i + "].goods["+(pos+1)+"]"; |