Commit fc776fb9965d2c940d7538f6e4a7b1b796803dfe
1 parent
9590597a
赠品超量也要倍增
Showing
1 changed file
with
7 additions
and
3 deletions
packageE/pages/cart/cart2/cart2.js
@@ -2396,7 +2396,8 @@ Page({ | @@ -2396,7 +2396,8 @@ Page({ | ||
2396 | giftsinfo: get_data.giftsinfo, | 2396 | giftsinfo: get_data.giftsinfo, |
2397 | zp_num: get_data.zp_num * get_data.bs, | 2397 | zp_num: get_data.zp_num * get_data.bs, |
2398 | gf_pr_name: item_map.name, | 2398 | gf_pr_name: item_map.name, |
2399 | - prom_id: item_map.prom_id | 2399 | + prom_id: item_map.prom_id, |
2400 | + bs: parseInt(get_data.bs), | ||
2400 | }); | 2401 | }); |
2401 | 2402 | ||
2402 | duo_zp_num_arr[item_map.prom_id] = t_zp_num; | 2403 | duo_zp_num_arr[item_map.prom_id] = t_zp_num; |
@@ -7250,7 +7251,8 @@ Page({ | @@ -7250,7 +7251,8 @@ Page({ | ||
7250 | zp_num: this.data.send_gf[pk][index].zp_num, | 7251 | zp_num: this.data.send_gf[pk][index].zp_num, |
7251 | gift_pkid: pk, | 7252 | gift_pkid: pk, |
7252 | gf_prom_id: this.data.send_gf[pk][index].prom_id, | 7253 | gf_prom_id: this.data.send_gf[pk][index].prom_id, |
7253 | - send_gf_index: index | 7254 | + send_gf_index: index, |
7255 | + gf_bs:this.data.send_gf[pk][index].bs | ||
7254 | }) | 7256 | }) |
7255 | }, | 7257 | }, |
7256 | 7258 | ||
@@ -7310,6 +7312,8 @@ Page({ | @@ -7310,6 +7312,8 @@ Page({ | ||
7310 | th.data.isget_by_quan[gf_pickup_id]=null; | 7312 | th.data.isget_by_quan[gf_pickup_id]=null; |
7311 | 7313 | ||
7312 | var zp_num = this.data.zp_num; | 7314 | var zp_num = this.data.zp_num; |
7315 | + var gf_bs = this.data.gf_bs?this.data.gf_bs:1; | ||
7316 | + | ||
7313 | var giftsinfo = this.data.giftsinfo; | 7317 | var giftsinfo = this.data.giftsinfo; |
7314 | var all_num = 0; | 7318 | var all_num = 0; |
7315 | for (let i in giftsinfo) { | 7319 | for (let i in giftsinfo) { |
@@ -7319,7 +7323,7 @@ Page({ | @@ -7319,7 +7323,7 @@ Page({ | ||
7319 | ut.m_toast("必送的赠品没有选中"); | 7323 | ut.m_toast("必送的赠品没有选中"); |
7320 | return false; | 7324 | return false; |
7321 | } | 7325 | } |
7322 | - if(item.goods_num<item.must_num){ | 7326 | + if(item.goods_num<item.must_num*gf_bs){ |
7323 | ut.m_toast("活动赠品的超量数量不足"); | 7327 | ut.m_toast("活动赠品的超量数量不足"); |
7324 | return false; | 7328 | return false; |
7325 | } | 7329 | } |