diff --git a/packageA/pages/prom_list/prom_list.js b/packageA/pages/prom_list/prom_list.js
index 44d72cc..7e16ca3 100644
--- a/packageA/pages/prom_list/prom_list.js
+++ b/packageA/pages/prom_list/prom_list.js
@@ -510,7 +510,7 @@ Page({
         goods_sn: o.goods_sn,
         sku: o.sku,
 		prom_type: 5,
-		prom_id:o.prom_id
+		prom_id:th.data.collocationGoods.id
       };
 
 		//---是不是从收藏夹出来的---
@@ -648,8 +648,8 @@ Page({
 			}
 		}
 
-		newd['pick_name'] = th.data.sto_sele_name;
-		newd['pick_dis'] = th.data.sto_sele_distr;
+		//newd['pick_name'] = th.data.sto_sele_name;
+		//newd['pick_dis'] = th.data.sto_sele_distr;
 
 		this.check_sele_collocation(function (collocationGoods) {
 			var is_ok = 1;
@@ -674,20 +674,84 @@ Page({
 				th.setData({lding:0})
 				return false;
 			}
-
-			newd["collocation_goods"] = collocationGoods;
-			newd["is_coupon"] = th.data.is_coupon;
-			th.buyNow(newd);
+			//newd["collocation_goods"] = collocationGoods;
+			//newd["is_coupon"] = th.data.is_coupon;
+			th.buyNow(newd,collocationGoods);
 		})
 
 	},
 
   //----------立即购买-----------
-  buyNow: function(e) {
-    s.set_b_now(e);
-    wx.redirectTo({
-      url: "/packageE/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id,
-    });
+  buyNow:async function(e,collocationGoods) {
+    //s.set_b_now(e);
+    // wx.redirectTo({
+    //   url: "/packageE/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id,
+    // });
+	console.log(1111);
+    console.log(e);
+    console.log(collocationGoods);
+	var th=this;
+
+	  //----其他就按照公众号的购物车立即购买形式来修改，先看会员在购物车中是否加入了该商品,立即购买的-----
+	  var res=await getApp().request.promiseGet("/api/weshop/cart/page", {
+		  data: {
+			  store_id: os.stoid,
+			  user_id: oo.user_id,
+			  state: 1
+		  }
+	  })
+
+	  //-------如果购物车中有相关的数据---------
+	  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/' + os.stoid + '/' + item_j.id;
+			  getApp().request.delete(url, {});
+		  }
+	  }
+
+	  //-- 推迟一下，因为删除没有那么快 --
+	  setTimeout(async () => {
+		  e.state = 1;
+		  e.selected=1;
+		  var dp_rs= await getApp().request.promisePost("/api/weshop/cart/save", {
+			  data: e,
+		  });
+
+		  if(!dp_rs || dp_rs.data.code!=0){
+			  return false;
+		  }
+
+		  for (let j = 0; j <collocationGoods.length ; j++) {
+			  var c_gd=collocationGoods[j];
+			  var save_data = {
+				  goods_id: c_gd.goods_id,
+				  goods_num: th.data.goodsInputNum,
+				  pick_id: th.data.sto_sele_id,
+				  user_id: oo.user_id,
+				  store_id: th.data.stoid,
+				  goods_price: c_gd.goods_price,
+				  member_goods_price: c_gd.goods_price,
+				  goods_name: c_gd.goods_name,
+				  goods_sn: c_gd.goods_sn,
+				  sku: c_gd.sku,
+				  prom_type: 5,
+				  prom_id:e.prom_id,
+				  is_collocation:1,
+				  state:1,
+				  selected:1
+			  };
+			  await getApp().request.promisePost("/api/weshop/cart/save", {
+				  data: save_data,
+			  });
+		  }
+		  setTimeout(()=>{ th.setData({lding:0}) },500);
+
+		  getApp().goto("/packageE/pages/cart/cart2/cart2?state=1");
+
+
+
+	  }, 500)
   },
 
   //----------增加购买数量-----------
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index cb88906..6c78491 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -681,7 +681,7 @@ Page({
 
   },
 
-  //-- 获取搭配购商品 --
+  //-- 获取搭配购商品gd是商品  arr是购物车商品列表（某个门店的）   --
   async set_collection(gd, arr, index) {
     var th = this;
     var user_id = getApp().globalData.user_id;
@@ -749,6 +749,17 @@ Page({
     }
 
     if (arr) {
+
+      //-- 看一下增品是不是已经在购物车列表中 --
+      for(var ig=0;ig<new_arr.length;ig++){
+          var f_coll=arr.find(function (em){
+              return em.goods_id==new_arr[ig].goods_id && em.is_collocation==1 && new_arr[ig].prom_id==em.prom_id
+          })
+          if(f_coll){
+            new_arr[ig].selected=1;
+          }
+      }
+
       arr[index].collocationList = new_arr;
     }
     else th.setData({
@@ -2008,6 +2019,7 @@ Page({
     //-- 代发商品不参与任何活动 --
     if (item1.whsle_id) return false;
     if (item1.is_gift) return false;
+    if (item1.is_collocation) return false;
     //-- 购物车的秒杀和团购不计算 --
     var p_type=parseInt(item1.prom_type);
     if([1,2].indexOf(p_type)>-1) return false;
@@ -7783,7 +7795,14 @@ Page({
 
       if(ck_res.code==0){
         th.data.cartlist[idx].show_can_cx[gd_key].sele_prom_type=ck_prom_type.prom_type;
-        var goods= JSON.parse(JSON.stringify(th.data.cartlist_y))
+        var goods0= JSON.parse(JSON.stringify(th.data.cartlist_y));
+        var goods=[];
+        for(var ik=0;ik<goods0.length;ik++){
+           var item_c=goods0[ik];
+           if(item_c.pick_id==pk && item_c.is_collocation) continue;
+           goods.push(item_c);
+        }
+
         //-- 此时要把购物车中的商品确定活动 --
         for (var b=0; b<ck_prom_type.goods.length;b++){
           //-- 开始查找 --
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index a5c6b98..eea6664 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -7379,6 +7379,12 @@ Page({
 
                             //普通购买的时候，重新算一下组合购有没有
                             if (is_nor || is_spec) {
+
+
+                              th.setData({
+                                cx_prom_group: []
+                              })
+
                               var arr3 = null;
                               var url = '/api/weshop/activitylist/listGoodActInfo2New';
                               var req_d = {