虚拟商品起订量的优化

yvan.ni
1 parent 27d72475
Showing 9 changed files with 557 additions and 240 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/presell/goodsInfo/goodsInfo.wxml
packageE/pages/cart/cart2/cart2.js
pages/activity/pind_list/pind_list.js
pages/cart/cart/cart.js
pages/cart/cart/cart.wxml
pages/goods/goodsInfo/buy_com_pop.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
@@ -1572,7 +1572,7 @@ Page({
           //   title: '提示',
           //   content: '超出商品限购'
           // });
-					getApp().my_warnning('超出商品限购', 0, th);
+		  getApp().my_warnning('超出商品限购', 0, th);
           return false;
         }
       }
@@ -1583,7 +1583,7 @@ Page({
           //   title: '提示',
           //   content: '超出商品活动限购'
           // });
-					getApp().my_warnning('超出商品活动限购', 0, th);
+          getApp().my_warnning('超出商品活动限购', 0, th);
           return false;
         }
       }
@@ -1752,43 +1752,7 @@ Page({
         //---如果是线下门店销售的时候---
         if(!getApp().is_virtual(th.data.sele_g)  && !th.data.sele_g.whsle_id && th.data.sales_rules >= 2) {
           var pick = th.get_pick_from_list(th.data.sto_sele_id)
-          //---通过接口获取门店的线下库存信息--
-          // getApp().request.get("/api/weshop/goods/getWareStorages", {
-          //   data: { storageNos: pick.pickup_no, wareIds: encodeURIComponent(th.data.sele_g.erpwareid), storeId: os.stoid },
-          //   success: function (res) {
-          //     if (res.data.code == 0) {
-          //       if (res.data.data.pageData.length > 0) {
-          //         var CanOutQty = res.data.data.pageData[0].CanOutQty;
-          //         if (CanOutQty < e.data.goodsInputNum) {
-          //           return s.my_warnning("库存不足！", 0, th);
-          //         }
-          //         //在调一次接口,读取商品的预出库的数量，lock
-          //         getApp().request.get("/api/weshop/order/ware/lock/page", {
-          //           data: { store_id: os.stoid, wareId: th.data.sele_g.goods_id, storageId: pick.pickup_id, pageSize: 1000 },
-          //           success: function (res_data) {
-          //             if (res_data.data.code == 0 && res_data.data.data.total > 0) {
-          //
-          //               var lock = 0;
-          //               for (var i in res_data.data.data.pageData) {
-          //                 lock += res_data.data.data.pageData[i].outQty;
-          //               }
-          //
-          //               if (CanOutQty <= lock) {
-          //                 return s.my_warnning("库存不足！", 0, th);
-          //               }
-          //               th.add_cart_next(e, t, a, o, newd, CanOutQty - lock);
-          //             } else {
-          //               th.add_cart_next(e, t, a, o, newd, CanOutQty);
-          //             }
-          //           }
-          //         })
-          //       } else {
-          //         return s.my_warnning("库存不足！", 0, th);
-          //       }
-          //
-          //     }
-          //   }
-          // })
+
  
  
           th.check_CanOutQty(th.data.sele_g, pick, function (CanOutQty) {
@@ -2190,11 +2154,20 @@ Page({
  
   //----------增加购买数量-----------
   addCartNum: function (t) {
-    this.checkCartNum(this.data.goodsInputNum + 1);
+
+    var add_num=1;
+    if(this.data.is_normal == 1){
+      add_num=getApp().get_limit_qty(this.data.sele_g,0,1);
+    }
+    this.checkCartNum(this.data.goodsInputNum + add_num);
   },
   //----------减少购买数量-----------
   subCartNum: function (t) {
-    this.checkCartNum(this.data.goodsInputNum - 1);
+    var add_num=1;
+    if(this.data.is_normal == 1){
+      add_num=getApp().get_limit_qty(this.data.sele_g,0,1);
+    }
+    this.checkCartNum(this.data.goodsInputNum - add_num);
   },
   //----------输入框输入购买数量-----------
   inputCartNum: function (t) {
@@ -2218,6 +2191,7 @@ Page({
   //------检查数量是不是超出限购------
   checkCartNum: function (t) {
     var th = this;
+    var mo_num=getApp().get_limit_qty(th.data.sele_g);
     this.get_buy_num(this.data.sele_g, async function () {
  
       //--判断商品是否超出限购--
@@ -2286,9 +2260,20 @@ Page({
       if (e < t) {
         wx.showModal({ title: '库存不足', });
         if (e < 0) e = 0;
+
+        if(th.data.is_normal == 1){
+           if(e<mo_num) e=mo_num;
+        }
+
         th.setData({ goodsInputNum: e }); return false;
       }
       t > e || 0 == e ? t = e : t < 1 && (t = 1);
+
+      //只有普通商品才有起购数
+      if(th.data.is_normal == 1){
+        if(t<mo_num) t=mo_num;
+      }
+
       th.setData({ goodsInputNum: t });
       th.is_show_more_buy();
  
@@ -4303,7 +4288,10 @@ Page({
   // ind == 1 为普通购买
   openSpecModel_pt: function (e) {
  
-    this.setData({ open_ind_store: 9, goodsInputNum: 1 });
+
+    var mo_num=getApp().get_limit_qty(this.data.sele_g);
+
+    this.setData({ open_ind_store: 9, goodsInputNum: mo_num });
     // 判断是否有待支付订单
     var aid = this.data.group_id;
     var switOn = true;
@@ -4477,172 +4465,252 @@ Page({
     //----------添加到购物车时，要判断限购数量，--------
     e.get_buy_num(o, async function (ee) {
  
-      //---判断商品是否超出限购---
-      // if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
-      //   if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) {
-      //     wx.showModal({
-      //       title: '提示',
-      //       content: '超出商品限购'
-      //     });
-
-      //     var num = th.data.prom_buy_limit - th.data.prom_buy_num;
-      //     if (num < 0) num = 0;
-      //     th.setData({ goodsInputNum: num })
-      //     return false;
-      //   }
-      // }
+          //---判断商品是否超出限购---
+          if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
+            if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) {
+              wx.showModal({
+                title: '提示',
+                content: '超出商品限购'
+              });
  
-      //---判断商品是否超出活动限购,拼团的普通购买不计算活动的限购---
-      // if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0 && th.data.is_normal != 1) {
-      //   if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) {
-      //     wx.showModal({
-      //       title: '提示',
-      //       content: '超出商品活动限购'
-      //     });
-
-      //     var num = th.data.prom_buy_limit - th.data.prom_buy_num;
-      //     if (num < 0) num = 0;
-      //     th.setData({ goodsInputNum: num })
-      //     return false;
-      //   }
-      // }
+              var num = th.data.prom_buy_limit - th.data.prom_buy_num;
+              if (num < 0) num = 0;
+              th.setData({goodsInputNum: num})
+              return false;
+            }
+          }
  
-      var redis_num = 0
-      //不是普通购买的时候
-      // if (th.data.is_normal != 1) {
-      //   //-------判断活动是否抢光---------
-      //   await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.sele_g.prom_id, {
-      //     1: 1
-      //   }).then(res => {
-      //     redis_num = res.data.data;
-      //   })
  
-      //   if (th.data.goodsInputNum > redis_num) {
-      //     wx.showModal({
-      //       title: '提示',
-      //       content: '超出商品活动库存'
-      //     });
+          var redis_num = 0
  
-      //     th.setData({ goodsInputNum: redis_num })
+          if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined)
+            th.setData({
+              sto_sele_name: ""
+            });
  
-      //     return false;
-      //   }
-      // }
+          if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th);
+
+          //--------------此时操作的数据------------
+          var newd = {
+            goods_id: o.goods_id,
+            goods_num: th.data.goodsInputNum,
+            pick_id: th.data.sto_sele_id,
+            user_id: oo.user_id,
+            store_id: th.data.stoid,
+            goods_price: o.shop_price,
+            goods_name: o.goods_name,
+            goods_sn: o.goods_sn,
+            sku: o.sku,
+          };
  
-      // if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
-      // if (th.data.goodsInputNum > o.store_count) {
-      //   th.setData({ goodsInputNum: o.store_count })
-      //   return s.my_warnning("超出商品库存", 0, th);
-      // }
+          //---是不是从收藏夹出来的---
+          if (th.data.c_guide_id) {
+            newd['guide_id'] = th.data.c_guide_id;
+            newd['guide_type'] = 2;
  
-      if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined)
-        th.setData({
-          sto_sele_name: ""
-        });
-      if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th);
+          } else {
+            if (getApp().globalData.guide_id) {
+              newd['guide_id'] = getApp().globalData.guide_id;
+              newd['guide_type'] = 0;
  
-      //--------------此时操作的数据------------
-      var newd = {
-        goods_id: o.goods_id,
-        goods_num: th.data.goodsInputNum,
-        pick_id: th.data.sto_sele_id,
-        user_id: oo.user_id,
-        store_id: th.data.stoid,
-        goods_price: o.shop_price,
-        goods_name: o.goods_name,
-        goods_sn: o.goods_sn,
-        sku: o.sku,
-      };
+            }
+          }
+          if (getApp().globalData.groupchat_id) {
+            newd['groupchat_id'] = getApp().globalData.groupchat_id;
+          }
+          //让商品带上房间号
+          if (th.data.sys_switch.is_skuroom_id == 1) {
+            if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
+              newd.room_id = getApp().globalData.room_id;
+            }
+          } else {
+            if (newd.goods_id == getApp().globalData.room_goods_id) {
+              newd.room_id = getApp().globalData.room_id;
+            }
+          }
  
-      //---是不是从收藏夹出来的---
-      if (th.data.c_guide_id) {
-        newd['guide_id'] = th.data.c_guide_id;
-        newd['guide_type'] = 2;
+          //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
  
-      } else {
-        if (getApp().globalData.guide_id) {
-          newd['guide_id'] = getApp().globalData.guide_id;
-          newd['guide_type'] = 0;
+          if (th.data.is_normal == 1) {
+            var conf = th.data.bconfig;
+            if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']) {
+              var s_list = JSON.parse(conf.switch_list);
  
-        }
-      }
-      if(getApp().globalData.groupchat_id){
-        newd['groupchat_id'] = getApp().globalData.groupchat_id;
-      }
-      //让商品带上房间号
-      if (th.data.sys_switch.is_skuroom_id == 1) {
-        if (th.data.data.goods_id == getApp().globalData.room_goods_id) {
-          newd.room_id = getApp().globalData.room_id;
-        }
-      } else {
-        if (newd.goods_id == getApp().globalData.room_goods_id) {
-          newd.room_id = getApp().globalData.room_id;
-        }
-      }
+              var now = ut.gettimestamp();
  
-      //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
+              var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/');
+              var end = new Date(str);
+              end = Date.parse(end) / 1000;
  
-      if (th.data.is_normal == 1) {
-        var conf = th.data.bconfig;
-        if (conf.switch_list && getApp().globalData.userInfo['card_field'] && getApp().globalData.userInfo['card_expiredate']) {
-          var s_list = JSON.parse(conf.switch_list);
+              //如果后台有开启等级价的功能
+              if (parseInt(s_list.rank_switch) == 2 && end > now) {
+                var card_price = o[getApp().globalData.userInfo['card_field']];
+                //如果会员有等级价
+                if (getApp().globalData.userInfo['card_field'] != undefined && getApp().globalData.userInfo['card_field'] != null
+                    && getApp().globalData.userInfo['card_field'] != "" && card_price > 0) {
+                  newd.goods_price = card_price;
+                }
+              }
+            }
  
-          var now = ut.gettimestamp();
+            //---如果是线下门店销售的时候---
+            if (!getApp().is_virtual(th.data.sele_g) && th.data.sales_rules >= 2 && !th.data.sele_g.whsle_id) {
+              var pick = th.get_pick_from_list(th.data.sto_sele_id)
  
-          var str = getApp().globalData.userInfo['card_expiredate'].replace(/-/g, '/');
-          var end = new Date(str);
-          end = Date.parse(end) / 1000;
+              th.check_CanOutQty(th.data.sele_g, pick, function (CanOutQty) {
+                if (CanOutQty) {
+
+                  if (CanOutQty < e.data.goodsInputNum) {
+                    wx.showToast({
+                      title: '库存不足！',
+                      icon: 'none',
+                    });
+                    return false;
+                  }
+
+                  th.by_next_func(newd);
+                } else {
+                  wx.showToast({
+                    title: '库存不足！',
+                    icon: 'none',
+                  });
+                  return false;
+                }
+              })
+
+            } else {
+              if (o.store_count <= 0) {
+                wx.showToast({
+                  title: '库存已为空！',
+                  icon: 'none',
+                });
+                return false;
+                //return s.my_warnning("库存已为空！", 0, th);
+              }
+
+              if (o.store_count < e.data.goodsInputNum) {
+                wx.showToast({
+                  title: '库存不足！',
+                  icon: 'none',
+                });
+                return false;
+                //return s.my_warnning("库存不足！", 0, th);
+              }
  
-          //如果后台有开启等级价的功能
-          if (parseInt(s_list.rank_switch) == 2 && end > now) {
-            var card_price = o[getApp().globalData.userInfo['card_field']];
-            //如果会员有等级价
-            if (getApp().globalData.userInfo['card_field'] != undefined && getApp().globalData.userInfo['card_field'] != null
-              && getApp().globalData.userInfo['card_field'] != "" && card_price > 0) {
-              newd.goods_price = card_price;
+
+              th.by_next_func(newd);
             }
+            return false;
+
+
           }
-        }
-      }
  
  
-      //-----如果是秒杀，团购，积分购,拼团,且不是普通购买-----
-      if (th.data.prom_type == 9 && th.data.is_normal != 1) {
-        newd.goods_price = th.data.prom_price;
-        newd.prom_type = th.data.prom_type;
-        newd.prom_id = th.data.prom_id;
-        //newd.kt_type = th.data.prom_act.kttype; //开团类型
-        newd.is_pt_tz = 0;
-        //th.data.sto_sele_distr=1; //直接用自提的方式提交
-        if (newd.kt_type > 1) {
-          newd.is_pt_tz = 1; //开团类型
+          //-----如果是秒杀，团购，积分购,拼团,且不是普通购买-----
+          if (th.data.prom_type == 9 && th.data.is_normal != 1) {
+            newd.goods_price = th.data.prom_price;
+            newd.prom_type = th.data.prom_type;
+            newd.prom_id = th.data.prom_id;
+            //newd.kt_type = th.data.prom_act.kttype; //开团类型
+            newd.is_pt_tz = 0;
+            //th.data.sto_sele_distr=1; //直接用自提的方式提交
+            if (newd.kt_type > 1) {
+              newd.is_pt_tz = 1; //开团类型
+            }
+            if (newd.kt_type == 3) {
+              th.data.sto_sele_distr = 1;
+            }
+
+          }
+
+          // else if (th.data.prom_type == 3) {
+          //      newd.prom_type = 0;
+          //      newd.prom_id = 0;
+          //    }
+
+          th.by_next_func(newd);
         }
-        if (newd.kt_type == 3) {
-          th.data.sto_sele_distr = 1;
+
+
+    )
+  },
+  by_next_func(newd){
+    var th=this;
+    newd['pick_name'] = th.data.sto_sele_name;
+    newd['pick_dis'] = th.data.sto_sele_distr;
+    newd['is_normal'] = th.data.is_normal;
+
+    if (newd['is_normal']) {
+      newd['is_pd_normal'] = 1;
+      //判断一下有没有全局优惠活动
+      th.buyNow(newd);
+    }
+    else {
+      // 点击立即参团
+      th.buyNow_pt(newd);
+    }
+  },
+
+    //统一一下获取线下库存的函数
+    async check_CanOutQty(goodsinfo, item, func) {
+
+      var sales_rules = this.data.sales_rules;
+
+      var lock_rq = {
+        store_id: os.stoid,
+        wareId: goodsinfo.goods_id,
+        pageSize: 1000
+      };
+
+      if (sales_rules == 2) {
+        lock_rq.storageId = item.pickup_id
+      } else {
+        lock_rq.appoint_pick_keyid = encodeURIComponent(this.data.appoint_pick_keyid)
+      }
+
+      var lock = 0;
+      var CanOutQty = 0;
+      var plist = null;
+      //先读取门店的lock
+      await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", {
+        data: lock_rq
+      }).then(res => {
+        if (res.data.code == 0 && res.data.data.total > 0) {
+          for (var i in res.data.data.pageData)
+            lock += res.data.data.pageData[i].outQty;
         }
+      })
  
+      var sto_req = {
+        wareIds: encodeURIComponent(goodsinfo.erpwareid),
+        storeId: os.stoid
+      }
+      if (sales_rules == 2) {
+        sto_req.storageNos = item.pickup_no
+      } else {
+        sto_req.storageIds = encodeURIComponent(this.data.appoint_pick_keyid)
       }
  
-      // else if (th.data.prom_type == 3) {
-      //      newd.prom_type = 0;
-      //      newd.prom_id = 0;
-      //    }
  
-      newd['pick_name'] = th.data.sto_sele_name;
-      newd['pick_dis'] = th.data.sto_sele_distr;
-      newd['is_normal'] = th.data.is_normal;
  
-      if (newd['is_normal']) {
-          newd['is_pd_normal'] = 1;
-          //判断一下有没有全局优惠活动
-          th.buyNow(newd);
+      //读取线下的门店库存
+      await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", {
+        data: sto_req
+      }).then(res => {
+        if (res.data.code == 0 && res.data.data.total > 0) {
+          plist = res.data.data.pageData[0];
+        }
+      })
+
+      if (plist && plist.CanOutQty - lock > 0) {
+        CanOutQty = plist.CanOutQty - lock;
       }
-      else {
-        // 点击立即参团
-        th.buyNow_pt(newd);
-      };
-    })
-  },
+
+      if (func) func(CanOutQty);
+
+    },
+
+
   //----------立即购买_pt-----------
   buyNow_pt: function (e) {
     s.set_b_now(e);
@@ -194,8 +194,7 @@
                 <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
                   (配送不匹配2)
                 </view>
-                <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty
-                       && !filters.is_virtual_gd(sele_g.is_virtual)  && sales_rules>=2 && prom_type==0}}">
+                <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual)  && sales_rules>=2 && prom_type==0}}">
                   (库存不足)
                 </view>
               </block>
@@ -631,8 +630,7 @@
           <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
           <block wx:else>
             <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配1)</view>
-            <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty
-                 && !filters.is_virtual_gd(sele_g.is_virtual)  && sales_rules>=2 && prom_type==0}}">
+            <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual)  && sales_rules>=2 && prom_type==0}}">
               (库存不足)
             </view>
           </block>
@@ -3989,6 +3989,22 @@ Page({
       }
  
  
+      var mo_num=getApp().get_limit_qty(th.data.bn_goods);
+      var steep=getApp().get_limit_qty(th.data.bn_goods,0,1);
+
+      if ([0,3,5,7,10].indexOf(goods.prom_type)>=-1){
+        if(mo_num>goods.goods_num){
+          getApp().confirmBox(goods.goods_name + "的未到达起订数量");
+          th.data.is_summit_ing = 0;
+          return false;
+        }
+        if(steep>1 && (goods.goods_num-mo_num)%steep!=0 ){
+          getApp().confirmBox(goods.goods_name + "的购买的数量不是起订量的倍数");
+          th.data.is_summit_ing = 0;
+          return false;
+        }
+      }
+
       //如果不立即购买或者秒杀，如果是线下库存购买的时候
       if (goods.prom_type != 1 && goods.prom_type != 6 && goods.prom_type != 2
           && th.data.sales_rules >= 2 && !th.data.bn_goods.whsle_id && !getApp().is_virtual(th.data.bn_goods)) {
@@ -4113,7 +4129,6 @@ Page({
  
       var order_prom_list_cart = th.data.order_prom_list_cart;
  
-
       //--组装推送数据--
       for (var i = 0; i < order_prom_list_cart.length; i++) {
         var t_item = order_prom_list_cart[i];
@@ -4336,8 +4351,26 @@ Page({
             check_map[txt] = 1;
           }
  
-          //如果不立即购买或者秒杀，如果是线下库存购买的时候
-          if (goods.prom_type == 0 && th.data.sales_rules >= 2 && !g_item.whsle_id  && !getApp().is_virtual(g_item) ) {
+          goods.prom_type=parseInt(goods.prom_type+'');
+          var mo_num=getApp().get_limit_qty(g_item);
+          var steep=getApp().get_limit_qty(g_item,0,1);
+
+          if ([0,3,5,7,10].indexOf(goods.prom_type)>=-1){
+              if(mo_num>goods.goods_num){
+                 getApp().confirmBox(goods.goods_name + "的未到达起订数量");
+                 th.data.is_summit_ing = 0;
+                 return false;
+              }
+              if(steep>1 && (goods.goods_num-mo_num)%steep!=0 ){
+                getApp().confirmBox(goods.goods_name + "的购买的数量不是起订量的倍数");
+                th.data.is_summit_ing = 0;
+                return false;
+              }
+
+          }
+
+              //如果不立即购买或者秒杀，如果是线下库存购买的时候
+          if ([0,3,5,7,10].indexOf(goods.prom_type)>=-1 && th.data.sales_rules >= 2 && !g_item.whsle_id  && !getApp().is_virtual(g_item) ) {
             var isok = 1;
             await th.check_store_num(goods.goods_id, t_item.pickup_id, goods.goods_num, function (res) {
               isok = res;
@@ -163,6 +163,39 @@ Page({
     if (plist.length <= 0) {
       getApp().showWarning("没有更多数据");
       th.data.ismore = 0;
+
+
+
+      //没有数据切换
+      if (e.data.currentPage == 1 && this.data.type == 1) {
+
+
+        e.data.currentPage=1;
+        i = "/api/weshop/teamlist/pageteam/0?page=" + e.data.currentPage;
+        await getApp().request.promiseGet(i, {
+          isShowLoading: 0,
+          data: {
+            store_id: os.stoid,
+            is_end: 0,
+            is_show: 1,
+            user_id:getApp().globalData.user_id,
+          }
+        }).then(res => {
+          plist = res.data.data.pageData;
+        });
+
+        if(plist){
+          setTimeout(function () {
+            th.data.ismore = 1;
+            th.setData({
+              type: 0
+            });
+            th.requestSalelist();
+          }, 1000);
+        }
+
+      }
+
     }
     //--循环读取接口---
     for (var i = 0; i < plist.length; i++) {
@@ -1612,9 +1612,16 @@ Page({
       }
     }
  
+    var add_num=1;
+    var mo_num=getApp().get_limit_qty(a);
+    var steep=getApp().get_limit_qty(a,0,1);
+    if(steep>1){
+       add_num=steep;
+    }
+
  
     var e = {
-      goods_num: a.goods_num + 1,
+      goods_num: a.goods_num + add_num,
       id: a.id,
       goods_id: a.goods_id,
       store_id: oo.stoid
@@ -1640,16 +1647,26 @@ Page({
     }
  
  
+    var add_num=1;
+    var mo_num=getApp().get_limit_qty(a);
+    var steep=getApp().get_limit_qty(a,0,1);
+    if(steep>1){
+      add_num=steep;
+    }
  
-    if (1 != a.goods_num) {
-      var e = {
-        goods_num: a.goods_num - 1,
-        id: a.id,
-        goods_id: a.goods_id,
-        store_id: oo.stoid
-      };
-      this.postCardList(e, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems);
+    var e = {
+      goods_num: a.goods_num - add_num,
+      id: a.id,
+      goods_id: a.goods_id,
+      store_id: oo.stoid
+    };
+
+    if(e.goods_num<=0){
+      this.data.up_dating = 0;
+      return false;
     }
+    this.postCardList(e, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems);
+
   },
  
  
@@ -1668,7 +1685,10 @@ Page({
     var e = a;
     var th = this;
  
-    if (a = isNaN(t.detail.value) || t.detail.value < 1 ? 1 : parseInt(t.detail.value)) {
+
+    var mo_num=getApp().get_limit_qty(e);
+
+    if (a = isNaN(t.detail.value) || t.detail.value < mo_num ? mo_num : parseInt(t.detail.value)) {
       var s = {
         goods_num: a,
         goods_id: e.service_id,
@@ -1754,6 +1774,33 @@ Page({
   },
  
  
+  click_set_limit(gd_info,pitems,item){
+    var th=this;
+    var mo_num=getApp().get_limit_qty(gd_info);
+    var steep=getApp().get_limit_qty(gd_info,0,1);
+    if(gd_info.is_integral_normal || gd_info.is_pd_normal || [0,3,5,7,10].indexOf(gd_info.prom_type) > -1){
+
+      var ue = {
+        goods_num: gd_info.goods_num,store_id: oo.stoid,
+        id: gd_info.id,goods_id: gd_info.goods_id
+      };
+      var up_num=0;
+      if(mo_num>gd_info.goods_num){
+        up_num=mo_num;
+      }
+      if(gd_info.goods_num>mo_num && (gd_info.goods_num-mo_num)%steep!=0 && steep>1){
+        up_num=mo_num+ parseInt((gd_info.goods_num-mo_num)/steep)*steep+steep;
+      }
+      if(up_num){
+        ue.goods_num=up_num;
+        th.update_cart(ue, pitems, item);
+        var txt1 = "requestData[" + pitems + "].goods[" + item + "].goods_num";
+        th.setData({[txt1]:up_num })
+      }
+    }
+  },
+
+
   //---------------全选,全选的时候要判断是否门店的匹配方式一致--------------
   checkAll: async function () {
     var e = this,
@@ -1792,11 +1839,16 @@ Page({
             [txt]: 0,
           });
         }
+
         var fir = 0;
         for (var j = 0; j < item.length; j++) {
           if (item[j].is_gift) continue;
-
           var obj = JSON.parse(JSON.stringify(item[j]));
+          //-- 判断起购数量 --
+          if(!e.data.checkAllToggle){
+            th.click_set_limit(obj,i,j);
+          }
+
           //计算之前先移除组合购的计算
           if (obj.prom_type == 7)
             zh_calc.remove_zhprom(dda, i, obj);
@@ -1884,7 +1936,7 @@ Page({
  
           // if (!e.data.checkAllToggle) {
             //多门店优惠促销次数控制
-            if(dda[i].pro_off){
+            if(dda[i].pro_off || e.data.checkAllToggle){
               var txt = "requestData[" + i + "].selected";
               e.setData({
                 [txt]: 0,
@@ -2041,8 +2093,10 @@ Page({
     for (var i = 0; i < item.length; i++) {
       let pro_off1=false
       var txt = "requestData[" + pitems + "].goods[" + i + "].selected";
-
       var gd_info = item[i];
+
+       if(!sele) th.click_set_limit(gd_info,pitems,i)
+
       if (!getApp().is_virtual(gd_info) && th.data.sales_rules >= 2 && !gd_info.whsle_id && [1, 2, 4, 6, 8, 9].indexOf(gd_info.prom_type) == -1 && !gd_info.selected) {
         var ob = {};
         await th.check_down_line_next(gd_info, pitems, i, gd_info.erpwareid, function (res) {
@@ -2227,45 +2281,56 @@ Page({
       var gd_info = a;
  
       var erpwareid = gd_info.erpwareid;
-      if (!getApp().is_virtual(gd_info) && th.data.sales_rules >= 2 && !gd_info.whsle_id && [1, 2, 4, 6, 8, 9].indexOf(gd_info.prom_type) == -1 && !a.selected) {
-        var ob = {};
-        await th.check_down_line_next(gd_info, pitems, item, erpwareid, function (res) {
-          ob = res;
-        });
  
-        if (ob.code == -1) {
-
-          wx.showToast({
-            title: '购买数量超出商品库存',
-            icon: 'none',
-          });
+      //-- 如果是选中的时候 --
+      if(!a.selected){
  
-          return false;
-        } else {
-          if (th.data.sales_rules == 3) {
-            var goods_id = gd_info.goods_id;
-            var num = 0;
+        //-- 专门来设置商品订购数量 --
+        th.click_set_limit(gd_info,pitems,item)
+        if (!getApp().is_virtual(gd_info) && th.data.sales_rules >= 2
+            && !gd_info.whsle_id && [1, 2, 4, 6, 8, 9].indexOf(gd_info.prom_type) == -1 ) {
  
-            for (let i = 0; i < th.data.requestData.length; i++) {
-              if (pitems == i) continue;
-              var it = th.data.requestData[i].goods.find((e) => {
-                return e.goods_id == goods_id;
-              })
-              if (it && it.selected) num += it.goods_num
-            }
+            var ob = {};
+            await th.check_down_line_next(gd_info, pitems, item, erpwareid, function (res) {
+              ob = res;
+            });
+            if (ob.code == -1) {
  
-            if (num > ob.CanOutQty) {
               wx.showToast({
                 title: '购买数量超出商品库存',
                 icon: 'none',
               });
  
               return false;
+            } else {
+              if (th.data.sales_rules == 3) {
+                var goods_id = gd_info.goods_id;
+                var num = 0;
+
+                for (let i = 0; i < th.data.requestData.length; i++) {
+                  if (pitems == i) continue;
+                  var it = th.data.requestData[i].goods.find((e) => {
+                    return e.goods_id == goods_id;
+                  })
+                  if (it && it.selected) num += it.goods_num
+                }
+
+                if (num > ob.CanOutQty) {
+                  wx.showToast({
+                    title: '购买数量超出商品库存',
+                    icon: 'none',
+                  });
+
+                  return false;
+                }
+              }
             }
-          }
+
         }
  
       }
+
+
       let pro_off=false
       //判断多店优惠促销次数控制
       if (th.data.requestData.length>1) {
@@ -2536,6 +2601,32 @@ Page({
       user_id = getApp().globalData.user_id;
  
     function normal_check(store_count, goodsinfo, wareIds) {
+
+
+      // getApp().my_warnning('购买数量超出商品库存', 0, th);
+      var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
+      //-- 要判断是不是起订量不购 --
+      if([0,3,5,7,10].indexOf(goodsinfo.prom_type)>-1){
+        var mo_num=getApp().get_limit_qty(goodsinfo);
+        var steep=getApp().get_limit_qty(goodsinfo,0,1);
+        if(mo_num>1 && t.goods_num<mo_num){
+          wx.showToast({
+            title: '购买数量小于商品的起订量',
+            icon: 'none',
+          });
+          t.goods_num =0;
+        }
+        if(steep>1 && t.goods_num>mo_num && (t.goods_num-mo_num)%steep!=0 ){
+
+          wx.showToast({
+            title: '购买数量必须是起订量的倍数',
+            icon: 'none',
+          });
+          t.goods_num =mo_num+parseInt((t.goods_num-mo_num)/steep+'')*steep+steep;
+        }
+      }
+
+
       //--- 看一下是不是线下库存 ---
       if (!getApp().is_virtual(goodsinfo) && th.data.sales_rules >= 2 && !goodsinfo.whsle_id) {
         th.check_down_line(t, pitem, item, wareIds);
@@ -2545,8 +2636,6 @@ Page({
             title: '购买数量超出商品库存',
             icon: 'none',
           });
-          // getApp().my_warnning('购买数量超出商品库存', 0, th);
-          var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
           e.setData({
             [txt]: store_count
           });
@@ -2620,7 +2709,29 @@ Page({
           });
           e.doCheckAll();
  
-          t.goods_num = cbuy > 0 ? cbuy : limit,
+          t.goods_num = cbuy > 0 ? cbuy : limit;
+
+          if([0,3,5,7,10].indexOf(goodsinfo.prom_type)>-1){
+              var mo_num=getApp().get_limit_qty(goodsinfo);
+              var steep=getApp().get_limit_qty(goodsinfo,0,1);
+              if(mo_num>1 && t.goods_num<mo_num){
+                wx.showToast({
+                  title: '购买数量小于商品的起订量',
+                  icon: 'none',
+                });
+                t.goods_num=0;
+
+              }
+              if(steep>1 && t.goods_num>mo_num && (t.goods_num-mo_num)%steep!=0 ){
+
+                wx.showToast({
+                  title: '购买数量必须是起订量的倍数',
+                  icon: 'none',
+                });
+
+                t.goods_num=mo_num+parseInt((t.goods_num-mo_num)/steep+'')*steep
+              }
+          }
             // t.goods_num = cbuy > 0 ? cbuy : 0,
             e.update_cart(t, pitem, item);
           return false;
@@ -3370,6 +3481,38 @@ Page({
             }
             glist += i_arr[j].goods_id + ",";
             ab = 1;
+
+            //判断商品的起订数量
+            var mo_num=getApp().get_limit_qty(i_arr[j]);
+            var steep=getApp().get_limit_qty(i_arr[j],0,1);
+            var py_type= parseInt(i_arr[j].prom_type+'');
+
+            if([0,3,5,7,10].indexOf(py_type)>-1){
+
+              if(mo_num>i_arr[j].goods_num){
+                getApp().confirmBox(i_arr[j].goods_name + "的未到达起订数量");
+                wx.hideLoading();
+                return false;
+              }
+              if(steep>1 && (i_arr[j].goods_num-mo_num)%steep!=0 ){
+                getApp().confirmBox(i_arr[j].goods_name + "的购买的数量不是起订量的倍数");
+                var num=mo_num+ parseInt((i_arr[j].goods_num-mo_num)/steep)*steep+steep;
+                var e = {
+                  goods_num: num,
+                  id: i_arr[j].id,
+                  goods_id: i_arr[j].goods_id,
+                  store_id: oo.stoid
+                };
+
+                th.postCardList(e, j, i);
+
+                wx.hideLoading();
+                return false;
+              }
+
+            }
+
+
  
             //--普通商品，如果有开启线下库存的功能，要调用线下库存进行计算,赠品不要进行调用线下库存---
             if ((i_arr[j].prom_type == 0 || i_arr[j].prom_type == 3 || i_arr[j].prom_type == 5 || i_arr[j].prom_type == 7 || i_arr[j].prom_type == 10  ||
@@ -42,6 +42,7 @@
       <!-- 门店底下的商品 -->
       <view class="store">
         <view class="shmd_m">
+
           <!-- 门店 -->
           <icon wx:if="{{checkAllToggle||item.selected}}" class="order-raido flex-center"  bindtap="check_th_all_item" data-pitems="{{pidx}}"
                   color="red" size="20" type="success"></icon>
@@ -158,7 +158,7 @@
  
  
  
-                        <block wx:elif="{{data.store_count<=0}}">
+                        <block wx:elif="{{data.store_count<(mo_num?mo_num:1)}}">
                             <view class="spec-cart-btn fs32" data-action="add"
                                   style="background-color: #dcdcdc;color: #999">库存不足
                             </view>
@@ -1102,6 +1102,8 @@ Page({
             });
  
  
+
+
             //获取统一条形码,普通商品和优惠促销的商品
             if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7 || ee.data.data.prom_type == 9 || ee.data.data.prom_type == 10) {
  
@@ -1109,6 +1111,7 @@ Page({
               //-- 更新默认购买的数量 ---
               var mo_num=getApp().get_limit_qty(t.data.data);
               ee.setData({goodsInputNum:mo_num})
+              ee.setData({mo_num:mo_num})
  
               ee.get_sto();
               ee.get_sku(o.stoid, t.data.data, gid);
@@ -1194,6 +1197,7 @@ Page({
           setTimeout(()=> {
             console.log('cccc');
             console.log(th.data.prom_type);
+
           },500)
  
  
@@ -1205,11 +1209,8 @@ Page({
     console.log('aaaaaaaaaa');
     console.log(this.data.prom_type);
  
-    this.data.enterAddressPage && (this.data.enterAddressPage = !1);
-
-
-
  
+    this.data.enterAddressPage && (this.data.enterAddressPage = !1);
  
  
   },
@@ -1939,6 +1940,9 @@ Page({
           th.add_cart_next(e, t, a, o, newd); //加入购物车下一步
         }
       }
+
+
+
     })
   },
  
@@ -2402,7 +2406,7 @@ Page({
  
      var add_num=1;
      var p_type=parseInt(this.data.prom_type)
-     if([1,2,4,6,8,9].indexOf(p_type)==-1 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1){
+     if([1,2,4,6,8,9].indexOf(p_type)==-1 || this.data.openSpecModal_inte_normal == 1 || this.data.is_normal == 1){
        add_num=getApp().get_limit_qty(this.data.sele_g,0,1);
      }
  
@@ -2413,7 +2417,7 @@ Page({
  
     var add_num=1;
     var p_type=parseInt(this.data.prom_type)
-    if([1,2,4,6,8,9].indexOf(p_type)==-1 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1){
+    if([1,2,4,6,8,9].indexOf(p_type)==-1 || this.data.openSpecModal_inte_normal == 1 || this.data.is_normal == 1){
       add_num=getApp().get_limit_qty(this.data.sele_g,0,1);
     }
     this.checkCartNum(this.data.goodsInputNum - add_num);
@@ -2440,6 +2444,8 @@ Page({
   //------检查数量是不是超出限购------
   checkCartNum: function (t) {
     var th = this;
+    var mo_num=getApp().get_limit_qty(th.data.sele_g);
+    var steep=getApp().get_limit_qty(th.data.sele_g,0,1);
     this.get_buy_num(this.data.sele_g, async function () {
  
       //--判断商品是否超出限购--
@@ -2528,12 +2534,33 @@ Page({
         });
         // wx.showModal({title: '库存不足',});
         if (e < 0) e = 0;
+
+        //只有普通商品才有起购数
+        if([1,2,4,6,8,9].indexOf(p_type)==-1 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1){
+          if(e<mo_num) e=mo_num;
+          if(e>mo_num && (e-mo_num)%steep!=0){
+            e=mo_num+ parseInt((e-mo_num)/steep)*steep;
+          }
+        }
         th.setData({
           goodsInputNum: e
         });
         return false;
       }
+
+
+      //var steep=getApp().get_limit_qty(th.data.sele_g,0,1);
+
+
       t > e || 0 == e ? t = e : t < 1 && (t = 1);
+
+
+      //只有普通商品才有起购数
+      if([1,2,4,6,8,9].indexOf(p_type)==-1 || th.data.openSpecModal_inte_normal == 1 || th.data.is_normal == 1){
+        if(t<mo_num) t=mo_num;
+      }
+
+
       th.setData({
         goodsInputNum: t
       });
@@ -4943,6 +4970,7 @@ Page({
  
     var th = this;
     var ind = parseInt(e.currentTarget.dataset.it);
+    var mo_num=getApp().get_limit_qty(this.data.sele_g);
  
     //如果是拼单活动的普通购买
     if (ind == 1) {
@@ -4956,14 +4984,19 @@ Page({
         th.get_sto(1);
         th.setData({
           is_normal: ind,
-          openSpecModal_pt: 1
+          openSpecModal_pt: 1,
+          goodsInputNum: mo_num,
+          mo_num:mo_num
+
         });
       } else {
         th.get_sto(1);
         th.get_sku(o.stoid, th.data.data, th.data.gid, 1, function () {
           th.setData({
             is_normal: ind,
-            openSpecModal_pt: 1
+            openSpecModal_pt: 1,
+            goodsInputNum: mo_num,
+            mo_num:mo_num
           });
         });
       }
@@ -4972,6 +5005,10 @@ Page({
  
       if (th.data.is_normal) {
         th.data.g_buy_num = new Map();
+        th.setData({
+          goodsInputNum: mo_num,
+          mo_num:mo_num
+        });
       }
  
       //拼单商品从这里进，先判断有没有买过商品，
@@ -8064,10 +8101,14 @@ Page({
   openSpecModel_Nor: function () {
     this.data.g_buy_num = new Map();
     var th = this;
+    var mo_num=getApp().get_limit_qty(this.data.sele_g);
+
     this.setData({
       open_ind_store: 5,
-      goodsInputNum: 1
+      goodsInputNum: mo_num,
+      mo_num:mo_num
     }); //拼团直接给4
+
     if (th.data.sku_g_pt) {
       this.get_sto(1)
       this.setData({
@@ -1399,7 +1399,7 @@
               <block wx:else>
                 <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
                 <block wx:if="{{sales_rules>=2 && prom_type==0 && !sele_g.whsle_id && !filters.is_virtual_gd(sele_g.is_virtual) }}">
-                  <block wx:if="{{!def_pick_store.CanOutQty}}">
+                  <block wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<mo_num }}">
                     <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
                       库存不足
                     </view>
@@ -1415,7 +1415,7 @@
                 </block>
                 <!-- 线上销售 -->
                 <block wx:else>
-                  <block wx:if="{{sele_g.store_count<=0 && is_no_new}}">
+                  <block wx:if="{{(sele_g.store_count<=0 || sele_g.store_count<mo_num ) && is_no_new}}">
                     <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
                       库存不足
                     </view>