diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
index 7b03c7e..e9292b4 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
@@ -714,7 +714,7 @@ Page({
         data: {
           store_id: os.stoid,
           type: 1,
-          pageSize: 3,
+          pageSize: 100,
           page: 1,
           is_share: 0,
         },
@@ -722,7 +722,24 @@ Page({
         fir_quan = res1.data.data.pageData;
       })
     }
-
+    //过滤不是本商品的单品优惠券-------------------
+    if(fir_quan.length > 0 ){
+      let goodInfo = ee.data.data
+      for (let index = fir_quan.length-1; index >= 0; index--) {
+        if (fir_quan[index].useobjecttype==20) { //判断是单品优惠券
+          if (fir_quan[index].useobjectno != goodInfo.goods_sn) {
+            fir_quan.splice(index,1)
+          }
+        }            
+      }         
+    }
+    let arr=[]
+    let length = fir_quan.length
+    if (length <= 3) {
+      arr=fir_quan
+    }else{
+      arr=fir_quan.splice(0,3);
+    }
     //--------获取视频图片---------
     await getApp().request.promiseGet("/api/weshop/goodsVideos/get/" + os.stoid + "/" + ee.data.gid, {
       1: 1
@@ -748,7 +765,7 @@ Page({
       is_collect: is_collect,
       collect_id: collect_id,
       categories3: categories3,
-      fir_quan: fir_quan,
+      fir_quan: arr,
       fir_comments: fir_com,
       mapurl_f_img: mapurl_f_img,
       mapurl: mapurl,
@@ -4450,7 +4467,18 @@ Page({
         wx.hideLoading();
         quan_list = res.data.data.pageData;
       })
-
+      //过滤不是本商品的单品优惠券
+      if (quan_list.length > 0) {
+        let goodInfo = th.data.data
+        for (let index = quan_list.length-1; index >= 0; index--) {
+          if (quan_list[index].useobjecttype==20) { //判断是单品优惠券
+            if (quan_list[index].useobjectno != goodInfo.goods_sn) {
+              quan_list.splice(index,1)
+            }
+          }            
+        }
+      }
+      //------------------------
       if (quan_list) {
         for (var ind in quan_list) {
           var ep = quan_list[ind];
diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js
index ffa4834..951acf3 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.js
@@ -561,7 +561,7 @@ Page({
         data: {
           store_id: os.stoid,
           type: 1,
-          pageSize: 3,
+          pageSize: 100,
           page: 1,
           is_share: 0,
         },
@@ -569,7 +569,24 @@ Page({
         fir_quan = res1.data.data.pageData;
       })
     }
-
+        //过滤不是本商品的单品优惠券-------------------
+        if(fir_quan.length > 0 ){
+          let goodInfo = ee.data.data
+          for (let index = fir_quan.length-1; index >= 0; index--) {
+            if (fir_quan[index].useobjecttype==20) { //判断是单品优惠券
+              if (fir_quan[index].useobjectno != goodInfo.goods_sn) {
+                fir_quan.splice(index,1)
+              }
+            }            
+          }         
+        }
+        let arr=[]
+        let length = fir_quan.length
+        if (length <= 3) {
+          arr=fir_quan
+        }else{
+          arr=fir_quan.splice(0,3);
+        }
     //--------获取视频图片---------
     await getApp().request.promiseGet("/api/weshop/goodsVideos/get/" + os.stoid + "/" + ee.data.gid, {
       1: 1
@@ -587,7 +604,7 @@ Page({
       is_collect: is_collect,
       collect_id: collect_id,
       categories3: categories3,
-      fir_quan: fir_quan,
+      fir_quan: arr,
       fir_comments: fir_com,
       mapurl_f_img: mapurl_f_img,
       mapurl: mapurl,
@@ -2615,7 +2632,18 @@ Page({
         wx.hideLoading();
         quan_list = res.data.data.pageData;
       })
-
+      //过滤不是本商品的单品优惠券
+      if (quan_list.length > 0) {
+        let goodInfo = th.data.data
+        for (let index = quan_list.length-1; index >= 0; index--) {
+          if (quan_list[index].useobjecttype==20) { //判断是单品优惠券
+            if (quan_list[index].useobjectno != goodInfo.goods_sn) {
+              quan_list.splice(index,1)
+            }
+          }            
+        }
+      }
+      //------------------------
       if (quan_list) {
         for (var ind in quan_list) {
           var ep = quan_list[ind];
diff --git a/packageC/pages/presell/pregoodsInfo/goodsInfo.js b/packageC/pages/presell/pregoodsInfo/goodsInfo.js
index d72e20a..31124c2 100644
--- a/packageC/pages/presell/pregoodsInfo/goodsInfo.js
+++ b/packageC/pages/presell/pregoodsInfo/goodsInfo.js
@@ -556,7 +556,7 @@ Page({
         data: {
           store_id: os.stoid,
           type: 1,
-          pageSize: 3,
+          pageSize: 100,
           page: 1,
           is_share: 0,
         },
@@ -564,7 +564,25 @@ Page({
         fir_quan = res1.data.data.pageData;
       })
     }
-
+    //过滤不是本商品的单品优惠券-------------------
+    if(fir_quan.length > 0 ){
+      let goodInfo = ee.data.data
+      for (let index = fir_quan.length-1; index >= 0; index--) {
+        if (fir_quan[index].useobjecttype==20) { //判断是单品优惠券
+          if (fir_quan[index].useobjectno != goodInfo.goods_sn) {
+            fir_quan.splice(index,1)
+          }
+        }            
+      }         
+    }
+    let arr=[]
+    let length = fir_quan.length
+    if (length <= 3) {
+      arr=fir_quan
+    }else{
+      arr=fir_quan.splice(0,3);
+    }
+    //--------获取视频图片---------
     //--------获取视频图片---------
     await getApp().request.promiseGet("/api/weshop/goodsVideos/get/" + os.stoid + "/" + ee.data.gid, {
       1: 1
@@ -580,7 +598,7 @@ Page({
       is_collect: is_collect,
       collect_id: collect_id,
       categories3: categories3,
-      fir_quan: fir_quan,
+      fir_quan: arr,
       fir_comments: fir_com,
       mapurl_f_img: mapurl_f_img,
       mapurl: mapurl,
@@ -2578,7 +2596,18 @@ Page({
         wx.hideLoading();
         quan_list = res.data.data.pageData;
       })
-
+      //过滤不是本商品的单品优惠券
+      if (quan_list.length > 0) {
+        let goodInfo = th.data.data
+        for (let index = quan_list.length-1; index >= 0; index--) {
+          if (quan_list[index].useobjecttype==20) { //判断是单品优惠券
+            if (quan_list[index].useobjectno != goodInfo.goods_sn) {
+              quan_list.splice(index,1)
+            }
+          }            
+        }
+      }
+      //------------------------
       if (quan_list) {
         for (var ind in quan_list) {
           var ep = quan_list[ind];
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 5a0fc2f..c25fb88 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -417,6 +417,7 @@ Page({
                     is_show_gb: 1
                 });
             }
+            console.log('获取系统参数');
             console.log(e);
             var json_d = JSON.parse(e.switch_list);
             ee.setData({
@@ -740,15 +741,33 @@ Page({
                 data: {
                     store_id: os.stoid,
                     type: 1,
-                    pageSize: 3,
+                    pageSize: 100,
                     page: 1,
                     is_share: 0,
                 },
             }).then(res1 => {
+
                 fir_quan = res1.data.data.pageData;
             })
         }
-
+        //过滤不是本商品的单品优惠券-------------------
+        if(fir_quan.length > 0 ){
+          let goodInfo = ee.data.data
+          for (let index = fir_quan.length-1; index >= 0; index--) {
+            if (fir_quan[index].useobjecttype==20) { //判断是单品优惠券
+              if (fir_quan[index].useobjectno != goodInfo.goods_sn) {
+                fir_quan.splice(index,1)
+              }
+            }            
+          }         
+        }
+        let arr=[]
+        let length = fir_quan.length
+        if (length <= 3) {
+          arr=fir_quan
+        }else{
+          arr=fir_quan.splice(0,3);
+        }
         //--------获取视频图片---------
         await getApp().request.promiseGet("/api/weshop/goodsVideos/get/" + os.stoid + "/" + ee.data.gid, {
             1: 1
@@ -764,7 +783,7 @@ Page({
             is_collect: is_collect,
             collect_id: collect_id,
             categories3: categories3,
-            fir_quan: fir_quan,
+            fir_quan: arr,
             fir_comments: fir_com,
             mapurl_f_img: mapurl_f_img,
             mapurl: mapurl,
@@ -2924,7 +2943,8 @@ Page({
                 }
             })
         }
-
+        console.log('活动详情------------');
+        console.log(prom);
         //----------如果有活动，并且在进行中，就不计算线下库存---------------
         var now = ut.gettimestamp();
         if (prom) {
@@ -3587,7 +3607,7 @@ Page({
                                 prom_end_time: prom_end_time,
                                 prom_start_time: prom_start_time,
                                 isshow: 1,
-                                prom_act: t.data.data
+                                // prom_act: t.data.data
                             });
 
                             ee.get_sto();
@@ -4768,7 +4788,18 @@ Page({
                 wx.hideLoading();
                 quan_list = res.data.data.pageData;
             })
-
+            //过滤不是本商品的单品优惠券
+            if (quan_list.length > 0) {
+              let goodInfo = th.data.data
+              for (let index = quan_list.length-1; index >= 0; index--) {
+                if (quan_list[index].useobjecttype==20) { //判断是单品优惠券
+                  if (quan_list[index].useobjectno != goodInfo.goods_sn) {
+                    quan_list.splice(index,1)
+                  }
+                }            
+              }
+            }
+            //------------------------
             if (quan_list) {
                 for (var ind in quan_list) {
                     var ep = quan_list[ind];
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index a9f23a8..9b90aa1 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -169,7 +169,7 @@
                 {{djs.min}}
               </view>
               <view class="xc-time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">分</view>
-              <view class='xc-time-val white t-c' style=";background:{{prom_st==1?'#d40022':'#0097e0'}}">
+              <view class='xc-time-val white t-c' style="background:{{prom_st==1?'#d40022':'#0097e0'}}">
                 {{djs.sec}}
               </view>
               <view class="xc-time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view>
@@ -264,7 +264,7 @@
                   &nbsp;&nbsp;&nbsp;￥{{filters.toFix(data.shop_price,2)}}
                 </text>
               </view>
-              <!-- 这个是分享按钮 -->
+              <!-- 这个是分享按钮 --> 
               <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c"  bindtap="saveImageToPhotosAlbum"> -->
               <view class="xc-share-frame t-c shrink0" bindtap="clickShare">
                 <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> -->
@@ -604,7 +604,7 @@
           </block>
         </block>
         <!-- 许程 7.24暂时注释 -->
-        <view class="bdt16" wx:if="{{prom_type!=1&& prom_type!=1 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1 && sele_g.is_xz_yh !=1}}">
+        <view class="bdt16" wx:if="{{ prom_type!=1 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1 && sele_g.is_xz_yh !=1}}">
           <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}">
             <view class="cx-sizs fs30">领券</view>
             <view class="flex ai_c f1 pdh20">