diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 6695c3e..2f46118 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -154,6 +154,7 @@ Page({
         prom_buy_limit: 0,
         djs: null,
         prom_st: 0,
+        f_prom_st: 0,
         prom_r_null: 0,
         prom_end_time: null,
         prom_start_time: null,
@@ -2276,6 +2277,7 @@ Page({
               openSpecModal_inte: 0,
               openSpecModal_inte_normal: 0,
               openSpecModal_pt: 0,
+              openSpecModal_flash_normal:0
             })
 
             if (e.prom_type == 4) {
@@ -3473,7 +3475,7 @@ Page({
               if (item) this.setData({
                 sele_g: item,
                 data: item,
-                //gid: gid,
+                //gid: gid,  //只去掉gid的更新
 
               });
 
@@ -4061,6 +4063,7 @@ Page({
                     front_def_pickpu_list:th.data.def_pickpu_list,
                     front_pickpu_listt:th.data.pickpu_list,
                     front_all_sto:th.data.all_sto,
+                    front_is_show_sto_cat:th.data.is_show_sto_cat,
                   })
                 }
               },
@@ -4833,6 +4836,7 @@ Page({
                                 prom_id: prom_id,
                                 prom_buy_limit: t.data.data.buy_limit,
                                 prom_act: t.data.data,
+                                f_prom_act: t.data.data,
                                 prom_end_time: prom_end_time,
                                 prom_start_time: prom_start_time,
                                 isshow: 1,
@@ -4851,7 +4855,8 @@ Page({
                                 if (endTime2 > newTime) {
                                   ee.setData({
                                     prom_time_text: '距秒杀结束还有',
-                                    prom_st: 1
+                                    prom_st: 1,
+                                    f_prom_st: 1
                                   })
                                   ee.countDown(endTime2);
                                 }
@@ -7403,7 +7408,8 @@ Page({
                             only_pk:ut.deep_cp(th.data.front_only_pk),
                             def_pickpu_list:ut.deep_cp(th.data.front_def_pickpu_list),
                             pickpu_list:ut.deep_cp(th.data.front_pickpu_listt),
-                            all_sto:ut.deep_cp(th.data.front_all_sto)
+                            all_sto:ut.deep_cp(th.data.front_all_sto),
+                            is_show_sto_cat:th.data.front_is_show_sto_cat
                           })
 
 
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 449f0ed..9588290 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -465,26 +465,26 @@
               </view>
             </view>
 
-            <!-- 许程 7.24 暂时注释 -->
+            <!-- 许程 7.24 暂时注释，秒杀才有多规格-->
             <view wx:if="{{prom_type==1}}">
               <view class="goods-num">
-                <block wx:if="prom_st>0">
-                  <view class="stock">总数量：{{prom_act.is_virtual_count ? prom_act.goods_num : (prom_act.goods_num+prom_act.virtual)}}件</view>
-                  <view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
+                <block wx:if="f_prom_st>0">
+                  <view class="stock">总数量：{{f_prom_act.is_virtual_count ? f_prom_act.goods_num : (f_prom_act.goods_num+f_prom_act.virtual)}}件</view>
+                  <view class="stock" wx:if="{{f_prom_act.buy_limit>0}}">限购:{{f_prom_act.buy_limit}}件</view>
                   <view class="stock" wx:else>限购:不限</view>
 
-                  <block wx:if="{{prom_st==0}}">
+                  <block wx:if="{{f_prom_st==0}}">
                     <view class="sales">已购:0件</view>
                   </block>
                   <block wx:else>
-                    <view class="sales">已购:{{prom_act.buy_num+prom_act.virtual}}件</view>
+                    <view class="sales">已购:{{f_prom_act.buy_num+f_prom_act.virtual}}件</view>
                   </block>
                 </block>
                 <block wx:else>
-                  <view class="stock">总数量：{{prom_act.goods_num}}件</view>
-                  <view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
+                  <view class="stock">总数量：{{f_prom_act.goods_num}}件</view>
+                  <view class="stock" wx:if="{{f_prom_act.buy_limit>0}}">限购:{{f_prom_act.buy_limit}}件</view>
                   <view class="stock" wx:else>限购:不限</view>
-                  <view class="sales">已购:{{prom_act.buy_num}}件</view>
+                  <view class="sales">已购:{{f_prom_act.buy_num}}件</view>
                 </block>
               </view>
             </view>
@@ -1683,7 +1683,7 @@
       <view class="store-list">
         <!-- 如果还没有点击更多门店的时候 -->
         <block wx:if="{{choice_sort_store==0}}">
-          <!-- 需要for循环 -->
+          <!-- 需要for循环is_show_sto_cat表示门店的数量已经超10个 -->
           <block wx:if="{{is_show_sto_cat==1}}">
             <view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
               <view class="store flex-vertical">
@@ -1717,6 +1717,7 @@
             </view>
           </block>
           <block wx:else>
+            <!-- 此时的情况就是门店的数量少于10个 -->
             <view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
               <view class="store flex-vertical">
                 <!-- 需要点击事件 -->
@@ -1816,6 +1817,7 @@
     </block>
   </view>
 </block>
+
 <!-- ---------------分享弹窗--------------- -->
 <!-- 二维码显示页面 -->
 <canvas canvas-id='share' style='width:750rpx;height:1217rpx;background-color:white;' wx:if="{{!canvasHidden}}"></canvas>