diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 3b84394..554f50b 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -1118,15 +1118,15 @@
       </block>
     </block>
     <!-- -----秒杀------ -->
-    <block wx:if="{{prom_type==1 || prom_type==2}}">
-      <block wx:if="{{f_prom_st==1 && !prom_r_null}}">
+    <block wx:if="{{prom_type==1}}">
+      <block wx:if="{{f_prom_st==1 && !f_prom_r_null}}">
         <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
         <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即抢购</view>
       </block>
 
-      <block wx:if="{{prom_st==0 && !prom_r_null}}">
+      <block wx:if="{{f_prom_st==0 && !f_prom_r_null}}">
         <!-- 秒杀预热要单独购买  -->
-        <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
+        <block wx:if="{{prom_type==1 && f_prom_act.is_shop_buy}}">
           <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
           <view class="buy-btn cart-btn lanse">即将开始</view>
         </block>
@@ -1136,12 +1136,12 @@
       </block>
 
 
-      <block wx:if="{{prom_r_null}}">
+      <block wx:if="{{f_prom_r_null}}">
         <block wx:if="{{prom_type==1}}">
 
           <!-- 多个秒杀的时候 -->
           <block wx:if="{{is_more_flash}}">
-              <block wx:if="{{prom_act.is_shop_buy}}">
+              <block wx:if="{{f_prom_act.is_shop_buy}}">
                 <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
                 <view bindtap="openSpecModel" data-ind="2"  class="buy-btn cart-btn">立即抢购</view>
               </block>
@@ -1151,7 +1151,7 @@
               </block>
           </block>
           <block wx:else>
-              <block wx:if="{{prom_act.is_shop_buy}}">
+              <block wx:if="{{f_prom_act.is_shop_buy}}">
                 <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
                 <view  class="buy-btn cart-btn huise">已抢光</view>
               </block>
@@ -1166,6 +1166,65 @@
         <view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width">已抢光</view>
 
       </block>
+      <block wx:if="{{f_prom_st==3 && !f_prom_r_null}}">
+        <block wx:if="{{prom_type==1 && f_prom_act.is_shop_buy}}">
+          <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
+          <view class="buy-btn cart-btn huise">活动已经结束</view>
+        </block>
+        <view wx:else class="buy-btn cart-btn cart-btn-lg lanse set_width">活动已经结束</view>
+      </block>
+    </block>
+
+
+    <!-- -----团购------ -->
+    <block wx:if="{{prom_type==2}}">
+      <block wx:if="{{prom_st==1 && !prom_r_null}}">
+        <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
+        <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即抢购</view>
+      </block>
+
+      <block wx:if="{{prom_st==0 && !prom_r_null}}">
+        <!-- 秒杀预热要单独购买  -->
+        <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
+          <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
+          <view class="buy-btn cart-btn lanse">即将开始</view>
+        </block>
+        <block wx:else>
+          <view class="buy-btn cart-btn cart-btn-lg lanse set_width">即将开始</view>
+        </block>
+      </block>
+
+
+      <block wx:if="{{prom_r_null}}">
+        <block wx:if="{{prom_type==1}}">
+
+          <!-- 多个秒杀的时候 -->
+          <block wx:if="{{is_more_flash}}">
+            <block wx:if="{{prom_act.is_shop_buy}}">
+              <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
+              <view bindtap="openSpecModel" data-ind="2"  class="buy-btn cart-btn">立即抢购</view>
+            </block>
+            <block wx:else>
+              <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
+              <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即抢购</view>
+            </block>
+          </block>
+          <block wx:else>
+            <block wx:if="{{prom_act.is_shop_buy}}">
+              <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
+              <view  class="buy-btn cart-btn huise">已抢光</view>
+            </block>
+            <block wx:else>
+              <view  class="buy-btn cart-btn huise">已抢光</view>
+            </block>
+          </block>
+
+
+        </block>
+
+        <view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width">已抢光</view>
+
+      </block>
       <block wx:if="{{prom_st==3 && !prom_r_null}}">
         <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}">
           <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view>
@@ -1174,6 +1233,7 @@
         <view wx:else class="buy-btn cart-btn cart-btn-lg lanse set_width">活动已经结束</view>
       </block>
     </block>
+
     <!-- -----拼单------ -->
     <block wx:if="{{prom_type==6}}">
       <view bindtap="openSpecModel_pt" data-it="1" data-ind="1" class="join-btn cart-btn line-h">