优化

@@ -143,8 +143,8 @@ App({
     // baseUrl: "http://192.144.144.220:20000/",
     // baseUrl: "http://154.8.229.55:20000/",
     // baseUrl: "http://47.110.250.177:20000/",
-    // baseUrl: "http://47.110.158.110:20000/",
-    baseUrl: "https://api.workai.com.cn/",
+    baseUrl: "http://47.110.158.110:20000/",
+    // baseUrl: "https://api.workai.com.cn/",
     OSSUrl: "", //"https://oss.workai.com.cn/",
     userInfo: null,
     hostInfo: null,

@@ -53,19 +53,19 @@ Page({
               duration: 1000
             })
           } else {
-            that.setData({
-              has_verify: false
-            })
-            // if (!res.data.need_verify) { //不需要再实名认证
-            //   that.setData({
-            //     has_verify: true
-            //   })
-            //   that.taxconfirm();
-            // } else {
-            //   that.setData({
-            //     has_verify: false
-            //   })
-            // }
+            // that.setData({
+            //   has_verify: false
+            // })
+            if (!res.data.need_verify) { //不需要再实名认证
+              that.setData({
+                has_verify: true
+              })
+              that.taxconfirm();
+            } else {
+              that.setData({
+                has_verify: false
+              })
+            }
           }
         }
       })

@@ -7,6 +7,9 @@ Page({
    * Page initial data
    */
   data: {
+    input_name: "",
+    input_card_number: "",
+
     facepath: '',
     already_getdata: false,
     front_card_info: {},
@@ -16,6 +19,11 @@ Page({
   },
 
   onLoad: function (options) {
+    console.log("options",options)
+    this.setData({
+      input_name:options.input_name,
+      input_card_number: options.input_card_number,
+    })
     this.initOSS()
   },
 
@@ -210,6 +218,15 @@ Page({
 
   gonext: function () {
     if (this.data.already_getdata) {
+      var id_Info = this.data.idInfo;
+      if(this.data.input_name!=id_Info.name){
+          this.showtoast("您输入的姓名与身份证照片不一致，请重试");
+          return;
+      }
+      if (this.data.input_card_number != id_Info.id_card_number) {
+        this.showtoast("您输入的证照号码与身份证照片不一致，请重试");
+        return;
+      }
       //提交数据 
       wx.request({
         url: baseUrl + 'uaa/v1/users/auth',
@@ -241,6 +258,16 @@ Page({
     }
   },
 
+  showtoast: function (title) {
+    wx.showToast({
+      title: title,
+      duration: 2000,
+      icon: 'none'
+      // image: '/images/error.png'
+    })
+  },
+
+
   /**
    * Lifecycle function--Called when page hide
    */

@@ -3,6 +3,7 @@ var format = require('../../../utils/util.js');
 const reg_18_Number = /^[0-9]{18}$/;
 const reg_9_n_a = /^([a-zA-z]|[0-9]){9}$/;
 const reg_15_n_a = /^([a-zA-z]|[0-9]){15}$/;
+const reg_20_n_a = /^([a-zA-z]|[0-9]){20}$/;
 var baseUrl = getApp().globalData.baseUrl;
 let Authorization = '';
 Page({
@@ -94,15 +95,9 @@ Page({
         this.showtoast('请输入姓名');
         return
       }
-      //todo 需要跟喜文确认 中英文姓名规则
       name = name.replace(/(^\s*)|(\s*$)/g, "");
-      if (type.indexOf('中国护照') > -1) {
-        if (!regname_c.test(name)) {
-          this.showtoast('请输入正确的中文名');
-          return
-        }
-      } else if (!regname_e.test(name)) {
-        this.showtoast('请输入正确的英文名');
+      if (!regname_c.test(name) && !regname_e.test(name)) {
+        this.showtoast('请输入正确的姓名');
         return
       }
       if (idCardNo.length < 1) {
@@ -110,14 +105,17 @@ Page({
         return
       }
       if (type.indexOf('居住证') > -1 && !reg_18_Number.test(idCardNo)) {
+        this.showtoast('证照号码有误0');
+        return
+      }else if (type.indexOf('中国护照') > -1 && !reg_9_n_a.test(idCardNo)) {
         this.showtoast('证照号码有误');
         return
-      }
-      if (type.indexOf('中国护照') > -1 && !reg_9_n_a.test(idCardNo)) {
+      }else if (type.indexOf('永久居留') > -1 && !reg_15_n_a.test(idCardNo)) {
         this.showtoast('证照号码有误');
         return
       }
-      if (type.indexOf('永久居留') > -1 && !reg_15_n_a.test(idCardNo)) {
+      
+      if (type.indexOf('居住证') < 0 && type.indexOf('中国护照') < 0 && type.indexOf('永久居留') < 0 &&!reg_20_n_a.test(idCardNo)) {
         this.showtoast('证照号码有误');
         return
       }
@@ -135,8 +133,8 @@ Page({
           'content-type': 'application/json',
           "Authorization": Authorization
         },
-        success: function (res) {
-          console.log("SUCC",res.data)
+        success: function(res) {
+          console.log("SUCC", res.data)
           if (res.data.code && res.data.code >= 300) {
             wx.navigateTo({
               url: 'verify_result/verify_result?result=fail',
@@ -167,7 +165,7 @@ Page({
         return;
       }
       wx.navigateTo({
-        url: 'verify_idcard/verify_idcard',
+        url: 'verify_idcard/verify_idcard?input_name=' + name + '&input_card_number=' + idCardNo,
       })
     }
   },

@@ -44,12 +44,13 @@
     <view class="divide_line_30"></view>
 
     <view style='padding-left: 30rpx;padding-right: 30rpx;'>
-      <text class='text_777_30 float_left' style='line-height: 90rpx'>身份证件号码</text>
       <view wx:if="{{is_foreigner=='false'}}">
-        <input class='input_wrap' placeholder='请输入您的身份证号码' placeholder-class='text_999_30' name='id_card_no' maxlength='18' value='{{card_number}}'  bindinput="bindinputcardnum"  type='idcard'></input>
+        <text class='text_777_30 float_left' style='line-height: 90rpx'>身份证号码</text>
+        <input class='input_wrap' placeholder='请输入您的身份证号码' placeholder-class='text_999_30' name='id_card_no' maxlength='18' value='{{card_number}}' bindinput="bindinputcardnum" type='idcard'></input>
       </view>
       <view wx:else>
-        <input class='input_wrap' placeholder='请输入您的证件号码' placeholder-class='text_999_30' name='id_card_no' maxlength='20' value='{{card_number}}'  bindinput="bindinputcardnum" ></input>
+        <text class='text_777_30 float_left' style='line-height: 90rpx'>证照号码</text>
+        <input class='input_wrap' placeholder='请输入您的证件号码' placeholder-class='text_999_30' name='id_card_no' maxlength='20' value='{{card_number}}' bindinput="bindinputcardnum"></input>
       </view>
     </view>
   </view>

@@ -4,11 +4,12 @@
 		"ignore": []
 	},
 	"setting": {
-		"urlCheck": true,
+		"urlCheck": false,
 		"es6": true,
 		"postcss": true,
 		"minified": true,
-		"newFeature": true
+		"newFeature": true,
+		"checkInvalidKey": true
 	},
 	"compileType": "miniprogram",
 	"libVersion": "2.4.2",