Merge branch 'qa' into 'master'

Qa See merge request !931

Merge branch 'qa' into 'master'
Qa See merge request !931
后端研发-苏明海
2 parents df78e498 2b8ecb97
Showing 5 changed files with 6 additions and 6 deletions
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
packageC/pages/presell/cart/cart2_pre.js
pages/cart/cart2/cart2.js
pages/cart/cart2_pt/cart2_pt.js
pages/cart/cart_wk/cart_wk.js
@@ -1042,7 +1042,7 @@ Page({
 			th = this;
 		price += parseFloat(o_shipping_price);
 		//如果是包邮
-		if (freight_free > 0 && o_price > freight_free) {
+		if (freight_free > 0 && o_price >= freight_free) {
 			return 0;
 		}
 		if (user_addr == null) {
@@ -706,7 +706,7 @@ Page({
      var price =0,th=this;
      price +=parseFloat(o_shipping_price);
      //如果是包邮
-     if (freight_free > 0 && o_price > freight_free){ return 0;}
+     if (freight_free > 0 && o_price >= freight_free){ return 0;}
      if (user_addr==null) { return 0; }
      //计算物流的config  item;
      var item=null;
@@ -884,8 +884,8 @@ Page({
                     }
-                        gd.prom_type=gg.prom_type;
-                        gd.prom_id=gg.prom_id;
+                    gd.prom_type=gg.prom_type?gg.prom_type:0;
+                    gd.prom_id=gg.prom_id?gg.prom_id:0;
                     switch (gd.prom_type) {
                         case 0:
@@ -779,7 +779,7 @@ Page({
      var price =0,th=this;
      price +=parseFloat(o_shipping_price);
      //如果是包邮
-     if (freight_free > 0 && o_price > freight_free){ return 0;}
+     if (freight_free > 0 && o_price >= freight_free){ return 0;}
      if (user_addr==null) { return 0; }
      //计算物流的config  item;
      var item=null;
@@ -470,7 +470,7 @@ Page({
     var price = 0, th = this;
     price += parseFloat(o_shipping_price);
     //如果是包邮
-    if (freight_free > 0 && o_price > freight_free) { return 0; }
+    if (freight_free > 0 && o_price >= freight_free) { return 0; }
     if (user_addr == null) { return 0; }
     //计算物流的config  item;
     var item = null;