diff --git a/packageA/pages/distribution/myteam/myteam.js b/packageA/pages/distribution/myteam/myteam.js
index 1dac6db..a5f1b49 100644
--- a/packageA/pages/distribution/myteam/myteam.js
+++ b/packageA/pages/distribution/myteam/myteam.js
@@ -144,10 +144,11 @@ Page({
    * 页面上拉触底事件的处理函数
    */
   onReachBottom: function () {
+  	    var th=this;
 		this.scrollToLower('/api/weshop/users/distribut/teamlist', {
 			store_id: app.globalData.setting.stoid,
 			user_id: app.globalData.user_id,
-			level: currentIndex + 1,
+			level: th.data.currentTabIndex + 1,
 		});
   },
 
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index 1752ce8..e3604d0 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -974,43 +974,55 @@ Page({
 				  })
 				  		  
 				  var lock=0,plist=null;
-				  //先读取门店的lock,
-				  await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-				      data:{store_id:os.stoid,wareId:good.goods_id,storageId:b_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)
-							lock+=res.data.data.pageData[i].outQty
-					  }			   
-				  })
-				  
-				  //---通过接口获取门店的线下库存信息--
-				  await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-				     data:{storageNos:pickup.pickup_no,wareIds:encodeURIComponent(good.erpwareid),storeId:os.stoid}
-				  }).then(res=>{
-				    if(res.data.code==0 && res.data.data.total>0){
-				      plist=res.data.data.pageData[0];
-				    }	    
-				  })
-				  
-				  if(!plist){
-					  err_text+= good['goods_name']+"库存不足\n";
-					  continue;   
-				  }			  
-				  if(plist.CanOutQty-lock<=0){
-				     err_text+= good['goods_name']+"库存不足\n";
-				     continue;   
-				  }			  
-				  if(b_item.goods_num>(plist.CanOutQty-lock)){
-					  b_item.goods_num=plist.CanOutQty-lock;
-				  }
+
+                  if(b_item.prom_type!=7) {
+                      //先读取门店的lock,
+                      await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", {
+                          data: {store_id: os.stoid, wareId: good.goods_id, storageId: b_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)
+                                  lock += res.data.data.pageData[i].outQty
+                          }
+                      })
+
+                      //---通过接口获取门店的线下库存信息--
+                      await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", {
+                          data: {
+                              storageNos: pickup.pickup_no,
+                              wareIds: encodeURIComponent(good.erpwareid),
+                              storeId: os.stoid
+                          }
+                      }).then(res => {
+                          if (res.data.code == 0 && res.data.data.total > 0) {
+                              plist = res.data.data.pageData[0];
+                          }
+                      })
+
+                      if (!plist) {
+                          err_text += good['goods_name'] + "库存不足\n";
+                          continue;
+                      }
+                      if (plist.CanOutQty - lock <= 0) {
+                          err_text += good['goods_name'] + "库存不足\n";
+                          continue;
+                      }
+                      if (b_item.goods_num > (plist.CanOutQty - lock)) {
+                          b_item.goods_num = plist.CanOutQty - lock;
+                      }
+                  }
 				  var req_data={
 				      store_id: os.stoid,
 				      user_id: getApp().globalData.user_id,
 				      goods_id: good.goods_id,
 				  };
+                  if(b_item.prom_type==7){
+                      req_data.prom_type=7;
+                      req_data.prom_id=b_item.prom_id;
+                  }
 				  
-				  var buynum=0;			  
+				  var buynum=0;
+                  var promnum=0;
 				  //---要获得商品，该用户买了多少件,同步应用---
 				  await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
 				    data: req_data,
@@ -1018,6 +1030,9 @@ Page({
 					  if(res.data.code==0){
 						 var buy_num_data = res.data.data;
 						 buynum = buy_num_data.goodsbuynum;
+                          if(buy_num_data.promgoodsbuynum){
+                              promnum=buy_num_data.promgoodsbuynum;
+                          }
 					  }					 				     
 				  })
 				  
@@ -1032,6 +1047,40 @@ Page({
 						  b_item.goods_num=good['viplimited'];
 					  }			  				  		    				   
 				  }
+
+                  //--要计算一下限购 --
+                  if(b_item.prom_type==7){
+                      var url1 = "/api/weshop/prom/zhbuyGoods/page";
+                      var req_data = {
+                          page: 1,
+                          pageSize: 2000,
+                          store_id: os.stoid,
+                          zh_id: b_item.prom_id,
+                          goods_id:b_item.goods_id
+                      }
+                      await getApp().request.promiseGet(url1, {
+                          data: req_data
+                      }).then(res => {
+                          if (ut.ajax_ok(res)) {
+                              var gdlist = res.data.data.pageData[0];
+                              b_item.buyqty=gdlist.buyqty;
+                          }
+                      })
+
+
+                      //---- 要计算商品的限购 -----
+                      if(b_item['buyqty']>0){
+                          if(cart_num+buynum>b_item['buyqty']){
+                              err_text+= good['goods_name']+"超出限购\n";
+                              continue;
+                          }
+                          b_item['buyqty']-=(cart_num+buynum);
+                          if(b_item.goods_num>b_item['buyqty']){
+                              b_item.goods_num=b_item['buyqty'];
+                          }
+                      }
+                  }
+
 				  
 				  back_goods_arr.push(b_item);  //返回商品元素	
 									
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 35b14a1..8ea2e4f 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -1083,43 +1083,56 @@ Page({
 			  })
 
 			  var lock=0,plist=null;
-			  //先读取门店的lock,
-			  await getApp().request.promiseGet("/api/weshop/order/ware/lock/page",{
-			      data:{store_id:os.stoid,wareId:good.goods_id,storageId:b_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)
-						lock+=res.data.data.pageData[i].outQty
-				  }
-			  })
 
-			  //---通过接口获取门店的线下库存信息--
-			  await getApp().request.promiseGet("/api/weshop/goods/getWareStorages",{
-			     data:{storageNos:pickup.pickup_no,wareIds:encodeURIComponent(good.erpwareid),storeId:os.stoid}
-			  }).then(res=>{
-			    if(res.data.code==0 && res.data.data.total>0){
-			      plist=res.data.data.pageData[0];
-			    }
-			  })
+			  if(b_item.prom_type!=7) {
+                  //先读取门店的lock,
+                  await getApp().request.promiseGet("/api/weshop/order/ware/lock/page", {
+                      data: {store_id: os.stoid, wareId: good.goods_id, storageId: b_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)
+                              lock += res.data.data.pageData[i].outQty
+                      }
+                  })
+                  //---通过接口获取门店的线下库存信息--
+                  await getApp().request.promiseGet("/api/weshop/goods/getWareStorages", {
+                      data: {
+                          storageNos: pickup.pickup_no,
+                          wareIds: encodeURIComponent(good.erpwareid),
+                          storeId: os.stoid
+                      }
+                  }).then(res => {
+                      if (res.data.code == 0 && res.data.data.total > 0) {
+                          plist = res.data.data.pageData[0];
+                      }
+                  })
 
-			  if(!plist){
-				  err_text+= good['goods_name']+"库存不足\n";
-				  continue;
-			  }
-			  if(plist.CanOutQty-lock<=0){
-			     err_text+= good['goods_name']+"库存不足\n";
-			     continue;
-			  }
-			  if(b_item.goods_num>(plist.CanOutQty-lock)){
-				  b_item.goods_num=plist.CanOutQty-lock;
-			  }
+                  if (!plist) {
+                      err_text += good['goods_name'] + "库存不足\n";
+                      continue;
+                  }
+                  if (plist.CanOutQty - lock <= 0) {
+                      err_text += good['goods_name'] + "库存不足\n";
+                      continue;
+                  }
+                  if (b_item.goods_num > (plist.CanOutQty - lock)) {
+                      b_item.goods_num = plist.CanOutQty - lock;
+                  }
+              }
 			  var req_data={
 			      store_id: os.stoid,
 			      user_id: getApp().globalData.user_id,
 			      goods_id: good.goods_id,
 			  };
 
+			  if(b_item.prom_type==7){
+                  req_data.prom_type=7;
+                  req_data.prom_id=b_item.prom_id;
+              }
+
+
 			  var buynum=0;
+			  var promnum=0;
 			  //---要获得商品，该用户买了多少件,同步应用---
 			  await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
 			    data: req_data,
@@ -1127,6 +1140,9 @@ Page({
 				  if(res.data.code==0){
 					 var buy_num_data = res.data.data;
 					 buynum = buy_num_data.goodsbuynum;
+					 if(buy_num_data.promgoodsbuynum){
+                         promnum=buy_num_data.promgoodsbuynum;
+                     }
 				  }
 			  })
 
@@ -1142,6 +1158,39 @@ Page({
 				  }
 			  }
 
+			  //--要计算一下限购 --
+              if(b_item.prom_type==7){
+                  var url1 = "/api/weshop/prom/zhbuyGoods/page";
+                  var req_data = {
+                      page: 1,
+                      pageSize: 2000,
+                      store_id: os.stoid,
+                      zh_id: b_item.prom_id,
+                      goods_id:b_item.goods_id
+                  }
+                  await getApp().request.promiseGet(url1, {
+                      data: req_data
+                  }).then(res => {
+                      if (ut.ajax_ok(res)) {
+                          var gdlist = res.data.data.pageData[0];
+                          b_item.buyqty=gdlist.buyqty;
+                      }
+                  })
+
+
+                  //---- 要计算商品的限购 -----
+                  if(b_item['buyqty']>0){
+                      if(cart_num+buynum>b_item['buyqty']){
+                          err_text+= good['goods_name']+"超出限购\n";
+                          continue;
+                      }
+                      b_item['buyqty']-=(cart_num+buynum);
+                      if(b_item.goods_num>b_item['buyqty']){
+                          b_item.goods_num=b_item['buyqty'];
+                      }
+                  }
+              }
+
 			  back_goods_arr.push(b_item);  //返回商品元素
 
 		  }else{