diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js
index c68a3e0..9ca84cc 100644
--- a/packageA/pages/prom_list/prom_list.js
+++ b/packageA/pages/prom_list/prom_list.js
@@ -241,20 +241,22 @@ Page({
 			  }else{
 				  ee.setData({ data: t.data.data, });			  
 			  }
-			  		  
-			  /*---获取活动的重表---*/
-			  //调用接口判断订单优惠，
-			  getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+ee.data.gid+"/2", {}).then(res => {
-			       if(res.data.code==0){
-			  				var r_data=res.data.data;
-							th.loop_promise(0,r_data.collocationList,function(){
-								ee.setData({
-									 collocationGoods:r_data.collocationPromList,
-									 collocationList:r_data.collocationList,
-								})
-							}) 	  				
-			  			} 
-			  }) 
+			  
+			  if(!ee.data.collocationList){
+				  /*---获取活动的重表---*/
+				  //调用接口判断订单优惠，
+				  getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+ee.data.gid+"/2", {}).then(res => {
+					   if(res.data.code==0){
+								var r_data=res.data.data;
+								th.loop_promise(0,r_data.collocationList,function(){
+									ee.setData({
+										 collocationGoods:r_data.collocationPromList,
+										 collocationList:r_data.collocationList,
+									})
+								}) 	  				
+							} 
+				  }) 
+			  }
 			          
 		      //获取统一条形码,普通商品和优惠促销的商品
 		      if ( t.data.data.prom_type == 5){
@@ -274,7 +276,7 @@ Page({
 											  }
 											  //---通过接口获取门店的线下库存信息--
 											  return  getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-												  data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid}		  
+												  data:{storageNos:that.data.fir_def_store.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid,pageSize:2000}		  
 									          })
 									}).then(res=>{
 										if(res.data.code==0 && res.data.data.total>0){
@@ -414,7 +416,7 @@ Page({
 			var pick=th.get_pick_from_list(th.data.sto_sele_id)
 			//---通过接口获取门店的线下库存信息--
 			getApp().request.get("/api/weshop/goods/getWareStorages",{
-				  data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid},
+				  data:{storageNos:pick.pickup_no,wareIds:encodeURIComponent(th.data.data.erpwareid),storeId:os.stoid,pageSize:2000},
 				  success:function(res){
 					 if(res.data.code==0){																	 
 						   if(res.data.data.pageData.length>0){
@@ -943,7 +945,7 @@ Page({
 		  }
 		  //---通过接口获取门店的线下库存信息--
 		  return  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.data.erpwareid),storeId:os.stoid,pageSize:2000}		  
 	      })
 	  }).then(res=>{	
 			  if(res.data.code==0){				   
@@ -1301,7 +1303,7 @@ Page({
 		  })		  
 		  //读取线下的门店库存
 		  await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-		  		  data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid}
+		  		  data:{storageNos:item.pickup_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid,pageSize:2000}
 		  }).then(res=>{
 		  		  if(res.data.code==0 && res.data.data.total>0){
 		  			  plist=res.data.data.pageData[0];		 
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index 5d88125..f13d81e 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -2173,7 +2173,7 @@ Page({
 		  })
 	  	  //读取线下的门店库存 
 	  	  await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-	  		  data:{storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid}
+	  		  data:{storageNos:pick_no,wareIds:encodeURIComponent(erpwareid),storeId:os.stoid,pageSize:2000}
 	  	  }).then(res=>{
 	  		  if(res.data.code==0){
 	  			  plist=res.data.data.pageData[0];		 
@@ -2848,8 +2848,10 @@ Page({
       //getApp().waitfor2(this,"g_cart_q_time","order_prom_list_cart",async function () {
           //var arr=th.data.order_prom_list_cart;
 		  var arr=order_prom_list_cart;
+		  if(!arr) arr=[];
           //如果系统有限制使用优惠券
           if(th.data.is_close_quan) return false;
+		
           //------------开始计算使用优惠券相关------------
           for(var ind in arr){
               var ep=arr[ind];