Merge branch 'dev' into 'test'

Dev See merge request !364

Merge branch 'dev' into 'test'
Dev See merge request !364
后端研发-苏明海
2 parents ddb2cb65 1f6b85f7
Showing 4 changed files with 10 additions and 10 deletions
pages/cart/cart/cart.js
pages/cart/cart2/cart2.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
@@ -645,7 +645,7 @@ Page({
 	  var lock=0,pick_no,plist;
 	  //先读取门店的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:t.goods_id,storageId:goodsinfo.pick_id,pageSize:1000}
 	  }).then(res=>{
 		  if(res.data.code==0 && res.data.data.total>0){
 			  for(var i in res.data.data.pageData)			  
@@ -1011,7 +1011,7 @@ Page({
 	  	  var lock=0,pick_no,plist,erpwareid;
 	  	  //先读取门店的lock
 	  	  await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-	  		  data:{store_id:os.stoid,wareId:goods_id,storageId:pick}
+	  		  data:{store_id:os.stoid,wareId:goods_id,storageId:pick,pageSize:1000}
 	  	  }).then(res=>{
 	  		  if(res.data.code==0 && res.data.data.total>0){
 				  for(var i in res.data.data.pageData)
@@ -635,7 +635,7 @@ Page({
 								var lock=0,plist=null;
 								//先读取门店的lock,采用链式写法，少用await
 								getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-									    data:{store_id:os.stoid,wareId:ee.data.data.goods_id,storageId:that.data.fir_def_store.pickup_id}
+									    data:{store_id:os.stoid,wareId:ee.data.data.goods_id,storageId:that.data.fir_def_store.pickup_id,pageSize:1000}
 								}).then(res=>{
 										  if(res.data.code==0 && res.data.data.total>0){
 											  for(var i in res.data.data.pageData)
@@ -953,7 +953,7 @@ Page({
 								}								
 								//在调一次接口,读取商品的预出库的数量，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},
+									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){
@@ -1513,7 +1513,7 @@ Page({
 			  var lock=0,plist=null;
 			  //先读取门店的lock,采用链式写法，少用await
 			  getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-				  data:{store_id:os.stoid,wareId:ee.data.sele_g.goods_id,storageId:that.data.def_pick_store.pickup_id}
+				  data:{store_id:os.stoid,wareId:ee.data.sele_g.goods_id,storageId:that.data.def_pick_store.pickup_id,pageSize:1000}
 			  }).then(res=>{
 				  if(res.data.code==0 && res.data.data.total>0){
 					  for(var i in res.data.data.pageData)
@@ -1653,11 +1653,11 @@ Page({
 		  if(th.data.sales_rules==2 && !th.data.is_newsales_rules && th.data.prom_type!=1 && th.data.prom_type!=6){			  
 			  setTimeout(function(){
 				   th.deal_pickup_dline(e);
-			  },500)			 
+			  },800)			 
 		  }else{
 			  setTimeout(function(){
 			      th.deal_pickup(e);  //--普通门店排版--
-			  },500)
+			  },800)
 		  }      
 		}
       })
@@ -1823,7 +1823,7 @@ Page({
 	  var lock=[];
 	  //先读取门店的lock,采用链式写法，少用await
 	  getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-		  data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id}
+		  data:{store_id:os.stoid,wareId:th.data.sele_g.goods_id,pageSize:1000}
 	  }).then(res=>{
 		  if(res.data.code==0 && res.data.data.total>0){
 			  lock=res.data.data.pageData
@@ -3655,7 +3655,7 @@ Page({
 		  //先读取门店的lock
 		  await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-		  		  data:{store_id:os.stoid,wareId:goodsinfo.goods_id,storageId:item.pickup_id}
+		  		  data:{store_id:os.stoid,wareId:goodsinfo.goods_id,storageId:item.pickup_id,pageSize:1000}
 		  }).then(res=>{
 		  		  if(res.data.code==0 && res.data.data.total>0){
 					  for(var i in res.data.data.pageData )					  
@@ -94,7 +94,7 @@
               <view class="word-line fs20 xc-qtunit-price">零售价￥{{data.market_price}}</view>
             </view>
             <view class="abs white xc-nanber">
-              <text class="fs22">已拼{{prom_act.buy_num}}份</text>
+              <text class="fs22">已拼{{prom_act.buy_num}}件</text>
               <view class="flex" style='margin-top:-34rpx'>
                 <view class="xc-people-img">
                   <image class="imgs" src="{{prom_st==1? iurl+'/miniapp/images/r_logo_red.png':iurl+'/miniapp/images/r_logo.png'}}"></image>