diff --git a/components/promate_pop/p_filter.wxs b/components/promate_pop/p_filter.wxs
new file mode 100644
index 0000000..c3db5af
--- /dev/null
+++ b/components/promate_pop/p_filter.wxs
@@ -0,0 +1,35 @@
+var g_filters = {
+    //-- 判断是不是有等级价 --
+    set_tab_title: function (item) {
+        switch (item.prom_type) {
+            case 3:
+                return '优惠';
+            case 5:
+                return '搭配';
+            case 7:
+                return '组合';
+            case 10:
+                return '阶梯';
+        }
+        return '';
+    },
+    set_title: function (item) {
+        switch (item.prom_type) {
+            case 3:
+                return '优惠促销';
+            case 5:
+                return '搭配促销';
+            case 7:
+                return '组合购';
+            case 10:
+                return '阶梯促销';
+        }
+        return '';
+    },
+
+
+}
+module.exports = {
+	set_tab_title: g_filters.set_tab_title,
+	set_title: g_filters.set_title,
+}
\ No newline at end of file
diff --git a/components/promate_pop/promate_pop.js b/components/promate_pop/promate_pop.js
index f596831..c23eaa1 100644
--- a/components/promate_pop/promate_pop.js
+++ b/components/promate_pop/promate_pop.js
@@ -34,15 +34,18 @@ Component({
 	  },
 
 	  go_the_url:function (e){
-		  var prom_id = e.currentTarget.dataset.id;
-		  var prom_type = e.currentTarget.dataset.prom_type;
+		  var index=e.currentTarget.dataset.index;
+		  var item=this.data.cx_prom_group[index];
+
+		  var prom_id = item.prom_id;
+		  var prom_type = item.prom_type;
 		  var url='';
 		  switch (parseInt(prom_type)){
 			  case 3:
 				  url = "/pages/goods/goodsList/goodsList?prom_type=3&prom_id=" + prom_id;
 				  break;
 			  case 5:
-				  url = "/packageA/pages/prom_list/prom_list?goods_id=" + this.data.gid;
+				  url = "/packageA/pages/prom_list/prom_list?goods_id=" + item.main_gid;
 				  var room_id = getApp().globalData.room_id;
 				  if (room_id && this.data.gid == getApp().globalData.room_goods_id) {
 					  url += "&room_id=" + room_id;
diff --git a/components/promate_pop/promate_pop.wxml b/components/promate_pop/promate_pop.wxml
index 6d870f8..2f5f18d 100644
--- a/components/promate_pop/promate_pop.wxml
+++ b/components/promate_pop/promate_pop.wxml
@@ -44,7 +44,7 @@
 
                                     <view style="height: 12rpx"></view>
                                 </block>
-                                <view bindtap="go_the_url" data-id="{{item.id}}" data-prom_type="{{item.prom_type}}" class="xq_btn fs30">详情</view>
+                                <view bindtap="go_the_url" data-index="{{index}}" class="xq_btn fs30">详情</view>
                             </view>
                         </view>
 
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 79fbf4d..b862bc7 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -1825,7 +1825,16 @@ Page({
     //--- 调用接口获取活动 ---
     await getApp().promiseGet('/api/weshop/goods/getGoodsPromInfo', {data:req_d}).then(res => {
          if(res.data.code==0){
-             item1.more_cx=res.data.data.more_cx;
+             var more_cx=res.data.data.more_cx;
+             for(var i=0;i<more_cx.length;i++){
+               if(more_cx[i].prom_type==5){
+                 more_cx[i].main_gid= more_cx[i].collocation.main_goods_id;
+                 var min=more_cx[i].collocation_main_price+more_cx[i].collocation_min_price;
+                 var max=more_cx[i].collocation_main_price+more_cx[i].collocation_max_price;
+                 more_cx[i].show_price="￥"+min+"-"+max;
+               }
+             }
+             item1.more_cx=more_cx;
 
              if(res.data.data.zh_pro){
                  th.data.zhhe_act_map[res.data.data.zh_pro.id]=res.data.data.zh_pro;
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index 1475c7b..4214ae9 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -69,7 +69,17 @@ Page({
     //--- 调用接口获取活动 ---
     await getApp().promiseGet('/api/weshop/goods/getGoodsPromInfo', {data:req_d}).then(res => {
       if(res.data.code==0){
-        item1.more_cx=res.data.data.more_cx;
+
+        var more_cx=res.data.data.more_cx;
+        for(var i=0;i<more_cx.length;i++){
+            if(more_cx[i].prom_type==5){
+                more_cx[i].main_gid= more_cx[i].collocation.main_goods_id;
+                var min=more_cx[i].collocation_main_price+more_cx[i].collocation_min_price;
+                var max=more_cx[i].collocation_main_price+more_cx[i].collocation_max_price;
+                more_cx[i].show_price="￥"+min+"-"+max;
+            }
+        }
+        item1.more_cx=more_cx
         if(res.data.data.zh_pro){
           th.data.zuhe_map[res.data.data.zh_pro.id]=res.data.data.zh_pro;
         }
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index f294d6e..46e417a 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -7092,7 +7092,8 @@ Page({
             title: r_data.collocationPromList.title,
             show_price: show_price,
             show_time: show_time,
-            prom_type:5
+            prom_type:5,
+            main_gid:gid
           });
         }