Merge branch 'dev_wy' into dev2.0

@@ -320,6 +320,7 @@ Page({
       wx.hideLoading()
       wx.hideLoading()
     } else {
     } else {
       this.setData({
       this.setData({
+        handle_finished: true,
         additionInfo: newdata
         additionInfo: newdata
       })
       })
     }
     }
@@ -518,6 +519,12 @@ Page({
     if (!Authorization || Authorization.length < 10) {
     if (!Authorization || Authorization.length < 10) {
       return
       return
     }
     }
+    var type = "all"
+    if (this.data.cur_status == "children_education") {
+      type = "children"
+    } else if (this.data.cur_status == "support_duty") {
+      type = "parents"
+    }
     wx.request({
     wx.request({
       url: baseUrl + 'persontax/v1/personal-taxes',
       url: baseUrl + 'persontax/v1/personal-taxes',
       method: "GET",
       method: "GET",
@@ -526,7 +533,9 @@ Page({
         "Authorization": Authorization
         "Authorization": Authorization
       },
       },
       data: {
       data: {
-        'all': true
+        // 'all': true,
+        "declare_unit_id":that.data.legal_entity_id,
+        "category": type
       },
       },
       success: function(res) {
       success: function(res) {
         console.log('succ', res)
         console.log('succ', res)

@@ -382,6 +382,7 @@
   </view>
   </view>
 
 
   <view class='bottom_btn_wrap' hidden="{{handle_finished&&additionInfo.length>0&&((cur_status=='support_duty'&&(additionInfo[0].co_supporters.length>0||additionInfo[0].support_duties.length>0))||(cur_status=='house_fund'&&house_type=='house_fund_loan'))}}">
   <view class='bottom_btn_wrap' hidden="{{handle_finished&&additionInfo.length>0&&((cur_status=='support_duty'&&(additionInfo[0].co_supporters.length>0||additionInfo[0].support_duties.length>0))||(cur_status=='house_fund'&&house_type=='house_fund_loan'))}}">
+  <!-- <view class='bottom_btn_wrap' wx:if="{{handle_finished&&(additionInfo.length<1||((!additionInfo[0].co_supporters||additionInfo[0].co_supporters.length<1)&&(!additionInfo[0].support_duties||additionInfo[0].support_duties.length<1))||((!additionInfo[0].profession_items||additionInfo[0].profession_items.length<1)&&(!additionInfo[0].title_items||additionInfo[0].title_items.length<1)))}}" > -->
     <view class='btn_blue_radius' bindtap="goadd">
     <view class='btn_blue_radius' bindtap="goadd">
       <view class='text_white_34'>添加</view>
       <view class='text_white_34'>添加</view>
     </view>
     </view>