Merge branch 'dev' into 'test'

商品详情选择门店 See merge request !109

Merge branch 'dev' into 'test'
商品详情选择门店 See merge request !109
后端研发-苏明海
2 parents 61a8f29f e732b15d
Showing 2 changed files with 4 additions and 3 deletions
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
@@ -301,6 +301,7 @@ Page({
     //获取用户的默认门店
     getApp().get_user_store(function(e) {
+      if(!e) return false;
       var w_time = setInterval(function() {
         if (that.data.is_get_local_ok == 0) return false;
         var distance = null;
@@ -993,7 +993,7 @@
           </view>
           <!-----第一级显示------>
           <view class="itemlists" hidden="{{is_sec_mend==1}}">
-            <block wx:if="{{is_show_sto_cat}}">
+            <block wx:if="{{is_show_sto_cat>0}}">
               <view wx:for="{{all_sto}}" wx:key="all_sto" class="item" bindtap="show_sec" data-index="{{index}}">{{item.name}}</view>
             </block>
             <block wx:else>
@@ -1120,7 +1120,7 @@
            </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"></view>
+              <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view>
            </view>
           </view>
        </view>
@@ -1129,7 +1129,7 @@
               <!--如果还没有点击更多门店的时候  -->
               <block wx:if="{{choice_sort_store==0}}">
                   <!-- 需要for循环 -->
-                  <block wx:if="is_show_sto_cat==1">
+                  <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">
                 <!-- 需要点击事件 -->