天天拼团的指定门店的优化

yvan.ni
1 parent fd26792b
Showing 2 changed files with 7 additions and 3 deletions
pages/goods/goodsInfo/buy_pt.wxml
pages/goods/goodsInfo/goodsInfo.js
@@ -73,6 +73,7 @@
               <block wx:else>
                   <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
                   <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_nor && is_normal}}">(该店不可售)</view>
+                  <view class="no_store" wx:elif="{{def_pick_store.is_no_dis_act && !is_normal}}">(该店不可售)</view>
                   <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && is_normal}}">(库存不足)</view>
               </block>
           </block>
@@ -220,7 +221,10 @@
 		  <!-- 根本就找不到门店 -->
 		  <block wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
 		  	  <view class="spec-cart-btn spec-buy w100"  style="background-color: #dcdcdc;color: #999;">配送不匹配</view>		   
-		  </block>		 
+		  </block>
+          <block wx:elif="{{def_pick_store && def_pick_store.is_no_dis_act}}">
+              <view class="spec-cart-btn spec-buy w100" data-action="add" style="background-color: #dcdcdc;color: #999;">该店不可售</view>
+          </block>
 		  <block wx:else>
 		      <view bindtap="addCart_pt" class="spec-cart-btn spec-buy w100" data-action="buy">确定</view>
 		  </block> 
@@ -3572,7 +3572,7 @@ Page({
                       var pickup_ids=th.data.sele_g.pickup_ids;
  
                       //指定门店判断， 不是普通购买的时候，秒杀的时候，秒杀有指定门店
-                      if(!is_normal && th.data.prom_type==1 && th.data.prom_act.pick_up_lists){
+                      if(!is_normal && (th.data.prom_type==1 || th.data.prom_type==6) && th.data.prom_act.pick_up_lists){
                         pickup_ids=th.data.prom_act.pick_up_lists
                       }
  
@@ -3602,7 +3602,7 @@ Page({
                             if(idx1<0){
                               th.data.def_pick_store.is_no_dis_nor=1;
                               //如果是秒杀的指定门店，就要设置秒杀的
-                              if(!is_normal && th.data.prom_type==1){
+                              if(!is_normal && (th.data.prom_type==1 || th.data.prom_type==6)  ){
                                 th.data.def_pick_store.is_no_dis_act=1;
                               }else{
                                 th.data.def_pick_store.is_no_dis_nor=1;