merge

@@ -254,23 +254,23 @@ Page({
     console.log("formdata", formdata);
     console.log('idnum', this.data.card_number.length < 1 && !format.isIDCardNum(formdata.id_card_no))
     if (formdata.name.length < 1) {
-      this.showtoast('有必填项未填写');
+      this.showtoast('姓名未填写');
       return
     } else if (!regname.test(formdata.name)) {
       this.showtoast('请输入正确姓名');
       return
     } else if (this.data.relativeData.selected.length < 1) {
-      this.showtoast('有必填项未填写');
+      this.showtoast('请选择关系');
       return
     }
     else if (this.data.isIdCard && (this.data.card_number.length < 1 && formdata.id_card_no.length < 1)) {
-      this.showtoast('有必填项未填写');
+      this.showtoast('请填写证照号码');
       return
     } else if (this.data.isIdCard && !format.isIDCardNum(formdata.id_card_no)) {
       this.showtoast('证照号码有误');
       return
     } else if (!this.data.isIdCard && (!formdata.id_card_no || formdata.id_card_no.length < 1)) {
-      this.showtoast('有必填项未填写');
+      this.showtoast('请填写证照号码');
       return
     } 
     else if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {

@@ -804,13 +804,37 @@ Page({
     })
   },
 
+  idcardblur: function (e) {
+    var idCardNo = e.detail.value
+    if (!format.isIDCardNum(idCardNo)) {
+      wx.showToast({
+        image: "../../../../images/warn.png",
+        title: '身份证格式有误'
+      })
+      return;
+    }
+    this.dealIdInfo(idCardNo)
+  },
   bindinputcardnum: function(e) {
-    console.log('bindinputcardnum', e)
+    var idCardNo = e.detail.value
+    if (e.detail.value.length == 18) {
+      if (!format.isIDCardNum(idCardNo)) {
+        wx.showToast({
+          image: "../../../../images/warn.png",
+          title: '身份证格式有误'
+        })
+        return;
+      }
+      this.dealIdInfo(idCardNo)
+    }
+  },
+  //根据身份证号码，获取相关信息
+  dealIdInfo: function (idCardNum) {
+    var info = format.analyzeIDCard(idCardNum)
     this.setData({
-      card_number: e.detail.value
+      card_number: idCardNum
     })
   },
-
   personalmoney:function(e){
     console.log('personalmoney', e)
     this.setData({
@@ -836,13 +860,13 @@ Page({
     console.log("formdata", formdata)
     console.log("card_number", this.data.card_number)
     if (this.data.name.length < 1) {
-      this.showtoast('有必填项未填写');
+      this.showtoast('请输入姓名');
       return
     } else if (this.data.name.length > 0 && !regname.test(this.data.name)) {
       this.showtoast('请输入正确姓名');
       return
     } else if (!this.data.isself && this.data.relativeData.selected.length < 1) {
-      this.showtoast('有必填项未填写');
+      this.showtoast('请选择关系');
       return
     } 
     // else if (this.data.personstatusData.selected.length < 1) {
@@ -853,7 +877,7 @@ Page({
       this.showtoast('有必填项未填写');
       return
     } else if (this.data.card_number.length < 1) {
-      this.showtoast('有必填项未填写');
+      this.showtoast('请输入身份证号码');
       return
     } else if (this.data.isIdCard && this.data.card_number.length > 0 && !format.isIDCardNum(this.data.card_number)) {
       this.showtoast('证照号码有误');

@@ -95,19 +95,12 @@
         <view class='item_body'>
           <text style='color:red;font-size: 30rpx;line-height: 90rpx;float:left'>*</text>
           <text class='text_black_30 float_left' style='line-height: 90rpx'>证照号码</text>
-          <view wx:if="{{isIdCard}}">
-            <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image>
+          <view>
+            <image  wx:if="{{isIdCard}}" class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image>
             <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
             <!-- <input class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'&&card_number?card_number:'请输入证照号码'}}" placeholder-class='text_999_28' name='id_card_no' maxlength='24' disabled="{{taxInfo.certification_status=='active'}}"></input> -->
-            <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}" maxlength='24' bindblur='bindinputcardnum'></input>
-            <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||card_number?card_number:'请输入证照号码'}}" name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}"
-              maxlength='24' bindblur='bindinputcardnum'></input>
-
-          </view>
-          <view wx:else>
-            <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}" maxlength='24' bindblur='bindinputcardnum'></input>
-            <input hidden="{{taxInfo.certification_status!='active'}}" class='input_wrap float_right' placeholder="{{taxInfo.certification_status=='active'||card_number?card_number:'请输入证照号码'}}" name='id_card_no' disabled="{{taxInfo.certification_status=='active'}}"
-              bindblur='bindinputcardnum' maxlength='24'></input>
+            <input class='input_wrap float_right' hidden="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value='{{card_number}}' name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum'></input>
+          <input class='input_wrap float_right' hidden="{{taxInfo.certification_status!='active'}}"  placeholder="{{card_number?card_number:'身份证号获取失败'}}" name='id_card_no' disabled='true'></input>
           </view>
         </view>