Merge branch 'dev2.0' of http://192.144.137.25:8888/wangyu/naturalPersonTax into dev2.0

@@ -530,7 +530,9 @@ Page({
     }
     if ("children_education" == options.status) {
       this.loadCountry()
-      this.getTaxList()
+      if (options.isedit != 'true'){
+        this.getTaxList()
+      }
     } else if ("continuing_education" == options.status) {
       var studystart_date = this.data.studystartdate
       studystart_date.label = "入学时间起"
@@ -561,7 +563,9 @@ Page({
       })
     } else if (frontPage.data.house_type == "rent" || frontPage.data.house_type == "house_fund_rent") { 
       this.getbanklist()
-      this.getTaxList()
+      if (options.isedit != 'true') {
+        this.getTaxList()
+      }
       house_type = "house_fund_rent"
       title = '住房租金'
       if (options.reducetype == '月度') {
@@ -573,7 +577,9 @@ Page({
       }
     } else if (frontPage.data.house_type == "house_fund_loan") {
       this.getbanklist()
-      this.getTaxList()
+      if (options.isedit != 'true') {
+        this.getTaxList()
+      }
       house_type = "house_fund_loan"
       title = '住房贷款利息'
       if (options.reducetype == '月度') {
@@ -713,18 +719,17 @@ Page({
         if (data.school_name && data.school_name.length) {
           setData.school_name = data.school_name
         }
+
+        var hasLoverData = this.data.hasLoverData
+        hasLoverData.selected = data.has_spouse == 'y' ? '是' : '否'
+        setData.hasLover = data.has_spouse == 'y' ? true : false
+        setData.hasLoverData = hasLoverData
         if (data.spouse_name && data.spouse_name.length) {
           setData.spouse_name = data.spouse_name
         }
         if (data.spouse_id_card_no && data.spouse_id_card_no.length) {
           setData.spouse_id_card_no = data.spouse_id_card_no
-          this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
-        }
-        if (data.spouse_birthday && data.spouse_birthday.length) {
-          var loverbirthDate = this.data.loverbirthDate
-          loverbirthDate.selected = format.formatTime_date(data.spouse_birthday)
-          loverbirthDate.datelong = data.spouse_birthday
-          setData.loverbirthDate = loverbirthDate
+          this.dealIdInfo(data.spouse_id_card_no, 'spouse_id_card_no_input')
         }
         this.setData(setData)
         break;
@@ -827,7 +832,17 @@ Page({
       //   break;
       case "house_fund":
         var setData = {}
-
+        var hasLoverData = this.data.hasLoverData
+        hasLoverData.selected = data.has_spouse == 'y'?'是':'否'
+        setData.hasLover = data.has_spouse=='y'?true:false
+        setData.hasLoverData = hasLoverData
+        if (data.spouse_name && data.spouse_name.length) {
+          setData.spouse_name = data.spouse_name
+        }
+        if (data.id_card_no && data.id_card_no.length) {
+          setData.spouse_id_card_no = data.id_card_no
+          this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
+        }
         if (this.data.house_type == 'house_fund_rent'){
           var workingcityInfo = this.data.workingcityInfo
           workingcityInfo.requestdata = data.work_city
@@ -873,20 +888,7 @@ Page({
           setData.owner_id_card_no = data.owner_id_card_no
 
         } else if (this.data.house_type == 'house_fund_loan'){
-          
-          // if (data.spouse_name && data.spouse_name.length) {
-          //   setData.spouse_name = data.spouse_name
-          // }
-          // if (data.spouse_id_card_no && data.spouse_id_card_no.length) {
-          //   setData.spouse_id_card_no = data.spouse_id_card_no
-          //   this.dealIdInfo(data.id_card_no, 'spouse_id_card_no_input')
-          // }
-          // if (this.data.loverbirthDate.selected.length) {
-          //   var loverbirthDate = this.data.loverbirthDate
-          //   loverbirthDate.selected = format.formatTime_date(data.spouse_birthday)
-          //   loverbirthDate.datelong = data.spouse_birthday
-          //   setData.loverbirthDate = loverbirthDate
-          // }
+      
           if (data.house_address && data.house_address.province) {
             var houseLocateInfo = this.data.houseLocateInfo
             houseLocateInfo.requestdata = data.house_address