Commit 761c269ca7a727f58e17550f51702b289f009347
1 parent
08767264
购物车确认订单页面的 搭配购商品 和 组合购商品切换的bug优化
Showing
1 changed file
with
7 additions
and
12 deletions
packageE/pages/cart/cart2/cart2.js
@@ -803,10 +803,10 @@ Page({ | @@ -803,10 +803,10 @@ Page({ | ||
803 | 803 | ||
804 | //如果是购物车的时候, | 804 | //如果是购物车的时候, |
805 | if (arr) { | 805 | if (arr) { |
806 | - var idx = th.data.allsto.findIndex(function (e) { | ||
807 | - return e.pickup_id == arr[index].pick_id | ||
808 | - }) | ||
809 | - pick = th.data.allsto[idx]; | 806 | + // var idx = th.data.allsto.findIndex(function (e) { |
807 | + // return e.pickup_id == arr[index].pick_id | ||
808 | + // }) | ||
809 | + // pick = th.data.allsto[idx]; | ||
810 | var get_gd = null; | 810 | var get_gd = null; |
811 | await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + gd.goods_id, { | 811 | await getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + gd.goods_id, { |
812 | 812 | ||
@@ -815,7 +815,7 @@ Page({ | @@ -815,7 +815,7 @@ Page({ | ||
815 | get_gd = res1.data.data; | 815 | get_gd = res1.data.data; |
816 | } | 816 | } |
817 | }) | 817 | }) |
818 | - distr_t = pick.distr_type || get_gd.distr_type; | 818 | + distr_t = gd.pickup_distr_type || get_gd.distr_type; |
819 | 819 | ||
820 | } else { | 820 | } else { |
821 | var gg = to.get_b_now(); | 821 | var gg = to.get_b_now(); |
@@ -849,7 +849,6 @@ Page({ | @@ -849,7 +849,6 @@ Page({ | ||
849 | // if (item0.distr_type == 0 || item0.distr_type == distr_t) { | 849 | // if (item0.distr_type == 0 || item0.distr_type == distr_t) { |
850 | // new_arr.push(item0); | 850 | // new_arr.push(item0); |
851 | // } | 851 | // } |
852 | - | ||
853 | // } | 852 | // } |
854 | 853 | ||
855 | if (!new_arr.length) return null; | 854 | if (!new_arr.length) return null; |
@@ -1311,9 +1310,6 @@ Page({ | @@ -1311,9 +1310,6 @@ Page({ | ||
1311 | let c_act=element.cur_act; | 1310 | let c_act=element.cur_act; |
1312 | delete c_act.goods; | 1311 | delete c_act.goods; |
1313 | } | 1312 | } |
1314 | - if(element.ch_map){ | ||
1315 | - delete element.ch_map; | ||
1316 | - } | ||
1317 | if(element.act_arr && element.act_arr.length>0){ | 1313 | if(element.act_arr && element.act_arr.length>0){ |
1318 | for (var ij = 0; ij < element.act_arr.length; ij++) { | 1314 | for (var ij = 0; ij < element.act_arr.length; ij++) { |
1319 | var act_ite = element.act_arr[ij]; | 1315 | var act_ite = element.act_arr[ij]; |
@@ -5586,7 +5582,6 @@ Page({ | @@ -5586,7 +5582,6 @@ Page({ | ||
5586 | }) | 5582 | }) |
5587 | // pdata.keyid = th.data.bn_goods.keyid | 5583 | // pdata.keyid = th.data.bn_goods.keyid |
5588 | } | 5584 | } |
5589 | - // debugger | ||
5590 | var str = JSON.stringify(pdata); | 5585 | var str = JSON.stringify(pdata); |
5591 | 5586 | ||
5592 | 5587 | ||
@@ -8173,8 +8168,8 @@ Page({ | @@ -8173,8 +8168,8 @@ Page({ | ||
8173 | 8168 | ||
8174 | //有改,都强制把券选择清理一下 | 8169 | //有改,都强制把券选择清理一下 |
8175 | var pickup_id = this.data.cartlist[cart_index].pickup_id; | 8170 | var pickup_id = this.data.cartlist[cart_index].pickup_id; |
8176 | - var txt='using_quan['+pickup_id+']'; | ||
8177 | - th.setData({[txt]:null}); | 8171 | + var txt1='using_quan['+pickup_id+']'; |
8172 | + th.setData({[txt1]:null}); | ||
8178 | 8173 | ||
8179 | //-- 如果是选中 -- | 8174 | //-- 如果是选中 -- |
8180 | if (e.selected) { | 8175 | if (e.selected) { |