From 2b78667afd1c86adea0876f3576c31b138b0cc88 Mon Sep 17 00:00:00 2001
From: WXD-SEASON\season <season.su@yolipai.com>
Date: Fri, 24 Dec 2021 17:57:44 +0800
Subject: [PATCH] 包邮价格大于等于

---
 packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js | 2 +-
 packageC/pages/presell/cart/cart2_pre.js                  | 2 +-
 pages/cart/cart2/cart2.js                                 | 4 ++--
 pages/cart/cart2_pt/cart2_pt.js                           | 2 +-
 pages/cart/cart_wk/cart_wk.js                             | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
index f568ee8..79d7362 100644
--- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
+++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.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) {
diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js
index ec01b55..39a3410 100644
--- a/packageC/pages/presell/cart/cart2_pre.js
+++ b/packageC/pages/presell/cart/cart2_pre.js
@@ -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;
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 1a8f8d9..736f9e2 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -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:
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index c088f9b..377b76f 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -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;
diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js
index 7d21c37..f55f477 100644
--- a/pages/cart/cart_wk/cart_wk.js
+++ b/pages/cart/cart_wk/cart_wk.js
@@ -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;
--
libgit2 0.21.4