Merge branch 'dev_wy' into dev2.0

@@ -31,18 +31,18 @@
 <view class='modal_lg' hidden="{{!showModal}}">
   <text class="text_title">您在多个单位有任职信息，请选择您要在哪家单位咨询问题。</text>
   <view class='divide_line_f5f5f5'></view>
-  <scroll-view style='width:100%;display:flex;flex-direction:column;max-height:688rpx;'>
+  <view style='width:100%;display:flex;flex-direction:column;max-height:560rpx;overflow-y: scroll;'>
     <view wx:for="{{comlist}}" wx:for-index="idx" bindtap='bindChange' id="{{idx}}">
       <view wx:if="{{idx==choosed_index}}" style='padding:30rpx;display:flex;flex-direction:row;'>
         <view class='text_item_blue float_left'>{{item.name}}</view>
         <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
       </view>
-      <view wx:else style='padding:30rpx ;display:flex;'>
+      <view wx:else style='padding:30rpx ;display:flex'>
         <text class='text_item_black float_left'>{{item.name}}</text>
       </view>
       <view class='divide_line_f5f5f5'></view>
     </view>
-  </scroll-view>
+  </view>
 
   <view class='divide_line_f5f5f5'></view>
   <view style='width:100%;display: flex;'>