Merge branch 'dev_py' into dev2.0

@@ -962,6 +962,10 @@ Page({
           this.showToast('请填写子女证照号码')
           this.showToast('请填写子女证照号码')
           return
           return
         }
         }
+        if (!format.isIDCardNum(formdata.children_id_card_no)) {
+          this.showToast('身份证格式有误')
+          return
+        }
         if (!formdata.children_name || formdata.children_name.length < 1) {
         if (!formdata.children_name || formdata.children_name.length < 1) {
           this.showToast('请填写子女姓名')
           this.showToast('请填写子女姓名')
           return
           return
@@ -1002,7 +1006,10 @@ Page({
           } else if (!formdata.spouse_id_card_no || formdata.spouse_id_card_no.length < 1) {
           } else if (!formdata.spouse_id_card_no || formdata.spouse_id_card_no.length < 1) {
             this.showToast('请填写配偶证照号码')
             this.showToast('请填写配偶证照号码')
             return
             return
-          } else if (this.data.loverbirthDate.selected.length < 1) {
+          } else if (!format.isIDCardNum(formdata.spouse_id_card_no)) {
+            this.showToast('配偶身份证格式有误')
+            return
+          }else if (this.data.loverbirthDate.selected.length < 1) {
             this.showToast('请选择配偶出生日期')
             this.showToast('请选择配偶出生日期')
             return
             return
           }
           }
@@ -1092,6 +1099,9 @@ Page({
         } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
         } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
           this.showToast('请填写赡养人证照号')
           this.showToast('请填写赡养人证照号')
           return
           return
+        } else if (!format.isIDCardNum(formdata.id_card_no)) {
+          this.showToast('赡养人身份证格式有误')
+          return
         }
         }
         if (this.data.olderbirthDate.selected.length < 1) {
         if (this.data.olderbirthDate.selected.length < 1) {
           this.showToast('请选择赡养人出生日期')
           this.showToast('请选择赡养人出生日期')
@@ -1124,6 +1134,9 @@ Page({
         } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
         } else if (!formdata.id_card_no || formdata.id_card_no.length < 1) {
           this.showToast('请填写证照号码')
           this.showToast('请填写证照号码')
           return
           return
+        } else if (!format.isIDCardNum(formdata.id_card_no)) {
+          this.showToast('身份证格式有误')
+          return
         } else if (this.data.commonbirthDate.selected.length < 1) {
         } else if (this.data.commonbirthDate.selected.length < 1) {
           this.showToast('请选择病人出生日期')
           this.showToast('请选择病人出生日期')
           return
           return
@@ -1221,6 +1234,9 @@ Page({
           } else if (!formdata.owner_id_card_no || formdata.owner_id_card_no.length < 1) {
           } else if (!formdata.owner_id_card_no || formdata.owner_id_card_no.length < 1) {
             this.showToast('请填写证照号码')
             this.showToast('请填写证照号码')
             return
             return
+          } else if (!format.isIDCardNum(formdata.owner_id_card_no)) {
+            this.showToast('身份证格式有误')
+            return
           } else if (this.data.rentLocateInfo.address_value[0].length < 1) {
           } else if (this.data.rentLocateInfo.address_value[0].length < 1) {
             this.showToast('请选择房屋地址')
             this.showToast('请选择房屋地址')
             return
             return
@@ -1256,6 +1272,9 @@ Page({
           } else if (!formdata.spouse_id_card_no || formdata.spouse_id_card_no.length < 1) {
           } else if (!formdata.spouse_id_card_no || formdata.spouse_id_card_no.length < 1) {
             this.showToast('请填写配偶证照号码')
             this.showToast('请填写配偶证照号码')
             return
             return
+          } else if (!format.isIDCardNum(formdata.spouse_id_card_no)) {
+            this.showToast('配偶身份证格式有误')
+            return
           } else if (this.data.loverbirthDate.selected.length < 1) {
           } else if (this.data.loverbirthDate.selected.length < 1) {
             this.showToast('请选择配偶出生日期')
             this.showToast('请选择配偶出生日期')
             return
             return

@@ -110,7 +110,7 @@ Page({
   //对各参数初始赋值
   //对各参数初始赋值
   handleDatas: function (tax_info) {
   handleDatas: function (tax_info) {
 
 
-    var isDisable = tax_info.certification_status != 'active'//已通过拍摄身份证认证过，不能修改
+    var isDisable = tax_info.certification_status == 'active'//已通过拍摄身份证认证过，不能修改
 
 
     this.data.relativeData.selected = tax_info.family_ties
     this.data.relativeData.selected = tax_info.family_ties
     // this.data.cardtypeData.selected = tax_info.id_card_type
     // this.data.cardtypeData.selected = tax_info.id_card_type