包邮券的优化，多个商品商品不不包邮的情况bug修复

yvan.ni
1 parent 39f61005
Showing 1 changed file with 16 additions and 10 deletions
pages/cart/cart2/cart2.js
@@ -507,15 +507,15 @@ Page({
           //--有不包邮区域，且不免运费,全场的计算--
           if(no_ex_id && freight_free>0 && o_price>freight_free  && c_arr[i].exp_type == 0 && (by_qc.region_list || by_qc.goods_list) ){
             //如果有设置不包邮区域的时候
-            if(by_qc.region_list){
+            if(by_qc.region_list!="" && by_qc.region_list!=null && by_qc.region_list!=undefined ){
               if(th.check_by_area(by_qc.region_list)){
                 freight_free=0;
                 th.data.is_no_by[pickid]=1;
               }
             }
             //如果有设置不包邮区商品
-            if(by_qc.goods_list && freight_free){
-              no_ex_good=res.data.data.goods_list;
+            if(by_qc.goods_list!="" && by_qc.goods_list!=undefined && by_qc!=null && freight_free>0){
+              no_ex_good=by_qc.goods_list;
             }
           }
@@ -525,7 +525,7 @@ Page({
             if(!th.data.isget_by_quan[pickid]){
               //--判断要不要显示包邮券,链式调用接口---
               getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea",{
-                data:{store_id:os.stoid,isuse:0,condition:o_price,user_id:getApp().globalData.user_id}
+                data:{store_id:os.stoid,isuse:0,condition:o_price,user_id:getApp().globalData.user_id,pageSize:2000}
               }).then(res=>{
                 if(res.data.code==0 && res.data.data.total>0){
                   //此时要循环判断包邮的地区，不包邮商品是不是符合
@@ -571,6 +571,8 @@ Page({
                     var arr2=quan.goods_list.split(",");
                     if(ut.isContained(arr,arr2)){
                         getApp().my_warnning("全场不包邮商品和包邮券的重复",0,th);
+                        th.data.using_quan[pickid]={};
+                        th.setData({using_quan:th.data.using_quan})
                         return false;
                     }
                     var n_arr=ut.mergeArray(arr,arr2);
@@ -621,10 +623,11 @@ Page({
           //计算物流价格
           if (c_arr[i].exp_type == 0) {
+            freight_free=0;  //后面不在进行判断
             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; //已经全场包邮，就不要选择券了
@@ -758,7 +761,7 @@ Page({
 		  if(!th.data.isget_by_quan[th.data.bn_pick]){
 			   //--判断要不要显示包邮券,链式调用接口---
 			   getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea",{
-				   data:{store_id:os.stoid,isuse:0,condition:allpice,user_id:getApp().globalData.user_id}
+				   data:{store_id:os.stoid,isuse:0,condition:allpice,user_id:getApp().globalData.user_id,pageSize:2000}
 			   }).then(res=>{
 			   		if(res.data.code==0 && res.data.data.total>0){
 						   //此时要循环判断包邮的地区，不包邮商品是不是符合
@@ -1293,11 +1296,14 @@ Page({
       }
       th.setData({ is_all_zt: iszt });
-	  
-	  
-      if(th.data.using_quan[th.data.bn_pick] && th.data.using_quan[th.data.bn_pick].isby==1){
-          th.setData({using_quan:{}});
+      var ind=t.currentTarget.dataset.ind;
+      var c_item=th.data.cartlist[ind];
+      var pickid=c_item.pickup_id;
+
+      if(th.data.using_quan[pickid] && th.data.using_quan[pickid].isby==1){
+          th.data.using_quan[pickid]={};
+          th.setData({using_quan:th.data.using_quan});
       }