优化

@@ -37,69 +37,17 @@ Page({
     //获取上一个页面的所有的方法和data中的数据
     var lastpage = pages[pages.length - 2]
     console.log("lastpage", lastpage.data);
-    this.handleData(options.datas)
+    // this.handleData(options.datas)
     this.setData({
       cur_status: options.status,
-      house_type: lastpage.data.house_type
+      house_type: lastpage.data.house_type,
+      datas: options.datas?JSON.parse(options.datas):{}
     })
     wx.setNavigationBarTitle({
       title: that.data.additiontitle[options.status],
     })
   },
 
-  handleData: function (data){
-    var newdata = JSON.parse(data);
-    if (newdata ){
-      this.verifyDate(newdata.children_birthday)
-      this.verifyDate(newdata.spouse_birthday)
-      this.verifyDate(newdata.education_start)
-      this.verifyDate(newdata.education_end)
-      this.verifyDate(newdata.birthday)
-      this.verifyDate(newdata.rent_start)
-      this.verifyDate(newdata.rent_end)
-
-      newdata.children_id_card_no = this.formatIdNum(newdata.children_id_card_no)
-      newdata.spouse_id_card_no = this.formatIdNum(newdata.spouse_id_card_no)
-      newdata.id_card_no = this.formatIdNum(newdata.id_card_no)
-
-      if (newdata.house_address) {
-        if (newdata.house_address.province == newdata.house_address.city) {
-          newdata.house_address_new = newdata.house_address.city + newdata.house_address.district
-        } else {
-          newdata.house_address_new = newdata.house_address.province + newdata.house_address.city + newdata.house_address.district
-        }
-      }
-      if (newdata.work_city) {
-        newdata.work_city_new = newdata.work_city.province + newdata.work_city.city
-      }
-      this.setData({
-        datas: newdata
-      })
-      console.log("handleData", this.data.datas)
-      
-    }
-  },
-
-  verifyDate(date){
-    if (date && date > 0) {
-      date = format.formatTime_date(date)
-    } else {
-      date = ""
-    }
-  },
-
-  formatIdNum: function (idnum) {
-    if (idnum && idnum.length >= 6 && idnum.length < 10) {
-      idnum = idnum.substring(0, 2) + '****' + idnum.substring(idnum.length - 2, idnum.length);
-    } 
-     if (idnum && idnum.length >= 10) {
-       idnum = idnum.substring(0, 4) + '****' + idnum.substring(idnum.length - 4, idnum.length);
-    } 
-    
-    console.log("formatIdNum", idnum)
-    return idnum
-  },
-
   /**
    * Lifecycle function--Called when page is initially rendered
    */

@@ -98,7 +98,11 @@
   <view style='padding:30rpx' wx:if="{{cur_status=='support_duty'}}">
     <view style='height:90rpx;width:100%;clear:both;'>
       <text class='text_left'>是否独生子女</text>
-      <text class='text_right_333'>{{datas.is_single=='y'?"是":"否"}}</text>
+      <text class='text_right_333'>{{datas.is_single=='n'?"否":"是"}}</text>
+    </view>
+    <view wx:if="{{datas.is_single=='y'}}" style='height:90rpx;width:100%;clear:both;'>
+      <text class='text_left'>分摊方式</text>
+      <text class='text_right_333'>{{datas.share_method}}</text>
     </view>
     <view style='height:90rpx;width:100%;clear:both;'>
       <text class='text_left'>被赡养人姓名</text>

@@ -88,7 +88,7 @@ Page({
       lefttext: "添加家庭成员并申报",
       righttext: "确定为该选择的人申报",
     },
-    reduce_amount: 0,
+    reduce_amount: -1,
     selected_reduceindex: 0,
     selected_addindex: 0
   },
@@ -172,6 +172,26 @@ Page({
       if (newdata[i].patient_birthday) {
         newdata[i].patient_birthday = this.formatDate(newdata[i].patient_birthday)
       }
+      //详情迁移
+      if (newdata[i].children_birthday) {
+        newdata[i].children_birthday = this.formatDate(newdata[i].children_birthday)
+      }
+      if (newdata[i].spouse_birthday) {
+        newdata[i].spouse_birthday = this.formatDate(newdata[i].spouse_birthday)
+      }
+      if (newdata[i].birthday) {
+        newdata[i].birthday = this.formatDate(newdata[i].birthday)
+      }
+      if (newdata[i].rent_start) {
+        newdata[i].rent_start = this.formatDate(newdata[i].rent_start)
+      }
+      if (newdata[i].rent_end) {
+        newdata[i].rent_end = this.formatDate(newdata[i].rent_end)
+      }
+
+      newdata[i].children_id_card_no = this.formatIdNum(newdata[i].children_id_card_no)
+      newdata[i].spouse_id_card_no = this.formatIdNum(newdata[i].spouse_id_card_no)
+      newdata[i].id_card_no = this.formatIdNum(newdata[i].id_card_no)
       
       if (newdata[i].house_address) {
         if (newdata[i].house_address.province == newdata[i].house_address.city) {
@@ -180,6 +200,11 @@ Page({
           newdata[i].house_address_new = newdata[i].house_address.province + newdata[i].house_address.city + newdata[i].house_address.district
         }
       }
+
+      if (newdata[i].work_city) {
+        newdata[i].work_city_new = newdata[i].work_city.province + newdata[i].work_city.city
+      }
+
       if (newdata[i].co_supporters && newdata[i].co_supporters.length > 0) {
         for (var j = 0; j < newdata[i].co_supporters.length; j++) {
           if (newdata[i].co_supporters[j].birthday) {
@@ -188,7 +213,6 @@ Page({
           newdata[i].co_supporters[j].id_card_no = this.formatIdNum(newdata[i].co_supporters[j].id_card_no)
         }
       }
-      newdata[i].id_card_no = this.formatIdNum(newdata[i].id_card_no)
     }
 
     var housetype_new = this.data.house_type
@@ -277,7 +301,10 @@ Page({
           this.showToast("请选择分摊方式")
           return
         }
-        if (this.data.reduce_amount < 1 || this.data.reduce_amount > 1000) {
+        if (this.data.reduce_amount == -1){
+          this.showToast("请输入扣除金额")
+          return
+        }else if (this.data.reduce_amount < 1 || this.data.reduce_amount > 1000) {
           this.showToast("本年度月扣除金额不得大于1000")
           return
         }
@@ -506,11 +533,15 @@ Page({
 
   bindinput: function(e) {
     console.log("bindinput", e)
+    var inputamount 
     if (e.detail.value && e.detail.value.replace(/\s+/g, "").length>0){
-      this.setData({
-        reduce_amount: parseFloat(e.detail.value)
-      })
+      inputamount = parseFloat(e.detail.value)+0
+    }else{
+      inputamount = -1
     }
+    this.setData({
+      reduce_amount: inputamount
+    })
   },
 
   showToast: function(data) {