Commit 1cac4268d2184f2fafd344538d7d235fb9d96591
Merge branch 'test' into 'qa'
Test See merge request !1001
Showing
1 changed file
with
3 additions
and
2 deletions
pages/cart/cart2/cart2.js
| @@ -4121,6 +4121,7 @@ Page({ | @@ -4121,6 +4121,7 @@ Page({ | ||
| 4121 | var good = this.data.buy_now_gift_goods; | 4121 | var good = this.data.buy_now_gift_goods; |
| 4122 | var goods_weight = -1, goods_piece = -1; | 4122 | var goods_weight = -1, goods_piece = -1; |
| 4123 | var gift_shipping_price = 0; | 4123 | var gift_shipping_price = 0; |
| 4124 | + gift_shipping_price = shipping_price; | ||
| 4124 | var th = this; | 4125 | var th = this; |
| 4125 | var out_of_weight = null; | 4126 | var out_of_weight = null; |
| 4126 | switch (good['exp_sum_type']) { | 4127 | switch (good['exp_sum_type']) { |
| @@ -4132,7 +4133,7 @@ Page({ | @@ -4132,7 +4133,7 @@ Page({ | ||
| 4132 | case 2: | 4133 | case 2: |
| 4133 | if (goods_weight < 0) goods_weight = 0; | 4134 | if (goods_weight < 0) goods_weight = 0; |
| 4134 | //累积商品重量 每种商品的重量 * 数量 | 4135 | //累积商品重量 每种商品的重量 * 数量 |
| 4135 | - goods_weight += good['weight'] * good['buynum']; | 4136 | + goods_weight += good['weight'] * parseInt(good['buynum']); |
| 4136 | if (goods_weight1 > 0) { | 4137 | if (goods_weight1 > 0) { |
| 4137 | out_of_weight = gift_weight_free - goods_weight; | 4138 | out_of_weight = gift_weight_free - goods_weight; |
| 4138 | //不能调换位置 下面goods_weight会变大 | 4139 | //不能调换位置 下面goods_weight会变大 |
| @@ -4142,7 +4143,7 @@ Page({ | @@ -4142,7 +4143,7 @@ Page({ | ||
| 4142 | case 3: | 4143 | case 3: |
| 4143 | if (goods_piece < 0) goods_piece = 0; | 4144 | if (goods_piece < 0) goods_piece = 0; |
| 4144 | //累积商品数量 | 4145 | //累积商品数量 |
| 4145 | - goods_piece += good['buynum']; | 4146 | + goods_piece += parseInt(good['buynum']); |
| 4146 | if (goods_piece1) { | 4147 | if (goods_piece1) { |
| 4147 | goods_piece += goods_piece1; | 4148 | goods_piece += goods_piece1; |
| 4148 | } | 4149 | } |