diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 01d7539..8e3422e 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -1927,13 +1927,49 @@ Page({
       //要判断积分购的普通购买有没有参加优惠活动
       if (e.is_normal == 1) {
         this.check_nor_promgood(e.goods_id, function (res) {
-          if (res && res.cat_id) {
-            e.prom_type = 3;
-            e.prom_id = res.cat_id;
+          if (res && res.act_id) {
+            e.prom_type =  res.prom_type;
+            e.prom_id = res.act_id;
           } else {
             e.prom_type = 0;
             // e.prom_id = 0;
           }
+
+
+          if(e.prom_type==10){
+            //----先看会员在购物车中是否加入了该商品,立即购买的-----
+            getApp().request.get("/api/weshop/cart/page", {
+              data: {
+                store_id: e.store_id,
+                user_id: oo.user_id,
+                state: 1
+              },
+              success: function (res) {
+                //-------如果购物车中有相关的数据,先清理掉---------
+                if (res.data.code == 0 && res.data.data.total > 0) {
+                  for (let j in res.data.data.pageData) {
+                    let item_j = res.data.data.pageData[j];
+                    var url = '/api/weshop/cart/del/' + e.data.stoid + '/' + item_j.id;
+                    getApp().request.delete(url, {});
+                  }
+                }
+
+                e.state = 1;
+                getApp().request.post("/api/weshop/cart/save", {
+                  data: e,
+                  success: function (t) {
+                    th.closeSpecModal();
+                    getApp().goto("/packageE/pages/cart/cart2/cart2?state=1");
+                  }
+                });
+
+              }
+            })
+            return false;
+          }
+
+
+
           s.set_b_now(e);
           /*--
           wx.redirectTo({
@@ -4391,11 +4427,9 @@ Page({
         //判断一下有没有全局优惠活动
         th.check_nor_promgood(newd.goods_id, function (e) {
           if (e && e.act_id) {
-            newd['prom_type'] = 0;
+            newd['prom_type'] = e.prom_type;
             newd['prom_id'] = e.act_id;
           }
-          console.log('aaaaa');
-          newd['prom_type'] = 0;
           th.buyNow(newd);
         });
       }
@@ -6252,10 +6286,20 @@ Page({
   check_nor_promgood(goods_id, back) {
     getApp().request.get("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + goods_id, {
       success: function (res) {
-        if (res.data.code == 0 && res.data.data && res.data.data.promGoodsLists && res.data.data.promGoodsLists.length > 0) {
-          var obj = {
-            act_id: res.data.data.promGoodsLists[0].prom_id,
+        if (res.data.code == 0 && res.data.data) {
+          var obj = {};
+          if(res.data.data.promGoodsLists && res.data.data.promGoodsLists.length > 0){
+            obj = {
+              act_id: res.data.data.promGoodsLists[0].prom_id,
+              prom_type:3
+            }
+          }else if(res.data.data.ladderLists){
+            obj = {
+              act_id: res.data.data.ladderLists[0].form_id,
+              prom_type:10
+            }
           }
+
           back(obj);
         } else {
           back(0)
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index cb0b817..0207e7c 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -4854,10 +4854,11 @@ Page({
         getApp().confirmBox("拼团商品至少要买" + qnum + "件!");
         return false;
       }
-      th.addcart_pt_func();
-    } else {
-      th.addcart_pt_func();
+
     }
+
+    th.addcart_pt_func();
+
   },
 
   addcart_pt_func: function () {
@@ -5051,9 +5052,42 @@ Page({
         //判断一下有没有全局优惠活动
         th.check_nor_promgood(newd.goods_id, function (e) {
           if (e && e.act_id) {
-            newd['prom_type'] = 3;
+            newd['prom_type'] = e.prom_type;
             newd['prom_id'] = e.act_id;
           }
+
+          if(e.prom_type==10){
+            //----先看会员在购物车中是否加入了该商品,立即购买的-----
+            getApp().request.get("/api/weshop/cart/page", {
+              data: {
+                store_id: e.store_id,
+                user_id: oo.user_id,
+                state: 1
+              },
+              success: function (res) {
+                //-------如果购物车中有相关的数据,先清理掉---------
+                if (res.data.code == 0 && res.data.data.total > 0) {
+                  for (let j in res.data.data.pageData) {
+                    let item_j = res.data.data.pageData[j];
+                    var url = '/api/weshop/cart/del/' + e.data.stoid + '/' + item_j.id;
+                    getApp().request.delete(url, {});
+                  }
+                }
+
+                newd.state = 1;
+                getApp().request.post("/api/weshop/cart/save", {
+                  data: newd,
+                  success: function (t) {
+                    th.closeSpecModal();
+                    getApp().goto("/packageE/pages/cart/cart2/cart2?state=1");
+                  }
+                });
+
+              }
+            })
+            return false;
+          }
+
           th.buyNow(newd)
         })
       } else th.buyNow_pt(newd);
@@ -7101,6 +7135,7 @@ Page({
           if (res.data.code == 0) {
             var r_data = res.data.data;
 
+            //如果有
             if (r_data.ladderLists) {
               var act_id = r_data.ladderLists[0].form_id;
               //-- 判断会员能不能参与阶梯促销 --
@@ -7114,6 +7149,16 @@ Page({
                       prom_content += "第" + (parseInt(jj) + 1) + "件" + r_data.ladderLists[jj].discount + "折，";
                     }
                   }
+
+                  //暂定优惠促销还不能重叠
+                  if(res.data.data.good_object==0 && (r_data.promGoodsLists || th.data.zh_act)){
+                    return false;
+                  }
+
+                  if(res.data.data.good_object==1){
+                    r_data.promGoodsLists=null;
+                  }
+
                   prom_content = ut.sub_last(prom_content);
                   th.data.prom_type = 10;
                   th.data.prom_id = act_id;
@@ -7379,10 +7424,20 @@ Page({
   check_nor_promgood(goods_id, back) {
     getApp().request.get("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + goods_id, {
       success: function (res) {
-        if (res.data.code == 0 && res.data.data && res.data.data.promGoodsLists && res.data.data.promGoodsLists.length > 0) {
-          var obj = {
-            act_id: res.data.data.promGoodsLists[0].prom_id,
+        if (res.data.code == 0 && res.data.data) {
+          var obj = {};
+          if(res.data.data.promGoodsLists && res.data.data.promGoodsLists.length > 0){
+            obj = {
+              act_id: res.data.data.promGoodsLists[0].prom_id,
+              prom_type:3
+            }
+          }else if(res.data.data.ladderLists){
+            obj = {
+              act_id: res.data.data.ladderLists[0].form_id,
+              prom_type:10
+            }
           }
+
           back(obj);
         } else {
           back(0)