weapps-plugin-jingtong-verify 1.4.4 → 1.4.5

package/README.md

@@ -1,2 +1,2 @@
 # SDK #
-1.4.4
+1.4.5

package/package.json

@@ -2,7 +2,7 @@
   "name": "weapps-plugin-jingtong-verify",
   "pluginName": "weapps-plugin-jingtong-verify",
   "pluginType": "mp",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "description": "",
   "main": "sdk.js",
   "author": "tongyirenzheng",

package/weapps-plugin-jingtong-verify/pages/face-verify/face-verify.js

@@ -690,39 +690,46 @@ Page({
     })
   },
 
+  // 显示自定义校验错误提示
+  showCuntomErrTip(msg) {
+    this.setData({
+      showCustomTips: true,
+      customTipsMsg: msg
+    }, () => {
+      // 3秒后关闭
+      setTimeout(() => {
+        this.setData({
+          showCustomTips: false,
+          customTipsMsg: ''
+        });
+      }, 3500);
+    })
+  },
+
   async handleFormSubmit(e) {
-    // 自定义校验结果
     const formValid = e.detail.validStatus
-    let customValid = this.data.language !== 'en' ? { valid: true, msg: '' } : this.validateFullname()
+    const customValid = this.data.language !== 'en' ? { valid: true, msg: '' } : this.validateFullname()
     if (!formValid || !customValid.valid) {
-      // 如果自定义校验字段没问题，则跳过
-      if (customValid.valid) {
-        return
-      }
       // 自定义校验字段有问题，获取表单错误列表
       const formErrList = e.detail.value
-      // 计算是否单独弹出错误提示
-      let showCustomTips = false
-      if (formErrList && formErrList.length) {
-        showCustomTips = !formErrList.some(i => ["id_card_number", "nation"].includes(i.name))
-      } else {
-        showCustomTips = true
+      // 如果表单校验有问题，自定义校验没问题，则显示表单校验错误提示
+      if (!formValid && customValid.valid) {
+        this.showCuntomErrTip(formErrList[0].message)
+        return
       }
-      // 如果需要弹出，则弹出
-      if (showCustomTips) {
-        this.setData({
-          showCustomTips: true,
-          customTipsMsg: customValid.msg
-        }, () => {
-          // 3秒后关闭
-          setTimeout(() => {
-            this.setData({
-              showCustomTips: false,
-              customTipsMsg: ''
-            });
-          }, 3500);
-        })
+      // 如果表单校验没有问题，自定义校验有问题，则显示自定义校验错误提示
+      if (formValid && !customValid.valid) {
+        this.showCuntomErrTip(customValid.msg)
+        return
+      }
+      // 如果两者都有问题，则判断显示谁
+      let lastMsg = ''
+      if (formErrList.some(i => ["id_card_number", "nation"].includes(i.name))) {
+        lastMsg = formErrList[0].message
+      } else {
+        lastMsg = customValid.msg
       }
+      this.showCuntomErrTip(lastMsg)
       return
     }
     wx.showLoading({

package/weapps-plugin-jingtong-verify/pages/face-verify/face-verify.wxml

@@ -324,6 +324,7 @@
       id="form"
       model="{{ formData }}"
       rules="{{ rules }}"
+      showTips="{{ false }}"
       validateType="{{ validateType }}"
       primary-text="Submit"
       bind:submit="handleFormSubmit"

package/weapps-plugin-jingtong-verify/pages/passport-verify/passport-verify.js

@@ -413,37 +413,46 @@ Page({
     })
   },
 
+  // 显示自定义校验错误提示
+  showCuntomErrTip(msg) {
+    this.setData({
+      showCustomTips: true,
+      customTipsMsg: msg
+    }, () => {
+      // 3秒后关闭
+      setTimeout(() => {
+        this.setData({
+          showCustomTips: false,
+          customTipsMsg: ''
+        });
+      }, 3500);
+    })
+  },
+
   async handleFormSubmit(e) {
-    const vid1 = this.validateFullname()
-    if (!e.detail.validStatus || !vid1.valid) {
-      // 如果自定义校验字段没问题，则跳过
-      if (vid1.valid) {
-        return
-      }
+    const formValid = e.detail.validStatus
+    const customValid = this.validateFullname()
+    if (!e.detail.validStatus || !customValid.valid) {
       // 自定义校验字段有问题，获取表单错误列表
       const formErrList = e.detail.value
-      // 计算是否单独弹出错误提示
-      let showCustomTips = false
-      if (formErrList && formErrList.length) {
-        showCustomTips = !formErrList.some(i => ["id_card_number", "nation"].includes(i.name))
-      } else {
-        showCustomTips = true
+      // 如果表单校验有问题，自定义校验没问题，则显示表单校验错误提示
+      if (!formValid && customValid.valid) {
+        this.showCuntomErrTip(formErrList[0].message)
+        return
       }
-      // 如果需要弹出，则弹出
-      if (showCustomTips) {
-        this.setData({
-          showCustomTips: true,
-          customTipsMsg: vid1.msg
-        }, () => {
-          // 3秒后关闭
-          setTimeout(() => {
-            this.setData({
-              showCustomTips: false,
-              customTipsMsg: ''
-            });
-          }, 3500);
-        })
+      // 如果表单校验没有问题，自定义校验有问题，则显示自定义校验错误提示
+      if (formValid && !customValid.valid) {
+        this.showCuntomErrTip(customValid.msg)
+        return
+      }
+      // 如果两者都有问题，则判断显示谁
+      let lastMsg = ''
+      if (formErrList.some(i => ["id_card_number", "nation"].includes(i.name))) {
+        lastMsg = formErrList[0].message
+      } else {
+        lastMsg = customValid.msg
       }
+      this.showCuntomErrTip(lastMsg)
       return
     }
     this.setData({

package/weapps-plugin-jingtong-verify/pages/passport-verify/passport-verify.wxml

@@ -17,6 +17,7 @@
       id="form"
       model="{{ formData }}"
       rules="{{ rules }}"
+      showTips="{{ false }}"
       validateType="{{ validateType }}"
       primary-text="Submit"
       bind:submit="handleFormSubmit"