Commit 78a54b8f7f11e5110ccf5281992eb27cbd521256
1 parent
84649812
赠品限购0时,不限的优化
Showing
2 changed files
with
12 additions
and
2 deletions
packageE/pages/cart/cart2/cart2.js
| @@ -2372,7 +2372,12 @@ Page({ | @@ -2372,7 +2372,12 @@ Page({ | ||
| 2372 | var can_zp_num = 0; | 2372 | var can_zp_num = 0; |
| 2373 | for (let iy in get_data.giftsinfo) { | 2373 | for (let iy in get_data.giftsinfo) { |
| 2374 | let item = get_data.giftsinfo[iy]; | 2374 | let item = get_data.giftsinfo[iy]; |
| 2375 | - can_zp_num += parseInt(item.gift_storecount) > parseInt(item.limit_num) ? parseInt(item.limit_num) : parseInt(item.gift_storecount); | 2375 | + |
| 2376 | + if(parseInt(item.limit_num)>0){ | ||
| 2377 | + can_zp_num += parseInt(item.gift_storecount) > parseInt(item.limit_num) ? parseInt(item.limit_num) : parseInt(item.gift_storecount); | ||
| 2378 | + }else{ | ||
| 2379 | + can_zp_num += parseInt(item.gift_storecount); | ||
| 2380 | + } | ||
| 2376 | } | 2381 | } |
| 2377 | 2382 | ||
| 2378 | var t_zp_num = parseInt(get_data.zp_num) * parseInt(get_data.bs); | 2383 | var t_zp_num = parseInt(get_data.zp_num) * parseInt(get_data.bs); |
pages/cart/cart/cart.js
| @@ -4153,7 +4153,12 @@ Page({ | @@ -4153,7 +4153,12 @@ Page({ | ||
| 4153 | var a_limit_num = 0; | 4153 | var a_limit_num = 0; |
| 4154 | for (let iy in discount.giftsinfo) { | 4154 | for (let iy in discount.giftsinfo) { |
| 4155 | let item = discount.giftsinfo[iy]; | 4155 | let item = discount.giftsinfo[iy]; |
| 4156 | - can_zp_num += parseInt(item.gift_storecount) > parseInt(item.limit_num) ? parseInt(item.limit_num) : parseInt(item.gift_storecount); | 4156 | + |
| 4157 | + if(parseInt(item.limit_num)>0){ | ||
| 4158 | + can_zp_num += parseInt(item.gift_storecount) > parseInt(item.limit_num) ? parseInt(item.limit_num) : parseInt(item.gift_storecount); | ||
| 4159 | + }else{ | ||
| 4160 | + can_zp_num += parseInt(item.gift_storecount); | ||
| 4161 | + } | ||
| 4157 | } | 4162 | } |
| 4158 | 4163 | ||
| 4159 | var t_zp_num = parseInt(discount.zp_num) * parseInt(discount.bs); | 4164 | var t_zp_num = parseInt(discount.zp_num) * parseInt(discount.bs); |