diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index e403f56..0826feb 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -1848,7 +1848,7 @@ Page({
           //-- 判断起购数量 --
           if(!e.data.checkAllToggle){
             //判断是不是有促销活动
-            var act=await getApp().get_has_cx_act(gd_info.goods_id);
+            var act=await getApp().get_has_cx_act(obj.goods_id);
             th.click_set_limit(obj,i,j,act);
           }
 
@@ -2599,6 +2599,30 @@ Page({
     });
   },
 
+  //-- 循环汇总其他门店，其他活动有此商品的购买数量的汇总，不包含赠品 --
+  get_goods_other(item, pitem){
+    var goods_id = this.data.requestData[pitem].goods[item].goods_id;
+    var num=0;
+    for (let i = 0; i < this.data.requestData[pitem].goods.length; i++) {
+        var t_item=this.data.requestData[pitem].goods[i]
+        if(i!=item && t_item.goods_id==goods_id && t_item.is_gift==0){
+          num+=t_item.goods_num
+        }
+    }
+    for (let j = 0; j < this.data.requestData.length;j++){
+        if(j!=pitem){
+            var goods=this.data.requestData[j];
+            for (let k = 0; k <goods.length ; k++) {
+                var m_item=goods[k];
+                if(m_item.goods_id==goods_id && m_item.is_gift==0){
+                  num+=m_item.goods_num
+                }
+            }
+        }
+    }
+    return num;
+  },
+
   //----------------------更新购物数量，加减,调用接口---------------------
   postCardList: function (t, item, pitem) {
     var e = this,th = e,user_id = getApp().globalData.user_id;
@@ -2617,9 +2641,9 @@ Page({
         var goodsinfo = e.data.requestData[pitem].goods[item];
         var promgoodsbuynum = 0;
         var goodsbuynum = 0;
+        var other_gd_num=th.get_goods_other(item, pitem);
 
         var is_showing=0;
-
         //--要获得商品，该用户买了多少件,同步应用，用于限购的计算--
         await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
           data: {
@@ -2642,6 +2666,9 @@ Page({
 
         })
 
+        //-- 已经购买数量要汇总其他活动，其他门店的商品数量 --
+        goodsbuynum+=other_gd_num;
+
         //--> by ty
         // var buyed_mum2 = t.goods_num + goodsbuynum;
         var buyed_mum2 = t.goods_num;
@@ -2651,7 +2678,6 @@ Page({
 
           //getApp().my_warnning('购买数量超出商品限购', 0, th);
           var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num";
-
           limit = limit - goodsbuynum;
           if(limit<0) limit=0;
 
@@ -2744,7 +2770,6 @@ Page({
 
                   //--活动的限购是不是要判断--
                   if(false_data.buy_limit > 0) {
-
                     if(t.goods_num + promgoodsbuynum > false_data.buy_limit && !is_showing){
                         wx.showToast({
                           title: '购买数量超出秒杀限购',
@@ -2768,6 +2793,7 @@ Page({
                }
                break;
           case 2:
+
               //-- 读取团购 --
               var res= await getApp().promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + goodsinfo.goods_id + "/" + goodsinfo.prom_id, {});
               if (res.data.code == 0 && res.data.data) {