Commit 728454618738c5b0ad34c8232eb3d3bfa8889420
1 parent
e1de2d06
再来一单
Showing
1 changed file
with
4 additions
and
4 deletions
pages/cart/cart/zh_calculate.js
| @@ -58,7 +58,9 @@ module.exports = { | @@ -58,7 +58,9 @@ module.exports = { | ||
| 58 | offline_price = 0, | 58 | offline_price = 0, |
| 59 | offline_num = 0; | 59 | offline_num = 0; |
| 60 | var txt = "requestData[" + a + "].need_list"; | 60 | var txt = "requestData[" + a + "].need_list"; |
| 61 | - if (!car_item.zh_map) { | 61 | + //活动的列表都存储在这里面，可以快速查询 |
| 62 | + var zh_prom_goods=car_item.zh_prom_goods; | ||
| 63 | + if (!car_item.zh_map && !zh_prom_goods) { | ||
| 62 | var res = { | 64 | var res = { |
| 63 | tfeel: tfeel, | 65 | tfeel: tfeel, |
| 64 | offline_price: offline_price, | 66 | offline_price: offline_price, |
| @@ -69,9 +71,7 @@ module.exports = { | @@ -69,9 +71,7 @@ module.exports = { | ||
| 69 | }); | 71 | }); |
| 70 | return res; | 72 | return res; |
| 71 | } | 73 | } |
| 72 | - | ||
| 73 | - //活动的列表都存储在这里面，可以快速查询 | ||
| 74 | - var zh_prom_goods=car_item.zh_prom_goods; | 74 | + |
| 75 | //因为可能有多个组合购的活动 | 75 | //因为可能有多个组合购的活动 |
| 76 | for (var i in car_item.zh_map) { | 76 | for (var i in car_item.zh_map) { |
| 77 | var bitem = car_item.zh_map[i]; | 77 | var bitem = car_item.zh_map[i]; |