From 9f27780687ea729cb37f513c5c298ae4bb5b78a2 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 29 Apr 2021 15:21:49 +0800
Subject: [PATCH] 商品的库存不足报错~~~

---
 pages/goods/goodsInfo/goodsInfo.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index b407211..fd5a67f 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -1587,11 +1587,10 @@ Page({
           th.setData({goodsInputNum:redis_num})
           return false;
         }
-
       }
-
       var e = th.data.sele_g.store_count;
-      if(th.data.sales_rules==2){
+	  var p_type=th.data.prom_type; //&& p_type!=1 && p_type!=4
+      if(th.data.sales_rules==2 && (p_type!=1 && p_type!=4 && p_type!=6 || th.data.openSpecModal_inte_normal==1 || th.data.is_normal== 1) ){
         if(!th.data.def_pick_store){
           wx.showModal({ title: '请选择门店', });
           return false;
@@ -1599,7 +1598,7 @@ Page({
           e=th.data.def_pick_store.CanOutQty;
         }
       }
-
+	  if(!e) e=0;
       //库存不足，不增加
       if(e<t){ wx.showModal({ title: '库存不足', });
         if(e<0) e=0;
@@ -1669,7 +1668,8 @@ Page({
       }
   
       var e = th.data.sele_g.store_count;
-      if(th.data.sales_rules==2){
+	  var p_type=th.data.prom_type; //&& p_type!=1 && p_type!=4	  
+      if(th.data.sales_rules==2 && (p_type!=1 && p_type!=4 && p_type!=6 || th.data.openSpecModal_inte_normal==1 || th.data.is_normal== 1) ){
         if(!th.data.def_pick_store){
           wx.showModal({ title: '请选择门店', });
           return false;
@@ -1677,7 +1677,7 @@ Page({
           e=th.data.def_pick_store.CanOutQty;
         }
       }
-  
+	  if(!e) e=0;
       //库存不足，不增加
       if(e<t){ wx.showModal({ title: '库存不足', });
         if(e<0) e=0;
@@ -3228,7 +3228,7 @@ Page({
   openSpecModel_pt: function(e) {
 
 
-    this.setData({ open_ind_store: 4});//拼团直接给4
+    this.setData({ open_ind_store: 4,goodsInputNum:1});//拼团直接给4
 
 
     //--先判断会员状态--
@@ -5137,7 +5137,7 @@ Page({
 	 //-- 积分购 --
 	 go_pay_integral:function(){
 		this.get_sto(0)
-		this.setData({openSpecModal_inte:1}); 
+		this.setData({openSpecModal_inte:1,goodsInputNum:1}); 
 	 },
 	  //-- 积分购普通购买 --
 	 go_pay_integral_normal:function(){
--
libgit2 0.21.4