diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
index d5ebcd7..c0ed359 100644
--- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml
+++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -731,18 +731,7 @@
     </view>
   </view>
 </view>
-<!-- 弹起来,购买积分购 -->
-<view hidden="{{!openSpecModal_inte}}">
-  <include src="buy_integral.wxml" />
-</view>
-<!-- 弹起来,购买积分购的普通购买 -->
-<view hidden="{{!openSpecModal_inte_normal}}">
-  <include src="buy_integral_normal.wxml" />
-</view>
-<!-- --弹起来,选择规格数量,拼单商品购买---- -->
-<view hidden="{{!openSpecModal_pt}}">
-  <include src="buy_pt.wxml" />
-</view>
+
 <!-- --弹起来优惠信息---- -->
 <view hidden="{{!openPromModal}}">
   <view bindtap="closePromModal" class="cover-layer"></view>
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index abcc6d5..6731237 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -2,28 +2,24 @@
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
 <wxs module="g_filters" src="g_filter.wxs"></wxs>
 <wxs module="tool" src="filter.wxs"></wxs>
-
 <!-- 商品内容区域,普通商品,秒杀,拼团 -->
-<block wx:if="{{isshow}}">  
+<block wx:if="{{isshow}}">
   <view class="container">
     <view class="type-navbar">
       <view class="type-box" wx:for="{{categories}}" wx:key="categories">
         <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
           {{item.name}}
-        </view> 
+        </view>
       </view>
     </view>
-
     <view class="goods-detail">
       <view class="goods-info" hidden="{{activeCategoryId==0?false:true}}">
-        <!--  视频  -->
+        <!-- 视频 -->
         <!-- <swiper bindchange="swiperChange"class="xc-pictures  swiperContainer rel" current="{{swiperCurrent}}"
 	  indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}"> -->
         <view id="id" bindtouchstart="handletouchtart" bindtouchmove="handletouchmove">
-
           <view class="xc-videos-picture rel">
             <swiper autoplay="{{false}}" current="{{swiperCurrent}}" class="swiper_box  swiperContainer rel" duration="{{1000}}" indicatorDots="{{mapurl?false:true}}" interval="{{3000}}" vertical="{{false}}" bindchange="swiperChange">
-
               <swiper-item wx:if="{{mapurl}}">
                 <view wx:if="{{noon == 0}}">
                   <image class="xc-picturess" src="{{iurl+mapurl_f_img}}" mode="aspectFit">
@@ -31,13 +27,12 @@
                   </image>
                 </view>
                 <view wx:else>
-                  <video class="xc-videos" src="{{iurl+mapurl}}" id="{{index}}" wx:if="{{_index == index}}"> </video>
+                  <video class="xc-videos" src="{{iurl+mapurl}}" id="{{index}}" wx:if="{{_index == index}}"></video>
                 </view>
               </swiper-item>
-
               <swiper-item wx:for="{{gallery}}" wx:key="gallery">
-                 <!-- <image class="wh100" src="{{item.image_url}}" mode="aspectFit" binderror="bind_bnerr" lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image> -->
-				 <view class="wh100 g_img_box" style="background-image:url({{item.image_url}});"></view>
+                <!-- <image class="wh100" src="{{item.image_url}}" mode="aspectFit" binderror="bind_bnerr" lazy-load="true" data-errorimg="gallery[{{index}}].image_url"></image> -->
+                <view class="wh100 g_img_box" style="background-image:url({{item.image_url}});"></view>
               </swiper-item>
             </swiper>
             <block wx:if="{{mapurl}}">
@@ -51,49 +46,52 @@
                   </view>
                 </view>
                 <view class="xc-picture  {{videopicture==1 ? 'xc-sn':''}}" data-vipi="1" bindtap="videopicture">
-                  <view>
-                    图片
-                  </view>
+                  <view>图片</view>
                 </view>
               </view>
             </block>
           </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="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="secview  flex abs fs24 xc-miaosha-time">
             <block wx:if="djs.day">
-              <view class='day-val' style="color:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.day}}</view>
+              <view class='day-val' style="color:{{prom_st==1?'#d40022':'#0097e0'}}">
+                {{djs.day}}
+              </view>
               <view class="day white" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">天</view>
             </block>
-            <view class='time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.hou}}</view>
+            <view class='time-val white t-c' style=" background:{{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'}}">{{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'}}">{{djs.sec}}</view>
+            <view class='time-val white t-c' style=" background:{{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'}}">
+              {{djs.sec}}
+            </view>
             <view class="time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view>
           </view>
         </view>
-
-        <!----拼单---->
+        <!-- --拼单-- -->
         <view class="pt_show " wx:if="{{prom_type==6}}">
           <view class="pt_view rel">
-            <!--许程 7. 24 -->
+            <!-- 许程 7. 24 -->
             <image class="secondkill-img" src="{{prom_st==1? iurl+'/miniapp/images/red_jx.png':iurl+'/miniapp/images/blue_ks.png'}}"></image>
             <view class="abs xc-qt-price">
               <view class="flex" style='height:40rpx; margin-top:5rpx'>
                 <view class="flex fs35 xc-qtsign">￥</view>
                 <view class="fs50 val">{{prom_price}}</view>
               </view>
-              <view class="word-line fs20 xc-qtunit-price">零售价￥{{filters.toFix(data.market_price,2)}}</view>
+              <view class="word-line fs20 xc-qtunit-price">
+                零售价￥{{filters.toFix(data.market_price,2)}}
+              </view>
             </view>
             <view class="abs white xc-nanber">
               <text class="fs22">已拼{{prom_act.buy_num}}件</text>
@@ -101,251 +99,267 @@
                 <view class="xc-people-img">
                   <image class="imgs" src="{{prom_st==1? iurl+'/miniapp/images/r_logo_red.png':iurl+'/miniapp/images/r_logo.png'}}"></image>
                 </view>
-                <view class="t-s fs20 xc-people-val">
-                  {{prom_act.ct_num}}人拼
-                </view>
+                <view class="t-s fs20 xc-people-val">{{prom_act.ct_num}}人拼</view>
               </view>
             </view>
             <view class="hy-stop word-color fs26 abs" wx:if="{{prom_st==1}}">距活动结束还有</view>
             <view class="hy-stop word-color-lan fs26  abs" wx:if="{{prom_st==0}}">距活动开始还有</view>
             <view class="secview  flex abs fs24 " style="color: black;right: 3px; top:46rpx;">
               <block wx:if="djs.day">
-                <view class='day-val' style="color:{{prom_st==1?'#d40022':'#0097e0'}};margin-top:-34rpx;">{{djs.day}}</view>
-                <view class="day white" style="margin-top:-34rpx;margin-right:10rpx;color: {{prom_st==1?'#d40022':'#0097e0'}}">天</view>
+                <view class='day-val' style="color:{{prom_st==1?'#d40022':'#0097e0'}};margin-top:-34rpx;">
+                  {{djs.day}}
+                </view>
+                <view class="day white" style="margin-top:-34rpx;margin-right:10rpx;color: {{prom_st==1?'#d40022':'#0097e0'}}">
+                  天
+                </view>
               </block>
-              <view class='xc-time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}">{{djs.hou}}</view>
+              <view class='xc-time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}">
+                {{djs.hou}}
+              </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'}}">{{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'}}">{{djs.sec}}</view>
+              <view class='xc-time-val white t-c' style=" background:{{prom_st==1?'#d40022':'#0097e0'}}">
+                {{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'}}">
+                {{djs.sec}}
+              </view>
               <view class="xc-time" style="color: {{prom_st==1?'#d40022':'#0097e0'}}">秒</view>
             </view>
           </view>
-
           <view class="pt_fir pd20">
-            <!----显示团类型和团价格---->
+            <!-- --显示团类型和团价格-- -->
             <view class="pt_fir_title ">
               <!-- 许程 商家团主页 -->
               <view class="xc-goods-explain flex-vertical-between">
-                <view class="xc-explain fs32 ellipsis-2"  wx:if="{{prom_type!=0 }}">
+                <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 }}">
                   {{data.goods_name}}
                 </view>
-
                 <!-- 这个是分享按钮 -->
-                <view class="xc-share-frame t-c"  bindtap="clickShare">
-                	<view class="iconfont icon-share fs60"></view>
-                	<view class="fs22 c-7b">分享</view>
+                <view class="xc-share-frame t-c" bindtap="clickShare">
+                  <view class="iconfont icon-share fs60"></view>
+                  <view class="fs22 c-7b">分享</view>
                 </view>
               </view>
             </view>
-
-            <!----显示价格,阶梯团---->
+            <!-- --显示价格,阶梯团-- -->
             <block wx:if="{{prom_act.kttype==3}}">
               <view class="jie_price  flex">
                 <view style='margin-right:26rpx' wx:for="{{prom_act.ct_rylist}}">
                   <view class="fs35 word-color">
-                    <text class="fs24">￥</text>{{item.price}}</view>
+                    <text class="fs24">￥</text>
+                    {{item.price}}
+                  </view>
                   <view class="fs24 t-c xc-person-number ">满{{item.rynum}}人</view>
                 </view>
               </view>
             </block>
           </view>
-
-          <view class="t_gz" wx:if="{{is_show_gz==1}}">
-            {{prom_act.remark}}
-          </view>
-
-          <!----------正有多少人在开团---------->
+          <view class="t_gz" wx:if="{{is_show_gz==1}}">{{prom_act.remark}}</view>
+          <!-- --------正有多少人在开团-------- -->
           <view class="pt_fir se2 bdt16" wx:if="{{teamgroup}}">
             <view class="xc-partner-frame">
               <view class="zzk-1 flex jc_sb" bindtap="go_t_more">
-								<view class="pdl10">以下小伙伴正在拼单，可直接参与</view>
-                <view class="ckgd flex ai_c">查看详细
+                <view class="pdl10">以下小伙伴正在拼单，可直接参与</view>
+                <view class="ckgd flex ai_c">
+                  查看详细
                   <view class="bg_right arrow-one"></view>
                 </view>
               </view>
             </view>
             <view class='group' wx:for="{{teamgroup}}" wx:for-index="t_ind" wx:key="teamgroup">
               <view class='group-list' bindtap="go_cj_team" data-ind="{{t_ind}}">
-								<!-- <view class="flex ai_c"> -->
-									<!--//选项框头像-->
-									<view class='gtou'>
-									  <image src='{{item.user.head_pic}}'></image>
-									</view>
-									<!--//等你来拼-->
-									<view class='gdn ellipsis-1'>{{item.user.nickname}}</view>
-								<!-- </view> -->
-                
-                <!--//还差几人，剩余时间-->
+                <!-- <view class="flex ai_c"> -->
+                <!-- //选项框头像 -->
+                <view class='gtou'>
+                  <image src='{{item.user.head_pic}}'></image>
+                </view>
+                <!-- //等你来拼 -->
+                <view class='gdn ellipsis-1'>{{item.user.nickname}}</view>
+                <!-- </view> -->
+                <!-- //还差几人，剩余时间 -->
                 <view class="rel">
                   <view class='ghaicha ellipsis-2'>
-                    <text class='gred' wx:if="{{prom_act.max_ct_num >0}}"><text class="flex" wx:if="{{prom_act.max_ct_num - item.open_num>0}}">还差<text class="word-color">{{prom_act.max_ct_num - item.open_num}}</text>人享最低优惠</text><text wx:else>您已经享最低优惠</text></text>
-                    <text class='gred' wx:else>还差<text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text>人成团 </text>
+                    <text class='gred' wx:if="{{prom_act.max_ct_num >0}}">
+                      <text class="flex" wx:if="{{prom_act.max_ct_num - item.open_num>0}}">
+                        还差
+                        <text class="word-color">{{prom_act.max_ct_num - item.open_num}}</text>
+                        人享最低优惠
+                      </text>
+                      <text wx:else>您已经享最低优惠</text>
+                    </text>
+                    <text class='gred' wx:else>
+                      还差
+                      <text style='color:#ff2753'>{{prom_act.ct_num - item.open_num}}</text>
+                      人成团
+                    </text>
                     <view class="t_show">
                       剩余
-					  <text wx:if="{{timer[t_ind].day}}">{{timer[t_ind].day}}天:</text>
-                      <text>{{timer[t_ind].hou}}</text>:
-                      <text>{{timer[t_ind].min}}</text>:
+                      <text wx:if="{{timer[t_ind].day}}">{{timer[t_ind].day}}天:</text>
+                      <text>{{timer[t_ind].hou}}</text>
+                      :
+                      <text>{{timer[t_ind].min}}</text>
+                      :
                       <text>{{timer[t_ind].sec}}</text>
                     </view>
                   </view>
                 </view>
-                <!--//参加团-->
-                <view class='cjt t-c'>
-                  去参团
-                </view>
+                <!-- //参加团 -->
+                <view class='cjt t-c'>去参团</view>
                 <!-- <view class="clear"></view> -->
               </view>
             </view>
           </view>
-
-
         </view>
-
         <!-- 积分购 -->
-        <view wx:if="{{prom_type==4}}">	
-			  <view class="goods-price">
-				  <!-- 价格显示 -->
-				  <view class="co-red flex jc_sb ai-center">
-				      <view class="market-price" style="overflow: hidden; height: 66rpx;display: flex; align-items: flex-end;">
-					     <image class="rel_img" src="{{iurl}}/miniapp/images/integral/integral_red.png"></image>
-						 <block wx:if="{{prom_integral}}"><text style="position: relative;top:10rpx">{{prom_integral}}</text><text class="rel_txt">积分</text></block>						
-						 <text class="rel_txt" wx:if="{{prom_integral && prom_price}}">+</text>						
-					     <text class="rel_txt" wx:if="{{prom_price}}" >{{filters.toFix(prom_price,2)}}元</text> 					 
-						 <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text>						 
-						 <text class="rel_txt fs22" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;">&nbsp;&nbsp;&nbsp;零售价:￥{{filters.toFix(data.market_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"  bindtap="clickShare">
-							<!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> -->
-							<view class="iconfont icon-share fs60"></view>
-							<!-- <view class="share-font">1分享</view> -->
-							<view class="fs22 c-7b">分享</view>
-						</view>
-				  </view>	
-						  
-				  
-				  
-				  <view class="goods-title">
-				    <view class="goods-name elli">{{data.goods_name}}</view>
-				  </view>
-				 					  
-				  <view class="goods-num">
-				    <view class="sales">销量：{{prom_act.buy_num}}件</view>
-					<view class="stock">折扣：{{g_filters.num((prom_price?prom_price:0)*10/data.shop_price)}}折</view>
-				    <view class="stock">{{categories3[0].num}}人评价</view>
-				  </view>				 
-			  </view>			  			 
-		</view>
-				
-		<!-- 不是拼团，不是积分购 -->
+        <view wx:if="{{prom_type==4}}">
+          <view class="goods-price">
+            <!-- 价格显示 -->
+            <view class="co-red flex jc_sb ai-center">
+              <view class="market-price" style="overflow: hidden; height: 66rpx;display: flex; align-items: flex-end;">
+                <image class="rel_img" src="{{iurl}}/miniapp/images/integral/integral_red.png"></image>
+                <block wx:if="{{prom_integral}}">
+                  <text style="position: relative;top:10rpx">{{prom_integral}}</text>
+                  <text class="rel_txt">积分</text>
+                </block>
+                <text class="rel_txt" wx:if="{{prom_integral && prom_price}}">+</text>
+                <text class="rel_txt" wx:if="{{prom_price}}">{{filters.toFix(prom_price,2)}}元</text>
+                <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text>
+                <text class="rel_txt fs22" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;">
+                  &nbsp;&nbsp;&nbsp;零售价:￥{{filters.toFix(data.market_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" bindtap="clickShare">
+                <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> -->
+                <view class="iconfont icon-share fs60"></view>
+                <!-- <view class="share-font">1分享</view> -->
+                <view class="fs22 c-7b">分享</view>
+              </view>
+            </view>
+            <view class="goods-title">
+              <view class="goods-name elli">{{data.goods_name}}</view>
+            </view>
+            <view class="goods-num">
+              <view class="sales">销量：{{prom_act.buy_num}}件</view>
+              <view class="stock">
+                折扣：{{g_filters.num((prom_price?prom_price:0)*10/data.shop_price)}}折
+              </view>
+              <view class="stock">{{categories3[0].num}}人评价</view>
+            </view>
+          </view>
+        </view>
+        <!-- 不是拼团，不是积分购 -->
         <block wx:if="{{prom_type!=6 && prom_type!=4}}">
           <view class="goods-price">
-							
-						<view class="flex jc_sb">
-							<view class="co-red" style="" wx:if="{{prom_type==0 || prom_type==3}}">
-							  <view class="market-price flex" style="align-items: baseline;">
-									<block wx:if="{{card_field && data[card_field]>0}}">
-										 <view class="flex ai-center  grade-card-frame"> 
-										<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
-											<view class="fs24 white view card-name ellipsis-1">{{card_name}}</view>
-										 </view>
-										 <text class="rel yuan">￥</text>{{filters.toFix(data[card_field],2)}}
-										<view class='yj' style="top:35rpx">
-													<text>零售价:￥{{filters.toFix(data.market_price,2)}}</text>
-												</view>
-									</block>
-									<block wx:else>
-										<text class="yuan">￥</text>{{filters.toFix(data.shop_price,2)}}
-										<view class='yj'><text>零售价:￥{{filters.toFix(data.market_price,2)}}</text></view>
-									</block>
-							  </view>
-							
-							</view>
-							
-							<!-- 这个是分享按钮 -->
-							<!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c"  bindtap="saveImageToPhotosAlbum"> -->
-							<view class="xc-share-frame t-c"  bindtap="clickShare"  wx:if="{{prom_type != 1}}">
-								<!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> -->
-								<view class="iconfont icon-share fs60"></view>
-								<!-- <view class="share-font">1分享</view> -->
-								<view class="fs22 c-7b">分享</view>
-							</view>
-						</view>
-						
-            
-
+            <view class="flex jc_sb">
+              <view class="co-red" style="" wx:if="{{prom_type==0 || prom_type==3}}">
+                <view class="market-price flex" style="align-items: baseline;">
+                  <block wx:if="{{card_field && data[card_field]>0}}">
+                    <view class="flex ai-center  grade-card-frame">
+                      <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
+                      <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view>
+                    </view>
+                    <text class="rel yuan">￥</text>
+                    {{filters.toFix(data[card_field],2)}}
+                    <view class='yj' style="top:35rpx">
+                      <text>零售价:￥{{filters.toFix(data.market_price,2)}}</text>
+                    </view>
+                  </block>
+                  <block wx:else>
+                    <text class="yuan">￥</text>
+                    {{filters.toFix(data.shop_price,2)}}
+                    <view class='yj'>
+                      <text>零售价:￥{{filters.toFix(data.market_price,2)}}</text>
+                    </view>
+                  </block>
+                </view>
+              </view>
+              <!-- 这个是分享按钮 -->
+              <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c"  bindtap="saveImageToPhotosAlbum"> -->
+              <view class="xc-share-frame t-c" bindtap="clickShare" wx:if="{{prom_type != 1}}">
+                <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> -->
+                <view class="iconfont icon-share fs60"></view>
+                <!-- <view class="share-font">1分享</view> -->
+                <view class="fs22 c-7b">分享</view>
+              </view>
+            </view>
             <!-- 不是秒杀 -->
-	        <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 -->
+            <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 -->
             <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && prom_type!=1 && card_list && card_list.length>0}}">
-           
-                  <view class="flex ai-center  grade-card-frame card-frame" >
-					    	<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
-					        <view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view>
+              <view class="flex ai-center  grade-card-frame card-frame">
+                <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
+                <view class="fs24 white view card-name ellipsis-1">
+                  {{g_filters.get_card_price(data,card_list,1)}}
+                </view>
+              </view>
+              <view class="fs32 xc-black3 ai_and carde_frame">
+                <text class="fs26">￥</text>
+                {{g_filters.get_card_price(data,card_list,0)}}
+              </view>
+            </view>
+            <!-- 等级卡的显示,购买, 等级卡近30天要显示续费 -->
+            <block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}">
+              <!-- 不是秒杀，且会员不是等级会员 -->
+              <view wx:if="{{!card_field && prom_type!=1 && card_list && card_list.length>0}}">
+                <view class="beauty-makeup-frame flex ai-center">
+                  <view class="left flex ai-center jc_sa">
+                    <view class="flex ai-center  grade-card-frame card-frame advert-card">
+                      <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
+                      <view class="fs24 white view card-name ellipsis-1">
+                        {{g_filters.get_card_price(data,card_list,1)}}
+                      </view>
+                    </view>
+                    <view class="card-effect">
+                      <view class="fs24 xc-black3">
+                        成为{{g_filters.get_card_price(data,card_list,1)}}立
+                        <text class="co-red">
+                          省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}}
+                        </text>
+                        元
+                      </view>
+                      <view class="fs22 xc-ash">开通会员 尽享更多优惠</view>
+                    </view>
                   </view>
-                  <view class="fs32 xc-black3 ai_and carde_frame">
-                  <text class="fs26">
-                  ￥</text>{{g_filters.get_card_price(data,card_list,0)}}
+                  <view class="right flex jc-center ai-center" bindtap="go_plus">
+                    <view class="at_once_carde xc-black3 fs28">立即开卡</view>
+                    <view class="bg_right"></view>
                   </view>
-			</view>
-
-              <!-- 等级卡的显示,购买, 等级卡近30天要显示续费-->
-              
-			<block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}">	
-         
-		    <!-- 不是秒杀，且会员不是等级会员 -->
-            <view wx:if="{{!card_field && prom_type!=1 && card_list && card_list.length>0}}">
-			   <view class="beauty-makeup-frame flex ai-center">
-				   <view class="left flex ai-center jc_sa">
-					   <view class="flex ai-center  grade-card-frame card-frame advert-card">
-							<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
-							<view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view>
-					   </view>
-					   <view class="card-effect">
-					     <view class="fs24 xc-black3">成为{{g_filters.get_card_price(data,card_list,1)}}立<text class="co-red">省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}}</text>元</view>
-					      <view class="fs22 xc-ash"> 开通会员 尽享更多优惠 </view>
-				       </view>
-			       </view>				   				
-			       <view class="right flex jc-center ai-center" bindtap="go_plus">
-								<view class="at_once_carde xc-black3 fs28">立即开卡</view>  
-								<view class="bg_right"></view>
-			       </view>
-               
-               </view>
-            </view>
-		    <!-- 立即续费的显示 -->	
-			<view wx:elif="{{is_near_date && data[card_field]>0 && prom_type!=1}}">
-				    <view class="beauty-makeup-frame flex ai-center">
-				 				   <view class="left flex ai-center jc_sa">
-				 					   <view class="flex ai-center grade-card-frame card-frame advert-card">
-				 							<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
-				 							<view class="fs24 white view card-name ellipsis-1">{{card_name}}</view>
-				 					   </view>
-				 					   <view class="card-effect">
-				 					     <view class="fs24 xc-black3">成为{{card_name}}立<text class="co-red">省{{filters.toFix(data.shop_price[card_field],2)}}</text>元</view>
-				 					      <view class="fs22 xc-ash"> 开通会员 尽享更多优惠 </view>
-				 				       </view>
-				     </view>				 				   				
-				     <view class="right flex jc-center ai-center" bindtap="go_card_info">
-				        <view class="at_once_carde xc-black3 fs28">立即续费</view>  
-				        <view class="bg_right"></view>
-				     </view>
-				 
-				 </view>
-				
-			</view>
-			
-			</block>
-            <!--许程商品名字-->
-
+                </view>
+              </view>
+              <!-- 立即续费的显示 -->
+              <view wx:elif="{{is_near_date && data[card_field]>0 && prom_type!=1}}">
+                <view class="beauty-makeup-frame flex ai-center">
+                  <view class="left flex ai-center jc_sa">
+                    <view class="flex ai-center grade-card-frame card-frame advert-card">
+                      <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
+                      <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view>
+                    </view>
+                    <view class="card-effect">
+                      <view class="fs24 xc-black3">
+                        成为{{card_name}}立
+                        <text class="co-red">
+                          省{{filters.toFix(data.shop_price[card_field],2)}}
+                        </text>
+                        元
+                      </view>
+                      <view class="fs22 xc-ash">开通会员 尽享更多优惠</view>
+                    </view>
+                  </view>
+                  <view class="right flex jc-center ai-center" bindtap="go_card_info">
+                    <view class="at_once_carde xc-black3 fs28">立即续费</view>
+                    <view class="bg_right"></view>
+                  </view>
+                </view>
+              </view>
+            </block>
+            <!-- 许程商品名字 -->
             <view wx:if="{{prom_type!=1}}">
               <view class="goods-title">
                 <view class="goods-name elli">{{data.goods_name}}</view>
               </view>
             </view>
-
             <view class="goods-num" wx:if="{{prom_type!=1}}">
               <view class="sales">销量：{{data.sales_sum}}件</view>
               <view class="stock">折扣：{{data.disc}}折</view>
@@ -354,18 +368,20 @@
             <view wx:if="{{prom_type==1}}">
               <view class="flex jc_sb">
                 <view class="flex" style="align-items: baseline;">
-                  <view class="flex xc-price-frame"><text class="fs30">￥</text>{{prom_price}}</view>
+                  <view class="flex xc-price-frame">
+                    <text class="fs30">￥</text>
+                    {{prom_price}}
+                  </view>
                   <view class="word-line fs24">零售价￥{{filters.toFix(data.market_price,2)}}</view>
                 </view>
-								
-								<!-- 这个是分享按钮 -->
-								<!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c"  bindtap="saveImageToPhotosAlbum"> -->
-								<view class="xc-share-frame t-c"  bindtap="clickShare">
-									<!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> -->
-									<view class="iconfont icon-share fs60"></view>
-									<!-- <view class="share-font">1分享</view> -->
-									<view class="fs22 c-7b">分享</view>
-								</view>
+                <!-- 这个是分享按钮 -->
+                <!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c"  bindtap="saveImageToPhotosAlbum"> -->
+                <view class="xc-share-frame t-c" bindtap="clickShare">
+                  <!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> -->
+                  <view class="iconfont icon-share fs60"></view>
+                  <!-- <view class="share-font">1分享</view> -->
+                  <view class="fs22 c-7b">分享</view>
+                </view>
                 <!-- <view class="xc-val-price"> 
                   <view class="fs30" style='padding-left:13rpx;' wx:if="{{prom_st==1}}" >已抢:{{prom_act.buy_num+prom_act.virtual}}件</view>
                   <view class="fs30" style='padding-left:13rpx;' wx:else >已抢:0件</view>
@@ -373,246 +389,244 @@
                 </view> -->
               </view>
             </view>
-           
             <view class="xc-explain fs32 ellipsis-2" wx:if="{{prom_type!=0 && prom_type!=4}}">
               {{data.goods_name}}
             </view>
-
             <!-- <view wx:if="{{prom_type==1}}" style='height:58rpx'></view> -->
             <!-- 许程 7.24 暂时注释 -->
             <view wx:if="{{prom_type==1}}">
               <view class="goods-num" wx:if="{{prom_type==1}}">
-
-                <block wx:if="prom_st>0" >
+                <block wx:if="prom_st>0">
                   <view class="stock">总数量：{{prom_act.goods_num+prom_act.virtual}}件</view>
                   <view class="stock">限购:{{prom_act.buy_limit}}件</view>
                   <block wx:if="{{prom_st==0}}">
-                      <view class="sales">已购:0件</view>
-                  </block>  
-                   <block wx:else>
-                      <view class="sales">已购:{{prom_act.buy_num+prom_act.virtual}}件</view>
-                  </block>  
+                    <view class="sales">已购:0件</view>
+                  </block>
+                  <block wx:else>
+                    <view class="sales">已购:{{prom_act.buy_num+prom_act.virtual}}件</view>
+                  </block>
                 </block>
-
                 <block wx:else>
-                   <view class="stock">总数量：{{prom_act.goods_num}}件</view>
-                   <view class="stock">限购:{{prom_act.buy_limit}}件</view>
-                   <view class="sales">已购:{{prom_act.buy_num}}件</view>
+                  <view class="stock">总数量：{{prom_act.goods_num}}件</view>
+                  <view class="stock">限购:{{prom_act.buy_limit}}件</view>
+                  <view class="sales">已购:{{prom_act.buy_num}}件</view>
                 </block>
-
               </view>
             </view>
-
           </view>
         </block>
-
-            <!-- 门店收货地址 -->
-            <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}" >
-                 <view class="address_frame" bindtap="choice_store"  data-ind="0">
-                  <view class="flex-vertical-between "> 
-                    <view class="flex-vertical select_store_height">
-                      <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
-                      <view class="fs30" style="color:black;">选择门店</view>
-                    </view>
-                    <view class="red_bb fs26">
-                         更多门店
-                         <text class="bg_jj"></text>
-                    </view>
+        <!-- 门店收货地址 -->
+        <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}">
+          <view class="address_frame" bindtap="choice_store" data-ind="0">
+            <view class="flex-vertical-between ">
+              <view class="flex-vertical select_store_height">
+                <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
+                <view class="fs30" style="color:black;">选择门店</view>
+              </view>
+              <view class="red_bb fs26">
+                更多门店
+                <text class="bg_jj"></text>
+              </view>
+            </view>
+            <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+              <view class="flex-space-between address ai_end pdv10">
+                <view>
+                  <text class="fs30 xc-black3 shop_name bold">{{def_pick_store.pickup_name}}</text>
+                </view>
+                <view class="distance fs24" wx:if="{{def_pick_store.distance!=null}}">
+                  距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+                </view>
+              </view>
+              <view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
+              <block wx:else>
+                <view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
+                  (库存不足)
+                </view>
+                <block wx:else>
+                  <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
+                    (配送不匹配)
                   </view>
-
-                  <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-                  <view  class="flex-space-between address ai_end pdv10">
-                     <view>
-                       <text class="fs30 xc-black3 shop_name bold">{{def_pick_store.pickup_name}}</text>
-                     </view>
-                     <view class="distance fs24"wx:if="{{def_pick_store.distance!=null}}">
-                      距离：{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-                     
-                     </view>
-                  </view>	
-								
-				
-				  <view class="no_store" wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
-				  <block wx:else>					
-							 <view class="no_store" wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
-							 <block wx:else>
-								  <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">(配送不匹配)</view>
-								  <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
-							 </block>							
-				  </block>
-				  
-                  <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view>
+                  <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">
+                    (库存不足)
                   </view>
-                 </view>   
-
+                </block>
+              </block>
+              <view class="fs24 xc-ash-9f">地址:{{def_pick_store.fulladdress}}</view>
             </view>
-
-        <!--许程 7.24暂时注释 -->
+          </view>
+        </view>
+        <!-- 许程 7.24暂时注释 -->
         <view class="bdt16" wx:if="{{prom_type!=1&&prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=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">
-							<view class="xc-coupon-fram" wx:for="{{fir_quan}}" wx:key="{{index}}">
-							  <view class="circle xc-circular xc-one"></view>
-							  <view class="xc-coupon t-c four-level-word">满{{item.condition}}减{{item.money}}</view>
-							  <view class="circle xc-circular xc-two"></view>
-							</view>
-						</view>
-						
+            <view class="flex ai_c f1 pdh20">
+              <view class="xc-coupon-fram" wx:for="{{fir_quan}}" wx:key="{{index}}">
+                <view class="circle xc-circular xc-one"></view>
+                <view class="xc-coupon t-c four-level-word">
+                  满{{item.condition}}减{{item.money}}
+                </view>
+                <view class="circle xc-circular xc-two"></view>
+              </view>
+            </view>
             <view data-coupon="1" bindtap="switchCoupon" class="cx-obtain-coupon wsize">
               <text class="bg_jj"></text>
             </view>
           </view>
         </view>
-
-
-
-
         <!-- 要判断是不是有促销活动 -->
         <block wx:if="{{prom_goods}}">
-          <view class="cx-frame flex" style="position: relative; height: auto" >
+          <view class="cx-frame flex" style="position: relative; height: auto">
             <view class="cx-sizs fs30">促销</view>
             <!-- 中间显示层 -->
             <view class="f1 pdh20">
-
-                    <view class="cx_show_view flex fs28" wx:for="{{prom_goods}}">
-                        <view class="prom_condition">消费满{{item.condition}}<text wx:if="{{item.prom_type==1}}">件</text><text wx:else>元</text></view>
-                        <view class="word {{is_more_cx?'':'ellipsis-1'}}">
-                                <text wx:if="{{item.money>0}}">减价{{item.money}}元;</text>
-                                <text wx:if="{{item.sale>0}}">打{{item.sale}}折;</text>
-                                <text wx:if="{{item.past==1}}">包邮;</text>
-                                <text wx:if="{{item.intValue>0}}">送{{tem.intValue}}积分;</text>
-                                <text wx:if="{{item.couponId>0}}">送{{item.couponMoney}}元优惠券;</text>
-                                <text wx:if="{{item.gift_id>0}}">送商品{{item.goods_name}};</text>
-                                <text wx:if="{{item.lb_id>0}}">送{{item.lbtitle}};</text>
-                        </view>
-                    </view>
+              <view class="cx_show_view flex fs28" wx:for="{{prom_goods}}">
+                <view class="prom_condition">
+                  消费满{{item.condition}}
+                  <text wx:if="{{item.prom_type==1}}">件</text>
+                  <text wx:else>元</text>
+                </view>
+                <view class="word {{is_more_cx?'':'ellipsis-1'}}">
+                  <text wx:if="{{item.money>0}}">减价{{item.money}}元;</text>
+                  <text wx:if="{{item.sale>0}}">打{{item.sale}}折;</text>
+                  <text wx:if="{{item.past==1}}">包邮;</text>
+                  <text wx:if="{{item.intValue>0}}">送{{tem.intValue}}积分;</text>
+                  <text wx:if="{{item.couponId>0}}">送{{item.couponMoney}}元优惠券;</text>
+                  <text wx:if="{{item.gift_id>0}}">送商品{{item.goods_name}};</text>
+                  <text wx:if="{{item.lb_id>0}}">送{{item.lbtitle}};</text>
+                </view>
+              </view>
             </view>
             <view data-coupon="1" bindtap="show_more_cx" class="cx-obtain-coupon wsize">
               <text class="bg_jj {{is_more_cx?'down1':''}}"></text>
             </view>
           </view>
         </block>
-
         <!-- 要判断是不是有订单优惠 -->
         <block wx:if="{{order_prom}}">
-          <view class="cx-frame flex" style="position: relative; height: auto" >
+          <view class="cx-frame flex" style="position: relative; height: auto">
             <view class="cx-sizs wsize" style="width: 144rpx">订单优惠</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="fs26" >(活动时间：{{tool.format_tt(order_prom.start_time)}} - {{tool.format_tt(order_prom.end_time)}})</view>
-                  </view>
+              <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="fs26">
+                  (活动时间：{{tool.format_tt(order_prom.start_time)}} - {{tool.format_tt(order_prom.end_time)}})
+                </view>
+              </view>
             </view>
           </view>
         </block>
-
-
         <!-- 要判断是不是有组合优惠 -->
         <block wx:if="{{zh_act}}">
-              <view class="cx-frame flex" style="position: relative; height: auto" >
-                  <view class="cx-sizs wsize" style="width: 144rpx">组合购</view>
-                  <!-- 中间显示层 -->
-                  <view class="flex ai-center jc_sb" style="width: 570rpx"  bindtap="go_zh" data-id="{{zh_act.id}}" >
-                      <view class="flex">
-                          <image class="hui_img" src="{{iurl}}/miniapp//images/hui.png"></image>
-                          <view class="order_hui">
-                              <view class="fs28 ellipsis-1">{{zh_act.name}}</view>
-                              <view class="fs26" >(活动时间：{{tool.format_tt(zh_act.start_time)}} - {{tool.format_tt(zh_act.end_time)}})</view>
-                          </view>
-                      </view>
-                      <view><text class="bg_jj is_more_cx" style="position: relative;top:-10rpx"></text></view>
+          <view class="cx-frame flex" style="position: relative; height: auto">
+            <view class="cx-sizs wsize" style="width: 144rpx">组合购</view>
+            <!-- 中间显示层 -->
+            <view class="flex ai-center jc_sb" style="width: 570rpx" bindtap="go_zh" data-id="{{zh_act.id}}">
+              <view class="flex">
+                <image class="hui_img" src="{{iurl}}/miniapp//images/hui.png"></image>
+                <view class="order_hui">
+                  <view class="fs28 ellipsis-1">{{zh_act.name}}</view>
+                  <view class="fs26">
+                    (活动时间：{{tool.format_tt(zh_act.start_time)}} - {{tool.format_tt(zh_act.end_time)}})
                   </view>
+                </view>
               </view>
-          </block>
-
-
+              <view>
+                <text class="bg_jj is_more_cx" style="position: relative;top:-10rpx"></text>
+              </view>
+            </view>
+          </view>
+        </block>
         <view class="bz_view flex bdt16" wx:if="{{bconfig}}" style="">
           <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image>
-					<view class="flex f1 ai_c rel">
-						<view class="bz-content {{flag ? '':'ellipsis-1'}} f1">{{bconfig.service_bz}}</view>
-						<view bindtap="clickCollapse" class="cx-obtain-coupon wsize arrow">
-						  <text class="bg_jj {{flag?'down1':''}}"></text>
-						</view>
-						<!-- <text class="bg_jj" bindtap="clickCollapse"></text> -->
-						<!-- <text class="iconfont icon-shuangjiantouxia c-db"></text> -->
-					</view>
-          
+          <view class="flex f1 ai_c rel">
+            <view class="bz-content {{flag ? '':'ellipsis-1'}} f1">{{bconfig.service_bz}}</view>
+            <view bindtap="clickCollapse" class="cx-obtain-coupon wsize arrow">
+              <text class="bg_jj {{flag?'down1':''}}"></text>
+            </view>
+            <!-- <text class="bg_jj" bindtap="clickCollapse"></text> -->
+            <!-- <text class="iconfont icon-shuangjiantouxia c-db"></text> -->
+          </view>
         </view>
-
-
-        <!--- 搭配促销 ---->
+        <!-- - 搭配促销 -- -->
         <view class="dp_cx_view" wx:if="{{collocationGoods}}">
           <view class="bb_view">
             <view>优惠热配</view>
-            <view class="red_bb" bindtap="go_prom_list">查看全部
+            <view class="red_bb" bindtap="go_prom_list">
+              查看全部
               <text class="bg_jj"></text>
             </view>
           </view>
-
           <!-- 搭配的显示 -->
           <view class="flex" bindtap="go_prom_list">
-                <image class="dp_img" src="{{iurl+collocationGoods.img_url}}"></image>
-                <view class="act_content">
-                     <view class="fs32">{{collocationGoods.title}}</view>
-                     <view class="fs30 color_b" wx:if="{{collocationGoods.max!=collocationGoods.min}}">搭配价￥{{collocationGoods.min}}-{{collocationGoods.max}}</view>
-                     <view class="fs30 color_b" wx:else>搭配价￥{{collocationGoods.min}}</view>
-                     <view class="fs30 color-gray">活动至{{filters.format_time(collocationGoods.end_time,1)}}</view>
-                </view>
+            <image class="dp_img" src="{{iurl+collocationGoods.img_url}}"></image>
+            <view class="act_content">
+              <view class="fs32">{{collocationGoods.title}}</view>
+              <view class="fs30 color_b" wx:if="{{collocationGoods.max!=collocationGoods.min}}">
+                搭配价￥{{collocationGoods.min}}-{{collocationGoods.max}}
+              </view>
+              <view class="fs30 color_b" wx:else>搭配价￥{{collocationGoods.min}}</view>
+              <view class="fs30 color-gray">
+                活动至{{filters.format_time(collocationGoods.end_time,1)}}
+              </view>
+            </view>
           </view>
         </view>
-
-
-        <!--- 宝贝评价 ---->
+        <!-- - 宝贝评价 -- -->
         <view class="bdt16">
           <view class="bb_view">
             <view class="bold">宝贝评价({{categories3[0].num}})</view>
-            <view class="red_bb fs26" bindtap="look_pj">查看全部
+            <view class="red_bb fs26" bindtap="look_pj">
+              查看全部
               <text class="bg_jj"></text>
             </view>
           </view>
-
           <view class="xc_comment">
-            <view class="xc_comment-have-pictures" data-val="5" bindtap="clik_evaluate">有图({{categories3[1].num}}) </view>
-            <view class="xc_comment-discuss" data-val="2" bindtap="clik_evaluate">好评({{categories3[2].num}}) </view>
-            <view class="xc_comment-discuss" data-val="3" bindtap="clik_evaluate">中评({{categories3[3].num}}) </view>
-            <view class="xc_comment-discuss" data-val="4"bindtap="clik_evaluate">差评({{categories3[4].num}}) </view>
+            <view class="xc_comment-have-pictures" data-val="5" bindtap="clik_evaluate">
+              有图({{categories3[1].num}})
+            </view>
+            <view class="xc_comment-discuss" data-val="2" bindtap="clik_evaluate">
+              好评({{categories3[2].num}})
+            </view>
+            <view class="xc_comment-discuss" data-val="3" bindtap="clik_evaluate">
+              中评({{categories3[3].num}})
+            </view>
+            <view class="xc_comment-discuss" data-val="4" bindtap="clik_evaluate">
+              差评({{categories3[4].num}})
+            </view>
           </view>
-
           <scroll-view scroll-x="true" class="pj_scroll">
-						<view class="flex">
-							<view class="xc_comment-detail" style="" wx:for="{{fir_comments}}" wx:key="fir_comments">
-							  <view class="xc_comment-left">
-							    <view class="xc_comment-user">
-							      <view class="xc_user-img">
-							        <image class="xc_imgs" src='{{item.is_anonymous!=1?item.head_pic:iurl+"/miniapp/images/hui_hear_pic.png"}}' binderror="bind_bnerr2" data-errorimg="fir_comments[{{index}}].head_pic"></image>
-							      </view>
-							
-							      <view class="xc_user">
-							        <view class="xc_user-name five-level-word">{{item.is_anonymous!=1?item.username:'匿名'}}</view>
-							        <image class="xc_comment-img" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
-							      </view>
-							    </view>
-							    <view class="xc_comment-font pj_word_size ellipsis-1 pdt12">
-                    <text class="ellipsis-1">{{item.content?item.content:'此用户没有填写评价。'}} </text>                     
-							    </view>
-							    <view class="xc_comment-val">
-							      <view class="xc_comment-time">{{item.add_time}}</view>
-							
-							    </view>
-							  </view>
-							  <view class="xc_goods-img-frame">
-							      <image wx:if="{{item.img[0]!=undefined && item.img[0]!=null}}" class="xc_goods-img" src='{{iurl+item.img[0]}}'></image>
-							      <image wx:elif="{{item.weapp_img[0]!=undefined && item.weapp_img[0]!=null}}" class="xc_goods-img" src='{{item.weapp_img[0]}}'></image>
-							      <image wx:else class="xc_goods-img" src='{{gallery[0].image_url}}'></image>
-							  </view>
-							</view>
-						</view>
+            <view class="flex">
+              <view class="xc_comment-detail" style="" wx:for="{{fir_comments}}" wx:key="fir_comments">
+                <view class="xc_comment-left">
+                  <view class="xc_comment-user">
+                    <view class="xc_user-img">
+                      <image class="xc_imgs" src='{{item.is_anonymous!=1?item.head_pic:iurl+"/miniapp/images/hui_hear_pic.png"}}' binderror="bind_bnerr2" data-errorimg="fir_comments[{{index}}].head_pic"></image>
+                    </view>
+                    <view class="xc_user">
+                      <view class="xc_user-name five-level-word">
+                        {{item.is_anonymous!=1?item.username:'匿名'}}
+                      </view>
+                      <image class="xc_comment-img" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
+                    </view>
+                  </view>
+                  <view class="xc_comment-font pj_word_size ellipsis-1 pdt12">
+                    <text class="ellipsis-1">{{item.content?item.content:'此用户没有填写评价。'}}</text>
+                  </view>
+                  <view class="xc_comment-val">
+                    <view class="xc_comment-time">{{item.add_time}}</view>
+                  </view>
+                </view>
+                <view class="xc_goods-img-frame">
+                  <image wx:if="{{item.img[0]!=undefined && item.img[0]!=null}}" class="xc_goods-img" src='{{iurl+item.img[0]}}'></image>
+                  <image wx:elif="{{item.weapp_img[0]!=undefined && item.weapp_img[0]!=null}}" class="xc_goods-img" src='{{item.weapp_img[0]}}'></image>
+                  <image wx:else class="xc_goods-img" src='{{gallery[0].image_url}}'></image>
+                </view>
+              </view>
+            </view>
           </scroll-view>
         </view>
-
         <!-- 图文详情 -->
         <view class="bdt16">
           <!-- <view class="tuwen_title">
@@ -626,96 +640,90 @@
             <view class="red_shu"></view>
             <view class="fs30 bold">商品详情</view>
           </view>
-					<view class="pd20">
-						<view class="table_s">
-						  <view class="tb_item tb-l">
-						    <view class="item_left">
-						      <text>商品名称</text>
-						    </view>
-						    <view class="item_right">
-						      <text>{{data.goods_name}}</text>
-						    </view>
-						  </view>
-						  <view class="tb_item tb-l">
-						    <view class="item_left">
-						      <text>商品编号</text>
-						    </view>
-						    <view class="item_right">
-						      <text>{{data.goods_sn}}</text>
-						    </view>
-						  </view>
-						  <view class="tb_item tb-l">
-						    <view class="item_left">
-						      <text>商品条码</text>
-						    </view>
-						    <view class="item_right">
-						      <text>{{data.sku}}</text>
-						    </view>
-						  </view>
-						  <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
-						    <view class="item_left">
-						      <text>品类</text>
-						    </view>
-						    <view class="item_right">
-						      <text>{{cat_name}}</text>
-						    </view>
-						  </view>
-						  <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
-						    <view class="item_left">
-						      <text>品牌</text>
-						    </view>
-						    <view class="item_right">
-						      <text>{{brand_name}}</text>
-						    </view>
-						  </view>
-						  <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
-						    <view class="item_left">
-						      <text>国别</text>
-						    </view>
-						    <view class="item_right">
-						      <text>{{nation_name}}</text>
-						    </view>
-						  </view>
-						  <view class="tb_item tb-l">
-						    <view class="item_left">
-						      <text>规格</text>
-						    </view>
-						    <view class="item_right">
-						      <text>{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
-						    </view>
-						  </view>
-						  <view class="tb_item tb-l">
-						    <view class="item_left">
-						      <text>上架时间</text>
-						    </view>
-						    <view class="item_right">
-						      <text>{{data.on_time}}</text>
-						    </view>
-						  </view>
-						</view>
-					</view>
-          
-          <!--详情图片-->
+          <view class="pd20">
+            <view class="table_s">
+              <view class="tb_item tb-l">
+                <view class="item_left">
+                  <text>商品名称</text>
+                </view>
+                <view class="item_right">
+                  <text>{{data.goods_name}}</text>
+                </view>
+              </view>
+              <view class="tb_item tb-l">
+                <view class="item_left">
+                  <text>商品编号</text>
+                </view>
+                <view class="item_right">
+                  <text>{{data.goods_sn}}</text>
+                </view>
+              </view>
+              <view class="tb_item tb-l">
+                <view class="item_left">
+                  <text>商品条码</text>
+                </view>
+                <view class="item_right">
+                  <text>{{data.sku}}</text>
+                </view>
+              </view>
+              <view class="tb_item tb-l" wx:if="{{cat_name && is_show_pl}}">
+                <view class="item_left">
+                  <text>品类</text>
+                </view>
+                <view class="item_right">
+                  <text>{{cat_name}}</text>
+                </view>
+              </view>
+              <view class="tb_item tb-l" wx:if="{{brand_name && is_show_pp}}">
+                <view class="item_left">
+                  <text>品牌</text>
+                </view>
+                <view class="item_right">
+                  <text>{{brand_name}}</text>
+                </view>
+              </view>
+              <view class="tb_item tb-l" wx:if="{{nation_name && is_show_gb}}">
+                <view class="item_left">
+                  <text>国别</text>
+                </view>
+                <view class="item_right">
+                  <text>{{nation_name}}</text>
+                </view>
+              </view>
+              <view class="tb_item tb-l">
+                <view class="item_left">
+                  <text>规格</text>
+                </view>
+                <view class="item_right">
+                  <text>{{filters.show_gui_ge(data.goods_spec,data.goods_color)}}</text>
+                </view>
+              </view>
+              <view class="tb_item tb-l">
+                <view class="item_left">
+                  <text>上架时间</text>
+                </view>
+                <view class="item_right">
+                  <text>{{data.on_time}}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+          <!-- 详情图片 -->
           <view class="wxParse">
             <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
           </view>
         </view>
-
         <!-- 推荐商品 -->
         <view class="flex-center rel xc-linellae-frame">
           <view class="xc-linellae"></view>
           <view class="abs flex-center xc-recommend-frame ">
-            <image class=" xc-recommend" src="{{iurl}}/miniapp/images/diamond.png">
-            </image>
+            <image class=" xc-recommend" src="{{iurl}}/miniapp/images/diamond.png"></image>
             <view class="xc-recommend-word">推荐</view>
           </view>
         </view>
-        
-         <goods_recommend id="goods_list"></goods_recommend>
-
+        <goods_recommend id="goods_list"></goods_recommend>
       </view>
-
-      <!------------商品详情图片页面---------------->
+      <!-- ----------商品详情图片页面-------------- -->
       <view class="goods-norms" hidden="{{activeCategoryId==1?false:true}}">
         <view class="table_s">
           <view class="tb_item tb-l">
@@ -783,12 +791,11 @@
             </view>
           </view>
         </view>
-
         <view class="wxParse">
           <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
         </view>
       </view>
-      <!---------------评价页面-------------->
+      <!-- -------------评价页面------------ -->
       <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}">
         <view class="topframe">
           <view class="topframe-top">
@@ -796,98 +803,103 @@
               <view>宝贝评价</view>
               <view class="topframe-top-val">({{categories3[0].num}})</view>
             </view>
-            <view class="topframe-praise" wx:if="{{categories3[0].num}}">好评{{ filters.toFix(categories3[2].num/categories3[0].num*100,2) }}%</view>
+            <view class="topframe-praise" wx:if="{{categories3[0].num}}">
+              好评{{ filters.toFix(categories3[2].num/categories3[0].num*100,2) }}%
+            </view>
             <view wx:else>好评 0%</view>
           </view>
           <view class="buttem-list">
-            <view bindtap="tabClick3"  id="{{item.id}}"  wx:for="{{categories3}}" wx:key="categories3" class="item {{activeCategoryId3==item.id?'red':''}}">{{item.name}}({{item.num}})</view>
+            <view bindtap="tabClick3" id="{{item.id}}" wx:for="{{categories3}}" wx:key="categories3" class="item {{activeCategoryId3==item.id?'red':''}}">
+              {{item.name}}({{item.num}})
+            </view>
           </view>
         </view>
-
         <block wx:for="{{comments}}" wx:for-index="cIdx" wx:key="{{cIdx}}">
-           <view style='border-bottom:4rpx solid #eee;'>
-          <view class="middle">
-            <view class="middle-img-frame">
-              <image class="middle-img" src="{{item.is_anonymous!=1?item.head_pic:iurl+'/miniapp/images/hui_hear_pic.png'}}" binderror="bind_bnerr2" data-errorimg="comments[{{cIdx}}].head_pic"></image>
-              <view class="middle-user-frame">
-                <view class="middle-user">{{item.username==''||item.is_anonymous==1 ?'匿名用户':item.username}}</view>
-                <image class="star" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
+          <view style='border-bottom:4rpx solid #eee;'>
+            <view class="middle">
+              <view class="middle-img-frame">
+                <image class="middle-img" src="{{item.is_anonymous!=1?item.head_pic:iurl+'/miniapp/images/hui_hear_pic.png'}}" binderror="bind_bnerr2" data-errorimg="comments[{{cIdx}}].head_pic"></image>
+                <view class="middle-user-frame">
+                  <view class="middle-user">
+                    {{item.username==''||item.is_anonymous==1 ?'匿名用户':item.username}}
+                  </view>
+                  <image class="star" src="{{iurl}}/miniapp/images/star-red.png" wx:for="{{item.sum_rank}}" wx:key="{{index}}"></image>
+                </view>
               </view>
-            </view>
-            <view class="xc-pirces">
-            <view class="middle-font {{item.seeMore==true?'ellipsis-3':''}}" >
-              {{item.content?item.content:'此用户没有填写评价。'}}
-            </view> 
-            </view>
-            <view wx:if='{{item.seeMore}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleHandler'>全部显示</view>
-            <view wx:if='{{!item.seeMore && item.auto}}' data-index='{{cIdx}}' class="s_btn fs30 red-co"  catchtap='toggleContent'>收起</view>
-            <view class="img-ul">
-
-              <block wx:if="{{item.source_type==0}}">
-                  <view class="img-li"  wx:for="{{item.img}}" wx:key="{{index}}">
-                    <image bindtap="previewCommentImgs" class="wh100" data-cidx="{{cIdx}}" data-img="{{iurl}}{{item}}"
-                           data-id="{{index}}" src="{{iurl}}{{item}}"></image>
+              <view class="xc-pirces">
+                <view class="middle-font {{item.seeMore==true?'ellipsis-3':''}}">
+                  {{item.content?item.content:'此用户没有填写评价。'}}
+                </view>
+              </view>
+              <view wx:if='{{item.seeMore}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleHandler'>
+                全部显示
+              </view>
+              <view wx:if='{{!item.seeMore && item.auto}}' data-index='{{cIdx}}' class="s_btn fs30 red-co" catchtap='toggleContent'>
+                收起
+              </view>
+              <view class="img-ul">
+                <block wx:if="{{item.source_type==0}}">
+                  <view class="img-li" wx:for="{{item.img}}" wx:key="{{index}}">
+                    <image bindtap="previewCommentImgs" class="wh100" data-cidx="{{cIdx}}" data-img="{{iurl}}{{item}}" data-id="{{index}}" src="{{iurl}}{{item}}"></image>
                   </view>
-              </block>
-              <block wx:if="{{item.source_type==1}}">
+                </block>
+                <block wx:if="{{item.source_type==1}}">
                   <view class="img-li" wx:for="{{item.weapp_img}}" wx:if="{{aitem.length>10}}" wx:key="{{index}}" wx:for-item="aitem">
-                     <image bindtap="previewCommentImgs_w" class="wh100" data-cidx="{{cIdx}}" data-img="{{aitem}}"
-                           data-id="{{index}}" src="{{aitem}}"></image>
+                    <image bindtap="previewCommentImgs_w" class="wh100" data-cidx="{{cIdx}}" data-img="{{aitem}}" data-id="{{index}}" src="{{aitem}}"></image>
                   </view>
-              </block>
-            </view>
-
-            <view class="z_parameter">
-              <view class="parameter-font">{{item.add_time}}</view>
-              <view class="parameter-dian" bindtap="click_zan" data-com_id="{{item.comment_id}}" data-item_id="{{cIdx}}">
-                <image wx:if="{{item.userZanNum==1}}" class="parameter-img" src="{{iurl}}/miniapp/images/zan_red.png"></image>
-                <image wx:else class="parameter-img" src="{{iurl}}/miniapp/images/dianzan.png"></image>
-                <view class="parameter-val" style='color:{{item.userZanNum==1? "#d60022":"#999" }}' >{{item.zan_num}}</view>
+                </block>
+              </view>
+              <view class="z_parameter">
+                <view class="parameter-font">{{item.add_time}}</view>
+                <view class="parameter-dian" bindtap="click_zan" data-com_id="{{item.comment_id}}" data-item_id="{{cIdx}}">
+                  <image wx:if="{{item.userZanNum==1}}" class="parameter-img" src="{{iurl}}/miniapp/images/zan_red.png"></image>
+                  <image wx:else class="parameter-img" src="{{iurl}}/miniapp/images/dianzan.png"></image>
+                  <view class="parameter-val" style='color:{{item.userZanNum==1? "#d60022":"#999" }}'>
+                    {{item.zan_num}}
+                  </view>
+                </view>
               </view>
             </view>
-          
-          </view>
-          <view class="reply rel" wx:if="{{item.replay_list}}">
-            <view class="line_bulge"></view>
-            <view class="shop-reply">店家回复: </view>
-            <view class="shop-font" wx:for="{{item.replay_list}}" wx:for-item="r_item" wx:key="{{index}}">
-              {{r_item.content}}
+            <view class="reply rel" wx:if="{{item.replay_list}}">
+              <view class="line_bulge"></view>
+              <view class="shop-reply">店家回复:</view>
+              <view class="shop-font" wx:for="{{item.replay_list}}" wx:for-item="r_item" wx:key="{{index}}">
+                {{r_item.content}}
+              </view>
             </view>
           </view>
-          </view>
         </block>
         <block wx:if="{{(!comments || comments.length==0) && get_c }}">
-             <text class="no_pj_list">暂无评价</text>
+          <text class="no_pj_list">暂无评价</text>
         </block>
         <block wx:if="{{comments.length>10 && comments_no_more}}">
           <text class="no_pj_list">已经加载到底部</text>
         </block>
       </view>
     </view>
-		
-		<!-- 技术支持 -->
-		<view class="logo-container t-c">
-			<view class="flex ai_c fs24 jc-center pdv30 white"><image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持</view>
-		</view>
-		
+    <!-- 技术支持 -->
+    <view class="logo-container t-c">
+      <view class="flex ai_c fs24 jc-center pdv30 white">
+        <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>
+        提供技术支持
+      </view>
+    </view>
   </view>
-  <!---滚动到顶部---->
+  <!-- -滚动到顶部-- -->
   <view bindtap="doScrollTop" class="toTop" wx:if="{{supportPageScroll}}">
     <image class="wh100" src="{{iurl}}/miniapp/images/topup.png"></image>
   </view>
-
-  <!-------------------底部按钮-------------------->
+  <!-- -----------------底部按钮------------------ -->
   <view class="join-cart">
-	<!-- bindtap="contactService" -->  	  
-    <button wx:if="{{sys_switch.weapp_customertype}}" class="custom-service cart-ico new_split"  open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
+    <!-- bindtap="contactService" -->
+    <button wx:if="{{sys_switch.weapp_customertype}}" class="custom-service cart-ico new_split" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}">
       <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
       <view>客服</view>
     </button>
-	<view wx:else class="custom-service cart-ico new_split" bindtap="contactService">
-		<image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
-		<view>客服</view>
-	</view>
-	
+    <view wx:else class="custom-service cart-ico new_split" bindtap="contactService">
+      <image class="cs-img" src="{{iurl}}/miniapp/images/custom-service.png"></image>
+      <view>客服</view>
+    </view>
     <view bindtap="collectGoods" class="custom-service cart-ico new_split">
       <image hidden="{{is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart.png"></image>
       <image hidden="{{!is_collect}}" class="cs-img" src="{{iurl}}/miniapp/images/heart-h.png"></image>
@@ -896,27 +908,25 @@
     <view class="shopping-cart cart-ico new_split">
       <navigator open-type="switchTab" url="/pages/cart/cart/cart">
         <image class="sc-img" src="{{iurl}}/miniapp/images/shopping-cart.png"></image>
-        <view class="cart-num ellipsis-1"> {{cartGoodsNum}} </view>
+        <view class="cart-num ellipsis-1">{{cartGoodsNum}}</view>
         <view>购物车</view>
       </navigator>
     </view>
-    <view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">立即购买</view>
-
+    <view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">
+      立即购买
+    </view>
     <!-- 普通商品购买 -->
     <block wx:if="{{prom_type==0 || prom_type==2 || prom_type==3}}">
-
-    <!-- 线上销售的时候，要判断库存量，  线下库存的时候不用判断 -->
-    <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules==2 }}">
-      <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 wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules==2 }}">
+        <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:else>
+        <view class="is_stock cart-btn is_stock xc-ash-b " style="width:55.5%">库存不足</view>
       </block>
-    <block wx:else>
-      <view class="is_stock cart-btn is_stock xc-ash-b " style="width:55.5%">库存不足</view>
-    </block>
-
     </block>
-
-    <!-------秒杀-------->
+    <!-- -----秒杀------ -->
     <block wx:if="{{prom_type==1}}">
       <block wx:if="{{prom_st==1 && !prom_r_null}}">
         <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
@@ -932,307 +942,321 @@
         <view 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">
         <view class="fir-v">
-			<!-- ￥{{data.shop_price,2)}} -->		
-			<block wx:if="{{card_field && sele_g[card_field]>0}}">
-				{{filters.toFix(sele_g[card_field],2)}}
-			</block> 		 
-			<block wx:else>
-				{{filters.toFix(sele_g.shop_price,2)}}
-			</block>	 		
-		</view>
+          <!-- ￥{{data.shop_price,2)}} -->
+          <block wx:if="{{card_field && sele_g[card_field]>0}}">
+            {{filters.toFix(sele_g[card_field],2)}}
+          </block>
+          <block wx:else>{{filters.toFix(sele_g.shop_price,2)}}</block>
+        </view>
         <view>单独购买</view>
       </view>
-
       <block wx:if="{{user_order_pt_state==0}}">
-        <!----商家团---->
+        <!-- --商家团-- -->
         <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==1}}" class="buy-btn cart-btn line-h">
           <view class="fir-v">￥{{prom_act.price}}</view>
           <view>去参团</view>
         </view>
-        <!----会员团---->
+        <!-- --会员团-- -->
         <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==2}}" class="buy-btn cart-btn line-h">
-            <!--<view class="fir-v">￥{{prom_act.price}}</view>-->
-            <view class="pd_top1" wx:if="{{prom_act.tz_yhjgtype>1}}">
-              <view>一键开团</view>
-              <view wx:if="{{prom_act.tz_yhjgtype==3}}">佣金<text style="font-size: 23rpx">￥</text>{{filters.toFix(prom_act.tz_yyhjg,2)}}</view>
-              <view wx:if="{{prom_act.tz_yhjgtype==2}}">团长免单</view>
-            </view>
-            <view  wx:else>
-               <view class="fir-v">￥{{ filters.toFix(prom_act.price,2)}}</view>
-               <view>一键开团</view>
+          <!-- <view class="fir-v">￥{{prom_act.price}}</view> -->
+          <view class="pd_top1" wx:if="{{prom_act.tz_yhjgtype>1}}">
+            <view>一键开团</view>
+            <view wx:if="{{prom_act.tz_yhjgtype==3}}">
+              佣金
+              <text style="font-size: 23rpx">￥</text>
+              {{filters.toFix(prom_act.tz_yyhjg,2)}}
+            </view>
+            <view wx:if="{{prom_act.tz_yhjgtype==2}}">团长免单</view>
+          </view>
+          <view wx:else>
+            <view class="fir-v">￥{{ filters.toFix(prom_act.price,2)}}</view>
+            <view>一键开团</view>
           </view>
-
         </view>
-        <!---阶梯团---->
+        <!-- -阶梯团-- -->
         <view bindtap="openSpecModel_pt" data-it="0" wx:if="{{prom_st==1 && !prom_r_null && prom_act.kttype==3 && user_order_pt_state!=3 }}" class="buy-btn cart-btn line-h">
           <view class="fir-v">￥{{filters.toFix(prom_act.yf_price,2)}}</view>
           <view>支付定金</view>
         </view>
-          
         <view wx:if="{{prom_st==0}}" class="buy-btn cart-btn lanse">即将开始</view>
         <view wx:if="{{prom_r_null}}" class="buy-btn cart-btn huise">已抢光</view>
         <view wx:if="{{prom_st==3 && !prom_r_null}}" class="buy-btn cart-btn lanse">活动已经结束</view>
       </block>
       <block wx:else>
-        <view bindtap="go_to_nopay" wx:if="{{user_order_pt_state==1}}" class="buy-btn cart-btn huise">您还未支付</view>
-        <view bindtap="go_to_team_show" wx:if="{{user_order_pt_state==2}}" class="buy-btn cart-btn">查看支付详情</view>
-        <view wx:if="{{user_order_pt_state==3}}" bindtap="go_pay_wk"  class="buy-btn cart-btn">支付尾款</view>
+        <view bindtap="go_to_nopay" wx:if="{{user_order_pt_state==1}}" class="buy-btn cart-btn huise">
+          您还未支付
+        </view>
+        <view bindtap="go_to_team_show" wx:if="{{user_order_pt_state==2}}" class="buy-btn cart-btn">
+          查看支付详情
+        </view>
+        <view wx:if="{{user_order_pt_state==3}}" bindtap="go_pay_wk" class="buy-btn cart-btn">
+          支付尾款
+        </view>
       </block>
     </block>
-	
-	
-	<!-------积分购-------->
-	<block wx:if="{{prom_type==4}}">
-		
-	  <block wx:if="{{is_shopbuy}}">	 		
-		  <view bindtap="go_pay_integral_normal" class="join-btn cart-btn line-h">
-			<view class="fir-v">	
-				<block wx:if="{{card_field && sele_g[card_field]>0}}">
-					{{filters.toFix(sele_g[card_field],2)}}
-				</block> 		 
-				<block wx:else>
-					{{filters.toFix(sele_g.shop_price,2)}}
-				</block>	 		
-			</view>
-			<view>单独购买</view>
-		  </view>  
-		  <view bindtap="go_pay_integral"  class="buy-btn cart-btn" wx:if="{{can_integral}}" >立即兑换</view>	
-		  <view class="buy-btn cart-btn" style="background-color: #aaa;" wx:else >积分不足</view>	
-	  </block>
-	  
-	   <block wx:else>	 
-			<view bindtap="go_pay_integral"  class="buy-btn-all cart-btn"  style="width: 58%; margin-left:1%;"  wx:if="{{can_integral}}" >立即兑换</view>
-			<view class="buy-btn-all cart-btn" style="background-color: #aaa; width: 58%;margin-left:1%" wx:else >积分不足</view>	   
-	   </block>
-	  
-	</block>
-		
-    <!---<view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:else>立即兑换</view>-->
+    <!-- -----积分购------ -->
+    <block wx:if="{{prom_type==4}}">
+      <block wx:if="{{is_shopbuy}}">
+        <view bindtap="go_pay_integral_normal" class="join-btn cart-btn line-h">
+          <view class="fir-v">
+            <block wx:if="{{card_field && sele_g[card_field]>0}}">
+              {{filters.toFix(sele_g[card_field],2)}}
+            </block>
+            <block wx:else>{{filters.toFix(sele_g.shop_price,2)}}</block>
+          </view>
+          <view>单独购买</view>
+        </view>
+        <view bindtap="go_pay_integral" class="buy-btn cart-btn" wx:if="{{can_integral}}">
+          立即兑换
+        </view>
+        <view class="buy-btn cart-btn" style="background-color: #aaa;" wx:else>积分不足</view>
+      </block>
+      <block wx:else>
+        <view bindtap="go_pay_integral" class="buy-btn-all cart-btn" style="width: 58%; margin-left:1%;" wx:if="{{can_integral}}">
+          立即兑换
+        </view>
+        <view class="buy-btn-all cart-btn" style="background-color: #aaa; width: 58%;margin-left:1%" wx:else>
+          积分不足
+        </view>
+      </block>
+    </block>
+    <!-- -<view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:else>立即兑换</view> -->
   </view>
-
-  <!--  制作一个圆球导航  -->
+  <!-- 制作一个圆球导航 -->
   <nav_box></nav_box>
-
 </block>
-
-<!----弹起来,选择规格数量,普通商品购买和秒杀------>
+<!-- --弹起来,选择规格数量,普通商品购买和秒杀---- -->
 <view hidden="{{!openSpecModal}}">
-  <view bindtap="closeSpecModal" class="cover-layer"></view> 
+  <view bindtap="closeSpecModal" class="cover-layer"></view>
   <view class="spec-model">
-    <view class="pding"> 
+    <view class="pding">
       <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>
       <view class="spec-goods">
         <image class="wh100 spec-img xc-distance-bottom" src="{{sele_g.original_img}}" binderror="pop_err_img" data-errorimg="sele_g.original_img"></image>
         <view class="spec-goods-info">
           <view class="spec-goods-name ellipsis-2">{{sele_g.goods_name}}</view>
-          <view class="flex ai_end xc-val-money" >
-              <view class="spec-goods-price" wx:if="{{prom_price==null}}" >			  
-			    <text class="fs20">￥</text>
-		        <!-- 如果是等级会员，且有等级价 -->
-			 	<block wx:if="{{card_field && sele_g[card_field]>0}}">{{sele_g[card_field]}} </block> 		 
-			 	<block wx:else>{{sele_g.shop_price}}</block>
-		      </view>
-              <view class="spec-goods-price" wx:else><text class="fs20">￥</text>{{prom_price}}</view>
-			  <!-- 显示线下价格 -->
-			  <view wx:if="{{sele_g.offline_price}}" class="quan_price flex ai-center jc-center">
-				 券后￥<text class="fs32">{{sele_g.offline_price}}</text>
-			  </view>
-         </view>
-       
+          <view class="flex ai_end xc-val-money">
+            <view class="spec-goods-price" wx:if="{{prom_price==null}}">
+              <text class="fs20">￥</text>
+              <!-- 如果是等级会员，且有等级价 -->
+              <block wx:if="{{card_field && sele_g[card_field]>0}}">{{sele_g[card_field]}}</block>
+              <block wx:else>{{sele_g.shop_price}}</block>
+            </view>
+            <view class="spec-goods-price" wx:else>
+              <text class="fs20">￥</text>
+              {{prom_price}}
+            </view>
+            <!-- 显示线下价格 -->
+            <view wx:if="{{sele_g.offline_price}}" class="quan_price flex ai-center jc-center">
+              券后￥
+              <text class="fs32">{{sele_g.offline_price}}</text>
+            </view>
+          </view>
           <block wx:if="{{prom_type==0}}">
-              <view class="flex">
-                <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
-		      	<block wx:if="{{sales_rules==2}}">		
-                  <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view>
-				  <view class="spec-goods-stock" wx:else>可售:0</view>
-		    	</block>
-			    <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block>       
-              </view>
+            <view class="flex">
+              <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
+              <block wx:if="{{sales_rules==2}}">
+                <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">
+                  可售：{{def_pick_store.CanOutQty}}
+                </view>
+                <view class="spec-goods-stock" wx:else>可售:0</view>
+              </block>
+              <block wx:else>
+                <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
+              </block>
+            </view>
           </block>
           <block wx:if="{{prom_type==1}}">
-             <view class="flex">
-                <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售：{{prom_act.buy_num+prom_act.virtual}}</view>
-                <view class="spec-goods-stock" wx:else >已售：{{prom_act.buy_num}}</view>
-                <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>         
-             </view>
+            <view class="flex">
+              <view class="spec-goods-stock" wx:if="{{prom_st>0}}">
+                已售：{{prom_act.buy_num+prom_act.virtual}}
+              </view>
+              <view class="spec-goods-stock" wx:else>已售：{{prom_act.buy_num}}</view>
+              <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
+            </view>
           </block>
         </view>
-
         <!-- 选择门店模块 -->
-        <view  class="flex-space-between address ai_end xc-width ">
-
-                     <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
-                       <text class="fs30 xc-black3 shop_name bold">{{def_pick_store.pickup_name}}</text>
-                         <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
-                          距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
-                         
-                          </view>
-                     </view>
-					 
-                     <!-- 没有门店的时候 -->
-                     <view  class="flex" bindtap="choice_store" wx:else>
-                           <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
-                           <view class="fs30" style="color:black;">选择门店</view>						  
-                      </view>
-
-                      <view class="red-co fs28" bindtap="choice_store" >
-                         更多门店
-                         <text class="right-arrow"></text>
-                      </view>
-                   </view>
-				   <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
-				   <block wx:else>
-				         <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
-						 <block wx:else>
-							  <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
-					     	  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
-						 </block>				       
-				   </block>
-				   	   
-                   <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
-         </view>
-
-       <!--商品的属性项目-->
-        <view  class="xc-goods-attribute">
-            <view hidden="{{ismend==1}}" class="spec-name">商品规格</view>
-            <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;">
-             <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">
-                {{item.gg}}
-              </view>
-           </view>
+        <view class="flex-space-between address ai_end xc-width ">
+          <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
+            <text class="fs30 xc-black3 shop_name bold">{{def_pick_store.pickup_name}}</text>
+            <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">
+              距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
+            </view>
+          </view>
+          <!-- 没有门店的时候 -->
+          <view class="flex" bindtap="choice_store" wx:else>
+            <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
+            <view class="fs30" style="color:black;">选择门店</view>
+          </view>
+          <view class="red-co fs28" bindtap="choice_store">
+            更多门店
+            <text class="right-arrow"></text>
+          </view>
+        </view>
+        <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
+        <block wx:else>
+          <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
+          <block wx:else>
+            <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
+            <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">
+              (库存不足)
+            </view>
+          </block>
+        </block>
+        <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.fulladdress}}">
+          地址:{{def_pick_store.fulladdress}}
         </view>
-  
-
-        <view class="b_num">
-          <view>购买数量</view>
-          <view class="count">
-            <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view>
-            <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>
-            <view bindtap="addCartNum" class="add">+</view>
+      </view>
+      <!-- 商品的属性项目 -->
+      <view class="xc-goods-attribute">
+        <view hidden="{{ismend==1}}" class="spec-name">商品规格</view>
+        <view hidden="{{ismend==1}}" style="max-height: 120rpx;overflow-y: auto;">
+          <view class="spec_bt {{gid==item.goods_id?'act':''}}" bindtap="sele_spec" data-gid='{{item.goods_id}}' wx:for="{{sku_g}}" wx:key="sku_g">
+            {{item.gg}}
           </view>
         </view>
-		
-		<!-- 提示再买多少优惠 -->
-		<view style="margin-top: 35rpx;color:#333;font-size:28rpx;" wx:if="{{hui_condition && openSpecModal_ind==2}}">
-			再买{{hui_condition.need}}
-			<text wx:if="{{hui_condition.money}}">，免{{hui_condition.money}}元</text>
-			<text wx:if="{{hui_condition.sale}}">，打{{hui_condition.sale}}折</text>
-			<text wx:if="{{hui_condition.past==1}}">，包邮</text>
-			<text wx:if="{{hui_condition.intValue>0}}">，送{{hui_condition.intValue}}积分</text>
-			<text wx:if="{{hui_condition.couponId>0}}">，送优惠券</text>
-			<text wx:if="{{hui_condition.gift_id>0}}">，送赠品</text>
-			<text wx:if="{{hui_condition.lb_id>0}}">，送礼包</text>
-		</view>
-	
-	
       </view>
-      
-	  <view class="spec-cart-btns">	
-	       <view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">配送不匹配</view>
-		   <block wx:else>
-
-			   <!-- 根本就找不到门店 -->
-			   <block wx:if="{{!only_pk && !def_pickpu_list}}">
-				   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>		   
-			   </block>		 
-			   <block wx:else>
-			   
-						  
-				  <block wx:if="{{only_pk.length && !only_pk.length}}">
-					   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">库存不足</view>
-				  </block>  	  
-				  <block wx:else>
-					  <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
-						   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>
-					 </block>
-					 <block wx:else>
-						 <block wx:if="{{!def_pick_store}}">
-							 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
-						 </block>					 
-						 <block wx:else>	 						 						  
-							 <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
-							 <block wx:if="{{sales_rules==2 && prom_type==0}}">
-								 <block wx:if="{{!def_pick_store.CanOutQty}}">
-									   <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>						 
-								 </block>
-								 <block wx:else>
-									  <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"  
-										   class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
-									  <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" 
-										   class="spec-cart-btn spec-buy" data-action="buy">
-										   {{sele_g.offline_price?"券后购买":"立即购买"}}										   
-									  </view> 
-								 </block>			 
-							 </block>
-							 <!-- 线上销售 -->
-							 <block wx:else>
-								 <block wx:if="{{sele_g.store_count<=0}}">
-									  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>	
-								 </block>
-								 <block wx:else>
-									 <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"  
-										 class="spec-cart-btn yellow fs32" data-action="add">加入购物车</view>
-									 <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}"
-										 class="spec-cart-btn spec-buy" data-action="buy">
-										 {{sele_g.offline_price?"券后购买":"立即购买"}}
-									</view> 
-								 </block>
-							 </block>
-						 </block>									 
-					 </block>
-			  </block>  			
-			   </block>				   
-    
-	       </block>
-	 </view>
-
-      <view class="clear"></view>
-      <!-- 选择门店的列表 -->
-      <view hidden="{{ismend==0}}" class="sto_v">
-        <view class="title" hidden="{{is_sec_mend==1}}" bindtap="hidemend">
-          <image class="tubiao" src="{{iurl}}/miniapp/images/icon-left.png"></image>选择门店
+      <view class="b_num">
+        <view>购买数量</view>
+        <view class="count">
+          <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">
+            -
+          </view>
+          <input bindblur="inputCartNum" type="number" value="{{goodsInputNum}}"></input>
+          <view bindtap="addCartNum" class="add">+</view>
         </view>
-        <!-----第一级显示------>
-        <view class="itemlists" hidden="{{is_sec_mend==1}}">
-          <block wx:if="{{is_show_sto_cat}}">
-            <view wx:for="{{all_sto}}" wx:key="all_sto" class="item" bindtap="show_sec" data-index="{{index}}">{{item.name}}</view>
+      </view>
+      <!-- 提示再买多少优惠 -->
+      <view style="margin-top: 35rpx;color:#333;font-size:28rpx;" wx:if="{{hui_condition && openSpecModal_ind==2}}">
+        再买{{hui_condition.need}}
+        <text wx:if="{{hui_condition.money}}">，免{{hui_condition.money}}元</text>
+        <text wx:if="{{hui_condition.sale}}">，打{{hui_condition.sale}}折</text>
+        <text wx:if="{{hui_condition.past==1}}">，包邮</text>
+        <text wx:if="{{hui_condition.intValue>0}}">，送{{hui_condition.intValue}}积分</text>
+        <text wx:if="{{hui_condition.couponId>0}}">，送优惠券</text>
+        <text wx:if="{{hui_condition.gift_id>0}}">，送赠品</text>
+        <text wx:if="{{hui_condition.lb_id>0}}">，送礼包</text>
+      </view>
+    </view>
+    <view class="spec-cart-btns">
+      <view wx:if="{{def_pick_store && def_pick_store.is_no_dis}}" class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
+        配送不匹配
+      </view>
+      <block wx:else>
+        <!-- 根本就找不到门店 -->
+        <block wx:if="{{!only_pk && !def_pickpu_list}}">
+          <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
+            库存不足
+          </view>
+        </block>
+        <block wx:else>
+          <block wx:if="{{only_pk.length && !only_pk.length}}">
+            <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999;">
+              库存不足
+            </view>
           </block>
           <block wx:else>
-            <view wx:for="{{only_pk}}" wx:key="only_pk" class="item" bindtap="hidemend" data-p_id="{{item.pickup_id}}" data-p_name="{{item.pickup_name}}" data-p_dis="{{item.distr_type}}">{{item.pickup_name}}</view>
+            <block wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">
+              <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
+                库存不足
+              </view>
+            </block>
+            <block wx:else>
+              <block wx:if="{{!def_pick_store}}">
+                <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
+                  请先选择门店
+                </view>
+              </block>
+              <block wx:else>
+                <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
+                <block wx:if="{{sales_rules==2 && prom_type==0}}">
+                  <block wx:if="{{!def_pick_store.CanOutQty}}">
+                    <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
+                      库存不足
+                    </view>
+                  </block>
+                  <block wx:else>
+                    <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32" data-action="add">
+                      加入购物车
+                    </view>
+                    <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy">
+                      {{sele_g.offline_price?"券后购买":"立即购买"}}
+                    </view>
+                  </block>
+                </block>
+                <!-- 线上销售 -->
+                <block wx:else>
+                  <block wx:if="{{sele_g.store_count<=0}}">
+                    <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
+                      库存不足
+                    </view>
+                  </block>
+                  <block wx:else>
+                    <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32" data-action="add">
+                      加入购物车
+                    </view>
+                    <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy">
+                      {{sele_g.offline_price?"券后购买":"立即购买"}}
+                    </view>
+                  </block>
+                </block>
+              </block>
+            </block>
           </block>
-        </view>
-        <!-----第二级显示------>
-        <view class="stitle" hidden="{{is_sec_mend==0}}" bindtap="hide_sec_mend">
-          <image class="tubiao" src="{{iurl}}/miniapp/images/icon-left.png"></image>{{sec_sto.name}}
-        </view>
-        <view class="itemlists" hidden="{{is_sec_mend==0}}">
-          <view wx:for="{{sec_sto.s_arr}}" wx:key="{{index}}" class="item" bindtap="hidemend" data-p_id="{{item.pickup_id}}" data-p_name="{{item.pickup_name}}" data-p_dis="{{item.distr_type}}">{{item.pickup_name}}
+        </block>
+      </block>
+    </view>
+    <view class="clear"></view>
+    <!-- 选择门店的列表 -->
+    <view hidden="{{ismend==0}}" class="sto_v">
+      <view class="title" hidden="{{is_sec_mend==1}}" bindtap="hidemend">
+        <image class="tubiao" src="{{iurl}}/miniapp/images/icon-left.png"></image>
+        选择门店
+      </view>
+      <!-- ---第一级显示---- -->
+      <view class="itemlists" hidden="{{is_sec_mend==1}}">
+        <block wx:if="{{is_show_sto_cat}}">
+          <view wx:for="{{all_sto}}" wx:key="all_sto" class="item" bindtap="show_sec" data-index="{{index}}">
+            {{item.name}}
           </view>
+        </block>
+        <block wx:else>
+          <view wx:for="{{only_pk}}" wx:key="only_pk" class="item" bindtap="hidemend" data-p_id="{{item.pickup_id}}" data-p_name="{{item.pickup_name}}" data-p_dis="{{item.distr_type}}">
+            {{item.pickup_name}}
+          </view>
+        </block>
+      </view>
+      <!-- ---第二级显示---- -->
+      <view class="stitle" hidden="{{is_sec_mend==0}}" bindtap="hide_sec_mend">
+        <image class="tubiao" src="{{iurl}}/miniapp/images/icon-left.png"></image>
+        {{sec_sto.name}}
+      </view>
+      <view class="itemlists" hidden="{{is_sec_mend==0}}">
+        <view wx:for="{{sec_sto.s_arr}}" wx:key="{{index}}" class="item" bindtap="hidemend" data-p_id="{{item.pickup_id}}" data-p_name="{{item.pickup_name}}" data-p_dis="{{item.distr_type}}">
+          {{item.pickup_name}}
         </view>
       </view>
-    </view>   
+    </view>
+  </view>
 </view>
-
-<!--  弹起来,购买积分购  -->
+<!-- 弹起来,购买积分购 -->
 <view hidden="{{!openSpecModal_inte}}">
-    <include src="buy_integral.wxml" />
-</view>	
-<!--  弹起来,购买积分购的普通购买  -->
+  <include src="buy_integral.wxml" />
+</view>
+<!-- 弹起来,购买积分购的普通购买 -->
 <view hidden="{{!openSpecModal_inte_normal}}">
-    <include src="buy_integral_normal.wxml" />
-</view>	
-
-<!----弹起来,选择规格数量,拼单商品购买------>
+  <include src="buy_integral_normal.wxml" />
+</view>
+<!-- --弹起来,选择规格数量,拼单商品购买---- -->
 <view hidden="{{!openSpecModal_pt}}">
-    <include src="buy_pt.wxml" />
+  <include src="buy_pt.wxml" />
 </view>
-
-<!----弹起来优惠信息------>
+<!-- --弹起来优惠信息---- -->
 <view hidden="{{!openPromModal}}">
   <view bindtap="closePromModal" class="cover-layer"></view>
   <view class="prom-model">
@@ -1246,38 +1270,44 @@
     </view>
   </view>
 </view>
-<!----弹起的---->
+<!-- --弹起的-- -->
 <block wx:if="{{pd_xx==1}}">
   <view class="bview"></view>
   <view class="juzhong">
     <view class="xq">
-      <view class="title" bindtap="close_pt_xx">拼团玩法介绍
+      <view class="title" bindtap="close_pt_xx">
+        拼团玩法介绍
         <image src="{{iurl}}/miniapp/images/gbi.png" class="close"></image>
       </view>
-      <view>1.开团：
+      <view>
+        1.开团：
         <text class="hs1">选择心仪商品，点击“发起X人团”按钮，付款后即为开团成功；</text>
       </view>
-      <view>2.参团：
+      <view>
+        2.参团：
         <text class="hs1">进入朋友分享的页面，点击“立即参团”按钮，付款后即为参团成功，若多人同时支付，支付成功时间较早的人获得参团资格；</text>
       </view>
-      <view>3.成团：
+      <view>
+        3.成团：
         <text class="hs1">在开团或参团成功后，点击“邀请小伙伴参团”将页面分享给好友，在有效时间内凑齐人数即为成团，此时商家会开始发货；</text>
       </view>
-      <view>4.组团失败：
+      <view>
+        4.组团失败：
         <text class="hs1">在有效时间内未凑齐人数，即为组团失败，此时付款项会原路退回到支付账户；</text>
       </view>
-      <view>5.
-        <text class="hs1">组团有效期间内，拼购商品订单不允许取消。 </text>
+      <view>
+        5.
+        <text class="hs1">组团有效期间内，拼购商品订单不允许取消。</text>
       </view>
     </view>
   </view>
 </block>
-<!----弹起领券---->
+<!-- --弹起领券-- -->
 <view wx:if='{{coupon==1}}'>
   <view class="cover-layer flex-center" data-coupon='0' bindtap="switchCoupon"></view>
   <view class="cx-popup {{coupon== true ? 'up' : 'down'}} ">
     <view class="top-frame">
-			<!-- <view class="top two-level-word t-c"> -->
+      <!-- <view class="top two-level-word t-c"> -->
       <view class="top t-c">优惠券领取</view>
     </view>
     <!-- <view class="top-frame">
@@ -1286,209 +1316,205 @@
     <view class="xc-frame">
       <view class="top-frame">
         <view class="xc-coupon-frame ">
-            <!---单张的券--->
-            <view class="rel" wx:for="{{quan_list}}" wx:key="{{index}}">
-              <view class="coupon flex">
-                <view class="circle xc-circular-one"></view>
-                <view class="xc-coupon-left ">
-                  <view class="flex ai_c xc-money-frame">
-                    <text class="xc-money two-level-word  xc-rmb">￥</text>
-                    <text class="one-level-word xc-money">{{item.money}}</text>
-                  </view>
-                  <view class="xc-money four-level-word  xc-spacing">
-                    满{{item.condition}}元可用
-                  </view>
+          <!-- -单张的券- -->
+          <view class="rel" wx:for="{{quan_list}}" wx:key="{{index}}">
+            <view class="coupon flex">
+              <view class="circle xc-circular-one"></view>
+              <view class="xc-coupon-left ">
+                <view class="flex ai_c xc-money-frame">
+                  <text class="xc-money two-level-word  xc-rmb">￥</text>
+                  <text class="one-level-word xc-money">{{item.money}}</text>
                 </view>
-                <view class="xc-coupon-right flex">
-                  <view class="xc-detail-coupon">
-                    <view class="four-level-word">订单金额满{{item.condition}}元可用</view>
-                    <view class="four-level-word xc-below">{{filters.replace_time2(item.start)}} 至 {{filters.replace_time2(item.end)}}</view>
+                <view class="xc-money four-level-word  xc-spacing">满{{item.condition}}元可用</view>
+              </view>
+              <view class="xc-coupon-right flex">
+                <view class="xc-detail-coupon">
+                  <view class="four-level-word">订单金额满{{item.condition}}元可用</view>
+                  <view class="four-level-word xc-below">
+                    {{filters.replace_time2(item.start)}} 至 {{filters.replace_time2(item.end)}}
                   </view>
-                  <view class="flex-vertical">
-                  <view class="three-level-word xc-get background  {{item.everyone_num>0 && item.lqnum>=item.everyone_num?'nouse':''}}"
-                          data-ind="{{index}}"  data-cid="{{item.id}}" bindtap="get_quan">{{ item.linging==1?'领取中':'领取'}}</view>
+                </view>
+                <view class="flex-vertical">
+                  <view class="three-level-word xc-get background  {{item.everyone_num>0 && item.lqnum>=item.everyone_num?'nouse':''}}" data-ind="{{index}}" data-cid="{{item.id}}" bindtap="get_quan">
+                    {{ item.linging==1?'领取中':'领取'}}
                   </view>
                 </view>
-                <view class="circle xc-circular-two"></view>
               </view>
+              <view class="circle xc-circular-two"></view>
             </view>
+          </view>
         </view>
       </view>
     </view>
     <view class="cx-confirm pd20" data-coupon='0' bindtap="switchCoupon">
-      <view  class="confirm t-c">关闭</view>
+      <view class="confirm t-c">关闭</view>
     </view>
   </view>
 </view>
-
 <!-- 选择门店的弹框，1.1版最新的 -->
 <block wx:if="{{store==1}}">
   <view class="mongolia-layer" bindtap="close_popup"></view>
   <view class="popup-frame">
-  <block  wx:if="{{sort_store==0}}">
-  <!-- 头部 标题 -->
-     <view class="popup-top flex-space-between">
-       <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text>
+    <block wx:if="{{sort_store==0}}">
+      <!-- 头部 标题 -->
+      <view class="popup-top flex-space-between">
+        <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text>
         <view>
-           <view>
-              <icon bindtap="close_popup" class="modal-closes" color="black" size="22"       type="cancel"></icon>
-           </view>
-           <view class="felx choose_more" bindtap="more_store">
-              <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text>
-              <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view>
-           </view>
+          <view>
+            <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
+          </view>
+          <view class="felx choose_more" bindtap="more_store">
+            <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">
+              {{choice_sort_store==0?'更多门店':'返回'}}
+            </text>
+            <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view>
           </view>
-       </view>
-          <!-- 门店列表，最外层的门店列表，一开始 -->
-          <view class="store-list">
-              <!--如果还没有点击更多门店的时候  -->
-              <block wx:if="{{choice_sort_store==0}}">
-                  <!-- 需要for循环 -->
-                  <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">
+        </view>
+      </view>
+      <!-- 门店列表，最外层的门店列表，一开始 -->
+      <view class="store-list">
+        <!-- 如果还没有点击更多门店的时候 -->
+        <block wx:if="{{choice_sort_store==0}}">
+          <!-- 需要for循环 -->
+          <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">
                 <!-- 需要点击事件 -->
                 <block wx:if="{{index==fir_pick_index}}">
-               <view class="circle white xc-hook fs20 red-b">Г</view>
-             </block>
+                  <view class="circle white xc-hook fs20 red-b">Г</view>
+                </block>
                 <block wx:else>
-               <view class="circle  xc-hooks"></view>
-             </block>
+                  <view class="circle  xc-hooks"></view>
+                </block>
                 <view class="address-frame xc-ash">
-              <view class="flex-vertical-between butttem5">
-                  <view class="flex xc-ash">
-                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
-                   </view>
-                  <view>
-                    <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
-                    距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view>
+                  <view class="flex-vertical-between butttem5">
+                    <view class="flex xc-ash">
+                      <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
+                    </view>
+                    <view>
+                      <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
+                        距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}
+                      </view>
+                    </view>
                   </view>
+                  <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+                </view>
               </view>
-              <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
-            </view>
             </view>
-                 </view>
-                  </block>
-                  <block wx:else>
-                           <view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
-               <view class="store flex-vertical">
-                 <!-- 需要点击事件 -->
-                 <block wx:if="{{index==fir_pick_index}}" >
-                   <view  class="circle white xc-hook fs20 red-b">Г</view>
-                 </block>
-                 <block wx:else>
-                   <view  class="circle  xc-hooks"></view>
-                 </block>
-
-                 <view class="address-frame xc-ash">
-                   <view class="flex-vertical-between ">
-                     <view class="flex xc-ash">
-                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
-                     </view>
-                     <view>
-                       <view class="distance fs24 address-val"
-                       wx:if="{{item.distance!=null}}">距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}
-                     </view>
-                     </view>
-                   </view>
-                   <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
-                 </view>
-               </view>
-             </view>
-                   </block>
-              </block>
-              <block wx:else> <!-- 如果是点击选择门店分类后显示分类下的门店  -->
-                   <view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" data-ind="{{index}}"  bindtap="choose_for_store">
-                  <view class="store flex-vertical">
-                    <!-- 需要点击事件 -->
-                    <block wx:if="{{index==sec_pick_index}}">
-                      <view  class="circle white xc-hook fs20 red-b">Г</view>
-                    </block>
-                    <block wx:else>
-                      <view class="circle  xc-hooks"></view>
-                    </block>
-
-                    <view class="address-frame xc-ash">
-                      <view class="flex-vertical-between ">
-                        <view class="flex xc-ash">
-                          <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
-                        </view>
-                        <view>
-                          <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}">
-							  距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view>
-                        </view>
+          </block>
+          <block wx:else>
+            <view class="store_choose flex" wx:for="{{only_pk}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
+              <view class="store flex-vertical">
+                <!-- 需要点击事件 -->
+                <block wx:if="{{index==fir_pick_index}}">
+                  <view class="circle white xc-hook fs20 red-b">Г</view>
+                </block>
+                <block wx:else>
+                  <view class="circle  xc-hooks"></view>
+                </block>
+                <view class="address-frame xc-ash">
+                  <view class="flex-vertical-between ">
+                    <view class="flex xc-ash">
+                      <view class="fs30 xc-black3 address_name">{{item.pickup_name}}</view>
+                    </view>
+                    <view>
+                      <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
+                        距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}
                       </view>
-                      <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
                     </view>
                   </view>
+                  <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
                 </view>
+              </view>
+            </view>
+          </block>
+        </block>
+        <block wx:else>
+          <!-- 如果是点击选择门店分类后显示分类下的门店 -->
+          <view class="store_choose flex" wx:for="{{sec_sto.s_arr}}" data-ind="{{index}}" bindtap="choose_for_store">
+            <view class="store flex-vertical">
+              <!-- 需要点击事件 -->
+              <block wx:if="{{index==sec_pick_index}}">
+                <view class="circle white xc-hook fs20 red-b">Г</view>
+              </block>
+              <block wx:else>
+                <view class="circle  xc-hooks"></view>
               </block>
-
-           </view>
-
-           <!-- 门店列表底部 -->
-           <view class="store-bottom-frame">
-              <view class="store-bottom flex-vertical-between">
-                <view class="determine red-b fs28 white t-c" bindtap="sure_pick" 
-                data-openindstore="{{open_ind_store}}">确定</view>
-                <view class="default  t-c fs28" bindtap="set_def_pick"data-openindstore="{{open_ind_store}}">设为默认</view>
-             </view>
+              <view class="address-frame xc-ash">
+                <view class="flex-vertical-between ">
+                  <view class="flex xc-ash">
+                    <view class="fs28 xc-black3 address_name">{{item.pickup_name}}</view>
+                  </view>
+                  <view>
+                    <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}">
+                      距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}
+                    </view>
+                  </view>
+                </view>
+                <view class="fs24 xc-ash-9f">地址:{{item.fulladdress}}</view>
+              </view>
+            </view>
+          </view>
+        </block>
+      </view>
+      <!-- 门店列表底部 -->
+      <view class="store-bottom-frame">
+        <view class="store-bottom flex-vertical-between">
+          <view class="determine red-b fs28 white t-c" bindtap="sure_pick" data-openindstore="{{open_ind_store}}">
+            确定
+          </view>
+          <view class="default  t-c fs28" bindtap="set_def_pick" data-openindstore="{{open_ind_store}}">
+            设为默认
           </view>
-       
-     </block>
-
-
-       <block wx:else>
-         <view class="popup-top flex-space-between">
-       <text class="fs32 nearby_store">门店分类选择</text>
+        </view>
+      </view>
+    </block>
+    <block wx:else>
+      <view class="popup-top flex-space-between">
+        <text class="fs32 nearby_store">门店分类选择</text>
         <view>
-           <view>
-              <icon bindtap="close_popup" class="modal-closes" color="black" size="22"       type="cancel"></icon>
-           </view>
-           <view class="felx choose_mores" bindtap="returns">
-              <text class="fs26 red-co">返回</text>
-           </view>
+          <view>
+            <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
           </view>
-       </view>
-       <view class="sort_store_list"> 
-
-          <view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store" data-region="{{item.name}}">
-              <view class="sort-store flex-vertical-between" >
-                  <view class="fs30" di>{{item.name}}</view>
-                  <view class="black_rights-frame">
-                      <view class="black_rights"></view>
-                </view>
-             </view>
+          <view class="felx choose_mores" bindtap="returns">
+            <text class="fs26 red-co">返回</text>
+          </view>
+        </view>
+      </view>
+      <view class="sort_store_list">
+        <view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store" data-region="{{item.name}}">
+          <view class="sort-store flex-vertical-between">
+            <view class="fs30" di>{{item.name}}</view>
+            <view class="black_rights-frame">
+              <view class="black_rights"></view>
+            </view>
           </view>
-
-       </view>
-       </block>
+        </view>
+      </view>
+    </block>
   </view>
-</block>  
-<!--  ---------------分享弹窗--------------- -->
-<!--二维码显示页面-->
+</block>
+<!-- ---------------分享弹窗--------------- -->
+<!-- 二维码显示页面 -->
 <canvas canvas-id='share' style='width:750rpx;height:1217rpx;background-color:white;' wx:if='{{!canvasHidden}}'></canvas>
 <warn id="warn"></warn>
-
-
 <!-- 分享控件，底部弹出 -->
-<share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum"  wx:if="{{share_hidden}}"></share>
-
-
+<share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum" wx:if="{{share_hidden}}"></share>
 <view wx:if="{{showPoster}}">
- <view class="mask" catchtap="closePoster"></view>
- <view class="poster-container">
-  <view class="poster-wrapper">
-   <view class="poster">
-   <!-- <view class="poster" bindtap="previewImage"> -->
-    <image src="{{shareImgPath}}" class="poster-img" ></image>
-    <view class="btn-close" catchtap="closePoster"><text class="iconfont icon-close"></text></view>
-   </view>
-   <view class="btn-container">
-       <!--<button class="btn-share" open-type="share" bindtap="">微信好友分享</button>-->
-       <button class="btn-share" bindtap="savePic">保存到相册</button>
-   </view>
+  <view class="mask" catchtap="closePoster"></view>
+  <view class="poster-container">
+    <view class="poster-wrapper">
+      <view class="poster">
+        <!-- <view class="poster" bindtap="previewImage"> -->
+        <image src="{{shareImgPath}}" class="poster-img"></image>
+        <view class="btn-close" catchtap="closePoster">
+          <text class="iconfont icon-close"></text>
+        </view>
+      </view>
+      <view class="btn-container">
+        <!-- <button class="btn-share" open-type="share" bindtap="">微信好友分享</button> -->
+        <button class="btn-share" bindtap="savePic">保存到相册</button>
+      </view>
+    </view>
   </view>
- </view>
-</view>
-
+</view>
\ No newline at end of file