1、赠品限量超量的优化

2、多门店的时候，一起超出商品限购的时候，不能提交订单！

1、赠品限量超量的优化
2、多门店的时候，一起超出商品限购的时候，不能提交订单！
yvan.ni
1 parent b0cec5a2
Showing 3 changed files with 43 additions and 12 deletions
packageE/pages/cart/cart2/cart2.js
packageE/pages/cart/cart2/cart2.wxml
packageE/pages/cart/cart2/cart2.wxss
@@ -2333,6 +2333,7 @@ Page({
                 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.gift_storecount
+                    && get_data.zp_num>get_data.must_num  //增加一个超量
                 ) {
                   item_map.gift_id = get_data.gift_id;
@@ -4711,6 +4712,8 @@ Page({
       var order_prom_list_cart = th.data.order_prom_list_cart;
+      //优惠商品限购的优化
+      var yh_lm_map={};
       //--组装推送数据--
       for (var i = 0; i < order_prom_list_cart.length; i++) {
         var t_item = order_prom_list_cart[i];
@@ -4877,8 +4880,6 @@ Page({
         var check_map = {};
         let groupchat_ids=[]
-
-
         //-------------让商品添加到商品列表--------------------
         for (var k = 0; k < t_item.goods.length; k++) {
@@ -4987,7 +4988,8 @@ Page({
           var mo_num=getApp().get_limit_qty(g_item,act.length);
           var steep=getApp().get_limit_qty(g_item,act.length,1);
-          if ([0,3,5,7,10].indexOf(goods.prom_type)>-1){
+          //赠品要排除之外，不进行判断
+          if ([0,3,5,7,10].indexOf(goods.prom_type)>-1 && !goods.is_gift){
               if(mo_num>goods.goods_num){
                  getApp().confirmBox(goods.goods_name + "的未达到起订数量");
                  th.data.is_summit_ing = 0;
@@ -5026,12 +5028,22 @@ Page({
                         pro_by_num=gd_limit_rs.data.data.promgoodsbuynum
                       }
-                      if(pro_gd_limit_num>0 && pro_gd_limit_num<pro_by_num+goods.goods_num){
+                      var m_ky=goods.goods_id+'|'+goods.prom_id;
+
+                      var more_num=yh_lm_map[m_ky]?yh_lm_map[m_ky]:0;
+
+                      if(pro_gd_limit_num<pro_by_num+goods.goods_num+more_num){
                         getApp().confirmBox(goods.goods_name + "超优惠促销限购，无法购买");
                         th.data.is_summit_ing = 0;
                         th.setData({ submit: 0 })
                         return false;
                       }
+
+                      //方便下一轮商品判断限购
+                      if(!yh_lm_map[m_ky]) {
+                         yh_lm_map[m_ky]=0;
+                      }
+                      yh_lm_map[m_ky]+=goods.goods_num;
                     }
               }
@@ -7245,7 +7257,7 @@ Page({
     var gift_id = discount.gift_id;
     for (var i in alllist) {
       var list_item = alllist[i];
-      //-- 门店相同，活动相同的时候 --
+      //-- 门店相同，活动相同的时候,就continue掉 --
       if (pick_id == list_item.pickup_id && prom_id == list_item.prom_id) continue;
       for (var j in list_item.goods) {
         //如果赠品的ID一样，要进行统计数量
@@ -7254,7 +7266,7 @@ Page({
           all_num += list_item.goods[j].goods_num;
         }
         if (list_item.goods[j].is_gift == 1 && list_item.goods[j].gift_id == gift_id && list_item.goods[j].prom_id == prom_id) {
-          all_limit_num += list_item.goods[j].limit_num;
+          all_limit_num += list_item.goods[j].goods_num;
         }
       }
     }
@@ -7268,7 +7280,8 @@ Page({
       });
       return false;
     }
-    if (discount.limit_num < all_limit_num) {
+    //-- 限购一定要大于0，否则就是不限的意思 --
+    if (discount.limit_num>0 && discount.limit_num < all_limit_num) {
       wx.showToast({
         title: "超出赠品限购",
         icon: 'none',
@@ -7292,6 +7305,11 @@ Page({
     for (let i in giftsinfo) {
       let item = giftsinfo[i];
       if (!item.selected) continue;
+
+      if(item.must_num>0 && item.goods_num<item.must_num){
+          ut.m_toast("活动赠品的超量数量不足");
+          return false;
+      }
       all_num += item.goods_num;
     }
     if (all_num > zp_num) {
@@ -7323,7 +7341,6 @@ Page({
       var pos=this.find_pro_last(pk_list_goods,3,this.data.gf_prom_id);
       var fd_gd=pk_list_goods[pos]
-
       var url = "/api/weshop/cart/delGift?store_id=" + os.stoid + "&user_id="
         + getApp().globalData.user_id + "&is_gift=1&pick_id=" + this.data.gift_pkid + "&prom_id=" + this.data.gf_prom_id;
       await getApp().request.promiseDelete(url, {});
@@ -1054,17 +1054,21 @@
       </view>
       <navigator class="goods-img rel" bindtap="go_gd" data-gd="{{items.goods_id}}">
-        <image class="wh100" src="{{imgUrl+items.goodsinfo.original_img}}" binderror="bind_bnerr2" data-errorimg="gift_goods[{{idx}}].goodsinfo.original_img"></image>
+        <image class="wh100" src="{{imgUrl+items.goodsinfo.original_img}}" binderror="cart_set_err1" data-err="giftsinfo[{{idx}}].goodsinfo.original_img"></image>
       </navigator>
       <view class="goods-cont">
-        <view class="goods-name">
-          <navigator bindtap="go_gd" class="ellipsis-2 fs30" data-gd="{{items.goods_id}}">{{items.goods_name}}</navigator>
+        <view class="goods-name2">
+          <navigator bindtap="go_gd" class="ellipsis-2 fs30" data-gd="{{items.goods_id}}">{{items.goods_name}}
+          </navigator>
           <view class="specifications  ellipsis-1">
             <view wx:if="{{items.goodsinfo.goods_color || items.goodsinfo.goods_spec}}">
               {{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:elif="{{items.must_num>0}}">必选{{items.must_num}}件</text>
+
         </view>
         <view class="flex alend jc_sb">
@@ -130,7 +130,13 @@ page {
     margin-bottom: 16rpx;
     font-size: 28rpx;
     color: #333;
-
+}
+.goods-name2 {
+  height: 74rpx;
+  line-height: 40rpx;
+  margin-bottom: 16rpx;
+  font-size: 28rpx;
+  color: #333;
 }
 .goods-color {
@@ -1228,6 +1234,10 @@ margin-left: 20rpx;
     margin-top: 6rpx;
 }
+.c-red {
+    color: #f23030;vertical-align: top;position: relative;top: 3rpx;font-size: 21rpx;margin-left: 2rpx;
+}
+