Merge branch 'dev' into 'test'

Dev See merge request !358

Merge branch 'dev' into 'test'
Dev See merge request !358
后端研发-苏明海
2 parents df554a7c 31bdb593
Showing 6 changed files with 224 additions and 64 deletions
pages/cart/cart/cart.js
pages/cart/cart2/cart2.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsList/goodsList.js
pages/user/order_list/order_list.wxml
@@ -484,6 +484,9 @@ Page({
             [txt]: cbuy > 0 ? cbuy : 0,
           });
           e.doCheckAll();
+		  
+		  t.goods_num=cbuy > 0 ? cbuy : 0,
+		  e.update_cart(t, pitem, item);		  
           return false;
         }
@@ -505,6 +508,10 @@ Page({
 					    [txt]: store_count
 					  });
 					  e.doCheckAll();
+					  
+					  t.goods_num=store_count;
+					  e.update_cart(t, pitem, item);	
+					  
 					  return false;
 					}
@@ -520,6 +527,10 @@ Page({
 					    [txt]: false_data.goods_num - false_data.buy_num
 					  });
 					  e.doCheckAll();
+					  
+					  t.goods_num=false_data.goods_num - false_data.buy_num;
+					  e.update_cart(t, pitem, item);	
+					  
 					  return false;
 					}
@@ -534,6 +545,11 @@ Page({
 					    [txt]: false_data.redisnum
 					  });
 					  e.doCheckAll();
+					  
+					  t.goods_num=false_data.redisnum;
+					  e.update_cart(t, pitem, item);	
+					  
+					  
 					  return false;
 					}
@@ -548,6 +564,10 @@ Page({
 					    [txt]: false_data.false_data.buy_limit
 					  });
 					  e.doCheckAll();
+					  
+					  t.goods_num=false_data.false_data.buy_limit;
+					  e.update_cart(t, pitem, item);	
+					  
 					  return false;
 					}
 				}else{
@@ -588,7 +608,7 @@ Page({
 	      	     [txt]: store_count
 	      	   });
 	      	   e.doCheckAll();
-	      	   return false;
+	      	   t.goods_num=store_count;
 	      	 }
 	      	 e.update_cart(t, pitem, item);		
 	      }		      
@@ -614,7 +634,7 @@ Page({
 	      	     [txt]: ob.CanOutQty
 	      	   });
 	      	   th.doCheckAll();
-	      	   return false;
+	      	   t.goods_num=ob.CanOutQty;
 	  }
 	  this.update_cart(t, pitem, item);			  
   },
@@ -628,7 +648,8 @@ Page({
 		  data:{store_id:os.stoid,wareId:t.goods_id,storageId:goodsinfo.pick_id}
 	  }).then(res=>{
 		  if(res.data.code==0 && res.data.data.total>0){
-			  lock=res.data.data.pageData[0].outQty;
+			  for(var i in res.data.data.pageData)			  
+			     lock+=res.data.data.pageData[i].outQty;
 		  }
 	  })
 	  //先获取门店的编号
@@ -1014,7 +1014,8 @@ Page({
 	  		  data:{store_id:os.stoid,wareId:goods_id,storageId:pick}
 	  	  }).then(res=>{
 	  		  if(res.data.code==0 && res.data.data.total>0){
-	  			  lock=res.data.data.pageData[0].outQty;
+				  for(var i in res.data.data.pageData)
+	  			    lock+=res.data.data.pageData[i].outQty;
 	  		  }
 	  	  })
 	  	  //先获取门店的编号
@@ -914,7 +914,12 @@ Page({
 									data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,storageId:pick.pickup_id},
 									success:function(res_data){
 										 if(res_data.data.code==0 &&  res_data.data.data.total>0){
-											  var lock= res_data.data.data.pageData[0].outQty;
+											  
+											   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);	
 											  }
@@ -976,19 +981,25 @@ Page({
 	        pick_id: e.data.sto_sele_id,
 	      },
 	      success: function(re) {			 
-			//判断数量，要看下购物车中有没有该商品  
-			if(CanOutQty){
-				 if(th.data.cartGoodsNum + th.data.goodsInputNum>CanOutQty){
-					 return s.my_warnning("库存不足！", 0, th);		
-				 }
-			}else{
-				if(th.data.cartGoodsNum + th.data.goodsInputNum>o.store_count){
-					return s.my_warnning("库存不足！", 0, th);						 
-				}
-			}  
+			
 	        //-------如果购物车中有相关的数据---------
 	        if (re.data.data.total > 0) {
-	          var item = re.data.data.pageData[0];
+			
+			   var item = re.data.data.pageData[0];	
+					
+			   //判断数量，要看下购物车中有没有该商品
+			  if(CanOutQty){
+					 if(item.goods_num+ th.data.goodsInputNum>CanOutQty){
+						 return s.my_warnning("库存不足！", 0, th);		
+					 }
+				}else{
+					if(item.goods_num+ th.data.goodsInputNum>o.store_count){
+						return s.my_warnning("库存不足！", 0, th);						 
+					}
+				}  	
+				
+				
+			      
 	          var updata = {
 	            id: item.id,
 	            goods_num: e.data.goodsInputNum + item.goods_num,
@@ -1082,10 +1093,17 @@ Page({
       //--判断商品是否超出限购--
       if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) {
-        if (t + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) {
+		  
+		var gd_buy_num=th.data.g_buy_num.get(th.data.sele_g.goods_id);  
+		  
+        if (t + gd_buy_num > th.data.sele_g.viplimited) {
           wx.showModal({
             title: '超出商品限购',
           });
+		  
+		  var num= th.data.sele_g.viplimited-gd_buy_num;
+		  if(num<0) num=0;		  
+		  th.setData({goodsInputNum:num})	
           return false;
         }
       }
@@ -1096,6 +1114,10 @@ Page({
           wx.showModal({
             title: '超出商品活动限购',
           });
+		  
+		  var num=th.data.prom_buy_limit- th.data.prom_buy_num ;
+		  if(num<0) num=0;		  
+		  th.setData({goodsInputNum:num})	  		  
           return false;
         }
       }
@@ -1113,17 +1135,31 @@ Page({
         if (t > redis_num) {
           wx.showModal({
             title: '超出商品活动库存',
-          });
+          });		  
+		  th.setData({goodsInputNum:redis_num})	  
           return false;
         }
       }
-      var e = th.data.sele_g.store_count;
-      t > e || 0 == e ? t = e : t < 1 && (t = 1),
-        th.setData({
-          goodsInputNum: t
-        });
+      var e = th.data.sele_g.store_count;  
+	  if(th.data.sales_rules==2){
+		  if(!th.data.def_pick_store){
+			   wx.showModal({ title: '请选择门店', });
+			   return false;
+		  }else{
+			  e=th.data.def_pick_store.CanOutQty;		 
+		  }		  
+	  }
+	  
+	  //库存不足，不增加
+	  if(e<t){ wx.showModal({ title: '库存不足', }); 
+	          if(e<0) e=0;    
+			  th.setData({ goodsInputNum: e });   return false;
+		}		 		  		 
+	  t > e || 0 == e ? t = e : t < 1 && (t = 1);
+	  th.setData({ goodsInputNum: t });
+	       
     })
   },
@@ -1427,6 +1463,8 @@ Page({
       sele_g: item,
       gid: gid
     });	
+	this.get_sto();
+	
 	this.sele_spec_chech_activity();	
   },
@@ -1706,7 +1744,7 @@ Page({
 	  var lock=[];
 	  //先读取门店的lock
 	  await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-		  data:{store_id:os.stoid,wareId:th.data.data.goods_id}
+		  data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id}
 	  }).then(res=>{
 		  if(res.data.code==0 && res.data.data.total>0){
 			  lock=res.data.data.pageData
@@ -1715,7 +1753,7 @@ Page({
       //---通过接口获取门店的线下库存信息--
 	  await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-		  data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid}		  
+		  data:{storageNos:pkno_str,wareIds:encodeURIComponent(th.data.sele_g.erpwareid),storeId:os.stoid}		  
 	  }).then(res=>{	
 			  if(res.data.code==0){				   
 				   if(res.data.data.pageData){
@@ -1732,11 +1770,11 @@ Page({
 									   var lock_num=th.find_lock_num(o_plist[kk].pickup_id,lock);	
 									   //可出库数大于预出库库存的数量，可以判断为有库存
 									   if(n_item.CanOutQty>lock_num){									   
-										   o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num														 
+										   o_plist[kk].CanOutQty=n_item.CanOutQty-lock_num;														 
 										   new_list.push(o_plist[kk]);  
 										   //如果找到默认门店
-										   if(def_pick_store && n_item.StorageNo==def_pick_store.pickup_no){										   
-											   def_pick_store.CanOutQty=n_item.CanOutQty;												   
+										   if(def_pick_store && n_item.StorageNo==def_pick_store.pickup_no){									   
+											   def_pick_store.CanOutQty=n_item.CanOutQty-lock_num;												   
 											   th.setData({def_pick_store:def_pick_store})											   
 											   is_find_def_store=1;											  
 										   }
@@ -1773,7 +1811,7 @@ Page({
 	  if(lock.length<0) return 0;
 	  for(var i in lock){
 		  if(pick_id==lock[i].pickupId){
-			   lock_num=lock[i].outQty;
+			   lock_num+=lock[i].outQty;
 		  }
 	  }
 	  return lock_num;
@@ -2496,6 +2534,10 @@ Page({
             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;
         }
       }
@@ -2506,6 +2548,10 @@ Page({
             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;
         }
       }
@@ -2525,12 +2571,19 @@ Page({
 			  title: '提示',
 			  content: '超出商品活动库存'
 			});
+			
+			th.setData({goodsInputNum:redis_num})
+			
 			return false;
 		  }
 	  }
       if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th);
-      if (th.data.goodsInputNum > o.store_count) return s.my_warnning("超出商品库存", 0, th);
+      if (th.data.goodsInputNum > o.store_count) {		  
+		   	th.setData({goodsInputNum:o.store_count})
+			return s.my_warnning("超出商品库存", 0, th);
+	  }
+	  	    
       if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined)
         this.setData({
           sto_sele_name: ""
@@ -3348,7 +3401,22 @@ Page({
     var th = this;
     //var ind=ee.currentTarget.dataset.ind;
     var bconfig = th.data.bconfig;
-
+	
+	if(!th.data.only_pk && !th.data.def_pickpu_list){
+		getApp().confirmBox("门店库存不足", null, 25000, !1);
+		return false;
+	}
+		
+	if(th.data.only_pk && !th.data.only_pk.length){
+		getApp().confirmBox("门店库存不足", null, 25000, !1);
+		return false;
+	}	
+	if(th.data.def_pickpu_list &&  !th.data.def_pickpu_list.length){
+		getApp().confirmBox("门店库存不足", null, 25000, !1);
+		return false;
+	}
+	
+	
     if (bconfig.is_sort_storage) {
       wx.getLocation({
         type: 'wgs84',
@@ -3386,7 +3454,10 @@ Page({
       th.data.is_get_local_ok = 1;
       th.get_sto();
     }
-
+	
+	
+	
+	
     this.setData({
       //open_ind_store: ind,
       store: 1,
@@ -3449,7 +3520,7 @@ Page({
 	  var goodsinfo=th.data.sele_g;
 	  var erpwareid=goodsinfo.erpwareid;
 	  var plist=null;
-    var lock=0;
+      var lock=0;
 	  //---如果是活动的时候---
 	  if(th.data.prom_type==1 || th.data.prom_type==6){	 
@@ -3472,10 +3543,11 @@ Page({
 		  //先读取门店的lock
 		  await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-		  		  data:{store_id:os.stoid,wareId:t.goods_id,storageId:goodsinfo.pick_id}
+		  		  data:{store_id:os.stoid,wareId:goodsinfo.goods_id,storageId:item.pickup_id}
 		  }).then(res=>{
 		  		  if(res.data.code==0 && res.data.data.total>0){
-		  			  lock=res.data.data.pageData[0].outQty;
+					  for(var i in res.data.data.pageData )					  
+		  			      lock+=res.data.data.pageData[i].outQty;
 		  		  }
 		  })
@@ -3489,7 +3561,7 @@ Page({
 		  })	  
 		  if(plist && plist.CanOutQty-lock>0){
-		  	 func()  
+		     	 func();  
 				 return false;
 		  }
 		  getApp().my_warnning(item.pickup_name+"库存不足！", 0, th);		
@@ -757,18 +757,17 @@
     </view>
     <view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">立即购买</view>
-    <!---- 普通商品购买 ----->
+    <!-- 普通商品购买 -->
     <block wx:if="{{prom_type==0 || prom_type==2 || prom_type==3 || prom_type==4}}">
-    <block wx:if="{{sele_g.store_count>0}}">
+    <!-- 线上销售的时候，要判断库存量，  线下库存的时候不用判断 -->
+    <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules==2 }}">
       <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
       <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即购买</view>
       </block>
-       <block wx:else>
-      <view class="is_stock cart-btn is_stock xc-ash-b " style="width:55.5%">
-      库存不足
-      </view>
-      </block>
+    <block wx:else>
+      <view class="is_stock cart-btn is_stock xc-ash-b " style="width:55.5%">库存不足</view>
+    </block>
     </block>
@@ -868,8 +867,13 @@
           <block wx:if="{{prom_type==0}}">
           <view class="flex">
             <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
-            <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>可售：{{sele_g.store_count}}</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>
             </view>
           </block>
@@ -879,7 +883,7 @@
             <view class="spec-goods-stock" wx:else >已售：{{prom_act.buy_num}}</view>
             <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
-          
+         
                </view>
           </block>
         </view>
@@ -896,17 +900,25 @@
                      </view>
                      <!-- 没有门店的时候 -->
-                     <view  class="flex" bindtap="choice_store"wx:else>
-                          <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
-                           <view class="fs28 xc-ash-9f">选择门店</view>
+                     <view  class="flex" bindtap="choice_store" wx:else>
+                           <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
+                           <view class="fs28 xc-ash-9f">选择门店</view>						  
                       </view>
                       <view class="red-co fs28" bindtap="choice_store" >
                          更多门店
                          <text class="right-arrow"></text>
                       </view>
-                  </view>
-                  <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
+                   </view>
+				   <view wx:if="{{only_pk && !only_pk.length}}">门店库存不足</view>
+				   <block wx:else>
+				         <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">门店库存不足</view>
+						 <block wx:else>
+					     	  <view wx:if="{{def_pick_store && def_pick_store.CanOutQty<=0 && 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}}</view>
          </view>
       <!----商品的属性项目---->
@@ -929,12 +941,58 @@
           </view>
         </view>
       </view>
-       <view class="spec-cart-btns">
-   
-    
-        <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">立即购买</view>
-    
+       <view class="spec-cart-btns">	
+	       <!-- 根本就找不到门店 -->
+	       <block wx:if="{{!only_pk && !def_pickpu_list}}">
+			   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>		   
+		   </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>  	  
+			  <block wx:else>
+			      <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<=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" 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">立即购买</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" 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">立即购买</view> 
+							 </block>
+						 </block>
+					 </block>									 
+				 </block>
+		  </block>  
+		 
+			
+		</block>	
+			   
     </view>
       <view class="clear"></view>
@@ -1069,7 +1127,7 @@
           <view>购买数量</view>
           <view class="count">
             <view bindtap="subCartNum" class="sub">-</view>
-            <input bindblur="inputCartNum xc-val-fream" type="number" value="{{goodsInputNum}}"></input>
+            <input bindblur="inputCartNum" class="xc-val-fream" type="number" value="{{goodsInputNum}}"></input>
             <view bindtap="addCartNum" class="add">+</view>
           </view>
         </view>
@@ -1288,7 +1346,8 @@
                           <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
                         </view>
                         <view>
-                          <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">                         距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
+                          <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
+							  距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
                         </view>
                       </view>
                       <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
@@ -97,10 +97,15 @@ Page({
     },
     requestGoodsList: function(t) {
         var e = this;
-        this.data.requestUrl = t,     
-        t += "&orderField=" + e.data.tabname;
-        t += "&orderType=" + e.data.adname; 
-        t +="&page=" + e.data.currentPage, 
+        this.data.requestUrl = t;
+			
+		//不是商品分组的，不是默认排序的	
+		if(t.indexOf("group_id")==-1 || e.data.tabname!="goods_id" ){					
+           t += "&orderField=" + e.data.tabname;
+           t += "&orderType=" + e.data.adname; 
+		}
+		
+        t +="&page=" + e.data.currentPage;
         a.request(t, 
           function(t) {
             e.setData({is_go:1});
@@ -32,10 +32,12 @@
         <view wx:if="{{item.pt_status==6}}"><text style="font-size: 26rpx;">支付尾款失败</text></view>
       </block>
       <block wx:else>退款中</block>
+	  <!--
       <view class="flex" wx:if="{{(item.order_status==0&&item.pay_status==0)}}">
         <view class="lin"></view>
         <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData"  data-index="{{index}}"   data-order_id="{{item.order_id}}"></image>
-      </view>
+      </view>-->
+	  
     </view>
   </view>