Merge branch 'test' into 'qa'

Test See merge request !1001

Merge branch 'test' into 'qa'
Test See merge request !1001
后端研发-苏明海
2 parents 21c0cdc9 91f88a16
Showing 1 changed file with 3 additions and 2 deletions
pages/cart/cart2/cart2.js
@@ -4121,6 +4121,7 @@ Page({
         var good = this.data.buy_now_gift_goods;
         var goods_weight = -1, goods_piece = -1;
         var gift_shipping_price = 0;
+        gift_shipping_price = shipping_price;
         var th = this;
         var out_of_weight = null;
         switch (good['exp_sum_type']) {
@@ -4132,7 +4133,7 @@ Page({
             case 2:
                 if (goods_weight < 0) goods_weight = 0;
                 //累积商品重量 每种商品的重量 * 数量
-                goods_weight += good['weight'] * good['buynum'];
+                goods_weight += good['weight'] * parseInt(good['buynum']);
                 if (goods_weight1 > 0) {
                     out_of_weight = gift_weight_free - goods_weight;
                     //不能调换位置 下面goods_weight会变大
@@ -4142,7 +4143,7 @@ Page({
             case 3:
                 if (goods_piece < 0) goods_piece = 0;
                 //累积商品数量
-                goods_piece += good['buynum'];
+                goods_piece += parseInt(good['buynum']);
                 if (goods_piece1) {
                     goods_piece += goods_piece1;
                 }