小程序提交起订量的优化

yvan.ni
1 parent 2fe25ed6
Showing 10 changed files with 26 additions and 23 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
packageE/pages/cart/cart2/cart2.js
pages/cart/cart/cart.js
pages/goods/goodsInfo/buy_com_pop.wxml
pages/goods/goodsInfo/buy_integral.wxml
pages/goods/goodsInfo/buy_pt.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
@@ -25,15 +25,14 @@
           <block wx:if="{{is_normal==1}}">
             <view class="flex">
 			  <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
-
-                <block wx:if="{{!filters.is_virtual_gd(sele_g.is_virtual)}}">
                       <block wx:if="{{sales_rules>=2}}">
-                         <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>
-                         <view class="spec-goods-stock" wx:else>可售:0</view>
+                          <block wx:if="{{!filters.is_virtual_gd(sele_g.is_virtual)}}">
+                          <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>
+                          <view class="spec-goods-stock" wx:else>可售:0</view>
+                          </block>
                       </block>
                       <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block>
-                </block>
-            </view>
+              </view>
           </block>
           <!-- <block wx:if="{{is_normal==0}}">
             <view class="flex">
@@ -4469,9 +4469,7 @@ Page({
   //-----------------拼单生成方法---------------------
   addCart_pt: function () {
-    this.setData({
-      openSpecModal_pt: 0,
-    });
+
     if (this.data.is_normal == 0) {
       //看一下有没有起购数，如果有起购数，要计算起购数
       // var qnum = parseFloat(th.data.prom_act.minbuynum);
@@ -1186,7 +1186,7 @@
               <block wx:else>
                 <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
                 <block wx:if="{{sales_rules>=2 && prom_type==0}}">
-                  <block wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<mo_num}}">
+                  <block wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<1}}">
                     <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
                       库存不足
                     </view>
@@ -1202,7 +1202,7 @@
                 </block>
                 <!-- 线上销售 -->
                 <block wx:else>
-                  <block wx:if="{{sele_g.store_count<(mo_num?mo_num:1)}}">
+                  <block wx:if="{{sele_g.store_count<1}}">
                     <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
                       库存不足
                     </view>
@@ -4069,7 +4069,7 @@ Page({
       if ([0,3,5,7,10].indexOf(goods.prom_type)>-1){
         if(mo_num>goods.goods_num){
-          getApp().confirmBox(goods.goods_name + "的未到达起订数量");
+          getApp().confirmBox(goods.goods_name + "的未达到起订数量");
           th.data.is_summit_ing = 0;
           return false;
         }
@@ -4452,7 +4452,7 @@ Page({
           if ([0,3,5,7,10].indexOf(goods.prom_type)>-1){
               if(mo_num>goods.goods_num){
-                 getApp().confirmBox(goods.goods_name + "的未到达起订数量");
+                 getApp().confirmBox(goods.goods_name + "的未达到起订数量");
                  th.data.is_summit_ing = 0;
                  return false;
               }
@@ -3511,7 +3511,7 @@ Page({
             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 + "的未到达起订数量");
+                getApp().confirmBox(i_arr[j].goods_name + "的未达到起订数量");
                 wx.hideLoading();
                 return false;
               }
@@ -141,7 +141,7 @@
                     </block>
                     <block wx:else>
                         <block wx:if="{{sales_rules>=2  && !sele_g.whsle_id }}">
-                            <view wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<mo_num }}" class="spec-cart-btn fs32" data-action="add"
+                            <view wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<1 }}" class="spec-cart-btn fs32" data-action="add"
                                   style="background-color: #dcdcdc;color: #999">库存不足
                             </view>
                             <block wx:else>
@@ -156,7 +156,7 @@
                             </block>
                         </block>
-                        <block wx:elif="{{data.store_count<(mo_num?mo_num:1)}}">
+                        <block wx:elif="{{data.store_count<1}}">
                             <view class="spec-cart-btn fs32" data-action="add"
                                   style="background-color: #dcdcdc;color: #999">库存不足
                             </view>
@@ -48,7 +48,7 @@
 		      						 <block wx:else>
 										  <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
 		      					     	  <view wx:elif="{{def_pick_store && sales_rules>=2 && prom_type==0}}">
-											  <block wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<mo_num}}">(库存不足)</block>
+											  <block wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<1}}">(库存不足)</block>
 										  </view>
 		      						 </block>				       
 		      				   </block>
@@ -183,7 +183,7 @@
                              <block wx:else>
                                  <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
                                  <block wx:if="{{sales_rules>=2 && !sele_g.whsle_id}}">
-                                     <block wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<mo_num}}">
+                                     <block wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<1}}">
                                          <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
                                              库存不足
                                          </view>
@@ -194,7 +194,7 @@
                                  </block>
                                  <!-- 线上销售 -->
                                  <block wx:else>
-                                     <block wx:if="{{sele_g.store_count<(mo_num?mo_num:1) && is_no_new}}">
+                                     <block wx:if="{{sele_g.store_count<1 && is_no_new}}">
                                          <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
                                              库存不足
                                          </view>
@@ -2407,12 +2407,18 @@ Page({
   },
   //----------减少购买数量-----------
   subCartNum: function (t) {
-
     var add_num=1;
     var p_type=parseInt(this.data.prom_type)
     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, this.data.is_act, 1);
-
+        var mo_num = getApp().get_limit_qty(this.data.sele_g, this.data.is_act);
+        if(this.data.goodsInputNum - add_num<mo_num){
+            wx.showToast({
+              title: '购买数量不能小于起订量',
+              icon: 'none',
+            });
+            return false;
+        }
     }
     this.checkCartNum(this.data.goodsInputNum - add_num);
   },
@@ -1410,7 +1410,7 @@
                 <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
                 <block wx:if="{{sales_rules>=2 && prom_type==0 && !sele_g.whsle_id}}">
-                  <block wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<mo_num }}">
+                  <block wx:if="{{!def_pick_store.CanOutQty || def_pick_store.CanOutQty<1 }}">
                     <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
                       库存不足
                     </view>
@@ -1426,7 +1426,7 @@
                 </block>
                 <!-- 线上销售 -->
                 <block wx:else>
-                  <block wx:if="{{ sele_g.store_count<(mo_num?mo_num:1)  && is_no_new}}">
+                  <block wx:if="{{ sele_g.store_count<1  && is_no_new}}">
                     <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
                       库存不足
                     </view>