diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 7f53423..9b51e1d 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -151,6 +151,7 @@ Page({
         prom_type: 0,
         prom_time_text: "",
         prom_price: null,
+        f_prom_price: null,  //秒杀使用
         prom_buy_limit: 0,
         djs: null,
         prom_st: 0,
@@ -4846,6 +4847,7 @@ Page({
 
                               ee.setData({
                                 prom_price: t.data.data.user_price,
+                                f_prom_price: t.data.data.user_price,
                                 prom_type: 1,
                                 prom_id: prom_id,
                                 prom_buy_limit: t.data.data.buy_limit,
@@ -8287,11 +8289,23 @@ Page({
                                   th.data.collocationGoods = r_data.collocationPromList;
                                   th.data.prom_goods = r_data.promGoodsLists;
                                 } else {
-                                  th.setData({
-                                    order_prom: r_data.promOrder,
-                                    collocationGoods: r_data.collocationPromList,
-                                    prom_goods: r_data.promGoodsLists,
-                                  })
+
+                                  if(gid==th.data.front_g){
+                                       th.setData({
+                                          order_prom: r_data.promOrder,
+                                          f_order_prom: r_data.promOrder,
+                                          collocationGoods: r_data.collocationPromList,
+                                          prom_goods: r_data.promGoodsLists,
+                                       })
+                                  }else{
+                                      th.setData({
+                                        order_prom: r_data.promOrder,
+                                        collocationGoods: r_data.collocationPromList,
+                                        prom_goods: r_data.promGoodsLists,
+                                      })
+                                  }
+
+
                                 }
 
 
@@ -8397,9 +8411,21 @@ Page({
                               //使用sort排序
                               ppdata.sort(comp);
 
-                              th.setData({
-                                cx_prom_group: ppdata
-                              })
+
+                               //-- 如果是前端商品的时候 --
+                              if(th.data.sele_g.goods_id==th.data.front_g.goods_id){
+                                th.setData({
+                                  cx_prom_group: ppdata,
+                                  f_cx_prom_group: ppdata,
+                                })
+
+                              }else{
+                                th.setData({
+                                  cx_prom_group: ppdata
+                                })
+                              }
+
+
 
                             })
                           },
@@ -8854,9 +8880,20 @@ Page({
                                     //   th.data.prom_type = new_arr[0].prom_type;
                                     // }
 
-                                    th.setData({
-                                      more_flash: new_arr
-                                    });
+                                    //-- 如果是前端商品的时候 --
+                                    if(gid==th.data.front_g.goods_id){
+                                      th.setData({
+                                        more_flash: new_arr,
+                                        f_more_flash: new_arr,
+                                      });
+
+                                    }else{
+                                        th.setData({
+                                          more_flash: new_arr
+                                        });
+                                    }
+
+
                                   }
                                 })
                               },
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 554f50b..d507a30 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -83,34 +83,35 @@
           </view>
         </view>
 
-        <!-- --显示秒杀价 -->
+        <!-- --显示秒杀的定时器 -->
         <view class="prom_show rel" wx:if="{{prom_type==1}}">
-          <image class="secondkill-img" src='{{prom_st==1? iurl+"/miniapp/images/red_jx.png":iurl+"/miniapp/images/blue_ks.png"}}'></image>
+          <image class="secondkill-img" src='{{f_prom_st==1? iurl+"/miniapp/images/red_jx.png":iurl+"/miniapp/images/blue_ks.png"}}'></image>
           <image class="abs spike-img" src="{{iurl}}/miniapp/images/xsmiaosha.png"></image>
-          <view class="stop fs26 abs" wx:if="{{prom_st==1}}">距活动结束还有</view>
-          <view class="start fs26  abs" wx:if="{{prom_st==2}}">距活动开始还有</view>
+          <view class="stop fs26 abs" wx:if="{{f_prom_st==1}}">距活动结束还有</view>
+          <view class="start fs26  abs" wx:if="{{f_prom_st==2}}">距活动开始还有</view>
           <view class="secview  flex abs fs24 xc-miaosha-time">
             <block wx:if="djs.day">
-              <view class='day-val' style="color:{{prom_st==1?'#d40022':'#0097e0'}}">
+              <view class='day-val' style="color:{{f_prom_st==1?'#d40022':'#0097e0'}}">
                 {{djs.day}}
               </view>
-              <view class="day white" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">天</view>
+              <view class="day white" style="color: {{f_prom_st==1?'#d40022':'#0097e0'}}">天</view>
             </block>
-            <view class='time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}">
+            <view class='time-val white t-c' style=" background:{{f_prom_st==1?'#d40022':'#0097e0'}}">
               {{djs.hou}}
             </view>
-            <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">时</view>
-            <view class='time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}">
+            <view class="time" style="color: {{f_prom_st==1?'#d40022':'#0097e0'}}">时</view>
+            <view class='time-val white t-c' style=" background:{{f_prom_st==1?'#d40022':'#0097e0'}}">
               {{djs.min}}
             </view>
-            <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">分</view>
-            <view class='time-val white t-c' style="background:{{prom_st==1?'#d40022':'#0097e0'}}">
+            <view class="time" style="color: {{f_prom_st==1?'#d40022':'#0097e0'}}">分</view>
+            <view class='time-val white t-c' style="background:{{f_prom_st==1?'#d40022':'#0097e0'}}">
               {{djs.sec}}
             </view>
-            <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view>
+            <view class="time" style="color: {{f_prom_st==1?'#d40022':'#0097e0'}}">秒</view>
           </view>
         </view>
-        <!-- --显示团购价 -->
+
+        <!-- --显示团购价和剩余时间 -->
         <view class="prom_show rel" wx:if="{{prom_type==2}}">
  
           <view class="abs flex fs36" style="align-items:flex-end;color: #fff; margin-top: 34rpx; margin-left: 10rpx; height: 60rpx">￥{{prom_price}}
@@ -437,7 +438,7 @@
                 <view class="flex" style="align-items: baseline;">
                   <view class="flex xc-price-frame">
                     <text class="fs30">￥</text>
-                    {{prom_price}}
+                    {{f_prom_price}}
                   </view>
                   <view wx:if="{{is_retail_price}}" class="word-line fs24 no_line_x">零售价：￥{{filters.toFix(front_g.market_price,2)}}</view>
                   <view wx:else class="word-line no_line_x fs24">￥{{filters.toFix(front_g.shop_price,2)}}</view>
@@ -574,18 +575,17 @@
 <!--            </view>-->
 <!--          </view>-->
 <!--        </block>-->
-
-
-        <block wx:if="{{order_prom}}">
+        
+        <block wx:if="{{f_order_prom}}">
           <view class="cx-frame flex" style="position: relative; height: auto">
             <view class="cx-sizs fs30 pdr20">订单优惠</view>
             <!-- 中间显示层 -->
             <view class="flex ai-center">
               <image class="hui_img" src="{{iurl}}/miniapp//images/hui.png"></image>
               <view class="order_hui">
-                <view class="fs28 ellipsis-1">{{order_prom.name}}</view>
+                <view class="fs28 ellipsis-1">{{f_order_prom.name}}</view>
                 <view class="fs26">
-                  (活动时间：{{tool.format_tt(order_prom.start_time)}} - {{tool.format_tt(order_prom.end_time)}})
+                  (活动时间：{{tool.format_tt(f_order_prom.start_time)}} - {{tool.format_tt(f_order_prom.end_time)}})
                 </view>
               </view>
             </view>
@@ -616,9 +616,9 @@
 
         <!-- 判断是不是有秒杀 -->
            <!-- 判断是不是有秒杀 -->
-        <block wx:if="{{more_flash}}">
+        <block wx:if="{{f_more_flash}}">
 
-          <block wx:for="{{more_flash}}">
+          <block wx:for="{{f_more_flash}}">
 <!--            <view class="cx-frame flex" style="position: relative; height: auto" wx:if="{{item.prom_type==1}}">-->
             <view class="cx-frame flex" style="position: relative; height: auto" >
                <view wx:if="{{item.prom_type==1}}"  class="cx-sizs wsize" style="width: 144rpx">秒杀</view>
@@ -657,11 +657,11 @@
         </block>
 
         <!-- 新增促销多活动的排版 -->
-        <view class="bdt16" wx:if="{{ prom_type!=1 && prom_type!=2 && prom_type!=4 && prom_type!=6 && cx_prom_group.length>0}}">
+        <view class="bdt16" wx:if="{{ prom_type!=1 && prom_type!=2 && prom_type!=4 && prom_type!=6 && f_cx_prom_group.length>0}}">
           <view data-coupon="1" bindtap="switch_cx_group" class="cx-frame flex" style="position: relative">
             <view class="cx-sizs fs30">促销</view>
             <view class="flex ai_c f1 pdh20">
-                <view class="xc-coupon-fram" wx:for="{{cx_prom_group}}" >
+                <view class="xc-coupon-fram" wx:for="{{f_cx_prom_group}}" >
                   <view wx:if="{{item.prom_type==3}}" class="xc-coupon t-c four-level-word">优惠促销</view>
                   <view wx:if="{{item.prom_type==5}}" class="xc-coupon t-c four-level-word">搭配促销</view>
                   <view wx:if="{{item.prom_type==7}}" class="xc-coupon t-c four-level-word">组合购</view>