Merge branch 'dev2.0' into dev_py

@@ -170,7 +170,7 @@ Page({
     }
     if(this.data.house_type==''){
       this.setData({
-        house_type: newdata[0].type ? newdata[0].type:""
+        house_type: newdata.length>0&&newdata[0].type ? newdata[0].type:""
       })
     }
 
@@ -384,7 +384,7 @@ Page({
     })
     var senddata = ""
     if (this.data.cur_status == 'support_duty' ){
-      senddata = JSON.stringify(this.data.additionInfo[0]);
+      // senddata = JSON.stringify(this.data.additionInfo[0]);
     }
     wx.navigateTo({
       url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],

@@ -145,7 +145,7 @@
       </view>
 
       <view wx:if="{{cur_status=='support_duty'}}">
-        <view wx:for="{{additionInfo}}" >
+        <view wx:if="{{additionInfo.length>0}}" wx:for="{{additionInfo}}" >
           <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
             <view style='height:110rpx'>
               <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
@@ -215,11 +215,11 @@
             </view>
           </view>
           <view>
-            <view style='background:#FFF;padding:30rpx' wx:if="{{idx==additionInfo.length-1}}">
+            <!-- <view style='background:#FFF;padding:30rpx' wx:if="{{idx==additionInfo.length-1}}">
               <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;' id='{{index}}' bindtap='goadd'>
                 添加
               </view>
-            </view>
+            </view> -->
             <view style='margin-left:30rpx' wx:if="{{!item.co_supporters||item.co_supporters.length<1}}">
               <text class='text_999_28'>您还没有添加继续共同赡养人，</text>
               <text class='text_blue_28' bindtap='goaddSupporter'>请添加</text>
@@ -338,7 +338,7 @@
 
   </view>
 
-  <view class='bottom_btn_wrap' hidden="{{additionInfo&&additionInfo.length>0&&cur_status=='support_duty'}}">
+  <view class='bottom_btn_wrap'>
     <view class='btn_blue_radius' bindtap="goadd">
       <view class='text_white_34'>添加</view>
     </view>

@@ -29,7 +29,7 @@
 <view class='modal_lg' hidden="{{!showModal}}">
   <text class="text_title">您在多个单位有任职信息，请选择您要在哪家单位咨询问题。</text>
   <view class='divide_line_f5f5f5'></view>
-  <view style='width:100%;display:flex;flex-direction:column;align-items:center;max-height:450rpx'>
+  <!-- <view style='width:100%;display:flex;flex-direction:column;align-items:center;max-height:450rpx'>
     <block wx:for="{{comlist}}" wx:for-index="idx">
       <view wx:if="{{idx==choosed_index}}" bindtap='goselect' id="{{idx}}">
         <text class='text_item_blue float_left'>{{item.name}}</text>
@@ -40,6 +40,19 @@
       </view>
       <view class='divide_line_f5f5f5'></view>
     </block>
+  </view> -->
+
+  <view style='width:100%;display:flex;flex-direction:column;max-height:450rpx;align-items:center;'>
+    <view wx:for="{{comlist}}" wx:for-index="idx" bindtap='goselect' id="{{idx}}">
+      <view wx:if="{{idx==choosed_index}}" >
+        <text class='text_item_blue float_left'>{{item.name}}</text>
+        <image class='icon_choosed' src="/images/icon_chat_choosed.png"></image>
+      </view>
+      <view wx:else >
+        <view class='text_item_black float_left'>{{item.name}}</view>
+      </view>
+      <view class='divide_line_f5f5f5'></view>
+    </view>
   </view>
 
   <view class='divide_line_f5f5f5'></view>