Commit 643cd3fe9cf83edf920f0d9f4ba67e07305b2e09
Merge branch 'test' into 'qa'
Test See merge request !1003
Showing
1 changed file
with
4 additions
and
1 deletions
pages/cart/cart2/cart2.js
| @@ -4121,7 +4121,10 @@ Page({ | @@ -4121,7 +4121,10 @@ 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 | + if (shipping_price) |
| 4125 | + { | ||
| 4126 | + gift_shipping_price = shipping_price; | ||
| 4127 | + } | ||
| 4125 | var th = this; | 4128 | var th = this; |
| 4126 | var out_of_weight = null; | 4129 | var out_of_weight = null; |
| 4127 | switch (good['exp_sum_type']) { | 4130 | switch (good['exp_sum_type']) { |