身份证识别回填

@@ -849,57 +849,39 @@ Page({
             birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
             birth_day = id_info.birthday.year + '-0' + id_info.birthday.month + '-0' + id_info.birthday.day;
           }
           }
 
 
-          if (that.data.name.length > 0 && id_info.name != that.data.name) {
-            that.showtoast("姓名冲突")
-            id_error = true
-            return
-          }
-          if (that.data.card_number.length > 0 && id_info.id_card_number != that.data.card_number) {
-            that.showtoast("证照号码冲突")
-            id_error = true
-            return
-          }
-          // children_id_card_no
-          // spouse_id_card_no
-          // older_idno
-          // long_birth_date: Date.parse(new Date(birth_day)) / 1000,
-          // that.data.genderData.selected = id_info.gender
-          // that.data.birthDate.selected = birth_day
-          console.log('name***card_number', that.data.name + '***' + that.data.card_number)
-
-          if (this.idcard_belong == 'children_id_card_no') {
-            this.data.commonbirthDate.selected = birth_day
-            this.data.commonbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
+          if (that.idcard_belong == 'children_id_card_no') {
+            that.data.commonbirthDate.selected = birth_day
+            that.data.commonbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
             data = {
             data = {
               children_id_card_no: id_info.id_card_number,
               children_id_card_no: id_info.id_card_number,
               children_name: id_info.name,
               children_name: id_info.name,
-              commonbirthDate: this.data.commonbirthDate
+              commonbirthDate: that.data.commonbirthDate
             }
             }
-          } else if (this.idcard_belong == 'spouse_id_card_no') {
-            this.data.loverbirthDate.selected = birth_day
-            this.data.loverbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
+          } else if (that.idcard_belong == 'spouse_id_card_no') {
+            that.data.loverbirthDate.selected = birth_day
+            that.data.loverbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
             data = {
             data = {
               spouse_id_card_no: id_info.id_card_number,
               spouse_id_card_no: id_info.id_card_number,
               spouse_name: id_info.name,
               spouse_name: id_info.name,
-              loverbirthDate: this.data.loverbirthDate
+              loverbirthDate: that.data.loverbirthDate
             }
             }
-          } else if (this.idcard_belong == 'older_id_card_no') {
-            this.data.olderbirthDate.selected = birth_day
-            this.data.olderbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
+          } else if (that.idcard_belong == 'older_id_card_no') {
+            that.data.olderbirthDate.selected = birth_day
+            that.data.olderbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
             data = {
             data = {
               id_card_no: id_info.id_card_number,
               id_card_no: id_info.id_card_number,
               supported_name: id_info.name,
               supported_name: id_info.name,
-              olderbirthDate: this.data.olderbirthDate
+              olderbirthDate: that.data.olderbirthDate
             }
             }
-          } else if (this.idcard_belong == 'medical_id_card_no') {
-            this.data.commonbirthDate.selected = birth_day
-            this.data.commonbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
+          } else if (that.idcard_belong == 'medical_id_card_no') {
+            that.data.commonbirthDate.selected = birth_day
+            that.data.commonbirthDate.datelong = (Date.parse(new Date(birth_day)) / 1000)
             data = {
             data = {
               id_card_no: id_info.id_card_number,
               id_card_no: id_info.id_card_number,
-              commonbirthDate: this.data.commonbirthDate
+              commonbirthDate: that.data.commonbirthDate
             }
             }
           }
           }
-          this.setData(data)
+          that.setData(data)
           console.log('-cardtypeData--', that.data.cardtypeData)
           console.log('-cardtypeData--', that.data.cardtypeData)
 
 
         }
         }