wxd / MShopWeApp

Commit 8396af913f4fc63c05af09f7488ee877d2140650

Authored by 后端研发-苏明海
2 parents 61a8f29f e732b15d

Merge branch 'dev' into 'test' 

商品详情选择门店

See merge request !109
Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
pages/goods/goodsInfo/goodsInfo.js
  View file @8396af9
... ... @@ -301,6 +301,7 @@ Page({
301 301  
302 302 //获取用户的默认门店
303 303 getApp().get_user_store(function(e) {
  304 + if(!e) return false;
304 305 var w_time = setInterval(function() {
305 306 if (that.data.is_get_local_ok == 0) return false;
306 307 var distance = null;
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @8396af9
... ... @@ -993,7 +993,7 @@
993 993 </view>
994 994 <!-----第一级显示------>
995 995 <view class="itemlists" hidden="{{is_sec_mend==1}}">
996   - <block wx:if="{{is_show_sto_cat}}">
  996 + <block wx:if="{{is_show_sto_cat>0}}">
997 997 <view wx:for="{{all_sto}}" wx:key="all_sto" class="item" bindtap="show_sec" data-index="{{index}}">{{item.name}}</view>
998 998 </block>
999 999 <block wx:else>
... ... @@ -1120,7 +1120,7 @@
1120 1120 </view>
1121 1121 <view class="felx choose_more" bindtap="more_store">
1122 1122 <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text>
1123   - <view class="bg_rights"></view>
  1123 + <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view>
1124 1124 </view>
1125 1125 </view>
1126 1126 </view>
... ... @@ -1129,7 +1129,7 @@
1129 1129 <!--如果还没有点击更多门店的时候 -->
1130 1130 <block wx:if="{{choice_sort_store==0}}">
1131 1131 <!-- 需要for循环 -->
1132   - <block wx:if="is_show_sto_cat==1">
  1132 + <block wx:if="{{is_show_sto_cat==1}}">
1133 1133 <view class="store_choose flex" wx:for="{{def_pickpu_list}}" bindtap="choose_for_store_fir" data-ind="{{index}}">
1134 1134 <view class="store flex-vertical">
1135 1135 <!-- 需要点击事件 -->
... ...