赠品的超量和限量不限的优化

yvan.ni
1 parent 78a54b8f
Showing 3 changed files with 36 additions and 12 deletions
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2/cart2.wxml
pages/cart/cart/cart.js
@@ -2373,11 +2373,16 @@ Page({
                   for (let iy in get_data.giftsinfo) {
                     let item = get_data.giftsinfo[iy];
+                    var c_zp=0;
                     if(parseInt(item.limit_num)>0){
-                      can_zp_num += parseInt(item.gift_storecount) > parseInt(item.limit_num) ? parseInt(item.limit_num) : parseInt(item.gift_storecount);
+                       c_zp= parseInt(item.gift_storecount) > parseInt(item.can_num) ? parseInt(item.can_num) : parseInt(item.gift_storecount);
                     }else{
-                      can_zp_num += parseInt(item.gift_storecount);
+                       c_zp= parseInt(item.gift_storecount);
                     }
+
+                    if(c_zp<0) c_zp=0;
+                    can_zp_num +=c_zp;
+
                   }
                   var t_zp_num = parseInt(get_data.zp_num) * parseInt(get_data.bs);
@@ -7286,7 +7291,7 @@ Page({
       return false;
     }
     //-- 限购一定要大于0，否则就是不限的意思 --
-    if (discount.limit_num>0 && discount.limit_num < all_limit_num) {
+    if (discount.limit_num>0 && discount.can_num < all_limit_num) {
       wx.showToast({
         title: "超出赠品限购",
         icon: 'none',
@@ -7309,12 +7314,17 @@ Page({
     var all_num = 0;
     for (let i in giftsinfo) {
       let item = giftsinfo[i];
-      if (!item.selected) continue;
-
-      if(item.must_num>0 && item.goods_num<item.must_num){
+      if(item.must_num>0 ){
+        if(!item.selected){
+          ut.m_toast("必送的赠品没有选中");
+          return false;
+        }
+        if(item.goods_num<item.must_num){
           ut.m_toast("活动赠品的超量数量不足");
           return false;
+        }
       }
+      if (!item.selected) continue;
       all_num += item.goods_num;
     }
     if (all_num > zp_num) {
@@ -7515,14 +7525,18 @@ Page({
           var gf_pr_name = item_arr[ip].gf_pr_name;
           var zp_num = item_arr[ip].zp_num;
           var giftsinfo = item_arr[ip].giftsinfo;
+
           var limit_all = 0;
           var stock_all = 0;
+          var no_limit=0;
+
           for (let iu in giftsinfo) {
             let gf_item = giftsinfo[iu];
-            limit_all += gf_item.limit_num;
+            limit_all += gf_item.can_num>0?gf_item.can_num:0;
             stock_all += gf_item.gift_storecount;
+            if(gf_item.limit_num<=0) no_limit=1;
           }
-          if (limit_all < zp_num) {
+          if (!no_limit && limit_all < zp_num) {
             error_arr.push(gf_pr_name + "限购不足");
           }
           if (stock_all < zp_num) {
@@ -1066,7 +1066,7 @@
               {{items.goodsinfo.goods_color}}{{items.goodsinfo.goods_color?"/":''}}{{items.goodsinfo.goods_spec}}</view>
             <view wx:else>规格1</view>
           </view>
-          <text class="c-red" wx:if="{{items.must_num>0 && items.limit_num>0 && items.must_num>items.limit_num}}">(超量不足)</text>
+          <text class="c-red" wx:if="{{items.must_num>0 && items.limit_num>0 && items.must_num>items.can_num}}">(超量不足)</text>
           <text class="c-red" wx:elif="{{items.must_num>0}}">必选{{items.must_num}}件</text>
         </view>
@@ -4154,11 +4154,14 @@ Page({
           for (let iy in discount.giftsinfo) {
             let item = discount.giftsinfo[iy];
+            var c_zp=0;
             if(parseInt(item.limit_num)>0){
-              can_zp_num += parseInt(item.gift_storecount) > parseInt(item.limit_num) ? parseInt(item.limit_num) : parseInt(item.gift_storecount);
+              c_zp= parseInt(item.gift_storecount) > parseInt(item.can_num) ? parseInt(item.can_num) : parseInt(item.gift_storecount);
             }else{
-              can_zp_num += parseInt(item.gift_storecount);
+              c_zp= parseInt(item.gift_storecount);
             }
+            if(c_zp<0) c_zp=0;
+            can_zp_num +=c_zp;
           }
           var t_zp_num = parseInt(discount.zp_num) * parseInt(discount.bs);
@@ -4480,7 +4483,14 @@ Page({
             var a_limit_num = 0;
             for (let iy in discount.giftsinfo) {
               let item = discount.giftsinfo[iy];
-              can_zp_num += parseInt(item.gift_storecount) > parseInt(item.limit_num) ? parseInt(item.limit_num) : parseInt(item.gift_storecount);
+              var c_zp=0;
+              if(parseInt(item.limit_num)>0) {
+                c_zp= parseInt(item.gift_storecount) > parseInt(item.can_num) ? parseInt(item.can_num) : parseInt(item.gift_storecount);
+              }else{
+                c_zp= parseInt(item.gift_storecount)
+              }
+              if(c_zp<0) c_zp=0;
+              can_zp_num +=c_zp;
             }
             var t_zp_num = parseInt(discount.zp_num) * parseInt(discount.bs);