Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp

season
2 parents 00247450 249f0fa7
Showing 2 changed files with 7 additions and 7 deletions
packageE/pages/cart/cart2/cart2.js
pages/cart/cart/cart.js
@@ -2329,9 +2329,9 @@ Page({
                 var other_gift=0;
                 other_gift=th.get_other_gift(c_arr,get_data.gift_id,pickid);
-                //------end-------
+                //------end------- ,因为增加了限购数量不限的情况
                 if (get_data.gift_id && parseInt(get_data.zp_mode) != 1
-                    && get_data.zp_num * item_map.bs <= get_data.limit_num-other_gift
+                    && (get_data.zp_num * item_map.bs <= get_data.limit_num-other_gift || !get_data.limit_num)
                     && get_data.zp_num * item_map.bs <= get_data.gift_storecount
                     && get_data.zp_num>get_data.must_num  //增加一个超量
                 ) {
@@ -4254,7 +4254,7 @@ Page({
         } else {
           //---如果有打折的信息，赠送的信息,赠送的时候要判断是不是限购数量---
-          if (discount && discount['goods_id'] && discount.limit_num >= discount.bs * discount.zp_num &&
+          if (discount && discount['goods_id'] && (!discount.limit_num || discount.limit_num >= discount.bs * discount.zp_num) &&
             discount.gift_storecount >= discount.bs * discount.zp_num) {
             //如果这礼品超了情况下
             if (no_gift_arr.indexOf(discount.gift_id) != -1) continue;
@@ -4302,7 +4302,7 @@ Page({
             }
             //-- 赠品的数量超出库存数量和会员的限制,这里是保证所有的赠品部会超出 --
-            if (discount.gift_storecount < all_num + newd.goods_num || discount.limit_num < all_limit_num + newd.goods_num) {
+            if (discount.gift_storecount < all_num + newd.goods_num || (discount.limit_num &&  discount.limit_num < all_limit_num + newd.goods_num)) {
               no_gift_arr.push(discount.gift_id);
               //--进入下一个循环 --
               continue;
@@ -4582,8 +4582,8 @@ Page({
             }
           } else {
-            //---如果有打折的信息，赠送的信息,赠送的时候要判断是不是限购数量---
-            if (discount && discount['goods_id'] && discount.limit_num >= discount.bs * discount.zp_num &&
+            //---如果有打折的信息，赠送的信息,赠送的时候要判断是不是限购数量,因为增加了限购数量不限的情况---
+            if (discount && discount['goods_id'] && (!discount.limit_num || discount.limit_num >= discount.bs * discount.zp_num) &&
               discount.gift_storecount >= discount.bs * discount.zp_num) {
               //如果这礼品超了情况下
               if (no_gift_arr.indexOf(discount.gift_id) != -1) continue;
@@ -4631,7 +4631,7 @@ Page({
               }
               //-- 赠品的数量超出库存数量和会员的限制,这里是保证所有的赠品部会超出 --
-              if (discount.gift_storecount < all_num + newd.goods_num || discount.limit_num < all_limit_num + newd.goods_num) {
+              if (discount.gift_storecount < all_num + newd.goods_num ||  (discount.limit_num && discount.limit_num < all_limit_num + newd.goods_num)) {
                 no_gift_arr.push(discount.gift_id);
                 //--进入下一个循环 --
                 continue;