weapps-plugin-jingtong-verify 1.3.7 → 1.3.9

package/package.json

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

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

@@ -58,6 +58,8 @@ Component({
         },
         password: Boolean,
         clearable: Boolean,
+        showEye: Boolean,
+        isOpen: Boolean,
         disabled: Boolean,
         prepend: Boolean,
         append: Boolean,
@@ -124,6 +126,7 @@ Component({
         },
         // 内部校验 input
         validateInput() {
+            console.log('=========内部校验=======')
             if (!this.id) {
                 throw new Error('请提供需要校验的组件 ID');
             }
@@ -168,13 +171,15 @@ Component({
         },
         // blur
         handleBlur(e) {
+            console.log('blur', e)
             const { validateTrigger } = this.properties;
-            if (validateTrigger === 'blur') {
+            const { eye, open } = e.currentTarget.dataset
+            if (validateTrigger === 'blur' && ((eye && open) || !eye)) {
               // 触发内部校验
               setTimeout(() => {
                 this.validateInput();
               }, 300)
-          }
+            }
             this.setData({ _focus: false });
             this.triggerEvent('blur', e.detail);
             // 避免输入法最后一个字没点击确认
@@ -202,6 +207,20 @@ Component({
                 this.validateInput();
             }
         },
+        // 明文
+        handleTapEye(e) {
+            const { disabled } = this.properties;
+            const { _focus } = this.data;
+            if (disabled)
+                return false;
+            // this.triggerEvent('input', { value: '' });
+            // this.triggerEvent('change', { value: '' });
+            // if (!_focus) {
+            //     // 触发内部校验
+            //     this.validateInput();
+            // }
+            this.triggerEvent('openEye', { isOpen: e.currentTarget.dataset.open });
+        },
         // tap info
         handleTapIcon() {
             const { icon } = this.properties;

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

@@ -21,13 +21,18 @@
         adjust-position="{{adjustPosition}}"
         bindinput="handleInput" bindfocus="handleFocus"
         bindblur="handleBlur" bindconfirm="handleConfirm"
+        data-open="{{isOpen}}"
+        data-eye="{{showEye}}"
       />
 
-
       <view class="{{icon === 'info'?'input__iconInfo__container':'input__icon__container'}}" >
         <view class="input__icon input__icon--clear" hidden="{{!clearable || !value}}" catch:tap="handleTapClear">
           <g-icon type="close-circle" size="36"/>
         </view>
+        <view class="input__icon input__icon--clear" hidden="{{!showEye}}" catch:tap="handleTapEye" data-value="{{value}}" data-open="{{isOpen}}">
+          <g-icon type="eye" size="36" wx:if="{{isOpen}}" />
+          <g-icon type="eye-close" size="36" wx:else />
+        </view>
         <view class="input__icon input__icon--{{icon}}" wx:if="{{icon}}" catch:tap="handleTapIcon">
             <g-popover wx:if="{{icon === 'info'}}" content="{{iconDesc}}" placement="topRight">
               <g-icon  type="info-o" size="36"/>

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

@@ -312,6 +312,26 @@ Page({
     })
   },
 
+  // 判断是否是PC端登录
+  getDevice() {
+    return new Promise((resolve, reject) => {
+      const systemInfo = wx.getDeviceInfo();
+      console.log('systemInfo', systemInfo)
+      if (['windows', 'mac'].includes(systemInfo.platform)) {
+        console.log('当前为电脑端微信');
+        wx.showToast({
+          title: '请您使用移动端京通小程序',
+          icon: 'none',
+          duration: 3000
+        })
+        return
+      } else {
+        console.log('当前为手机端');
+        resolve()
+      }
+    })
+  },
+
   // 根据证件类型匹配校验正则和校验类型
   toMatchRules() {
     let { cid_type, nation, nation_name } = this.data.formData
@@ -598,6 +618,9 @@ Page({
     if (currentAuthType === 'wxFace') {
       console.log('微信人脸识别认证')
 
+      // 判断是否是PC端登录
+      await this.getDevice()
+
       // 判断人脸失败次数
       await this.fetchFaceFailCount(false)
 
@@ -611,6 +634,9 @@ Page({
       // 错误触发销毁回调函数处理
       this.handleExitedState()
 
+      // 判断是否是PC端登录
+      await this.getDevice()
+
       // 出入境微信人脸识别接口
       this.toFaceReceptionAuth()
     } else if(currentAuthType === 'cardAuth') {
@@ -1233,5 +1259,29 @@ Page({
     flow.navigateTo({
       url: `../face-error-reason/face-error-reason?type=${this.data.faceErrorType}`,
     })
+  },
+
+  openEye(e) {
+    console.log(e)
+    const isOpen = e.detail.isOpen
+    const key = e.currentTarget.id
+    const strKey = e.currentTarget.dataset.star
+    console.log('isOpen', isOpen)
+    console.log('key', key)
+    console.log('strKey', strKey)
+    if (isOpen) {
+      console.log('显示脱敏')
+      const { name, id_card_number } = this.data.formData
+      const value = key === 'name' ? utils.hideName(name) : utils.hideIdCard(id_card_number, '111')
+      console.log('value', value)
+      this.setData({
+        [`formData.${strKey}`]: value
+      })
+    } else {
+      console.log('删除脱敏，显示明文')
+      this.setData({
+        [`formData.${strKey}`]: ''
+      })
+    }
   }
 })

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

@@ -86,10 +86,13 @@
             label="姓名"
             placeholder="请输入本人姓名"
             value="{{ formData.strName || formData.name }}"
-            clearable="true"
+            clearable="{{ false }}"
+            showEye="{{ true }}"
+            isOpen="{{ !formData.strName }}"
             bind:change="handleChange"
             showQuestion="{{ true }}"
             bind:showQuestionTip="showQuestionTip"
+            bind:openEye="openEye"
           />
         </view>
 
@@ -100,10 +103,13 @@
             label="证件号码"
             placeholder="请输入本人证件号码"
             value="{{ formData.strCid || formData.id_card_number }}"
-            clearable="true"
+            clearable="{{ false }}"
+            showEye="{{ true }}"
+            isOpen="{{ !formData.strCid }}"         
             bind:change="handleChange"
             showQuestion="{{ true }}"
             bind:showQuestionTip="showQuestionTip"
+            bind:openEye="openEye"
           />
         </view>
       </view>