商品门店选择的问题优化

yvan.ni
1 parent 7485cbc3
Showing 4 changed files with 35 additions and 16 deletions
app.js
pages/giftpack/public/buy_com.wxml
pages/goods/goodsInfo/buy_integral_normal.wxml
pages/goods/goodsInfo/buy_pt.wxml
@@ -530,21 +530,40 @@ App({
             }
             if (!th.globalData.pk_store) {
                 var pick_id = 0;
-                //先找一个会员是否有设置默认的地址
-                if (th.globalData.userInfo.def_pickup_id) {
-                    pick_id = th.globalData.userInfo.def_pickup_id
-                }
-                //查找会员的注册的地址
-                else if (th.globalData.userInfo.pickup_id) {
+
+                var is_pricing_open_store=0;
+                var is_regstores=0;
+                if (conf.switch_list) {
+                    var t_swi = JSON.parse(conf.switch_list);
                     //--购买门店是否默认登记门店--
-                    if (conf.switch_list) {
-                        var t_swi = JSON.parse(conf.switch_list);
-                        if (t_swi.is_regstores) {
-                            pick_id = th.globalData.userInfo.pickup_id
-                        }
+                    is_regstores=t_swi.is_regstores;
+                    is_pricing_open_store=t_swi.is_pricing_open_store;
+                }
+
+                //-- 如果是区域价格提现，现在注册门店是默认 --
+                if(is_pricing_open_store){
+
+                    //查找会员的注册的地址
+                    if (th.globalData.userInfo.pickup_id) {
+                        pick_id = th.globalData.userInfo.pickup_id
+                    }
+                    //先找一个会员是否有设置默认的地址
+                    else if (th.globalData.userInfo.def_pickup_id) {
+                        pick_id = th.globalData.userInfo.def_pickup_id
                     }
  
+                }else{
+                    //先找一个会员是否有设置默认的地址
+                    if (th.globalData.userInfo.def_pickup_id) {
+                        pick_id = th.globalData.userInfo.def_pickup_id
+                    }
+                    //查找会员的注册的地址
+                    else if (th.globalData.userInfo.pickup_id && is_regstores) {
+                        pick_id = th.globalData.userInfo.pickup_id
+                    }
                 }
+
+
                 //---如果会员没有设置默认门店，同时也没有再注册的时候选择门店--
                 if (pick_id == 0) return func(null);
  
@@ -186,7 +186,7 @@
             <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  hidden="{{has_def && sys_switch.is_pricing_open_store}}"   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>
@@ -39,7 +39,7 @@
 		                           <!-- 没有门店的时候 -->
 		                           <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 class="fs30" style="color:black;">选择门店</view>
 		                            </view>
  
 		                            <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
@@ -49,7 +49,7 @@
 		      				         <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>
+		      					     	  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2}}">(库存不足)</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>
@@ -118,7 +118,7 @@
 				  						 <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">请先选择门店</view>
 				  					 </block>					 
 				  					 <block wx:else>	 						 						  																	
-				  							 <block wx:if="{{data.store_count<=0}}">
+				  							 <block wx:if="{{def_pick_store && !def_pick_store.CanOutQty}}">
 				  								  <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view>	
 				  							 </block>
 				  							 <block wx:else>	
@@ -66,7 +66,7 @@
           <view hidden="{{has_def && sys_switch.is_pricing_open_store}}" class="red-co fs28" bindtap="choice_store" >更多门店<text class="right-arrow"></text></view>
         </view>
 		<view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
-		<view class="no_store" wx:elif="{{is_normal && def_pick_store && def_pick_store.CanOutQty<=0}}">(库存不足)</view>
+		<view class="no_store" wx:elif="{{is_normal && def_pick_store && (!def_pick_store.CanOutQty || def_pick_store.CanOutQty<=0)}}">(库存不足)</view>
         <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.pickup_name}}">地址:{{def_pick_store.fulladdress}}</view>
       </view>
       <!----商品的属性项目---->