no message

pages/info/info.js

@@ -455,7 +455,7 @@ Page({
           // 新添加学历功能
           data.edu = that.data.index||0;
           console.log('data',data)
-          if (data.name == '' || data.name == 'null' || data.sex == "null" || data.sex == "" || data.birthday == '' || data.birthday == 'null' || data.edu == 0||data.idCard==""||data.ask_department==""||data.select==0){
+          if (data.name == '' || data.name == 'null' || data.sex == "null" || data.sex == "" || data.birthday == '' || data.birthday == 'null' || data.edu == 0||data.idCard==""||data.ask_department==""||data.hunfou==0){
             that.setData({
               payInfo: true
             })

pages/info1/info1.js

 var Api = require('../../utils/api.js');
+import { validateIdCard } from '../../utils/util'
 var app = getApp();
 
 Page({
@@ -328,7 +329,7 @@ Page({
       if (that.data.hosiptiaFlag) { // 非池州市人民医院
         data.hunfou = this.data.select; // 婚姻状况
         data.ask_department = this.data.username1; // 单位名称
-        data.serialNumber = this.data.usernumber;//编号
+        data.usernumber = this.data.usernumber;//编号
       } else { // 池州市人民医院
         data.fage = this.data.fage; // 父亲年龄
         data.foccupation = this.data.foccupation; //父亲职业
@@ -340,7 +341,7 @@ Page({
       }
 
       if (that.data.hosiptiaFlag) { // 非池州市人民医院
-        if (data.name == '' || data.name == 'null' || data.sex == "null" || data.sex == "" || data.birthday == '' || data.birthday == 'null' || data.edu == 0||data.idCard==""||data.ask_department==""||data.select==0) {
+        if (data.name == '' || data.name == 'null' || data.sex == "null" || data.sex == "" || data.birthday == '' || data.birthday == 'null' || data.edu == 0||data.idCard==""||data.ask_department==""||data.hunfou==0) {
           // wx.hideLoading()
           clearTimeout(timer1)
           that.setData({
@@ -349,6 +350,20 @@ Page({
           Api.alert('请完善信息');
           return;
         }
+        if( data.usernumber=='' || data.usernumber == 'null' || data.usernumber.length != 11){
+            that.setData({
+              payInfo: true
+            })
+            Api.alert('请填写正确的手机号');
+            return;
+          }
+          if(!validateIdCard(data.idCard)){
+            that.setData({
+              payInfo: true
+            })
+            Api.alert('请填写正确的身份证号');
+            return;
+          }
       } else {
         // console.log(data)
         if (data.name == '' || data.name == 'null' || data.sex == "null" || data.sex == "" || data.birthday == '' || data.birthday == 'null' || data.edu == 0 || data.fage.length < 1 || data.foccupation.length < 1 || data.fdegree.length < 1 || data.mage.length < 1 || data.moccupation.length < 1 || data.mdegree.length < 1 || data.house.length < 1) {

pages/info1/info1.wxml

@@ -49,8 +49,8 @@
           </picker>
         </view>
       </view>
-      <view class="partyone">编号
-        <input type='text' placeholder='请输入编号' bindinput="inputChange2" value='{{usernumber}}'></input>
+      <view class="partyone">联系方式
+        <input type='text' placeholder='请输入联系方式' bindinput="inputChange2" value='{{usernumber}}'></input>
       </view>
       <view class="partyone">
         身份证号