From 5b4a39f270f7e26e14ebfe1f228a05c38e2ce6c1 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 12 Jun 2023 21:35:42 +0800
Subject: [PATCH] 1、优化起订量，倍数 2、优化虚拟商品

---
 packageA/pages/goodsInfo/buy_flash_normal.wxml                  |   2 +-
 packageA/pages/goodsInfo/goodsInfo.js                           |  31 ++++++++-----------------------
 packageA/pages/goodsInfo/goodsInfo.wxml                         |  48 ++++++++++++++++++++++++++----------------------
 packageA/pages/prom_list/prom_list.wxml                         |   5 ++---
 packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml            |  17 ++++++++++-------
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js   | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------
 packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml |   7 ++++---
 packageC/pages/presell/goodsInfo/goodsInfo.wxml                 |   4 ++--
 packageC/pages/presell/pregoodsInfo/goodsInfo.wxml              |   2 +-
 pages/cart/cart/cart.js                                         |  20 ++++++++++++++------
 pages/goods/goodsInfo/buy_com_pop.wxml                          |   8 +++-----
 pages/goods/goodsInfo/buy_integral.wxml                         |   4 +++-
 pages/goods/goodsInfo/buy_pt.wxml                               |   8 ++++----
 pages/goods/goodsInfo/goodsInfo.wxml                            |  18 ++++++++++++------
 pages/user/order_detail/order_detail.js                         |  11 ++++++++---
 pages/user/order_list/order_list.js                             |   7 ++++++-
 16 files changed, 157 insertions(+), 203 deletions(-)

diff --git a/packageA/pages/goodsInfo/buy_flash_normal.wxml b/packageA/pages/goodsInfo/buy_flash_normal.wxml
index 72e8a72..42280d9 100644
--- a/packageA/pages/goodsInfo/buy_flash_normal.wxml
+++ b/packageA/pages/goodsInfo/buy_flash_normal.wxml
@@ -51,7 +51,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}}">(配送不匹配)</view>
-		      					     	  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</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>
 		      						 </block>				       
 		      				   </block>		      				   	   
 		                       <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 94ec55b..9746d05 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -510,16 +510,7 @@ Page({
 			});
 		};
 		// <---- 秒杀
-		
-		
-
-		
-		
-		
-		
 
-		
-		
     //------是否收藏----------
     await getApp().request.promiseGet("/api/weshop/goodscollect/page", {
       data: {
@@ -1027,21 +1018,15 @@ Page({
 									});
                                     is_ok=0;
 									return false;
-								};
-							};
-							
-							
-						});
-						
-						
-						
-					};
-				});
+								}
+							}
+						})
+
+					}
+				})
 				
-			};
-			
-			
-		};
+			}
+		}
 		
 
         if(!is_ok) return false;
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index c93b2fd..101a376 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -638,6 +638,7 @@
 
 <!-- 弹起来,选择规格数量,普通商品购买和秒杀 -->
 <view hidden="{{!openSpecModal}}">
+
 	<view bindtap="closeSpecModal" class="cover-layer"></view>
 	<view class="spec-model">
 		<view class="pding">
@@ -685,7 +686,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}}">(配送不匹配)</view>
-					<view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</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>
 				</block>
 			</block>
 
@@ -716,7 +717,6 @@
 				</block>
 				<block wx:else>
 
-
 					<block wx:if="{{only_pk.length && !only_pk.length}}">
 						<view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
 					</block>
@@ -724,29 +724,33 @@
 						<block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
 							<view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
 						</block>
+
 						<block wx:else>
 							<block wx:if="{{!def_pick_store}}">
+
 								<view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
 							</block>
 							<block wx:else>
-								<!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
-								<block wx:if="{{sales_rules==2 && prom_type==0}}">
-									<block wx:if="{{!def_pick_store.CanOutQty}}">
-										<view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
-									</block>
-									<block wx:else>
-										<view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
-										<view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy">
-											{{sele_g.offline_price?"券后购买":"立即购买"}}
-										</view>
-									</block>
-								</block>
-								<!-- 线上销售 -->
-								<block wx:else>
-									<block wx:if="{{sele_g.store_count<=0}}">
-										<view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
-									</block>
-									<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}}">-->
+<!--										<view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>-->
+<!--									</block>-->
+<!--									<block wx:else>-->
+<!--										<view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>-->
+<!--										<view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy">-->
+<!--											{{sele_g.offline_price?"券后购买":"立即购买"}}-->
+<!--										</view>-->
+<!--									</block>-->
+<!--								</block>-->
+
+								<!-- 线上销售，也没有线上库存 -->
+<!--								<block wx:else>-->
+<!--									<block wx:if="{{sele_g.store_count<=0}}">-->
+<!--										<view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>-->
+<!--									</block>-->
+<!--									<block wx:else>-->
 										<view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32 {{!sto_sele_name?'gray':''}}"
 										 data-action="add">加入购物车</view>
 										 <!-- 秒杀 -->
@@ -765,8 +769,8 @@
 											 </view>
 											</block>
 											
-									</block>
-								</block>
+<!--									</block>-->
+<!--								</block>-->
 							</block>
 						</block>
 					</block>
diff --git a/packageA/pages/prom_list/prom_list.wxml b/packageA/pages/prom_list/prom_list.wxml
index d5dad88..5b7cb2b 100644
--- a/packageA/pages/prom_list/prom_list.wxml
+++ b/packageA/pages/prom_list/prom_list.wxml
@@ -113,7 +113,7 @@
                     <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
                     <block wx:else>
 						<view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(配送不匹配)</view>
-                        <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules>=2 && prom_type==0}}">(库存不足)</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>
                     </block>
                 </block>
 
@@ -160,9 +160,8 @@
                             <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
                         </block>
                         <block wx:else>
-                            <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
+                            <!-- 如果是线下库存购买的时候, 此时不要计算起订量-->
                             <block wx:if="{{sales_rules>=2}}">
-
                                 <block wx:if="{{!def_pick_store.CanOutQty}}">
                                     <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
                                 </block>
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
index 15fa211..3b02402 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
@@ -25,11 +25,14 @@
           <block wx:if="{{is_normal==1}}">
             <view class="flex">
 			  <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
-              <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>
-              <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block>   
+
+                <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>
+                      <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block>
+                </block>
             </view>
           </block>
           <!-- <block wx:if="{{is_normal==0}}">
@@ -70,8 +73,8 @@
           </view>
         </view>
 		<view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
-		<view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view>
-        <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view>
+		<view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0  && !filters.is_virtual_gd(sele_g.is_virtual) }}">(库存不足)</view>
+        <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view>
       </view>
       <!----商品的属性项目---->
      <view> 
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index bf256a7..3fc1d37 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -3371,6 +3371,7 @@ Page({
                 all_sto: newarr
               });
 
+
             } else {
               th.setData({
                 is_show_sto_cat: -1,
@@ -3434,8 +3435,6 @@ Page({
     var g_distr_type = th.data.sele_g.distr_type;
     var lock = [];
 
-
-
     var lock_rq = {
       store_id: os.stoid,
       wareId: th.data.sele_g.goods_id,
@@ -4318,7 +4317,7 @@ Page({
   // ind == 1 为普通购买
   openSpecModel_pt: function (e) {
 
-    this.setData({ open_ind_store: 9, goodsInputNum: mo_num });
+    this.setData({ open_ind_store: 9 });
     // 判断是否有待支付订单
     var aid = this.data.group_id;
     var switOn = true;
@@ -4678,69 +4677,68 @@ Page({
     }
   },
 
-    //统一一下获取线下库存的函数
-    async check_CanOutQty(goodsinfo, item, func) {
-
-      var sales_rules = this.data.sales_rules;
+  //统一一下获取线下库存的函数
+  async check_CanOutQty(goodsinfo, item, func) {
 
-      //如果默认是商品
-      if(getApp().is_virtual(goodsinfo)){
-        return func(100000);
-      }
-
-      var lock_rq = {
-        store_id: os.stoid,
-        wareId: goodsinfo.goods_id,
-        pageSize: 1000
-      };
+    var sales_rules = this.data.sales_rules;
+    //如果默认是商品
+    if(getApp().is_virtual(goodsinfo)){
+      return func(100000);
+    }
 
-      if (sales_rules == 2) {
-        lock_rq.storageId = item.pickup_id
-      } else {
-        lock_rq.appoint_pick_keyid = encodeURIComponent(this.data.appoint_pick_keyid)
-      }
+    var lock_rq = {
+      store_id: os.stoid,
+      wareId: goodsinfo.goods_id,
+      pageSize: 1000
+    };
 
-      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;
-        }
-      })
+    if (sales_rules == 2) {
+      lock_rq.storageId = item.pickup_id
+    } else {
+      lock_rq.appoint_pick_keyid = encodeURIComponent(this.data.appoint_pick_keyid)
+    }
 
-      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)
+    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)
+    }
 
 
-      //读取线下的门店库存
-      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;
+    //读取线下的门店库存
+    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 (func) func(CanOutQty);
+    if (plist && plist.CanOutQty - lock > 0) {
+      CanOutQty = plist.CanOutQty - lock;
+    }
 
-    },
+    if (func) func(CanOutQty);
+
+  },
 
 
   //----------立即购买_pt-----------
@@ -6415,7 +6413,7 @@ Page({
       }
     })
 
-    if (r_data.ladderLists) {
+    if (r_data && r_data.ladderLists) {
       var act_id = r_data.ladderLists[0].form_id;
       //-- 判断会员能不能参与阶梯促销 --
       await getApp().request.promiseGet("/api/weshop/prom/ladderForm/getNew/" + os.stoid + "/" + user_id + "/" + act_id, {}).then(res => {
@@ -6454,7 +6452,6 @@ Page({
     if(this.data.zh_act || this.data.prom_goods || this.data.jieti_prom || this.data.collocationGoods ){
       this.data.is_act=1;
     }
-
     //-- 更新默认购买的数量 ---
     var mo_num=getApp().get_limit_qty(th.data.sele_g,this.data.is_act);
     this.setData({goodsInputNum:mo_num})
@@ -7090,65 +7087,6 @@ Page({
 		});
 	},
 
-    //统一一下获取线下库存的函数
-    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)
-    }
-
-
-
-    //读取线下的门店库存
-    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;
-    }
-
-    if (func) func(CanOutQty);
-
-  },
-
 
   async getUserBuyPromNum(prom_id){
     var userInfo = getApp().globalData.userInfo;
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index 8b166fc..aabdb7f 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -1151,6 +1151,7 @@
         <text wx:if="{{hui_condition.zxlb_id>0}}">，送专享礼包</text>
       </view>
     </view>
+
     <view class="spec-cart-btns">
       <view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
         配送不匹配
@@ -1182,8 +1183,8 @@
               </block>
               <block wx:else>
                 <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
-                <block wx:if="{{!filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0}}">
-                  <block wx:if="{{!def_pick_store.CanOutQty}}">
+                <block wx:if="{{sales_rules>=2 && prom_type==0}}">
+                  <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>
@@ -1199,7 +1200,7 @@
                 </block>
                 <!-- 线上销售 -->
                 <block wx:else>
-                  <block wx:if="{{sele_g.store_count<=0}}">
+                  <block wx:if="{{sele_g.store_count<(mo_num?mo_num:1)}}">
                     <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
                       库存不足
                     </view>
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
index ca90d87..3c52dfc 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -194,7 +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 && sales_rules>=2 && prom_type==0}}">
                   (库存不足)
                 </view>
               </block>
@@ -630,7 +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>
diff --git a/packageC/pages/presell/pregoodsInfo/goodsInfo.wxml b/packageC/pages/presell/pregoodsInfo/goodsInfo.wxml
index 53f3938..c079331 100644
--- a/packageC/pages/presell/pregoodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/pregoodsInfo/goodsInfo.wxml
@@ -603,7 +603,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 && 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>
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index b966a6a..2e57e80 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -1614,7 +1614,7 @@ Page({
     var add_num=1;
     //调用接口判断是不是促销活动的商品
     if([0,3,5,7,10].indexOf(a.prom_type) > -1){
-        var cx_arr=await getApp().jc(a.goods_id,user_id);
+        var cx_arr=await getApp().get_has_cx_act(a.goods_id);
         var steep=getApp().get_limit_qty(a,cx_arr.length,1);
         if(steep>1){
           add_num=steep;
@@ -2102,7 +2102,7 @@ Page({
          th.click_set_limit(gd_info,pitems,i,act)
       }
 
-      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) {
+      if (!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) {
           ob = res;
@@ -2293,8 +2293,7 @@ Page({
         var act=await getApp().get_has_cx_act(gd_info.goods_id);
         //-- 专门来设置商品订购数量 --
         th.click_set_limit(gd_info,pitems,item,act)
-        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 ) {
+        if (th.data.sales_rules >= 2 && !gd_info.whsle_id && [1, 2, 4, 6, 8, 9].indexOf(gd_info.prom_type) == -1 ) {
 
             var ob = {};
             await th.check_down_line_next(gd_info, pitems, item, erpwareid, function (res) {
@@ -2634,7 +2633,7 @@ Page({
 
 
       //--- 看一下是不是线下库存 ---
-      if (!getApp().is_virtual(goodsinfo) && th.data.sales_rules >= 2 && !goodsinfo.whsle_id) {
+      if (th.data.sales_rules >= 2 && !goodsinfo.whsle_id) {
         th.check_down_line(t, pitem, item, wareIds);
       } else {
         if (t.goods_num > store_count) {
@@ -3273,6 +3272,15 @@ Page({
   async check_down_line_next(t, pitem, item, erpwareid, func) {
 
     var goodsinfo = this.data.requestData[pitem].goods[item];
+    if(getApp().is_virtual(goodsinfo)){
+      var ob = {};
+      ob.code = 1;
+      ob.CanOutQty = 100000;
+      func(ob);
+      return false;
+    }
+
+
     var lock = 0,
       pick_no, plist;
 
@@ -3529,7 +3537,7 @@ Page({
             
             //--普通商品，如果有开启线下库存的功能，要调用线下库存进行计算,赠品不要进行调用线下库存---
             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  ||
-              i_arr[j].need_downlow_num)  && !getApp().is_virtual(i_arr[j]) && th.data.sales_rules >= 2 && i_arr[j].is_gift != 1 && !i_arr[j].whsle_id) {
+              i_arr[j].need_downlow_num) && th.data.sales_rules >= 2 && i_arr[j].is_gift != 1 && !i_arr[j].whsle_id) {
               //--获取商品的线下商品ID--
               
               var gd = null;
diff --git a/pages/goods/goodsInfo/buy_com_pop.wxml b/pages/goods/goodsInfo/buy_com_pop.wxml
index ee65537..80fd82f 100644
--- a/pages/goods/goodsInfo/buy_com_pop.wxml
+++ b/pages/goods/goodsInfo/buy_com_pop.wxml
@@ -57,7 +57,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}}">(配送不匹配)</view>
-            <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules>=2 && !filters.is_virtual_gd(sele_g.is_virtual)  }}">
+            <view wx:elif="{{def_pick_store &&  !def_pick_store.CanOutQty  && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2}}">
                 (库存不足)
             </view>
         </block>
@@ -140,8 +140,8 @@
                         </view>
                     </block>
                     <block wx:else>
-                        <block wx:if="{{sales_rules>=2  && !sele_g.whsle_id && !filters.is_virtual_gd(sele_g.is_virtual) }}">
-                            <view wx:if="{{!def_pick_store.CanOutQty}}" class="spec-cart-btn fs32" data-action="add"
+                        <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"
                                   style="background-color: #dcdcdc;color: #999">库存不足
                             </view>
                             <block wx:else>
@@ -156,8 +156,6 @@
                             </block>
                         </block>
 
-
-
                         <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">库存不足
diff --git a/pages/goods/goodsInfo/buy_integral.wxml b/pages/goods/goodsInfo/buy_integral.wxml
index 6f05c80..cf62a58 100644
--- a/pages/goods/goodsInfo/buy_integral.wxml
+++ b/pages/goods/goodsInfo/buy_integral.wxml
@@ -47,7 +47,9 @@
 		      				         <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}}">(配送不匹配)</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>
+		      					     	  <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>
+										  </view>
 		      						 </block>				       
 		      				   </block>
 		      				   	   
diff --git a/pages/goods/goodsInfo/buy_pt.wxml b/pages/goods/goodsInfo/buy_pt.wxml
index 4a302f1..00c864b 100644
--- a/pages/goods/goodsInfo/buy_pt.wxml
+++ b/pages/goods/goodsInfo/buy_pt.wxml
@@ -73,7 +73,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}}">(配送不匹配)</view>
-                  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual)  && sales_rules>=2 && is_normal}}">(库存不足)</view>
+                  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && is_normal}}">(库存不足)</view>
               </block>
           </block>
 
@@ -182,8 +182,8 @@
 
                              <block wx:else>
                                  <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
-                                 <block wx:if="{{sales_rules>=2 && !sele_g.whsle_id && !filters.is_virtual_gd(sele_g.is_virtual) }}">
-                                     <block wx:if="{{!def_pick_store.CanOutQty}}">
+                                 <block wx:if="{{sales_rules>=2 && !sele_g.whsle_id}}">
+                                     <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>
@@ -194,7 +194,7 @@
                                  </block>
                                  <!-- 线上销售 -->
                                  <block wx:else>
-                                     <block wx:if="{{sele_g.store_count<=0 && is_no_new}}">
+                                     <block wx:if="{{sele_g.store_count<(mo_num?mo_num:1) && is_no_new}}">
                                          <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
                                              库存不足
                                          </view>
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index d41e3c8..7fab3ed 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -685,7 +685,7 @@
                   <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
                     (配送不匹配)
                   </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 && !sele_g.whsle_id}}">
+                  <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules>=2 && prom_type==0 && !sele_g.whsle_id}}">
                     (库存不足)
                   </view>
                 </block>
@@ -1372,6 +1372,8 @@
         <text wx:if="{{hui_condition.monthgiftbag_id>0}}">，送每月礼包</text>
       </view>
     </view>
+
+    <!-- 底部处理按钮 -->
     <view class="spec-cart-btns">
       <view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
         配送不匹配
@@ -1402,8 +1404,12 @@
                 </view>
               </block>
               <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="{{sales_rules>=2 && prom_type==0 && !sele_g.whsle_id}}">
+
                   <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">
                       库存不足
@@ -1420,7 +1426,7 @@
                 </block>
                 <!-- 线上销售 -->
                 <block wx:else>
-                  <block wx:if="{{(sele_g.store_count<=0 || sele_g.store_count<mo_num ) && is_no_new}}">
+                  <block wx:if="{{ sele_g.store_count<(mo_num?mo_num:1)  && is_no_new}}">
                     <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
                       库存不足
                     </view>
@@ -1619,7 +1625,7 @@
                   <view class="flex-vertical-between butttem5">
                     <view class="flex xc-ash">
                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}
-                        <text class="c-red22" wx:if="{{item.is_no_qyt && !filters.is_virtual_gd(sele_g.is_virtual)}}">(库存不足)</text>
+                        <text class="c-red22" wx:if="{{item.is_no_qyt}}">(库存不足)</text>
                       </view>
                     </view>
                     <view>
@@ -1647,7 +1653,7 @@
                   <view class="flex-vertical-between ">
                     <view class="flex xc-ash">
                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}
-                        <text class="c-red22" wx:if="{{item.is_no_qyt && !filters.is_virtual_gd(sele_g.is_virtual) }}">(库存不足)</text>
+                        <text class="c-red22" wx:if="{{item.is_no_qyt }}">(库存不足)</text>
                       </view>
                     </view>
                     <view>
@@ -1677,7 +1683,7 @@
                 <view class="flex-vertical-between ">
                   <view class="flex xc-ash">
                     <view class="fs28 xc-black3 address_name">{{item.pickup_name}}
-                      <text class="c-red22" wx:if="{{item.is_no_qyt && !filters.is_virtual_gd(sele_g.is_virtual)}}">(库存不足)</text>
+                      <text class="c-red22" wx:if="{{item.is_no_qyt}}">(库存不足)</text>
                     </view>
                   </view>
                   <view>
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 4ee64b8..ec840be 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -659,7 +659,7 @@ Page({
 		          }
 				
 				  //--如果是线下库存的时候--		
-				  if(th.data.conf.sales_rules==2 && !gg.whsle_id){
+				  if(th.data.conf.sales_rules>=2 && !gg.whsle_id){
 					   var ob={};
 					   await th.check_down_line_next(gg,good.goods_num,order.pickup_id,function(obj){
 						   ob=obj;
@@ -961,8 +961,13 @@ Page({
 
 	//---检验线下库存的数量的子函数---
 	async check_down_line_next(gg,num,pick_id,func){
-	 
-	  var lock=0,pick_no,plist;
+      //如果默认是商品
+      if(getApp().is_virtual(gg)){
+        return func(100000);
+      }
+
+
+      var lock=0,pick_no,plist;
       var lock_rq={store_id:os.stoid,wareId:gg.goods_id,storageId:pick_id};
       if(this.data.sales_rules==3){
           log_rq.appoint_pick_keyid=this.data.appoint_pick_keyid;
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 2a90a97..ca3504d 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -1041,7 +1041,7 @@ Page({
         }
 
         //--如果是线下库存的时候--
-        if (!getApp().is_virtual(gg) && th.data.conf.sales_rules >= 2 && !gg.whsle_id) {
+        if (th.data.conf.sales_rules >= 2 && !gg.whsle_id) {
           var ob = {};
           await th.check_down_line_next(gg, good.goods_num, order.pickup_id, function (obj) {
             ob = obj;
@@ -1249,6 +1249,11 @@ Page({
   //---检验线下库存的数量的子函数---
   async check_down_line_next(gg, num, pick_id, func) {
 
+    //如果默认是商品
+    if(getApp().is_virtual(gg)){
+      return func(100000);
+    }
+
     var lock = 0, pick_no, plist;
     var log_rq = { store_id: os.stoid, wareId: gg.goods_id, storageId: pick_id };
     if (this.data.sales_rules == 3) {
--
libgit2 0.21.4