weapps-plugin-jingtong-verify 1.4.0 → 1.4.1

package/package.json

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

package/weapps-plugin-jingtong-verify/pages/bind-phone/bind-phone.wxml

@@ -12,6 +12,9 @@
     </view>
   </view>
   <view class="bottom-box">
-    <button class="btn" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">从微信获取，完成绑定</button>
+    <button class="btn" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">
+      <text class="cn">从微信获取，完成绑定</text>
+      <text class="en">You can access your phone number from WeChat to complete the bonding process.</text> 
+    </button>
   </view>
 </view>

package/weapps-plugin-jingtong-verify/pages/bind-phone/bind-phone.wxss

@@ -8,10 +8,23 @@
   background: rgba(206, 0, 34, 1);
   color: #ffffff;
   width: 686rpx !important;
-  height: 96rpx;
   border-radius: 16rpx;
-  font-size: 34rpx;
+  padding: 24rpx 28rpx;
   box-shadow: 0 24rpx 48rpx 0 rgba(206, 0, 34, 0.15);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  font-weight: normal;
+}
+.btn .cn {
+  font-size: 34rpx;
+  line-height: 40rpx;
+  margin-bottom: 12rpx;
+}
+.btn .en {
+  font-size: 26rpx;
+  line-height: 30rpx;
 }
 .content-box {
   display: flex;

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

@@ -5,6 +5,7 @@ const { flow } = require("@wecity/weda-plugin-utils");
 const rulesConfig = require("../../utils/rules")
 import { SDKTrack, setAccountInfo } from '../../utils/QDTrackerNew/QDTrackerMain'
 let cidType = '111'
+let Nation = 'CHN'
 
 Page({
   /**
@@ -71,7 +72,7 @@ Page({
     ],
     validateType: {
       id_card_number(value) {
-        return utils.validate.checkCid(value, cidType).data
+        return utils.validate.checkCid(value, cidType, Nation).data
       },
       name(value) {
         return utils.validate.checkName(value, cidType).data
@@ -83,7 +84,7 @@ Page({
         return utils.validate.checkName(value, cidType).data
       },
       passport_number(value) {
-        return utils.validate.checkHmtPassport(value, cidType).data
+        return utils.validate.checkHmtPassport(value, cidType, Nation).data
       },
     },
     rulesMap: {
@@ -171,6 +172,7 @@ Page({
     // 标记港澳居民来往内地通行证存在回显的session信息
     // exitHmSession: false,
     // HmSession: {}
+    showForeignTip: false
   },
 
   /**
@@ -204,6 +206,14 @@ Page({
       // 设置用户账号信息
       setAccountInfo(res.openid)
 
+      const hideForeignTip = wx.getStorageSync('tif.hideForeignTip') || 0
+      console.log('hideForeignTip', hideForeignTip)
+      if (!cid && hideForeignTip !== '1') {
+        this.setData({
+          showForeignTip: true
+        })
+      }
+
        if (cid_type === '111' && cid && name) {
         //  回填身份证类型
         this.setData({
@@ -254,6 +264,7 @@ Page({
   // 三证照：港澳通行证、台湾通行证、华侨护照
   matchOptionsRule () {
     let { cid_type, nation, sbSwitch } = this.data.formData
+    Nation = nation
 
     if (cid_type === '516' || cid_type === '511' || cid_type === '414') {
        if (nation !== 'CHN' && cid_type === '516') {
@@ -381,6 +392,7 @@ Page({
     let { cid_type, nation, nation_name } = this.data.formData
     let { rules, currentAuthType } = this.data.rulesMap[cid_type]
     console.log('核验源', currentAuthType)
+    Nation = nation
     // 默认【中国】
     if (cid_type === '516' || cid_type === '511' || cid_type === '414') {
       nation = 'CHN'
@@ -405,6 +417,7 @@ Page({
     if (formDataTemp && formDataTemp[cid_type]) {
       console.log('存在可回填的temp数据', formDataTemp[cid_type])
       let formData = Object.assign(formDataOld, formDataTemp[cid_type])
+      Nation = formData.nation
       this.setData({
         formData
       })
@@ -523,6 +536,7 @@ Page({
     wx.setStorageSync('tif.formDataTemp', formDataTemp)
     if (needFull) {
       // 是否需要回传
+      Nation = ''
       this.setData({
         formData: {
           cid_type: newCidType,
@@ -613,6 +627,7 @@ Page({
               verify_expire_time: verify_expire_time && Number(verify_expire_time) || ''
             }
             formData = Object.assign(formData, res, passportOldData)
+            Nation = nation
             this.setData({
               formData,
               passportOldData
@@ -1356,5 +1371,13 @@ Page({
     })
     // 处理三证照的正则问题
     this.matchOptionsRule()
+  },
+
+  // 隐藏提示
+  closeForeignTip() {
+    wx.setStorageSync('tif.hideForeignTip', '1')
+    this.setData({
+      showForeignTip: false
+    })
   }
 })

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

@@ -29,6 +29,12 @@
         ></g-picker>
       </view>
 
+      <!-- 外国人提示 -->
+      <view class="foreign-tip" wx:if="{{ formData.cid_type === '111' && showForeignTip }}">
+        <text>For foreign nationals, please click here to select International passport.</text>
+        <image src="../../images/close-circle.png" mode="widthFix" bind:tap="closeForeignTip" />
+      </view>
+
       <!-- 银行卡核验(港澳/台居住证) -->
       <view wx:if="{{ currentAuthType === 'cardAuth' }}">
         <view class="form-tip">
@@ -88,7 +94,7 @@
             placeholder="请输入本人姓名"
             value="{{ formData.strName || formData.name }}"
             clearable="{{ false }}"
-            showEye="{{ true }}"
+            showEye="{{ formData.name }}"
             isOpen="{{ !formData.strName }}"
             bind:change="handleChange"
             showQuestion="{{ true }}"
@@ -105,7 +111,7 @@
             placeholder="请输入本人证件号码"
             value="{{ formData.strCid || formData.id_card_number }}"
             clearable="{{ false }}"
-            showEye="{{ true }}"
+            showEye="{{ formData.id_card_number }}"
             isOpen="{{ !formData.strCid }}"         
             bind:change="handleChange"
             showQuestion="{{ true }}"

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

@@ -80,4 +80,38 @@
   background: linear-gradient(  #F5FAFF 0%, #F1F7FF 100%);
   padding: 0 20rpx 20rpx;
   box-sizing: border-box;
+}
+
+.foreign-tip {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  margin: -12rpx 32rpx 0;
+  background: #EEF2F6;
+  border-radius: 8rpx;
+  padding: 24rpx 16rpx 24rpx 24rpx;
+  position: relative;
+}
+.foreign-tip::before {
+  content: '';
+  position: absolute;
+  border-left: 17rpx solid transparent;
+  border-top: 17rpx solid transparent;
+  border-bottom: 17rpx solid #EEF2F6;
+  border-right: 17rpx solid transparent;
+  top: -30rpx;
+  right: 18rpx;
+
+}
+.foreign-tip text {
+  font-weight: 500;
+  font-size: 26rpx;
+  color: #62667A;
+  line-height: 30rpx;
+}
+.foreign-tip image {
+  width: 40rpx;
+  height: 40rpx;
+  flex-shrink: 0;
 }

package/weapps-plugin-jingtong-verify/pages/log-off/log-off.js

@@ -96,6 +96,7 @@ Page({
     wx.removeStorageSync('tif.faceTimeStamp')
     wx.removeStorageSync('tif.CAUniqueId')
     wx.removeStorageSync('tif.lastLoginTime')
+    wx.removeStorageSync('tif.hideForeignTip')
     
     flow.navigateTo({
       url: '../logoff-success/logoff-success',

package/weapps-plugin-jingtong-verify/pages/user-info/user-info.js

@@ -70,8 +70,8 @@ Page({
             sex = '女'
           }
         }
-        // 港澳/台通行证、华侨护照和外国护照四类证件
-        const fourTypeCertList = ['516', '511', '414', '700']
+        // 港澳/台通行证、华侨护照三类证件
+        const fourTypeCertList = ['516', '511', '414']
         const fourTypeCert = fourTypeCertList.includes(cid_type) || false
 
         // 获取弹窗时间戳
@@ -83,6 +83,7 @@ Page({
           birthday = birth_date.slice(0, 4) + '-' + birth_date.slice(4, 6) + '-' + birth_date.slice(6, 8);
         }
         this.setData({
+          cid_type,
           sexIndex: sex === '未知' ? 0 : Number(res.sex) - 1,
           birthday,
           fourTypeCert,

package/weapps-plugin-jingtong-verify/pages/user-info/user-info.wxml

@@ -50,6 +50,13 @@
           </text>
         </view>
 
+        <view class="cell" wx:if="{{ cid_type === '700' }}">
+          <text class="label">出生日期</text>
+          <text class="content">
+            <text>{{ birthday }}</text>
+          </text>
+        </view>
+
         <view class="cell">
           <view class="cell-flex">
             <text class="label">证件号码</text>

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

@@ -349,7 +349,8 @@ function checkOrgName(orgName) {
 }
 
 // 证件号码
-function checkCid(cid, ctype, who = '') {
+function checkCid(cid, ctype, nation, who = '') {
+  console.log('校验证件号码', nation)
   cid = removeSpaceFun(cid);
   if (!cid) {
     return {
@@ -403,7 +404,7 @@ function checkCid(cid, ctype, who = '') {
   // 港澳居民来往内地通行证、台湾居民来往大陆通行证
   if (ctype === 516 || ctype === 511) {
     console.log('港澳居民来往内地通行证、台湾居民来往大陆通行证')
-    if (!checkHmtPassport(cid, ctype).data) {
+    if (!checkHmtPassport(cid, ctype, nation).data) {
       return {
         data: false,
         msg: who + '证件号码不正确'
@@ -470,22 +471,39 @@ function checkResidenceCid(cid) {
 /**
  * 港澳台居民来往内地通行证号码校验
  * https://www.nia.gov.cn/n741440/n741547/c1197066/content.html
- * 港澳："H/M"+8位阿拉伯数字
+ * https://www.guiyang.gov.cn/zwgk/zdlyxxgk2024/shsyjzdms/shaq/crjgl/202408/t20240823_85468731.html
+ * 港澳-中国籍："H/M"+8位阿拉伯数字
+ * 港澳-外籍："HA/MA"+7位阿拉伯数字
  * 台湾: 8位阿拉伯数字
  */
-function checkHmtPassport(value, ctype) {
+function checkHmtPassport(value, ctype, nation = 'CHN') {
+  console.log('港澳台居民来往内地通行证号码校验', nation)
   value = value.replace(/(^\s*)|(\s*$)/g, "")
   ctype = +ctype
 
   const isHm = [516,17].includes(ctype) // 港澳
   const isTw = [511,18].includes(ctype) // 台湾
   const hmReg = /^(H|M|h|m)[0-9]{8}$/
+  const hmForeignReg = /^[hm]a\d{7}$/i
   const twReg = /^[0-9]{8}$/
 
-  if (isHm && !hmReg.test(value)) {
-    return {
-      data: false,
-      msg: '港澳居民来往内地通行证号码不正确'
+  if (isHm) {
+    if (!nation || nation === 'CHN') {
+      console.log('中国籍')
+      if (!hmReg.test(value)) {
+        return {
+          data: false,
+          msg: '港澳居民来往内地通行证号码不正确'
+        }
+      }
+    } else {
+      console.log('外籍')
+      if (!hmForeignReg.test(value)) {
+        return {
+          data: false,
+          msg: '港澳居民来往内地通行证号码不正确'
+        }
+      }
     }
   }
   if (isTw && !twReg.test(value)) {