Merge branch 'dev_py' into dev2.0

@@ -1481,7 +1481,7 @@ Page({
             // var curYear = d.getFullYear();
             // var curYear = d.getFullYear();
             var selYear = this.data.applydate.selected.substring(0, 4);
             var selYear = this.data.applydate.selected.substring(0, 4);
             if (selYear < 2019) {
             if (selYear < 2019) {
-              this.showToast('发证(批准)日期不符合要求，无法申报')
+              this.showToast('发证（批准）日期须在2019年度内')
               return
               return
             }
             }
           }
           }
@@ -1739,7 +1739,6 @@ Page({
           var request_rent_address = this.getRentAddressRequest()
           var request_rent_address = this.getRentAddressRequest()
           newdata.house_address = request_rent_address
           newdata.house_address = request_rent_address
           console.log('request_working_address', request_working_address)
           console.log('request_working_address', request_working_address)
-          newdata.nation = "中国"
         }
         }
         if (this.data.hasLoverData.selected.length < 1) {
         if (this.data.hasLoverData.selected.length < 1) {
           this.showToast('请选择是否有配偶')
           this.showToast('请选择是否有配偶')
@@ -1762,6 +1761,7 @@ Page({
           newdata.id_card_no = newdata.spouse_id_card_no ? newdata.spouse_id_card_no : ''
           newdata.id_card_no = newdata.spouse_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
           newdata.birthday = this.data.loverbirthDate.datelong
+          newdata.nation = "中国"
         }
         }
         newdata.has_spouse = this.data.hasLover ? 'y' : 'n'
         newdata.has_spouse = this.data.hasLover ? 'y' : 'n'
         break;
         break;
@@ -2184,7 +2184,7 @@ Page({
         })
         })
         var selYear = apply_date.selected.substring(0, 4);
         var selYear = apply_date.selected.substring(0, 4);
         if (selYear < 2019) {
         if (selYear < 2019) {
-          this.showToast('发证(批准)日期不符合要求，无法申报')
+          this.showToast('发证（批准）日期须在2019年度内')
           return
           return
         }
         }
         break;
         break;