Merge branch 'work1.1_20190926' of http://git.vipzhuang.cn/wxd/MShopWeApp into work1.1_20190926

yvan.ni
2 parents b3d61910 61e42d09
Showing 4 changed files with 26 additions and 16 deletions
components/goods_list/goods_list.js
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/goodsInfo.wxss
@@ -916,6 +916,9 @@ Page({
     });
   },
   openSpecModel: function(t) {
+    this.setData({
+      store: 0, choice_sort_store: 0, sort_store: 0
+    })
     //--先判断会员状态--
     var user_info=getApp().globalData.userInfo;
     if(user_info==null || user_info.mobile==undefined || user_info.mobile=="" || user_info.mobile==null){
@@ -2729,8 +2732,7 @@ Page({
  //关闭选择门店
 close_popup:function(){
   this.setData({
-      store: 0, choice_sort_store: 0,sort_store:0}
-      )
+      store: 0, choice_sort_store: 0,sort_store:0})
 },
 //选择更多门店
   more_store:function(){
@@ -301,7 +301,7 @@
         </block>
  
             <!-- 门店收货地址 -->
-            <view class="xc-address_frame flex-vertical xc-ash" >
+            <view class="xc-address_frame flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}" >
                  <view class="address_frame">
                   <view class="flex-vertical-between "> 
                     <view class="flex">
@@ -318,7 +318,7 @@
                   <view  class="flex-space-between address ai_end  ">
                      <view>
                        <text class="fs32 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
-                       <!--<text class="fs20">暂无库存</text>-->
+                    
                      </view>
                      <view class="distance fs20">
                       距离:{{filters.toFix(def_pick_store.distance,0)}}m
@@ -798,7 +798,7 @@
                          <text class="right-arrow"></text>
                       </view>
                   </view>
-                  <view class="fs20 xc-ash xc-distance-top">地址:{{def_pick_store.fulladdress}}</view>
+                  <view class="fs20 xc-ash xc-distance-top "wx:if="{{def_pick_store}}">地址:{{def_pick_store.fulladdress}}</view>
       </view>
       <!----商品的属性项目---->
       <view  class="xc-goods-attribute">
@@ -1055,7 +1055,7 @@
   <block  wx:if="{{sort_store==0}}">
   <!-- 头部 标题 -->
      <view class="popup-top flex-space-between">
-       <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':'门店分类'}}</text>
+       <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>
@@ -1174,9 +1174,9 @@
        </view>
        <view class="sort_store_list"> 
  
-          <view class="sort-store-frame" wx:for="{{all_sto}}" data-index="{{index}}" bindtap="choice_sort_store">
+          <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="fs28">{{item.name}}</view>
+                  <view class="fs28" di>{{item.name}}</view>
                   <view class="black_rights-frame">
                       <view class="black_rights"></view>
                 </view>
@@ -2244,9 +2244,14 @@ right:17rpx; top:55rpx;
 .xc-address_frame{
   border-top:1rpx solid #eee;
   width: 100%;
-  min-height: 90rpx;
   height: auto;
 }
+.on_height{
+height: 90rpx;
+}
+.sn_height{
+  height: 170rpx;
+}
 .xc-address_frame .address_frame{
   width: 92%;
 padding-left: 10rpx;
@@ -2356,16 +2361,16 @@ padding-left: 20rpx;
  
 }
 .xc-hook{
-  width: 30rpx;
-  height: 30rpx;
+  width: 33rpx;
+  height: 33rpx;
   transform: rotate(-145deg);
-line-height: 32rpx;
+line-height: 35rpx;
 text-align: center;
 }
  .xc-hooks{
    width: 30rpx;
   height: 30rpx;
-  border: 3rpx solid #999; 
+  border: 1rpx solid #999; 
  }
  .address-frame{
    width: 93%;
@@ -2387,17 +2392,18 @@ line-height: 30rpx;
  .store-bottom{
    width: 85%;
    margin: auto;
-   height: 105rpx;
+   height: 90rpx;
+   
  
  }
  .determine{
-   width: 280rpx;
+   width: 260rpx;
   height: 44rpx;
   border-radius: 50rpx;
   line-height: 44rpx;
  }
  .default{
-   width: 280rpx;
+   width: 260rpx;
   height: 44rpx;
   border:3rpx solid #c8c8c8;
     border-radius: 50rpx;
@@ -2407,6 +2413,8 @@ line-height: 30rpx;
    width: 95%;
      border-top: 3rpx solid #eee;
      margin: auto;
+     margin-top: 10rpx;
+
  }
  /* 门店分类列表 */
 .sort_store_list{