weapps-plugin-jingtong-verify 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.1-dev",
+  "version": "1.4.2",
   "description": "",
   "main": "sdk.js",
   "author": "tongyirenzheng",

package/weapps-plugin-jingtong-verify/components/gsd-ui/g-input/index.js

@@ -130,7 +130,6 @@ Component({
         },
         // 内部校验 input
         validateInput() {
-            console.log('=========内部校验=======')
             if (!this.id) {
                 throw new Error('请提供需要校验的组件 ID');
             }

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

@@ -131,6 +131,64 @@ const rules = {
     }
   },
 
+  // 外国护照(人脸识别)
+  foreignerRulesFace: {
+    id_card_number: {
+      required: {
+        zh_CN: '请输入护照号码',
+        en: 'Please enter your passport No.'
+      },
+      validate: {
+        zh_CN: '证件号码不允许汉字、全角字符、特殊字符',
+        en: 'Please enter your passport No.'
+      }
+    },
+    nation: {
+      required: {
+        zh_CN: '请选择国籍',
+        en: 'Please select your nationality'
+      }
+    },
+    sur_name: {
+      required: {
+        zh_CN: '请输入姓',
+        en: 'Please enter your surname'
+      },
+      validate: {
+        zh_CN: '不能输入小写字母',
+        en: 'Please enter capital letters'
+      },
+    },
+    first_name: {
+      required: {
+        zh_CN: '请输入名',
+        en: 'Please enter your given names'
+      },
+      validate: {
+        zh_CN: '不能输入小写字母',
+        en: 'Please enter capital letters'
+      },
+    },
+    sex: {
+      zh_CN: '请选择性别',
+      en: 'Please select your gender information'
+    },
+    birthday: {
+      zh_CN: '请选择出生日期',
+      en: 'Please select your date of birth'
+    },
+    cid_expire_date: {
+      zh_CN: '请选择护照有效期',
+      en: 'Please select the expiration date of your passport'
+    },
+    phone: {
+      required: {
+        zh_CN: '请输入手机号码',
+        en: 'Please enter your mobile phone number'
+      }
+    }
+  },
+
   // 银行卡
   cardRules: {
     id_card_number: {
@@ -200,4 +258,6 @@ const rules = {
   }
 }
 
-module.exports = { rules }
+module.exports = {
+  rules
+}

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

@@ -122,7 +122,7 @@ Page({
       },
       '700': {
         currentAuthType: 'ForeignPassortAuth',
-        rules: rulesConfig.ForeignPassortRules('en')
+        rules: rulesConfig.ForeignPassortRulesFace('en')
       }
     },
     rules: rulesConfig.chinaRules('zh_CN'),

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

@@ -1,9 +1,14 @@
 // weapps-plugin-jingtong-verify/pages/face-verify/index.js
 const jingtongVerifyRequest = require('../../utils/request')
 const utils = require("../../utils/index")
-const { flow } = require("@wecity/weda-plugin-utils");
+const {
+  flow
+} = require("@wecity/weda-plugin-utils");
 const rulesConfig = require("../../utils/rules")
-import { SDKTrack, setAccountInfo } from '../../utils/QDTrackerNew/QDTrackerMain'
+import {
+  SDKTrack,
+  setAccountInfo
+} from '../../utils/QDTrackerNew/QDTrackerMain'
 let cidType = '700'
 
 Page({
@@ -14,7 +19,7 @@ Page({
     language: 'en', // 语言环境：英文
     formData: {
       cid_type: '700', // 证件类型
-      id_card_number: '', 
+      id_card_number: '',
       nation: '', // 国籍
       nation_name: '',
       sur_name: '', // 姓
@@ -28,28 +33,43 @@ Page({
       isbind: 1
     },
     needUnite: '', // 是否需要串联起来
-    cidTypeRange: [
-      { name: 'International passport', value: '700' } // 外国护照
+    cidTypeRange: [{
+        name: 'International passport',
+        value: '700'
+      } // 外国护照
     ],
-    sexRange: [
-      { name: 'Male', value: 1 },
-      { name: 'Female', value: 2 }
+    sexRange: [{
+        name: 'Male',
+        value: 1
+      },
+      {
+        name: 'Female',
+        value: 2
+      }
     ],
-    loginTimeRangeEn: [
-      { name: 'Keep me logged in for 1 day', value: 24 },
-      { name: 'Keep me logged in for 7 days', value: 168 },
-      { name: 'Keep me logged in for 30 days', value: 720 }
+    loginTimeRangeEn: [{
+        name: 'Keep me logged in for 1 day',
+        value: 24
+      },
+      {
+        name: 'Keep me logged in for 7 days',
+        value: 168
+      },
+      {
+        name: 'Keep me logged in for 30 days',
+        value: 720
+      }
     ],
     validateType: {
       id_card_number(value) {
         return utils.validate.checkCid(value, cidType).data
       },
-      sur_name(value) {
-        return utils.validate.checkName(value, cidType).data
-      },
-      first_name(value) {
-        return utils.validate.checkName(value, cidType).data
-      }
+      // surName(value) {
+      //   return utils.validate.checkName(value, cidType).data
+      // },
+      // firstName(value) {
+      //   return utils.validate.checkName(value, cidType).data
+      // }
     },
     rules: rulesConfig.ForeignPassortRules('en'),
     // 打开文档的防抖操作
@@ -79,7 +99,127 @@ Page({
     // 记录是否已经登录成功
     hadSuccessLogin: false,
     // 该操作会触发小程序的销毁回调
-    exitedState: true
+    exitedState: true,
+    // surname自定义校验状态，傻逼数广傻逼组件逼的
+    sur_name_state: {
+      valid: true,
+      msg: ''
+    },
+    // givenName自定义校验状态，傻逼数广傻逼组件逼的
+    first_name_state: {
+      valid: true,
+      msg: ''
+    },
+    showCustomTips: false,
+    customTipsMsg: ''
+  },
+
+  // 验证sur_name和first_name
+  validateFullname() {
+    const {
+      sur_name,
+      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
+    }
+  },
+
+  // 自定义change事件，sur_name和first_name专用
+  handleCustomChange(e) {
+    let value = e.detail.value
+    let field = e.target.id
+    // 删除前后空格
+    if (typeof value === 'string') {
+      value = value.trim()
+    }
+    this.setData({
+      [`formData.${field}`]: value,
+    })
+    // 临时存储表单数据
+    this.saveFormDataTemp()
+    this.validateFullname()
+  },
+
+  // 关闭提示条
+  handleTipsClose(e) {
+    this.setData({
+      showCustomTips: e.detail.isShow
+    });
   },
 
   /**
@@ -93,6 +233,7 @@ Page({
     this.setData({
       needUnite: options.needUnite || 'true'
     })
+
     // 清空本地Temp数据
     wx.setStorageSync('tif.formDataTemp', '')
 
@@ -103,7 +244,7 @@ Page({
   // 生命周期函数--监听页面显示
   onShow: function () {
     wx.hideShareMenu()
-    
+
     // 获取国籍
     let pages = getCurrentPages()
     let currentPage = pages[pages.length - 1]
@@ -145,7 +286,10 @@ Page({
       this.setData({
         canOpenPdf: false
       })
-      let { name, file } = e.currentTarget.dataset
+      let {
+        name,
+        file
+      } = e.currentTarget.dataset
       console.log('文件地址', `https://js.jt.beijing.gov.cn/jt/tiffile/${file}.pdf`)
       utils.openDoc({
         url: `https://js.jt.beijing.gov.cn/jt/tiffile/${file}.pdf`,
@@ -177,7 +321,6 @@ Page({
     // 删除前后空格
     if (typeof value === 'string' && formId !== 'cid_type') {
       value = value.trim()
-      console.log('==删除前后空格==', value, '==删除前后空格==')
     }
 
     this.setData({
@@ -189,7 +332,6 @@ Page({
 
   // 临时存储用户填写的表单信息
   saveFormDataTemp() {
-    console.log('临时存储用户填写的表单信息')
     let {
       formData
     } = this.data
@@ -249,7 +391,9 @@ Page({
         },
         fail: err => {
           console.log('外国人护照核验接口获取失败', err)
-          let { errmsg } = JSON.parse(err)
+          let {
+            errmsg
+          } = JSON.parse(err)
           wx.showToast({
             title: errmsg || '获取核验信息接口失败',
             icon: 'none',
@@ -270,20 +414,70 @@ Page({
   },
 
   async handleFormSubmit(e) {
-    if (!e.detail.validStatus) {
+    const vid1 = this.validateFullname()
+    if (!e.detail.validStatus || !vid1.valid) {
+      // 如果自定义校验字段没问题，则跳过
+      if (vid1.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: vid1.msg
+        }, () => {
+          // 3秒后关闭
+          setTimeout(() => {
+            this.setData({
+              showCustomTips: false,
+              customTipsMsg: ''
+            });
+          }, 3500);
+        })
+      }
       return
     }
+    this.setData({
+      showCustomTips: false,
+      customTipsMsg: ''
+    })
     wx.showLoading({
       title: '加载中…',
       mask: true
     })
 
     console.log('删除“姓名、证件号码、护照号码、手机号码”的前后空格')
-    let { id_card_number, sur_name, first_name, phone, cid_type } = this.data.formData
-
+    let {
+      id_card_number,
+      sur_name,
+      first_name,
+      phone,
+      cid_type
+    } = this.data.formData
+    // sur_name值为空，增加空格
+    if (sur_name == null || sur_name === '') {
+      sur_name = ' '
+    } else {
+      sur_name = sur_name.trim()
+    }
+    // first_name值为空，增加空格
+    if (first_name == null || first_name === '') {
+      first_name = ' '
+    } else {
+      first_name = first_name.trim()
+    }
     this.setData({
-      ['formData.sur_name']: sur_name.trim(),
-      ['formData.first_name']: first_name.trim(),
+      ['formData.sur_name']: sur_name,
+      ['formData.first_name']: first_name,
       ['formData.phone']: phone.trim()
     })
 
@@ -294,7 +488,7 @@ Page({
       })
     }
     console.log('入参', this.data.formData)
-    
+
     console.log('外国人护照核验')
     // 外国人护照核验
     this.handlePassortAuth()
@@ -391,11 +585,13 @@ Page({
       })
       return
     }
-    
+
     const [err, res] = await utils.awaitTo(jingtongVerifyRequest.passportAuth(formData))
     if (err) {
       console.log('外国人护照核验接口认证失败', err)
-      let { errmsg } = JSON.parse(err)
+      let {
+        errmsg
+      } = JSON.parse(err)
       wx.showToast({
         title: errmsg || '认证失败',
         icon: 'none',
@@ -435,7 +631,9 @@ Page({
         // 埋点上报事件：自然人登录
         this.loginTracker(2, this.data.formData.cid_type)
 
-        let { errmsg } = JSON.parse(err)
+        let {
+          errmsg
+        } = JSON.parse(err)
         wx.showToast({
           title: errmsg || 'auth fail',
           icon: 'none',
@@ -457,7 +655,13 @@ Page({
       return
     }
 
-    const { face_time, realname_time, cid, has_phone, certType } = session
+    const {
+      face_time,
+      realname_time,
+      cid,
+      has_phone,
+      certType
+    } = session
     if ((!face_time && !realname_time) || !cid) {
       wx.showToast({
         title: `Login has expired, please log in again: ${this.data.formData.cid_type}`,
@@ -468,7 +672,7 @@ Page({
     }
 
     wx.showToast({
-      title: isEn ? 'Verification successful, redirecting...': '验证成功, 跳转中…',
+      title: isEn ? 'Verification successful, redirecting...' : '验证成功, 跳转中…',
       icon: 'none',
       duration: 5000,
       mask: true
@@ -598,7 +802,7 @@ Page({
     this.setData({
       modalStatus,
       showModal: true
-    },() => {
+    }, () => {
       wx.hideLoading()
     })
   },
@@ -610,7 +814,7 @@ Page({
     })
   },
 
-  onUnload: function() {
+  onUnload: function () {
     // 页面卸载时的逻辑处理
     console.log('======页面即将卸载======', this.data.hadSuccessLogin);
     if (!this.data.hadSuccessLogin) {
@@ -631,7 +835,7 @@ Page({
     }, 2000)
   },
 
-  onSaveExitState: function() {
+  onSaveExitState: function () {
     // 小程序可能被销毁之前的逻辑处理
     if (!this.data.hadSuccessLogin && this.data.exitedState) {
       console.log('======小程序可能被销毁======')

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

@@ -1,5 +1,6 @@
 {
   "usingComponents": {
+    "g-tips": "../../components/gsd-ui/g-tips/index",
     "g-form": "../../components/gsd-ui/g-form/index",
     "g-input": "../../components/gsd-ui/g-input/index",
     "g-picker": "../../components/gsd-ui/g-picker/index",

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

@@ -1,4 +1,9 @@
 <view class="en-page">
+  <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="top-box">
     <view class="img-box">
       <image src="../../images/Frame.png" mode="aspectFit" class="img"></image>
@@ -58,8 +63,10 @@
           placeholder=""
           value="{{ formData.sur_name }}"
           clearable="true"
-          bind:change="handleChange"
+          _required="{{ false }}"
+          bind:input="handleCustomChange"
         />
+        <view wx:if="!sur_name_state.valid" class="form-item__status-message--warn">{{ sur_name_state.msg }}</view>
       </view>
 
       <view class="form-item-wrap">
@@ -69,8 +76,10 @@
           placeholder=""
           value="{{ formData.first_name }}"
           clearable="true"
-          bind:change="handleChange"
+          _required="{{ false }}"
+          bind:input="handleCustomChange"
         />
+        <view wx:if="!first_name_state.valid" class="form-item__status-message--warn">{{ first_name_state.msg }}</view>
       </view>
 
       <view class="form-item-wrap">

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

@@ -45,4 +45,21 @@
 
 .content-box {
   padding-bottom: 60rpx;
+}
+
+.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/utils/rules.js

@@ -207,6 +207,49 @@ const cardRules = (language) => {
 const ForeignPassortRules = (language) => {
   const rules = dict.rules.foreignerRules
   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: 'surName', message: `${sur_name.validate[language]}` }
+    // ],
+    // first_name: [
+    //   { type: 'required', message: `${first_name.required[language]}` },
+    //   { type: 'firstName', 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]}` },
@@ -252,6 +295,7 @@ module.exports = {
   residenceAuthRules,
   cardRules,
   ForeignPassortRules,
+  ForeignPassortRulesFace,
   HMPassRulesForeign,
   HMORulesMore,
   residenceRules