diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index 2e9bb11..80957d7 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -866,7 +866,7 @@ Page({
 		// if(!this.data.openSpecModal_ind) {
 			if(this.data.prom_type == 1) {
 				this.data.sele_g.viplimited = this.data.sele_g.buy_limit;
-				
+
 				if(!this.data.is_normal) {
 					// 输入的数量
 					var t = th.data.goodsInputNum;
@@ -889,30 +889,44 @@ Page({
 								return false;
 							}
 
-						// 获取购物车同类数量 判断是否超库存
-						var cartGoodsNum = 0;
-						await getApp().request.promiseGet("/api/weshop/cartService/page?store_id="+os.stoid+"&user_id="+oo.user_id+"&service_id="+th.data.data.id+"&pick_id="+th.data.sto_sele_id, 
-							{ }).then(res => {
-								if (res.data.data.pageData.length > 0) {
-									const tmpObj = res.data.data.pageData[0];
-									cartGoodsNum = tmpObj.goods_num;
-								}
-								
-							});
+							// 获取购物车同类数量 判断是否超库存
+							var cartGoodsNum = 0;
+							await getApp().request.promiseGet("/api/weshop/cartService/page?store_id="+os.stoid+"&user_id="+oo.user_id+"&service_id="+th.data.data.id+"&pick_id="+th.data.sto_sele_id, 
+								{ }).then(res => {
+									if (res.data.data.pageData.length > 0) {
+										const tmpObj = res.data.data.pageData[0];
+										cartGoodsNum = tmpObj.goods_num;
+									}
+									
+								});
 
 							// 跳过<立即购买>	
 							if(action !="buy"){
 
-								if (cartGoodsNum >= redisNum) {
+								var maxNum = parseInt(t) + parseInt(cartGoodsNum);
+
+								if (maxNum > redisNum) {
 									wx.showModal({
 											title: '超出活动库存',
 									});
-									th.setData({goodsInputNum: redisNum});
 									return false;
 								}
 
+								// 是否开启限购
+								if (th.data.sele_g.viplimited > 0) {
+
+									if (maxNum + th.data.sele_g.buy_num > th.data.sele_g.buy_limit) {
+											wx.showModal({
+													title: '超出活动限购数量',
+											});
+											return false;
+									}
+
+								}
+								
+
+
 							}
-						
 
 					// 每人限购数
 					th.data.sele_g.viplimited = th.data.sele_g.buy_limit;
@@ -935,6 +949,9 @@ Page({
 							
 
 					};
+
+
+
 				};
 			};
 			
@@ -1147,7 +1164,7 @@ Page({
 									if (t > redis_num) {
 											wx.showModal({
 													// title: '超出商品活动库存',
-												title: '来晚了,已被抢光~',
+												title: '超出活动库存',
 											});
 											th.setData({goodsInputNum: redis_num})
 											return false;