Merge branch 'dev_py' into dev2.0

@@ -34,6 +34,7 @@ Page({
   legal_entity_id: "",
   legal_entity_id: "",
   legal_entity: "",
   legal_entity: "",
   supporttype:"",
   supporttype:"",
+  is_single:"",
   share_method:"",
   share_method:"",
   data: {
   data: {
     hasLover:false,
     hasLover:false,
@@ -514,6 +515,7 @@ Page({
     } else if ("support_duty" == options.status) {
     } else if ("support_duty" == options.status) {
       deduction_amount = frontPage.data.reduce_amount
       deduction_amount = frontPage.data.reduce_amount
       this.supporttype = frontPage.data.issinglechildData.selected == '是' ? 'D' : 'S',//是否独生
       this.supporttype = frontPage.data.issinglechildData.selected == '是' ? 'D' : 'S',//是否独生
+      this.is_single = frontPage.data.issinglechildData.selected == '是' ? 'y' : 'n',//是否独生
       this.share_method = frontPage.data.shareMethodData.selected
       this.share_method = frontPage.data.shareMethodData.selected
     } else if (frontPage.data.house_type == "rent" || frontPage.data.house_type == "house_fund_rent") { 
     } else if (frontPage.data.house_type == "rent" || frontPage.data.house_type == "house_fund_rent") { 
       this.getbanklist()
       this.getbanklist()
@@ -1068,6 +1070,7 @@ Page({
             return
             return
           }
           }
         }
         }
+        newdata.has_spouse = this.data.hasLover?'y':'n'
         newdata.relationship = this.data.taxperson_relativeData.selected
         newdata.relationship = this.data.taxperson_relativeData.selected
         newdata.percent = parseFloat(this.data.childrenpercentData.selected.replace("%",""))
         newdata.percent = parseFloat(this.data.childrenpercentData.selected.replace("%",""))
         newdata.children_id_card_type = '1' //this.data.childrencardtypeData.selected
         newdata.children_id_card_type = '1' //this.data.childrencardtypeData.selected
@@ -1172,6 +1175,7 @@ Page({
         //   newdata.percentage = parseFloat(formdata.percentage)
         //   newdata.percentage = parseFloat(formdata.percentage)
         // }
         // }
         newdata.support_type = this.supporttype
         newdata.support_type = this.supporttype
+        newdata.is_single = this.is_single
         if (this.supporttype == 'S' && this.share_method.length){
         if (this.supporttype == 'S' && this.share_method.length){
           newdata.share_method = this.share_method
           newdata.share_method = this.share_method
         }
         }
@@ -1341,6 +1345,7 @@ Page({
             return
             return
           }
           }
         }
         }
+        newdata.has_spouse = this.data.hasLover ? 'y' : 'n'
         newdata.id_card_no =  newdata.spouse_id_card_no
         newdata.id_card_no =  newdata.spouse_id_card_no
         newdata.id_card_type = '1' //this.data.lovercardtypeData.selected
         newdata.id_card_type = '1' //this.data.lovercardtypeData.selected
         newdata.birthday = this.data.loverbirthDate.datelong > 0 ? this.data.loverbirthDate.datelong : 0
         newdata.birthday = this.data.loverbirthDate.datelong > 0 ? this.data.loverbirthDate.datelong : 0