Merge branch 'dev_py' into dev2.0

@@ -163,27 +163,27 @@ Page({
           var gender_Data = that.data.genderData
           gender_Data.selected = id_info.gender
 
-          that.data.birthDate.selected = birth_day
-
-          if (that.data.name.length > 0 && id_info.name != that.data.name) {
-            that.showtoast("姓名冲突")
-            return
-          }
-          if (that.data.card_number.length > 0 && id_info.id_card_number != that.data.card_number) {
-            that.showtoast("证照号码冲突")
-            return
-          }
+          // that.data.birthDate.selected = birth_day
+
+          // if (that.data.name.length > 0 && id_info.name != that.data.name) {
+          //   that.showtoast("姓名冲突")
+          //   return
+          // }
+          // if (that.data.card_number.length > 0 && id_info.id_card_number != that.data.card_number) {
+          //   that.showtoast("证照号码冲突")
+          //   return
+          // }
           that.setData({
             idInfoData: id_info,
             name: id_info.name,
-            birthday: birth_day,
+            // birthday: birth_day,
             // cardtypeData: cardtype_Data,
             genderData: gender_Data,
-            long_birth_date: Date.parse(new Date(birth_day)) / 1000,
-            birthDate: that.data.birthDate,
+            // long_birth_date: Date.parse(new Date(birth_day)) / 1000,
+            // birthDate: that.data.birthDate,
             card_number: id_info.id_card_number
           })
-          this.dealIdInfo(id_info.id_card_number)
+          that.dealIdInfo(id_info.id_card_number)
         }
       },
     })
@@ -231,7 +231,12 @@ Page({
     }
 
   },
-
+  bindinputmobile: function (e) {
+    console.log('bindinputmobile', e)
+    this.setData({
+      mobile: e.detail.value
+    })
+  },
 
   // =============其他数据选中处理==============
 
@@ -263,10 +268,7 @@ Page({
     } 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('请填写证照号码');
-      return
-    } 
+    }
     if (formdata.name.length < 1) {
       this.showtoast('姓名未填写');
       return
@@ -274,6 +276,10 @@ Page({
       this.showtoast('请输入正确姓名');
       return
     }
+    if (formdata.mobile.length > 0 && !format.isMobile(formdata.mobile)) {
+      this.showtoast('手机号码有误');
+      return
+    } 
     var new_card_num = ''
     if (this.data.isIdCard) {
       if (this.data.card_number.length > 0) {
@@ -316,6 +322,7 @@ Page({
         "id_card_no": formdata.id_card_no ? formdata.id_card_no : that.data.card_number,
         "name": formdata.name,
         "gender": that.data.genderData.selected,
+        "mobile": formdata.mobile,
         //"age": formdata.age ? formdata.age : '',//不传
         "native": "中国",
         "is_overseas_personnel": "否",

@@ -24,7 +24,7 @@
           <view wx:if="{{isIdCard}}"   >
             <image class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo'></image>
             <!-- <text class='text_333_28 float_right'>{{card_number}}</text> -->
-             <input class='input_wrap float_right' placeholder='请输入或拍摄身份证'  placeholder-class='text_777_30' name='id_card_no' maxlength='18' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
+             <input class='input_wrap float_right' placeholder='请输入或拍摄身份证'  placeholder-class='text_777_30' name='id_card_no' maxlength='18' value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}' type='idcard'></input>
           </view>
           <view wx:else>
             <input class='input_wrap float_right' placeholder='请输入证照号码'  placeholder-class='text_777_30' name='id_card_no' maxlength='18' type="idcard" value='{{card_number}}' bindblur="idDone" bindinput="idChange" disabled='{{isDisable}}'></input>
@@ -53,7 +53,11 @@
           <text class='text_777_30 float_left' style='line-height: 90rpx'>国籍</text>
           <text class='text_black_30 float_right' style='line-height: 90rpx' >中国</text>
         </view>
-
+        <view class="divide_line_30"></view>
+        <view class='item_body'>
+          <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>手机号码</text>
+          <input class='input_wrap float_right' placeholder="请输入手机号" value='{{mobile}}' name='mobile' type='number' maxlength='11' bindblur='bindinputmobile' type='number'></input>
+        </view>
         <view class="divide_line_30"></view>
         <view class='item_body'>
           <text class='text_777_30 float_left head_in' style='line-height: 90rpx'>是否境外人员</text>

@@ -868,10 +868,16 @@ Page({
     // else if (this.data.mobile.length < 1) {
     //   this.showtoast('有必填项未填写');
     //   return
-    // } else if (this.data.mobile.length > 0 && !regMobile.test(this.data.mobile)) {
-    //   this.showtoast('手机号码有误');
-    //   return
-    // } else if (this.data.investInfo.selected.length < 1) {
+    // } else 
+    if (this.data.mobile.length > 0 && !regMobile.test(this.data.mobile)) {
+      this.showtoast('手机号码有误');
+      return
+    } 
+    if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
+      this.showtoast('请输入正确邮箱');
+      return
+    }
+    //else if (this.data.investInfo.selected.length < 1) {
     //   this.showtoast('有必填项未填写');
     //   return
     // } else if (this.data.specificIndustryInfo.selected.length < 1) {
@@ -880,11 +886,8 @@ Page({
     // } else if (this.data.employeeInfo.selected.length < 1) {
     //   this.showtoast('有必填项未填写');
     //   return
-    // } 
-    // else if (formdata.email && formdata.email.length > 0 && !regEmail.test(formdata.email)) {
-    //   this.showtoast('请输入正确邮箱');
-    //   return
-    // }
+    // } else 
+    
     //  else if (this.data.company_equity_total && this.data.company_equity_total.length > 0 && !regMoney.test(this.data.company_equity_total)) {
     //   this.showtoast('请输入正确金额');
     //   return

@@ -29,7 +29,7 @@
           <text class='text_777_30 float_left' style='line-height: 90rpx'>证照号码</text>
           <view>
             <image  wx:if="{{isIdCard}}" class='image_camera float_right' src='/images/camera.png' bindtap='getIdInfo' hidden="{{taxInfo.certification_status=='active'}}"></image>
-            <input class='input_wrap float_right' disabled="{{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' disabled="{{taxInfo.certification_status=='active'}}" placeholder="请输入证照号码" value="{{card_number}}" name='id_card_no' maxlength='18' bindblur='idcardblur' bindinput = 'bindinputcardnum' type='idcard'></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>
@@ -91,7 +91,7 @@
         <view class='item_body'>
           <text class='red_star_right_10'>*</text>
           <text class='text_777_30 float_left' style='line-height: 90rpx'>手机号码</text>
-          <input class='input_wrap float_right' placeholder="请输入手机号" value='{{mobile}}' name='mobile' type='number' maxlength='11' bindblur='bindinputmobile'></input>
+          <input class='input_wrap float_right' placeholder="请输入手机号" value='{{mobile}}' name='mobile' type='number' maxlength='11' bindblur='bindinputmobile' type='number'></input>
         </view>
 
         <!-- 非必填部分02 -->
@@ -148,14 +148,14 @@
           <view class="divide_line_30"></view>
           <view class='item_body'>
             <text class='text_666_30 float_left head_in' style='line-height: 90rpx'>银行账号</text>
-            <input class='input_wrap float_right' name='bank_account' value='{{taxInfo.bank_account}}' placeholder-class='text_999_30' placeholder='请输入银行账号' maxlength='24'></input>
+            <input class='input_wrap float_right' name='bank_account' value='{{taxInfo.bank_account}}' placeholder-class='text_999_30' placeholder='请输入银行账号' maxlength='24' type='number'></input>
           </view>
           <view class="divide_line_30"></view>
           <template is="picker_cell_normal" data="{{...disabilityInfo}}" />
           <view class="divide_line_30" hidden="{{disabilityInfo.selected!='是'}}"></view>
           <view class='item_body' hidden="{{disabilityInfo.selected!='是'}}">
             <text class='text_666_30 float_left head_in'  style='line-height: 90rpx'>残疾证号</text>
-            <input class='input_wrap float_right' name='disability_no' type='number' value='{{taxInfo.disability_no}}' placeholder-class='text_999_30' placeholder='请输入残疾证号' maxlength='24'></input>
+            <input class='input_wrap float_right' name='disability_no' value='{{taxInfo.disability_no}}' placeholder-class='text_999_30' placeholder='请输入残疾证号' maxlength='24'></input>
           </view>
           <view class="divide_line_30"></view>
          
@@ -163,7 +163,7 @@
           <view class="divide_line_30" hidden="{{lieshuInfo.selected!='是'}}"></view>
           <view class='item_body' hidden="{{lieshuInfo.selected!='是'}}">
             <text class='text_666_30 float_left head_in'  style='line-height: 90rpx'>烈属证号</text>
-            <input class='input_wrap float_right' name='martyr_family_no' type='number' value='{{taxInfo.martyr_family_no}}' placeholder-class='text_999_30' placeholder='请输入烈属证号' maxlength='24'></input>
+            <input class='input_wrap float_right' name='martyr_family_no' value='{{taxInfo.martyr_family_no}}' placeholder-class='text_999_30' placeholder='请输入烈属证号' maxlength='24'></input>
           </view>
           <view class="divide_line_30"></view>
           

@@ -135,6 +135,10 @@ function analyzeIDCard(IDCard){
   //返回性别和年龄
   return sexAndAge;
 }
+function isMobile(mobile) {
+  var regMobile = /^(13[0-9]|14[5-9]|15[012356789]|166|17[0-8]|18[0-9]|19[8-9])[0-9]{8}$/;
+  return regMobile.test(mobile)
+}
 
 module.exports = {
   formatTime: formatTime,
@@ -146,5 +150,6 @@ module.exports = {
   dayFormString: dayFormString,
   isIDCardNum: isIDCardNum,
   curDateTime: curDateTime,
-  analyzeIDCard: analyzeIDCard
+  analyzeIDCard: analyzeIDCard,
+  isMobile: isMobile
 }