weapps-plugin-jingtong-verify 1.4.2 → 1.4.3

package/README.md

@@ -1,2 +1,2 @@
 # SDK #
-1.4.1-dev
+1.4.2

package/package.json

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

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

@@ -25,6 +25,8 @@ Page({
       nation_name: '中国',
       sur_name: '', // 姓
       first_name: '', // 名
+      sur_name_en: '', // 姓（国外护照）
+      first_name_en: '', // 名（国外护照）
       sex: '', // 性别
       birthday: '', // 出生日期
       cid_expire_date: '', // 护照有效期
@@ -122,7 +124,7 @@ Page({
       },
       '700': {
         currentAuthType: 'ForeignPassortAuth',
-        rules: rulesConfig.ForeignPassortRulesFace('en')
+        rules: rulesConfig.ForeignPassortRules('en')
       }
     },
     rules: rulesConfig.chinaRules('zh_CN'),
@@ -172,7 +174,21 @@ Page({
     // 标记港澳居民来往内地通行证存在回显的session信息
     // exitHmSession: false,
     // HmSession: {}
-    showForeignTip: false
+    showForeignTip: false,
+    // (国外)surname自定义校验状态，傻逼数广傻逼组件逼的
+    sur_name_state: {
+      valid: true,
+      msg: ''
+    },
+    // (国外)givenName自定义校验状态，傻逼数广傻逼组件逼的
+    first_name_state: {
+      valid: true,
+      msg: ''
+    },
+    // 是否显示自定义校验提示
+    showCustomTips: false,
+    // 自定义校验提示文本
+    customTipsMsg: ''
   },
 
   /**
@@ -521,6 +537,9 @@ Page({
           [`formData.${starId}`]: ''
         })
       }
+      if (['sur_name_en', 'first_name_en'].includes(formId)) {
+        this.validateFullname()
+      }
     }
   },
 
@@ -547,6 +566,8 @@ Page({
           nation_name: '',
           sur_name: '',
           first_name: '',
+          sur_name_en: '',
+          first_name_en: '',
           sex: '',
           birthday: '',
           cid_expire_date: '',
@@ -663,33 +684,78 @@ Page({
   },
 
   async handleFormSubmit(e) {
-    if (!e.detail.validStatus) {
+    // 自定义校验结果
+    const formValid = e.detail.validStatus
+    let 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 (showCustomTips) {
+        this.setData({
+          showCustomTips: true,
+          customTipsMsg: customValid.msg
+        }, () => {
+          // 3秒后关闭
+          setTimeout(() => {
+            this.setData({
+              showCustomTips: false,
+              customTipsMsg: ''
+            });
+          }, 3500);
+        })
+      }
       return
     }
     wx.showLoading({
       title: '加载中…',
       mask: true
     })
-
+    // 处理参数
     console.log('删除“姓名、证件号码、护照号码、手机号码”的前后空格')
     let { name, id_card_number, sur_name, first_name, passport_number, phone, cid_type } = this.data.formData
-
     this.setData({
       ['formData.name']: name.trim(),
-      ['formData.sur_name']: sur_name.trim(),
-      ['formData.first_name']: first_name.trim(),
       ['formData.passport_number']: passport_number.trim(),
-      ['formData.phone']: phone.trim(),
-      ['formData.id_card_number']: id_card_number.trim()
+      ['formData.phone']: phone.trim()
     })
-
     if (cid_type === '700') {
-      console.log('删除“外国人护照号码”中间空格')
+      // 外国护照，sur_name和first_name需要特殊处理
+      let { sur_name_en, first_name_en } = this.data.formData
+      if (sur_name_en == null || sur_name_en === '') {
+        sur_name_en = ' '
+      } else {
+        sur_name = sur_name_en.trim()
+      }
+      if (first_name_en == null || first_name_en === '') {
+        first_name_en = ' '
+      } else {
+        first_name_en = first_name_en.trim()
+      }
       this.setData({
-        ['formData.id_card_number']: id_card_number.replace(/\s+/g, '')
+        ['formData.sur_name']: sur_name_en,
+        ['formData.first_name']: first_name_en,
+        // 删除“外国人护照号码”中间空格
+        ['formData.id_card_number']: id_card_number.replace(/\s+/g, '').trim()
+      })
+    } else {
+      this.setData({
+        ['formData.sur_name']: sur_name.trim(),
+        ['formData.first_name']: first_name.trim(),
+        ['formData.id_card_number']: id_card_number.trim()
       })
     }
-    
     console.log('入参', this.data.formData)
 
     let currentAuthType = this.data.currentAuthType
@@ -1379,5 +1445,90 @@ Page({
     this.setData({
       showForeignTip: false
     })
-  }
+  },
+
+    // 验证sur_name和first_name
+  validateFullname() {
+    const {
+      sur_name_en: sur_name,
+      first_name_en: first_name
+    } = this.data.formData
+    // 两个都没填
+    if ((sur_name == null || sur_name === '') && (first_name == null || first_name === '')) {
+      const msgEmpty = 'Please fill in surname or given name';
+      this.setData({
+        sur_name_state: {
+          valid: false,
+          msg: msgEmpty
+        },
+        first_name_state: {
+          valid: false,
+          msg: msgEmpty
+        }
+      })
+      return {
+        valid: false,
+        msg: msgEmpty
+      }
+    }
+    this.setData({
+      sur_name_state: {
+        valid: true,
+        msg: ''
+      },
+      first_name_state: {
+        valid: false,
+        msg: ''
+      }
+    })
+    // 其中一个填了，或者两个都填了
+    let sur_name_flag = true
+    let msg = 'Please enter capital letters'
+    if (sur_name != null && sur_name !== '') {
+      const valid = utils.validate.checkName(sur_name, cidType)
+      if (valid.data) {
+        sur_name_flag = true
+      } else {
+        this.setData({
+          sur_name_state: {
+            valid: false,
+            msg
+          }
+        })
+        sur_name_flag = false
+      }
+    }
+    let first_name_flag = true
+    if (first_name != null && first_name !== '') {
+      const valid = utils.validate.checkName(first_name, cidType)
+      if (valid.data) {
+        first_name_flag = true
+      } else {
+        this.setData({
+          first_name_state: {
+            valid: false,
+            msg
+          }
+        })
+        first_name_flag = false
+      }
+    }
+    if (sur_name_flag && first_name_flag) {
+      this.setData({
+        sur_name_state: {
+          valid: true,
+          msg: ''
+        },
+        first_name_state: {
+          valid: false,
+          msg: ''
+        }
+      })
+    }
+    const valid = sur_name_flag && first_name_flag
+    return {
+      valid,
+      msg: valid ? '' : msg
+    }
+  },
 })

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

@@ -11,7 +11,8 @@
     "card-modal": "../../components/card-modal/card-modal",
     "tip-modal": "../../components/tip-modal/tip-modal",
     "face-error-modal": "../../components/face-error-modal/face-error-modal",
-    "g-switch": "../../components/gsd-ui/g-switch/index"
+    "g-switch": "../../components/gsd-ui/g-switch/index",
+    "g-tips": "../../components/gsd-ui/g-tips/index"
   },
   "navigationBarTitleText": "身份验证"
 }

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

@@ -1,3 +1,8 @@
+<view wx:if="showCustomTips" class="custom-tips">
+    <g-tips position="fixed" is-show="{{showCustomTips}}" status="warn" closeable catch:close="handleTipsClose">
+      {{customTipsMsg}}
+    </g-tips>
+</view>
 <view class="{{ language == 'en' ? 'en-page' : ''}}">
   <view class="top-box">
     <view class="img-box">
@@ -363,25 +368,29 @@
       <!-- 姓 -->
       <view class="form-item-wrap">
         <g-input
-          id="sur_name"
+          id="sur_name_en"
           label="Surname"
           placeholder=""
-          value="{{ formData.sur_name }}"
+          value="{{ formData.sur_name_en }}"
           clearable="true"
+          _required="{{ false }}"
           bind:change="handleChange"
         />
+        <view wx:if="!sur_name_state.valid" class="form-item__status-message--warn">{{ sur_name_state.msg }}</view>
       </view>
 
       <!-- 名 -->
       <view class="form-item-wrap">
         <g-input
-          id="first_name"
+          id="first_name_en"
           label="Given names"
           placeholder=""
-          value="{{ formData.first_name }}"
+          value="{{ formData.first_name_en }}"
           clearable="true"
+          _required="{{ false }}"
           bind:change="handleChange"
         />
+        <view wx:if="!first_name_state.valid" class="form-item__status-message--warn">{{ first_name_state.msg }}</view>
       </view>
 
       <!-- 性别 -->

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

@@ -114,4 +114,21 @@
   width: 40rpx;
   height: 40rpx;
   flex-shrink: 0;
+}
+
+.form-item__status-message--warn {
+  color: #f13939;
+  font-size: 30rpx;
+  line-height: 40rpx;
+  margin-top: 10rpx;
+  padding-left: 40rpx;
+  padding-right: 40rpx;
+}
+
+.custom-tips {
+  position: fixed;
+  z-index: 905;
+  box-sizing: border-box;
+  top: 0rpx;
+  width: 100%;
 }

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

@@ -420,7 +420,7 @@ Page({
       if (vid1.valid) {
         return
       }
-      // 自定义校验字段没问题，获取表单错误列表
+      // 自定义校验字段有问题，获取表单错误列表
       const formErrList = e.detail.value
       // 计算是否单独弹出错误提示
       let showCustomTips = false

package/weapps-plugin-jingtong-verify/utils/rules.js

@@ -246,48 +246,48 @@ const ForeignPassortRules = (language) => {
   }
 }
 
-// 外国人护照（人脸识别用）
-const ForeignPassortRulesFace = (language) => {
-  const rules = dict.rules.foreignerRulesFace
-  const { id_card_number, sur_name, first_name } = rules
-  return {
-    id_card_number: [
-      { type: 'required', message: `${id_card_number.required[language]}` },
-      { type: 'id_card_number', message: `${id_card_number.validate[language]}` }
-    ],
-    nation: [
-      { type: 'required', message: `${rules.nation.required[language]}` }
-    ],
-    sur_name: [
-      { type: 'required', message: `${sur_name.required[language]}` },
-      { type: 'sur_name', message: `${sur_name.validate[language]}` }
-    ],
-    first_name: [
-      { type: 'required', message: `${first_name.required[language]}` },
-      { type: 'first_name', message: `${first_name.validate[language]}` }
-    ],
-    sex: [
-      { type: 'required', message: `${rules.sex[language]}` }
-    ],
-    birthday: [
-      { type: 'required', message: `${rules.birthday[language]}` }
-    ],
-    cid_expire_date: [
-      { type: 'required', message: `${rules.cid_expire_date[language]}` }
-    ],
-    phone: [
-      { type: 'required', message: `${rules.phone.required[language]}` }
-    ],
-    verify_expire_time: [
-      { type: 'required', message: `${verify_expire_time.required[language]}` },
-      { type: 'verify_expire_time', message: `${verify_expire_time.required[language]}` }
-    ],
-    agree: [
-      { type: 'required', message: `${agree.required[language]}` },
-      { type: 'agree', message: `${agree.required[language]}` }
-    ]
-  }
-}
+// 外国人护照（旧逻辑）
+// const ForeignPassortRulesFace = (language) => {
+//   const rules = dict.rules.foreignerRulesFace
+//   const { id_card_number, sur_name, first_name } = rules
+//   return {
+//     id_card_number: [
+//       { type: 'required', message: `${id_card_number.required[language]}` },
+//       { type: 'id_card_number', message: `${id_card_number.validate[language]}` }
+//     ],
+//     nation: [
+//       { type: 'required', message: `${rules.nation.required[language]}` }
+//     ],
+//     sur_name: [
+//       { type: 'required', message: `${sur_name.required[language]}` },
+//       { type: 'sur_name', message: `${sur_name.validate[language]}` }
+//     ],
+//     first_name: [
+//       { type: 'required', message: `${first_name.required[language]}` },
+//       { type: 'first_name', message: `${first_name.validate[language]}` }
+//     ],
+//     sex: [
+//       { type: 'required', message: `${rules.sex[language]}` }
+//     ],
+//     birthday: [
+//       { type: 'required', message: `${rules.birthday[language]}` }
+//     ],
+//     cid_expire_date: [
+//       { type: 'required', message: `${rules.cid_expire_date[language]}` }
+//     ],
+//     phone: [
+//       { type: 'required', message: `${rules.phone.required[language]}` }
+//     ],
+//     verify_expire_time: [
+//       { type: 'required', message: `${verify_expire_time.required[language]}` },
+//       { type: 'verify_expire_time', message: `${verify_expire_time.required[language]}` }
+//     ],
+//     agree: [
+//       { type: 'required', message: `${agree.required[language]}` },
+//       { type: 'agree', message: `${agree.required[language]}` }
+//     ]
+//   }
+// }
 
 module.exports = {
   chinaRules,
@@ -295,7 +295,6 @@ module.exports = {
   residenceAuthRules,
   cardRules,
   ForeignPassortRules,
-  ForeignPassortRulesFace,
   HMPassRulesForeign,
   HMORulesMore,
   residenceRules