fix: handle outrange address

pages/address/address.js

@@ -41,11 +41,22 @@ Page({
       title: '加载中...',
       mask: true
     })
+    var temp = []
+    var tempR = []
     addressList(data).then(res => {
       wx.hideLoading()
+      var response = res.data.vos || []
+      response.map(item => {
+        if (item.isEnable) {
+          temp.push(item)
+        } else {
+          tempR.push(item)
+        }
+      })
       this.setData({
         hasNext: res.data.hasNext,
-        addressList: res.data.vos
+        addressList: temp,
+        outRangAddresList: tempR
       })
     }).catch(e => {
       wx.hideLoading()

pages/address/address.wxml

@@ -2,7 +2,7 @@
 <view class="address-content">
   <view class="main-content">
     <block wx:for="{{addressList}}" wx:key="index">
-      <view class="addrss-item {{item.isEnable ? '' : 'addrss-item-disabled'}}">
+      <view class="addrss-item">
         <view class="top userinfo" data-info="{{item}}" bindtap="handleAddressChose">
           <view class="username ittflex-jcs">
             <text class="name">{{item.contactName}}</text>
@@ -22,26 +22,28 @@
         </view>
       </view>
     </block>
-    <!-- <view class="outrang-text">超预约范围地址：</view>
-    <view class="addrss-item out-rang-address-item" wx:for="{{outRangAddresList}}" wx:key="index">
-      <view class="top userinfo" data-info="{{item}}" bindtap="handleAddressChose">
-        <view class="username ittflex-jcs">
-          <text class="name">{{item.contactName}}</text>
-          <text class="phone">{{item.contactPhone}}</text>
-        </view>
-        <view class="address-detail">{{item.province}}{{item.city}}{{item.county}}{{item.detailAddress}}</view>
-      </view>
-      <view class="actions button ittflex">
-        <view class="edit-btn btn ittflex" data-item="{{item}}" bindtap="handleEdit">
-          <image class="btn-icon" src="./../../imaes/bianji@2x.png"></image>
-          <text class="btn-text" >编辑</text>
+    <block>
+      <view class="outrang-text">超预约范围地址：</view>
+      <view class="addrss-item out-rang-address-item addrss-item-disabled" wx:for="{{outRangAddresList}}" wx:key="index">
+        <view class="top userinfo">
+          <view class="username ittflex-jcs">
+            <text class="name">{{item.contactName}}</text>
+            <text class="phone">{{item.contactPhone}}</text>
+          </view>
+          <view class="address-detail">{{item.province}}{{item.city}}{{item.county}}{{item.detailAddress}}</view>
         </view>
-        <view class="delete-btn btn ittflex" data-addressid="{{item.addressId}}" bindtap="handleDelAddres">
-          <image class="btn-icon" src="./../../imaes/shanchu@2x.png"></image>
-          <text class="btn-text">删除</text>
+        <view class="actions button ittflex">
+          <view class="edit-btn btn ittflex" data-item="{{item}}" bindtap="handleEdit">
+            <image class="btn-icon" src="./../../imaes/bianji@2x.png"></image>
+            <text class="btn-text" >编辑</text>
+          </view>
+          <view class="delete-btn btn ittflex" data-addressid="{{item.addressId}}" bindtap="handleDelAddres">
+            <image class="btn-icon" src="./../../imaes/shanchu@2x.png"></image>
+            <text class="btn-text">删除</text>
+          </view>
         </view>
       </view>
-    </view> -->
+    </block>
   </view>
   <view class="add-address-btn itt-btn" bindtap="handleAddressAdd">新增检测地址</view>
 </view>

pages/address/address.wxss

@@ -1,15 +1,16 @@
 /* pages/checkAddress/handleAddCheck.wxss */
 .address-content {
   width: 100%;
-  min-height: 100%;
+  height: 100%;
   background-color: #f7f7f7;
   position: relative;
 }
 .main-content {
   width: 690rpx;
-  min-height: 232rpx;
+  height: calc(100% - 150rpx);
   padding-top: 1rpx;
   margin: 0 auto;
+  overflow-y:auto;
 }
 .outrang-text {
   font-size: 30rpx;
@@ -73,7 +74,7 @@
 }
 .add-address-btn {
   position: fixed;
-  bottom: 80rpx;
+  bottom: 60rpx;
   left: 4%;
   width: 690rpx;
   height: 80rpx;