Merge branch 'dev2.0' into dev_py

# Conflicts:
#	pages/main/addtionalreduce/addextrainfo/addextrainfo.js

@@ -5,62 +5,146 @@ Page({
    * Page initial data
    * Page initial data
    */
    */
   data: {
   data: {
-
+    support_duty_id:"",
+    name:"",
+    id_card_no:""
   },
   },
 
 
   /**
   /**
    * Lifecycle function--Called when page load
    * Lifecycle function--Called when page load
    */
    */
-  onLoad: function (options) {
-
+  onLoad: function(options) {
+    this.setData({
+      support_duty_id:options.id
+    })
   },
   },
 
 
   /**
   /**
    * Lifecycle function--Called when page is initially rendered
    * Lifecycle function--Called when page is initially rendered
    */
    */
-  onReady: function () {
+  onReady: function() {
 
 
   },
   },
 
 
   /**
   /**
    * Lifecycle function--Called when page show
    * Lifecycle function--Called when page show
    */
    */
-  onShow: function () {
+  onShow: function() {
+      var that = this
+      wx.getStorage({
+        key: 'id_info',
+        success: function(res) {
+          console.log('id_info', res.data)
+          if (res.data && res.data.length > 0) {
+            var id_info = JSON.parse(res.data)
+            if (that.data.name.length > 0 && id_info.name != that.data.name) {
+              that.showtoast("姓名冲突")
+              return
+            }
+            that.setData({
+              name: id_info.name,
+              id_card_no: id_info.id_card_number
+            })
+          }
+        },
+      })
+    wx.removeStorage({
+      key: 'id_info',
+      success(res) {
+        console.log(res.data)
+      }
+    })
+  },
+
+  getIdInfo: function(e) {
+    wx.navigateTo({
+      url: '../../taxperson/idinfo/idinfo'
+    })
+  },
+
+
+  formSubmit: function (e) {
+    console.log("formSubmit", e);
+    var formdata = e.detail.value
+    if (!formdata.name || formdata.name.length<1){
+      this.showToast("请输入姓名")
+      return;
+    } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
+      this.showToast("请输入身份证号")
+      return;
+    }
+    this.goAdd(formdata)
+  },
+
+  goAdd: function (formdata){
+    var that = this;
+    var Authorization = getApp().globalData.Authorization;
+    wx.request({
+      url: baseUrl + 'persontax/v1/co-supporters',
+      data: {
+        "support_duty_id": that.data.support_duty_id,
+        "co_supporter": formdata.name ,
+        "id_card_type": "1",
+        "id_card_no": formdata.id_card_no,
+      },
+      header: {
+        'content-type': 'application/json',
+        "Authorization": Authorization
+      },
+      success: function (res) {
+        if (res && res.data) {
+          console.log("res", res)
+          if (res && res.statusCode < 200) {
+            wx.navigateBack({
+              delta: 1
+            })
+          }
+        }
+      }
+    })
+  },
 
 
+  showToast: function (data) {
+    if (data && data.length > 0) {
+      wx.showToast({
+        title: data,
+        icon: "none"
+      })
+    }
   },
   },
 
 
   /**
   /**
    * Lifecycle function--Called when page hide
    * Lifecycle function--Called when page hide
    */
    */
-  onHide: function () {
+  onHide: function() {
 
 
   },
   },
 
 
   /**
   /**
    * Lifecycle function--Called when page unload
    * Lifecycle function--Called when page unload
    */
    */
-  onUnload: function () {
+  onUnload: function() {
 
 
   },
   },
 
 
   /**
   /**
    * Page event handler function--Called when user drop down
    * Page event handler function--Called when user drop down
    */
    */
-  onPullDownRefresh: function () {
+  onPullDownRefresh: function() {
 
 
   },
   },
 
 
   /**
   /**
    * Called when page reach bottom
    * Called when page reach bottom
    */
    */
-  onReachBottom: function () {
+  onReachBottom: function() {
 
 
   },
   },
 
 
   /**
   /**
    * Called when user click on the top right corner to share
    * Called when user click on the top right corner to share
    */
    */
-  onShareAppMessage: function () {
+  onShareAppMessage: function() {
 
 
   }
   }
 })
 })

+<!--pages/main/addtionalreduce/adddupporters/adddupporters.wxml-->
+<view class='page'>
+  <form bindsubmit='formSubmit'>
+    <view style='height:90rpx;padding:0 30rpx'>
+      <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
+      <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>共同赡养人姓名</text>
+      <!-- <input placeholder-class='input_placeholder_wrap'  class='input_wrap' placeholder='请输入姓名' name='name' value='{{name}}'  maxlength='18'></input> -->
+      <input class='input_wrap float_right' placeholder-class='text_999_30 float_right' style='line-height: 90rpx;text-align: right' placeholder='请输入姓名' name='name' value='{{name}}'></input>
+    </view>
+    <view class="divide_line"></view>
+    <view style='height:90rpx;padding:0 30rpx'>
+      <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
+      <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人证照类型</text>
+      <text style='color:#333;font-size: 30rpx;line-height: 90rpx; float:right'>居民身份证</text>
+    </view>
+    <view class='divide_line_f5f5f5'></view>
+    <view style='height:90rpx;padding:0 30rpx'>
+      <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
+      <text style='color:#777;font-size: 30rpx;line-height: 90rpx; float:left'>被赡养人证件号码</text>
+      <view>
+        <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' id="children_id_card_no"></image>
+        <input class='input_wrap01 float_right' placeholder='请输入或拍摄身份证' placeholder-class='text_999_30' name='id_card_no' maxlength='18' type='idcard' value='{{id_card_no}}'></input>
+      </view>
+    </view>
+    <view class="divide_line"></view>
+    <view class="btn_bottom">
+      <button class="btn_bottom" formType="submit"> 保存</button>
+    </view>
+  </form>
+</view>

+
+.input_wrap {
+  width: 460rpx;
+  height: 90rpx;
+  font-size: 30rpx;
+  color: #333;
+  text-align: right;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.text_999_30 {
+  font-family: PingFangSC-Regular;
+  font-size: 30rpx;
+  color: #999;
+}
+
+.input_wrap01 {
+  width: 380rpx;
+  height: 90rpx;
+  font-size: 30rpx;
+  color: #333;
+  text-align: right;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.image_camera {
+  width: 42rpx;
+  height: 42rpx;
+  margin-left: 10rpx;
+  margin-top: 22rpx;
+}

@@ -722,7 +722,6 @@ Page({
   },
   },
 
 
   addDatas: function (newdata){
   addDatas: function (newdata){
-
     wx.showModal({
     wx.showModal({
       title: '确认要提交申报吗？',
       title: '确认要提交申报吗？',
       content: '确认后将不能修改',
       content: '确认后将不能修改',
@@ -742,7 +741,7 @@ Page({
             },
             },
             data: newdata,
             data: newdata,
             success(res) {
             success(res) {
-              if (res && res.statusCode == 200) {
+              if (res && res.statusCode < 300) {
                 wx.navigateBack({
                 wx.navigateBack({
                   delta: 1
                   delta: 1
                 })
                 })
@@ -750,7 +749,6 @@ Page({
             }
             }
           })
           })
         } else if (res.cancel) {
         } else if (res.cancel) {
-          return;
         }
         }
       }
       }
     })
     })

@@ -10,7 +10,7 @@ Page({
   data: {
   data: {
     cur_status: "",
     cur_status: "",
     legal_entity_id: "",
     legal_entity_id: "",
-    legal_entity:"",
+    legal_entity: "",
     declareStatus: {
     declareStatus: {
       "to_declare ": "待申报",
       "to_declare ": "待申报",
       "declaring": "申报中",
       "declaring": "申报中",
@@ -40,9 +40,9 @@ Page({
     url_arr: {
     url_arr: {
       "children_education": "persontax/v1/children-educations/",
       "children_education": "persontax/v1/children-educations/",
       "continuing_education": "persontax/v1/continuing-educations/",
       "continuing_education": "persontax/v1/continuing-educations/",
-      "support_duty": "support-duties/",
-      "medical_fund": "persontax/v1/medical_founds/",
-      "house_fund": "persontax/v1/house_founds/"
+      "support_duty": "persontax/v1/support-duties/",
+      "medical_fund": "persontax/v1/medical-funds/",
+      "house_fund": "persontax/v1/house-funds/"
     },
     },
     reducetype: {
     reducetype: {
       "month": "月度扣除",
       "month": "月度扣除",
@@ -54,20 +54,20 @@ Page({
     children_modalData: {
     children_modalData: {
       title: "请选择子女进行申报",
       title: "请选择子女进行申报",
       datas: [],
       datas: [],
-      canceltext: "添加新子女并申报",
-      confirmtext: "确定为该子女申报",
+      lefttext: "添加新子女并申报",
+      righttext: "确定为该子女申报",
     },
     },
     support_older_modalData: {
     support_older_modalData: {
       title: "请选择父母或祖父母进行申报",
       title: "请选择父母或祖父母进行申报",
       datas: [],
       datas: [],
-      canceltext: "添加被赡养人并申报",
-      confirmtext: "确定为该被赡养人申报",
+      lefttext: "添加被赡养人并申报",
+      righttext: "确定为该被赡养人申报",
     },
     },
     medical_modalData: {
     medical_modalData: {
       title: "请选择本人、配偶或子女进行大病支出申报",
       title: "请选择本人、配偶或子女进行大病支出申报",
       datas: [],
       datas: [],
-      canceltext: "添加家庭成员并申报",
-      confirmtext: "确定为该选择的人申报",
+      lefttext: "添加家庭成员并申报",
+      righttext: "确定为该选择的人申报",
     },
     },
     selected_reduceindex: 0,
     selected_reduceindex: 0,
     selected_addindex: 0
     selected_addindex: 0
@@ -128,7 +128,7 @@ Page({
 
 
   goaddSupporter: function() {
   goaddSupporter: function() {
     wx.navigateTo({
     wx.navigateTo({
-      url: '../adddupporters/adddupporters',
+      url: '../adddupporters/adddupporters?support_duty_id=' + this.data.additionInfo.id,
     })
     })
   },
   },
 
 
@@ -205,12 +205,12 @@ Page({
       }
       }
       senddata = JSON.stringify(modalinfo.datas[e.currentTarget.id])
       senddata = JSON.stringify(modalinfo.datas[e.currentTarget.id])
       console.log("modalinfo", modalinfo)
       console.log("modalinfo", modalinfo)
-      if (modalinfo.datas.length < 2) {
+      if (modalinfo.datas.length > 0) {
+        this.showAddtionmodal(modalinfo)
+      } else {
         wx.navigateTo({
         wx.navigateTo({
           url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
           url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
         })
         })
-      } else {
-        this.showAddtionmodal(modalinfo)
       }
       }
     }
     }
   },
   },
@@ -311,25 +311,28 @@ Page({
     })
     })
   },
   },
 
 
-  reduce_modalCancel: function() { //modal取消(扣除类型)
+  reduce_modalLeft: function() { //modal取消(扣除类型)
     this.setData({
     this.setData({
       showModal_reducetype: false
       showModal_reducetype: false
     })
     })
   },
   },
 
 
-  reduce_modalConfirm: function() { //modal确认(扣除类型)
+  reduce_modalRight: function() { //modal确认(扣除类型)
     this.setData({
     this.setData({
       showModal_reducetype: false
       showModal_reducetype: false
     })
     })
   },
   },
 
 
-  modalCancel: function() { //modal取消(添加)
+  modalLeft: function() { //modal取消(添加)
     this.setData({
     this.setData({
       showModal_addtype: false
       showModal_addtype: false
     })
     })
+    wx.navigateTo({
+      url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + "" + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
+    })
   },
   },
 
 
-  modalConfirm: function(e) { //modal确认(添加)
+  modalRight: function(e) { //modal确认(添加)
     console.log("modalConfirm", e)
     console.log("modalConfirm", e)
     this.setData({
     this.setData({
       showModal_addtype: false
       showModal_addtype: false
@@ -337,9 +340,9 @@ Page({
     var senddata = JSON.stringify(this.data.modalData.datas[this.data.selected_addindex])
     var senddata = JSON.stringify(this.data.modalData.datas[this.data.selected_addindex])
     console.log("senddata", senddata)
     console.log("senddata", senddata)
     wx.navigateTo({
     wx.navigateTo({
-      url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata  + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
+      url: '../addextrainfo/addextrainfo?status=' + this.data.cur_status + '&datas=' + senddata + '&reducetype=' + this.data.reducetypeData[this.data.selected_reduceindex],
     })
     })
-  
+
   },
   },
 
 
   goselect: function(e) {
   goselect: function(e) {

 <!--pages/main/addtionalreduce/childreneducate/childreneducate.wxml-->
 <!--pages/main/addtionalreduce/childreneducate/childreneducate.wxml-->
 
 
-<view class='page'>
-  <view style='display:flex;flex-direction:column;background:#FCFCFC'>
-    <!-- <view style='height:180rpx'>
-      <image style='width:100%;height:180rpx;position:absolute;' src='/images/extra_img_bg.png'></image>
-      <view class='view_bg_wrap' style='margin-top: 48rpx;'>
-        <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
-          <text class='text_text_wrap'>累计使用额度</text>
-          <text class='text_num_wrap'>1610899.90</text>
-        </view>
-        <view style='width:2rpx;height:74rpx;background:#ffffff;'></view>
-        <view style='flex-grow: 1;text-align:center;display: flex;flex-direction: column;'>
-          <text class='text_text_wrap'>本月可使用额度</text>
-          <text class='text_num_wrap'>39100.10</text>
-        </view>
-      </view>
-    </view>
-    <view style='width:100%;height:20rpx;background:#f5f5f5'></view> -->
-
-    <!-- <view style='padding-left:30rpx;background:#ffffff;padding-top:30rpx' bindtap='showmodal'>
-      <image class='icon_declare_wrap' src="/images/icon_declare.png"></image>
-      <text style='padding-left:15rpx;' class='text_blue_28'>申报说明</text>
-    </view> -->
+<view style='width:100%;height:100%;background:#FCFCFC;'>
+  <view style='display:flex;flex-direction:column;margin-bottom:140rpx;'>
     <image class='openmodal_img' src="/images/openmodal_img.png" bindtap='showModalImg'></image>
     <image class='openmodal_img' src="/images/openmodal_img.png" bindtap='showModalImg'></image>
-
-    <image style='width:55%;height:254rpx;align-self:center;margin-top:160rpx;margin-bottom:320rpx' hidden='true' src='/images/noreduce_img.png'></image>
-
-    <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='showModalReducetype' hidden="{{cur_status=='continuing_education'}}">
+    <view style='height:100rpx;padding:0 30rpx;background:#FFF' bindtap='showModalReducetype' hidden="{{cur_status=='continuing_education'}}">
       <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text>
       <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>扣除方式</text>
       <image class='arrow_img float_right' style='margin-top:28rpx' src="/images/arrow_right.png"></image>
       <image class='arrow_img float_right' style='margin-top:28rpx' src="/images/arrow_right.png"></image>
       <text class='text_999_30 float_right' style='line-height:100rpx'>{{reducetypeData[selected_reduceindex]}}</text>
       <text class='text_999_30 float_right' style='line-height:100rpx'>{{reducetypeData[selected_reduceindex]}}</text>
     </view>
     </view>
 
 
+    <view wx:if="{{additionInfo&&additionInfo.length>0}}">
 
 
-    <!-- <view wx:if='{{new_data&&new_data!=null}}' style='margin:30rpx;' class='card_rectangle_bg_column'> -->
-
-    <!-- 子女教育  -->
-    <!-- <view wx:if="{{cur_index==0}}" style='display:flex;flex-direction:column;padding: 30rpx 30rpx 0 30rpx;'>
-        <view style='height:40rpx '>
-          <text class='text_999_28 float_left'>配偶姓名</text>
-          <text class='text_333_28 float_right'>{{new_data.lover_name}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>配偶身份证件类型</text>
-          <text class='text_333_28 float_right'>{{new_data.lover_cardtype}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>配偶身份证号</text>
-          <text class='text_333_28 float_right'>{{new_data.lover_idno}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>出生日期</text>
-          <text class='text_333_28 float_right'>{{new_data.lover_birthdate}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>国籍</text>
-          <text class='text_333_28 float_right'>中国</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>与纳税人关系</text>
-          <text class='text_333_28 float_right'>{{new_data.taxperson_relative}}</text>
-        </view>
-
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>子女姓名</text>
-          <text class='text_333_28 float_right'>{{new_data.children_name}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>子女身份证件类型</text>
-          <text class='text_333_28 float_right'>{{new_data.children_cardtype}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>子女身份证号</text>
-          <text class='text_333_28 float_right'>{{new_data.children_idno}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>出生日期</text>
-          <text class='text_333_28 float_right'>{{new_data.children_birthDate}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>国籍</text>
-          <text class='text_333_28 float_right'>中国</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>学籍号</text>
-          <text class='text_333_28 float_right'>{{new_data.children_schoolno}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>受教育阶段</text>
-          <text class='text_333_28 float_right'>{{new_data.edu_degree}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>受教育日期起</text>
-          <text class='text_333_28 float_right'>{{new_data.study_startdate}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>预计受教育日期止</text>
-          <text class='text_333_28 float_right'>{{new_data.study_enddate}}</text>
-        </view>
-
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>扣除比例</text>
-          <text class='text_333_28 float_right'>{{new_data.reduce_ratio}}</text>
-        </view>
-      </view> -->
-
-    <!-- 继续教育 -->
-    <!-- <view wx:if="{{cur_index==1}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>教育类型</text>
-          <text class='text_333_28 float_right'>{{new_data.edu_type}}</text>
-        </view>
-        <view style='height:40rpx' wx:if='{{new_data.edu_type_lable==0}}'>
-          <text class='text_999_28 float_left'>教育阶段</text>
-          <text class='text_333_28 float_right'>{{new_data.degree_level}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left' wx:if='{{new_data.edu_type_lable==0}}'>受教育日期起</text>
-          <text class='text_333_28 float_right'>{{new_data.study_startdate}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left' wx:if='{{new_data.edu_type_lable==0}}'>受教育日期止</text>
-          <text class='text_333_28 float_right'>{{new_data.study_enddate}}</text>
-        </view>
-
-        <view style='height:40rpx' wx:if='{{new_data.edu_type_lable==1}}'>
-          <text class='text_999_28 float_left'>证书名称名称</text>
-          <text class='text_333_28 float_right'>{{new_data.occupational_qualifiy_name}}</text>
-        </view>
-        <view style='height:40rpx' wx:if='{{new_data.edu_type_lable==1}}'>
-          <text class='text_999_28 float_left'>证书编号</text>
-          <text class='text_333_28 float_right'>{{new_data.occupational_qualifiy_no}}</text>
-        </view>
-        <view style='height:40rpx' wx:if='{{new_data.edu_type_lable==1}}'>
-          <text class='text_999_28 float_left'>发证机关</text>
-          <text class='text_333_28 float_right'>{{new_data.license_unit}}</text>
-        </view>
-      </view> -->
-
-    <!-- 赡养老人 -->
-    <!-- <view wx:if="{{cur_index==2}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>赡养类型</text>
-          <text class='text_333_28 float_right'>{{new_data.support_type}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>被赡养人姓名</text>
-          <text class='text_333_28 float_right'>{{new_data.older_name}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>被赡养人身份证类型</text>
-          <text class='text_333_28 float_right'>{{new_data.older_cardtype}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>老人身份证号</text>
-          <text class='text_333_28 float_right'>{{new_data.older_idno}}</text>
-        </view>
-        <view wx:if="{{new_data.support_type=='独立赡养'}}" style='height:40rpx'>
-          <text class='text_999_28 float_left'>被赡养人出生日期</text>
-          <text class='text_333_28 float_right'>{{new_data.older_birthday}}</text>
-        </view>
-        <view wx:if="{{new_data.support_type=='独立赡养'}}" style='height:40rpx'>
-          <text class='text_999_28 float_left'>被赡养人国籍(地区)</text>
-          <text class='text_333_28 float_right'>中国</text>
-        </view>
-        <view wx:if="{{new_data.support_type=='独立赡养'}}" style='height:40rpx'>
-          <text class='text_999_28 float_left'>与纳税人的关系</text>
-          <text class='text_333_28 float_right'>{{new_data.older_relative}}</text>
-        </view>
-
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>扣除方式</text>
-          <text class='text_333_28 float_right'>{{new_data.reduce_type}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>扣除金额</text>
-          <text class='text_333_28 float_right'>{{new_data.reduce_money}}元</text>
-        </view>
-      </view> -->
-
-    <!-- 大病医疗 -->
-    <!-- <view wx:if="{{cur_index==3}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>姓名</text>
-          <text class='text_333_28 float_right'>{{new_data.name}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>身份证件类型</text>
-          <text class='text_333_28 float_right'>{{new_data.cardtype}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>身份证号</text>
-          <text class='text_333_28 float_right'>{{new_data.idno}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>与纳税人关系</text>
-          <text class='text_333_28 float_right'>{{new_data.taxperson_relative}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>医疗支出总金额</text>
-          <text class='text_333_28 float_right'>{{new_data.total_money}}元</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>个人负担金额</text>
-          <text class='text_333_28 float_right'>{{new_data.personal_money}}元</text>
+      <view wx:if="{{cur_status=='children_education'}}">
+        <view 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'>{{item.children_name}}</text>
+              <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
+            </view>
+            <view style='padding-right: 30rpx'>
+              <view class='divide_line_f5f5f5'></view>
+              <view style='height:70rpx'>
+                <text class='text_999_28 ' style='line-height:70rpx'>子女姓名：</text>
+                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.children_name}}</text>
+              </view>
+              <view style='height:70rpx'>
+                <text class='text_999_28 ' style='line-height:70rpx'>分配比例：</text>
+                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.percent}}%</text>
+              </view>
+              <view style='height:70rpx'>
+                <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
+                <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
+              </view>
+              <view style='height:70rpx'>
+                <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
+                <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}</text>
+              </view>
+              <view class='divide_line_f5f5f5'></view>
+              <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
+              <view class='float_right' wx:if="{{item.status=='failed'}}">
+                <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
+                <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
+              </view>
+            </view>
+          </view>
         </view>
         </view>
-      </view> -->
+      </view>
 
 
-    <!-- 住房 -->
-    <!-- <view wx:if="{{title=='住房贷款利息'||title=='住房租金'}}" style='display:flex;flex-direction:column;padding:30rpx 30rpx 0 30rpx;'>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>配偶姓名</text>
-          <text class='text_333_28 float_right'>{{new_data.lover_name}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>配偶身份证件类型</text>
-          <text class='text_333_28 float_right'>{{new_data.lover_cardtype}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>配偶身份证号</text>
-          <text class='text_333_28 float_right'>{{new_data.lover_idno}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>出生日期</text>
-          <text class='text_333_28 float_right'>{{new_data.lover_birthdate}}</text>
-        </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>国籍</text>
-          <text class='text_333_28 float_right'>中国</text>
-        </view>
-        <view wx:if="{{title=='住房贷款利息'}}" style='display:flex;flex-direction:column'>
-          <view style='height:40rpx'>
-            <text class='text_999_28 float_left'>房屋坐落地址</text>
-            <text class='text_333_28 float_right'>{{new_data.house_location}}</text>
-          </view>
-          <view style='height:40rpx'>
-            <text class='text_999_28 float_left'>证书类型</text>
-            <text class='text_333_28 float_right'>{{new_data.identify_type}}</text>
-          </view>
-          <view style='height:40rpx'>
-            <text class='text_999_28 float_left'>证书编号</text>
-            <text class='text_333_28 float_right'>{{new_data.identify_no}}</text>
-          </view>
-          <view style='height:40rpx'>
-            <text class='text_999_28 float_left'>贷款类型</text>
-            <text class='text_333_28 float_right'>{{new_data.loan_type}}</text>
-          </view>
-          <view style='height:40rpx'>
-            <text class='text_999_28 float_left'>贷款合同编号</text>
-            <text class='text_333_28 float_right'>{{new_data.contract_no}}</text>
-          </view>
-          <view style='height:40rpx'>
-            <text class='text_999_28 float_left'>首次还款日期</text>
-            <text class='text_333_28 float_right'>{{new_data.payback_date}}</text>
+      <view wx:if="{{cur_status=='continuing_education'}}">
+        <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
+          <view style='height:110rpx'>
+            <text class='text_gray_36' style='line-height:110rpx'>非学历教育</text>
+            <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
           </view>
           </view>
-          <view style='height:40rpx'>
-            <text class='text_999_28 float_left'>贷款期限(月数)</text>
-            <text class='text_333_28 float_right'>{{new_data.loan_datelong}}</text>
+          <view style='padding-right:30rpx'>
+            <view class='divide_line_f5f5f5'></view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>教育类别：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{}}</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>教育类型：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type}}</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>证书名称：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_name}}</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>证书编号：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_no}}</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>发证机关：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_no}}</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
+              <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}</text>
+            </view>
           </view>
           </view>
         </view>
         </view>
-        <view wx:if="{{title=='住房租金'}}" style='display:flex;flex-direction:column'>
-          <view style='height:40rpx'>
-            <text class='text_999_28 float_left'>租赁房屋坐落地址</text>
-            <text class='text_333_28 float_right'>{{new_data.house_location}}</text>
-          </view>
-          <view style='height:40rpx'>
-            <text class='text_999_28 float_left'>出租方类型</text>
-            <text class='text_333_28 float_right'>{{new_data.lease_type}}</text>
-          </view>
-          <view style='height:40rpx'>
-            <text class='text_999_28 float_left'>出租房名称</text>
-            <text class='text_333_28 float_right'>{{new_data.lease_name}}</text>
-          </view>
-          <view style='height:40rpx'>
-            <text class='text_999_28 float_left'>出租房纳税人识别号</text>
-            <text class='text_333_28 float_right'>{{new_data.lease_idno}}</text>
-          </view>
-          <view style='height:40rpx'>
-            <text class='text_999_28 float_left'>证件类型</text>
-            <text class='text_333_28 float_right'>{{new_data.identify_type}}</text>
-          </view>
-          <view style='height:40rpx'>
-            <text class='text_999_28 float_left'>证件号码</text>
-            <text class='text_333_28 float_right'>{{new_data.identify_no}}</text>
-          </view>
-          <view style='height:40rpx'>
-            <text class='text_999_28 float_left'>租赁合同编号</text>
-            <text class='text_333_28 float_right'>{{new_data.contract_no}}</text>
-          </view>
-          <view style='height:40rpx'>
-            <text class='text_999_28 float_left'>租赁期起</text>
-            <text class='text_333_28 float_right'>{{new_data.lease_startdate}}</text>
+        <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
+          <view style='height:110rpx'>
+            <text class='text_gray_36' style='line-height:110rpx'>学历教育</text>
+            <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
           </view>
           </view>
-          <view style='height:40rpx'>
-            <text class='text_999_28 float_left'>租赁期止</text>
-            <text class='text_333_28 float_right'>{{new_data.lease_enddate}}</text>
+          <view style='padding-right:right'>
+            <view class='divide_line_f5f5f5'></view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>教育类别：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type}}</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>受教育阶段：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_period}}</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>受教育日期起：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>受教育日期止：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
+              <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}</text>
+            </view>
           </view>
           </view>
-        </view>
 
 
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>扣除方式</text>
-          <text class='text_333_28 float_right'>{{new_data.reduce_type}}</text>
         </view>
         </view>
-        <view style='height:40rpx'>
-          <text class='text_999_28 float_left'>扣除金额</text>
-          <text class='text_333_28 float_right'>{{new_data.reduce_money}}元</text>
+        <view class='float_right' wx:if="{{item.status=='failed'}}">
+          <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
+          <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
         </view>
         </view>
+      </view>
 
 
-      </view> -->
-
-    <!-- </view> -->
-
-
-    <view wx:if="{{cur_status=='children_education'}}">
-      <view wx:for="{{additionInfo}}">
-        <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
+      <view wx:if="{{cur_status=='support_duty'}}">
+        <view style='margin:30rpx;padding-left:30rpx' class='card_rectangle_bg_column'>
           <view style='height:110rpx'>
           <view style='height:110rpx'>
-            <text class='text_gray_36 float_left' style='line-height:110rpx'>{{item.children_name}}</text>
+            <text class='text_gray_36 float_left' style='line-height:110rpx'>被赡养人</text>
             <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
             <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
           </view>
           </view>
-          <view style='padding-right: 30rpx'>
+          <view style='padding-right:30rpx'>
             <view class='divide_line_f5f5f5'></view>
             <view class='divide_line_f5f5f5'></view>
             <view style='height:70rpx'>
             <view style='height:70rpx'>
-              <text class='text_999_28 ' style='line-height:70rpx'>子女姓名：</text>
-              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.children_name}}</text>
+              <text class='text_999_28 ' style='line-height:70rpx'>被赡养人姓名：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
             </view>
             </view>
             <view style='height:70rpx'>
             <view style='height:70rpx'>
-              <text class='text_999_28 ' style='line-height:70rpx'>分配比例：</text>
-              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.percent}}%</text>
+              <text class='text_999_28 ' style='line-height:70rpx'>分摊比例：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
             </view>
             </view>
             <view style='height:70rpx'>
             <view style='height:70rpx'>
               <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
               <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
@@ -344,217 +156,122 @@
               <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
               <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
             </view>
             </view>
           </view>
           </view>
-        </view>
-      </view>
-    </view>
 
 
-    <view wx:if="{{cur_status=='continuing_education'}}">
-      <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
-        <view style='height:110rpx'>
-          <text class='text_gray_36' style='line-height:110rpx'>非学历教育</text>
-          <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
-        </view>
-        <view style='padding-right:30rpx'>
-          <view class='divide_line_f5f5f5'></view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>教育类别：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{}}</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>教育类型：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type}}</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>证书名称：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_name}}</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>证书编号：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_no}}</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>发证机关：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.certification_no}}</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
-            <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}</text>
-          </view>
-        </view>
-      </view>
-      <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
-        <view style='height:110rpx'>
-          <text class='text_gray_36' style='line-height:110rpx'>学历教育</text>
-          <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
-        </view>
-        <view style='padding-right:right'>
-          <view class='divide_line_f5f5f5'></view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>教育类别：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_type}}</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>受教育阶段：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{item.education_period}}</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>受教育日期起：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>受教育日期止：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
-            <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}</text>
-          </view>
         </view>
         </view>
 
 
-      </view>
-      <view class='float_right' wx:if="{{item.status=='failed'}}">
-        <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
-        <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
-      </view>
-    </view>
-
-    <view wx:if="{{cur_status=='support_duty'}}">
-      <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>
-          <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
-        </view>
-        <view style='padding-right:30rpx'>
-          <view class='divide_line_f5f5f5'></view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>被赡养人姓名：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>分摊比例：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
-            <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}</text>
+        <view wx:if="{{true}}">
+          <view style='background:#FFF;padding:30rpx'>
+            <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;' id='{{index}}' bindtap='goadd'>
+              添加
+            </view>
           </view>
           </view>
-          <view class='divide_line_f5f5f5'></view>
-          <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
-          <view class='float_right' wx:if="{{item.status=='failed'}}">
-            <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
-            <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
+          <view style='margin-left:30rpx' wx:if="{{cur_status=='support_duty'}}">
+            <text class='text_999_28'>您还没有添加继续共同赡养人，</text>
+            <text class='text_blue_28' bindtap='goaddSupporter'>请添加</text>
           </view>
           </view>
-        </view>
 
 
+        </view>
       </view>
       </view>
-    </view>
 
 
-    <view wx:if="{{cur_status=='medical_fund'}}">
-      <view class='divide_line_f5f5f5'></view>
-      <view style='height:100rpx;margin:0 30rpx' bindtap='reducetype'>
-        <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>个人负担总金额</text>
-        <text class='text_orange_28 float_right' style='line-height:100rpx'>￥10</text>
-      </view>
-      <view class='divide_line_f5f5f5'></view>
-      <view style='height:100rpx;margin:0 30rpx' bindtap='reducetype'>
-        <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>可扣除金额</text>
-        <text class='text_orange_28 float_right' style='line-height:100rpx'>￥0</text>
-      </view>
-      <view class='divide_line_f5f5f5'></view>
-      <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
-        <view style='height:110rpx'>
-          <text class='text_gray_36' style='line-height:110rpx'>支出明细</text>
-          <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
-        </view>
-        <view style='padding-right:30rpx'>
-          <view class='divide_line_f5f5f5'></view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>姓名：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>身份证件类型：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>身份证件号码：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>医疗支出总金额：</text>
-            <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额：</text>
-            <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥2345元</text>
+      <view wx:if="{{cur_status=='medical_fund'}}">
+        <view class='divide_line_f5f5f5'></view>
+        <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='reducetype'>
+          <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>个人负担总金额</text>
+          <text class='text_orange_28 float_right' style='line-height:100rpx'>￥10</text>
+        </view>
+        <view class='divide_line_f5f5f5'></view>
+        <view style='height:100rpx;margin:0 30rpx;background:#FFF' bindtap='reducetype'>
+          <text style='font-size:30rpx;color:#333;line-height:100rpx;font-family: PingFangSC-Semibold;float:left'>可扣除金额</text>
+          <text class='text_orange_28 float_right' style='line-height:100rpx'>￥0</text>
+        </view>
+        <view class='divide_line_f5f5f5'></view>
+        <view style='margin:30rpx;padding-left: 30rpx' class='card_rectangle_bg_column'>
+          <view style='height:110rpx'>
+            <text class='text_gray_36' style='line-height:110rpx'>支出明细</text>
+            <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
           </view>
           </view>
-          <view class='float_right' wx:if="{{item.status!='failed'}}">
-            <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
-            <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
+          <view style='padding-right:30rpx'>
+            <view class='divide_line_f5f5f5'></view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>姓名：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>身份证件类型：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>身份证件号码：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>123</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>与纳税人关系：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>1234</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>医疗支出总金额：</text>
+              <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥12345元</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>个人负担金额：</text>
+              <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥2345元</text>
+            </view>
+            <view class='float_right' wx:if="{{item.status!='failed'}}">
+              <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
+              <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
+            </view>
           </view>
           </view>
         </view>
         </view>
       </view>
       </view>
-    </view>
 
 
-    <view wx:if="{{cur_status=='house_fund'}}">
-      <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>
-          <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
-        </view>
-        <view style='padding-right: 30rpx'>
-          <view class='divide_line_f5f5f5'></view>
-          <view style=''>
-            <text class='text_999_28 ' style='line-height:70rpx'>租赁房屋坐落地址：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>北京市 市辖区 朝阳区</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>瑞创国际SA大厦1101</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
-            <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
-          </view>
-          <view style='height:70rpx'>
-            <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
-            <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}</text>
+      <view wx:if="{{cur_status=='house_fund'}}">
+        <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>
+            <view class='declare_style float_right'> {{declareStatus[item.status]}}</view>
           </view>
           </view>
-          <view class='divide_line_f5f5f5'></view>
-          <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
-          <view class='float_right' wx:if="{{item.status=='failed'}}">
-            <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
-            <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
+          <view style='padding-right: 30rpx'>
+            <view class='divide_line_f5f5f5'></view>
+            <view style=''>
+              <text class='text_999_28 ' style='line-height:70rpx'>租赁房屋坐落地址：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>北京市 市辖区 朝阳区</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>瑞创国际SA大厦1101</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>扣除方式：</text>
+              <text class='text_333_28 ' style='line-height:70rpx;margin-left:20rpx'>{{reducetype[item.deduction_type]}}</text>
+            </view>
+            <view style='height:70rpx'>
+              <text class='text_999_28 ' style='line-height:70rpx'>扣除金额：</text>
+              <text class='text_orange_28 ' style='line-height:70rpx;margin-left:20rpx'>￥{{item.deduction_amount}}</text>
+            </view>
+            <view class='divide_line_f5f5f5'></view>
+            <text class='text_blue_28 float_right' style='line-height:90rpx;margin-left:40rpx' id='{{index}}' bindtap='showdetail'>查看</text>
+            <view class='float_right' wx:if="{{item.status=='failed'}}">
+              <text class='text_999_28 ' style='line-height:90rpx;margin-right:40rpx' id='{{index}}' bindtap='godelete'>删除</text>
+              <text class='text_blue_28 ' style='line-height:90rpx;' id='{{index}}' bindtap='goedit'>编辑</text>
+            </view>
           </view>
           </view>
         </view>
         </view>
       </view>
       </view>
+
     </view>
     </view>
-    <view style='background:#FFF;padding:30rpx'>
-      <view style='line-height:84rpx;text-align:center;font-size:34rpx;color:#fff;background:#357AEB;' id='{{index}}' bindtap='goadd'>
-        添加
-      </view>
+    <view wx:if="{{!additionInfo||additionInfo.length<1}}">
+      <image style='width:55%;height:254rpx;margin:166rpx;' src='/images/noreduce_img.png'></image>
     </view>
     </view>
 
 
-    <view style='margin-left:30rpx' wx:if="{{cur_status=='support_duty'}}">
-      <text class='text_999_28'>您还没有添加继续共同赡养人，</text>
-      <text class='text_blue_28' bindtap='goaddSupporter'>请添加</text>
+  </view>
+
+  <view class='bottom_btn_wrap' hidden="{{additionInfo&&additionInfo.length>0&&cur_status=='support_duty'}}">
+    <view class='btn_blue_radius' bindtap="goadd">
+      <view class='text_white_34'>添加</view>
     </view>
     </view>
   </view>
   </view>
+
 </view>
 </view>
 
 
+
+
 <view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}"></view>
 <view class="mask" catchtouchmove="preventTouchMove" hidden="{{!showModal_img&&!showModal_reducetype&&!showModal_addtype}}"></view>
 <!-- 申报说明 -->
 <!-- 申报说明 -->
 <view style='top:250rpx;position:absolute;z-index:10;width:100%' hidden="{{!showModal_img}}">
 <view style='top:250rpx;position:absolute;z-index:10;width:100%' hidden="{{!showModal_img}}">
@@ -581,9 +298,9 @@
   <view class='divide_line_f5f5f5'></view>
   <view class='divide_line_f5f5f5'></view>
 
 
   <view style='width:100%;display: flex;'>
   <view style='width:100%;display: flex;'>
-    <text class='text_cancel' bindtap='reduce_modalCancel'>取消</text>
+    <text class='text_cancel' bindtap='reduce_modalLeft'>取消</text>
     <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
     <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
-    <text class='text_confirm' bindtap='reduce_modalConfirm'>确认</text>
+    <text class='text_confirm' bindtap='reduce_modalRight'>确认</text>
   </view>
   </view>
 </view>
 </view>
 
 
@@ -605,8 +322,8 @@
   </view>
   </view>
   <view class='divide_line_f5f5f5'></view>
   <view class='divide_line_f5f5f5'></view>
   <view style='width:100%;display: flex;'>
   <view style='width:100%;display: flex;'>
-    <text class='text_cancel01' bindtap='modalCancel'>{{modalData.canceltext}}</text>
+    <text class='text_cancel01' bindtap='modalLeft'>{{modalData.lefttext}}</text>
     <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
     <view style='width:1px;background:#F5F5F5;margin:20rpx 0'></view>
-    <text class='text_confirm01' bindtap='modalConfirm'>{{modalData.confirmtext}}</text>
+    <text class='text_confirm01' bindtap='modalRight'>{{modalData.righttext}}</text>
   </view>
   </view>
 </view>
 </view>

@@ -21,6 +21,13 @@
   text-align: center;
   text-align: center;
 }
 }
 
 
+.btn_blue_radius{
+  margin: 26rpx 30rpx;
+  background: #357AEB;
+  border-radius: 5px;
+  height: 84rpx;
+}
+
 .icon_wrap {
 .icon_wrap {
   width: 8rpx;
   width: 8rpx;
   height: 28rpx;
   height: 28rpx;
@@ -94,6 +101,23 @@
   border-radius: 4px;
   border-radius: 4px;
 }
 }
 
 
+.text_white_34 {
+  font-family: PingFangSC-Regular;
+  font-size: 17px;
+  color: #FFFFFF;
+  text-align: center;
+  line-height: 42px;
+}
+
+.bottom_btn_wrap{
+  background: #FFFFFF;
+  box-shadow: 0 -2px 8px 0 rgba(208,208,208,0.30);
+  height: 136rpx;
+  width: 100%;
+  position: fixed;
+  bottom: 0;
+}
+
 /* 遮罩层 */
 /* 遮罩层 */
 
 
 .mask {
 .mask {
@@ -226,3 +250,4 @@
   line-height: 48rpx;
   line-height: 48rpx;
   margin-top: 30rpx;
   margin-top: 30rpx;
 }
 }
+

@@ -6,7 +6,7 @@
 
 
       <image class='bgimg' src='/images/guide_bg.png'></image>
       <image class='bgimg' src='/images/guide_bg.png'></image>
 
 
-      <view class='card_rectangle_bg_row' style='margin-top:280rpx;padding:30rpx' bindtap='gotaxPerson'>
+      <view class='card_rectangle_bg_row' style='margin-top:310rpx;padding:30rpx' bindtap='gotaxPerson'>
         <image class="icon_wrap" src="/images/tax_person.jpg"></image>
         <image class="icon_wrap" src="/images/tax_person.jpg"></image>
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>

@@ -8,7 +8,7 @@
 .bgimg {
 .bgimg {
   position: absolute;
   position: absolute;
   height: 280rpx;
   height: 280rpx;
-  width: 95%;
+  width: 92%;
   align-self: center;
   align-self: center;
 }
 }