diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 6ea4a19..6a9b4fc 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -271,6 +271,7 @@ Page({
 
   //----------子页返回父页触发----------
   onShow: function () {
+
     //富友支付取消支付强行回去
     var fy=ut.fy_back("/pages/user/order_list/order_list",1);
     if(fy) return false;
@@ -284,7 +285,6 @@ Page({
       wx.navigateTo({
         url: "/pages/index/index/index"
       })
-
     } else {
       this.getuser_addr(function (ie) {
         console.log("getuser_addr")
@@ -2121,9 +2121,9 @@ Page({
       var th=this;
       var pos=this.find_pro_last(ord_goods,3,item_map.prom_id);
       var is_has_gift=this.is_has_gift(ord_goods,item_map.prom_id)
+
       //-- 没有赠品的时候才添加，避免购物车重复出现 --
       if(pos>-1 && !is_has_gift){
-
           var newd = {
             goods_id: get_data.goods_id,
             goods_num: get_data.bs * get_data.zp_num, //是赠品的翻倍
@@ -2155,6 +2155,25 @@ Page({
 
   },
 
+  //-- 其他门店赠品的总和 --
+  get_other_gift(c_arr,gift_id,pickid){
+    var num=0;
+    for (var i in c_arr) {
+        var cart_item = c_arr[i];      //就是每一单的意思
+        var pickid0 = cart_item.pickup_id;
+        //相同门店不用统计
+        if(pickid0==pickid) continue;
+        var ord_goods = cart_item.goods;   //就是每一单的从表的意思
+        var fd=ord_goods.find(function (er){
+            return er.is_gift && er.gift_id==gift_id
+        })
+        if(fd){
+          num+=fd.goods_num;
+        }
+    }
+    return num;
+  },
+
   calc_per: async function (c_arr) {
 
     var send_gf = {};
@@ -2171,7 +2190,6 @@ Page({
       var o_price = 0, q_conditin = 0;
       //--------循环计算总价-----------
       for (var j = 0; j < ord_goods.length; j++) {
-
         if (ord_goods[j].whsle_id) continue;
         o_price += ord_goods[j].goods_price * ord_goods[j].goods_num;
       }
@@ -2208,9 +2226,15 @@ Page({
                 item_map.zxlbtitle = get_data.zxlbtitle;
                 //每月礼包
                 item_map.monthlbtitle = get_data.monthlbtitle;
+
+
+                //-- 其他门店赠品的总和 --
+                var other_gift=0;
+                other_gift=th.get_other_gift(c_arr,get_data.gift_id,pickid);
+
                 //------end-------
                 if (get_data.gift_id && parseInt(get_data.zp_mode) != 1
-                    && get_data.zp_num * item_map.bs <= get_data.limit_num
+                    && get_data.zp_num * item_map.bs <= get_data.limit_num-other_gift
                     && get_data.zp_num * item_map.bs <= get_data.gift_storecount
                 ) {