From 8bfaa1c18ce5a5b29bd34d668ac72f6516565e9b Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Tue, 12 May 2020 13:35:52 +0800
Subject: [PATCH] 包邮券的计算问题优化，（4个bug）

---
 pages/cart/cart2/cart2.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 4cbf41a..8d28a97 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -595,7 +595,7 @@ Page({
                 is_good_no_by=th.check_by_goods(no_ex_good,item[j].goods_id);
               }
 		      //如果达到全场包邮的条件，同时，没有地区不包邮，或者商品不包邮
-              if(o_price>freight_free && freight_free>0 && !is_good_no_by  &&  th.data.is_no_by[pickid]!=1) continue;
+              if(o_price>=freight_free && freight_free>0 && !is_good_no_by  &&  th.data.is_no_by[pickid]!=1) continue;
               //--如果是包邮券使用的情况下，如果商品是包邮的，那么就不进行计算--
               if(th.data.using_quan[pickid] && th.data.using_quan[pickid].isby==1 && !is_good_no_by) continue;
 
@@ -627,7 +627,7 @@ Page({
             var code = th.data.wu_arr[c_arr[i].wind].code;
             th.data.cartlist[i].shipping_price =
               th.calculatewuliu(code, o_shipping_price, goods_weight,
-                goods_piece,th.data.user_addr, freight_free, o_price, rs,);
+                goods_piece,th.data.user_addr, freight_free, o_price, rs);
 
              if(!th.data.using_quan[pickid] || th.data.using_quan[pickid].isby!=1){
                  if( th.data.cartlist[i].shipping_price ==0)  th.data.is_by[pickid]=0; //已经全场包邮，就不要选择券了
@@ -1375,7 +1375,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;
@@ -1388,7 +1388,7 @@ Page({
     var fw_price = 0, fp_price=0;
     item=item.config;
     //------按重量----------
-    if (goods_weight>=0) {
+    if (goods_weight>=0 && item['money']) {
       fw_price =parseFloat(item['money']);
       if (goods_weight > item['first_weight']){
         var fw = goods_weight - item['first_weight'];
@@ -1397,7 +1397,7 @@ Page({
       }
     }
     //------按件数----------
-    if (goods_piece > 0) {
+    if (goods_piece > 0 && item['piecemoney']) {
       fp_price = parseFloat(item['piecemoney']);
       if (goods_piece > item['first_piece']) {
         var fp = goods_piece - item['first_piece'];
--
libgit2 0.21.4