Merge branch 'develop' into test

miniprogram/pages/components/AreaSelect/AreaSelect.ts

@@ -111,7 +111,7 @@ Component({
         });
       } else {
         this.setData({
-          selected: this.data.range[value].id,
+          selected: this.data.filterList[value].id,
           selectedIndex: value,
         });
       }

miniprogram/pages/components/AreaSelect/AreaSelect.wxml

@@ -5,7 +5,7 @@
   <!-- </picker> -->
   <view class="areaselect-picker" bindtap="inputClickHandle">
     <view wx:if="{{mode === 'page' && selected}}" class="select-value">{{showText}}</view>
-    <view wx:elif="{{selected}}" class="select-value">{{range[selectedIndex][rangeKey]}}</view>
+    <view wx:elif="{{selected}}" class="select-value">{{filterList[selectedIndex][rangeKey]}}</view>
     <view wx:else class="select-placeholder">{{placeholder}}</view>
     <image class="select-icon" src="../../../images/btn_xiala@2x.png" mode="aspectFill" />
   </view>