weapps-plugin-jingtong-verify 1.10.1 → 1.11.0

package/README.md

@@ -1,2 +1,2 @@
 # SDK #
-1.10.0
+1.11.0

package/package.json

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

package/weapps-plugin-jingtong-verify/components/drainage-modal/drainage-modal.wxml

@@ -3,9 +3,9 @@
     <image class="bg-image" src="https://js.jt.beijing.gov.cn/jt/APP/APP-xiazai.png"></image>
     <image class="btn-image" src="https://js.jt.beijing.gov.cn/jt/APP/APP-zhidao.png" bind:tap="handleOk"></image>
     <view class="btns">
-      <view class="btn" bind:tap="handleCopy" data-link='https://apps.apple.com/cn/app/%E4%BA%AC%E9%80%9A/id6749835625'>苹果用户：点击即可复制下载链接</view>
       <view class="btn" bind:tap="handleCopy" data-link='https://app.jt.beijing.gov.cn/api/file/external/jtfs/download/latest'>安卓用户：点击即可复制下载链接</view>
       <view class="btn" bind:tap="handleCopy" data-link='https://appgallery.huawei.com/app/detail?id=com.bjbdc.jingtong.hos&channelId=SHARE&source=appshare'>鸿蒙用户：点击即可复制下载链接</view>
+      <view class="btn" bind:tap="handleCopy" data-link='https://apps.apple.com/cn/app/%E4%BA%AC%E9%80%9A/id6749835625'>苹果用户：点击即可复制下载链接</view>
     </view>
   </view>
 </view>

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

@@ -191,7 +191,7 @@ Page({
     // 自定义校验提示文本
     customTipsMsg: '',
     // 显示引流modal
-    showDrainageModal: true
+    showDrainageModal: false
   },
 
   handleDrainageModalOk() {
@@ -200,6 +200,16 @@ Page({
     })
   },
 
+  getDrainageModalIsShow() {
+    const that = this
+    jingtongVerifyRequest.getDrainageModalIsShow().then(res => {
+      console.log('getDrainageModalIsShow: ', res)
+      that.setData({
+        showDrainageModal: res && res.isShow === 1
+      })
+    })
+  },
+
   /**
    * 生命周期函数--监听页面加载
    */
@@ -211,6 +221,8 @@ Page({
 
     // 初始化操作，回填证件类型为身份证的身份信息
     this.initUserInfo()
+    // 查询引流弹窗是否显示
+    this.getDrainageModalIsShow()
   },
 
   // 初始化操作，回填证件类型为身份证的身份信息
@@ -395,7 +407,8 @@ Page({
 
         // if (count && 3 <= times && times <= 5) {
         if (count && times === 1) {
-          console.log('==============累计刷脸失败超过3次，小于6次===============')
+          // console.log('==============累计刷脸失败超过3次，小于6次===============')
+          console.log('==============刷脸失败1次===============')
           this.setData({
             showFaceModal: true,
             // showFaceModalTimes: times
@@ -859,7 +872,7 @@ Page({
 
   // 开启人脸识别认证
   async toFaceVerify() {
-    const [err, session] = await utils.awaitTo(jingtongVerifyRequest.faceVerifyWithIdCard(this.data.formData))
+    const [err, session] = await utils.awaitTo(jingtongVerifyRequest.faceVerifyWithIdCard2(this.data.formData))
 
     const cidType = this.data.formData.cid_type
 
@@ -871,8 +884,11 @@ Page({
       this.loginTracker(3, cidType)
 
       console.log('微信人脸识别失败', err)
-      let { errmsg, errMsg, errCode } = JSON.parse(err)
-      if (errCode) {
+      let { errmsg = '', errMsg = '', errCode = '', errcode = '' } = JSON.parse(err)
+      const resCode = errCode || errcode
+      console.log('===错误码===', resCode)
+      if (resCode) {
+        // https://developers.weixin.qq.com/miniprogram/dev/server/API/face/api_queryverifyinfo.html
         let errCodeArr = [
           10002, 
           10003, 
@@ -891,28 +907,28 @@ Page({
           90024, 
           90025
         ]
-        if (errCodeArr.indexOf(errCode) >= 0) {
+        if (errCodeArr.indexOf(resCode) >= 0) {
           console.log('在指定的错误码范围内，人脸失败次数+1')
           // 设置人脸失败次数
-          await this.fetchFaceFailCount(true, errCode)
+          await this.fetchFaceFailCount(true, resCode)
         }
         // 人脸识别异常温馨提示弹窗
-        this.handleFaceError(errCode)
+        this.handleFaceError(resCode)
       }
 
-      if (errCode && errCode === 90100) {
+      if (resCode && resCode === 90100) {
         wx.showToast({
           title: '您已取消人脸识别',
           icon: 'none',
           duration: 3000
         })
-      } else if (errCode && errCode === 10004) {
+      } else if (resCode && resCode === 10004) {
         wx.showToast({
           title: '人脸与身份信息不匹配',
           icon: 'none',
           duration: 3000
         })
-      } else if (errCode && errCode === 10003) {
+      } else if (resCode && resCode === 10003) {
         wx.showToast({
           title: '姓名或证件号码有误',
           icon: 'none',

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

@@ -59,6 +59,8 @@ Page({
       verify_result
     }))
 
+    console.log('注销结果->', logOffErr, logOffRes)
+
     if (logOffErr) {
       console.log(logOffErr, '账号注销err')
       wx.showToast({

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

@@ -1,10 +1,17 @@
 // weapps-plugin-jingtong-verify/pages/setting/setting.js
 const jingtongVerifyRequest = require('../../utils/request')
-const { flow } = require("@wecity/weda-plugin-utils");
+const {
+  flow
+} = require("@wecity/weda-plugin-utils");
 const utils = require("../../utils/index")
-const { logout } = require("../../i18n/index");
+const {
+  logout
+} = require("../../i18n/index");
 
-import { SDKTrack, setAccountInfo } from '../../utils/QDTrackerNew/QDTrackerMain'
+import {
+  SDKTrack,
+  setAccountInfo
+} from '../../utils/QDTrackerNew/QDTrackerMain'
 
 Page({
 
@@ -28,12 +35,20 @@ Page({
 
   onLoad() {
     wx.hideShareMenu()
-    
+
     let Gender = ''
     let Age = ''
     jingtongVerifyRequest.getSession({
       success: res => {
-        let { cid, cid_type, sex, phone, face_time, realname_time, openid } = res
+        let {
+          cid,
+          cid_type,
+          sex,
+          phone,
+          face_time,
+          realname_time,
+          openid
+        } = res
         Gender = sex
         if (cid_type === '111' && cid) {
           Gender = utils.parseIDCard(cid).sex
@@ -49,7 +64,7 @@ Page({
           authExpired: (!face_time && !realname_time) || !cid,
           phone,
           star_phone: phone ? phone.replace(pho, '$1****$2') : ''
-        })  
+        })
 
         // 设置用户账号信息
         setAccountInfo(openid)
@@ -59,7 +74,11 @@ Page({
 
   // 同意协议和隐私政策
   viewPrivacy(e) {
-    const { name, file, track } = e.currentTarget.dataset
+    const {
+      name,
+      file,
+      track
+    } = e.currentTarget.dataset
     console.log('文件地址', `https://js.jt.beijing.gov.cn/jt/tiffile/${file}.pdf`)
 
     const trackMap = {
@@ -132,7 +151,7 @@ Page({
       wx.removeStorageSync('tif.CAUniqueId')
       wx.removeStorageSync('tif.lastLoginTime')
 
-      
+
       // 退出登录，执行业务侧回调清除本地缓存
       wx.$_ServiceConfiguration && wx.$_ServiceConfiguration.methods && wx.$_ServiceConfiguration.methods._loginOutCallBack && wx.$_ServiceConfiguration.methods._loginOutCallBack(wx.$_ServiceConfiguration)
 
@@ -177,7 +196,7 @@ Page({
       url: '../../pages/user-info/user-info'
     })
   },
-  
+
   // 显示换绑手机号码弹窗
   showModal() {
     if (!this.data.authExpired) {
@@ -227,7 +246,7 @@ Page({
       let pho = /(\d{3})\d*(\d{4})/
 
       this.setData({
-        phone: wx.getStorageSync('tif.realPhone') || '', 
+        phone: wx.getStorageSync('tif.realPhone') || '',
         star_phone: phone ? phone.replace(pho, '$1****$2') : ''
       })
     }).catch(err => {
@@ -252,7 +271,11 @@ Page({
       title: '加载中…'
     })
 
-    let { name, cid, cid_type } = this.data.sessionInfo
+    let {
+      name,
+      cid,
+      cid_type
+    } = this.data.sessionInfo
 
     if (!name || !cid || !cid_type) {
       wx.showToast({
@@ -281,49 +304,98 @@ Page({
   },
 
   // 进行微信人脸识别
-  toWxFace(name, idCardNumber) {
+  async toWxFace() {
     let sessionInfo = this.data.sessionInfo
-    wx.startFacialRecognitionVerify({
-      name,
-      idCardNumber,
-      checkAliveType: '2',
-      success(res) {
-        console.log('刷脸认证结果: ', res)
-        if (res.errCode !== 0) {
-          wx.showToast({
-            title: '人脸识别失败,请稍后再试',
-            icon: 'none'
-          })
-          return
-        } else {
-          flow.navigateTo({
-            url: `../../pages/log-off/log-off?sessionInfo=${JSON.stringify(sessionInfo)}&verify_result=${res.verifyResult}`
-          })
-        }
-      },
-      fail: err => {
-        console.log('人脸识别err', err)
-        let { errmsg, errMsg, errCode } = err 
-        if (errCode && errCode === 90100) {
-          wx.showToast({
-            title: '您已取消人脸识别',
-            icon: 'none',
-            duration: 3000
-          })
-        } else if (errCode && errCode === 10004) {
-          wx.showToast({
-            title: '人脸与身份信息不匹配',
-            icon: 'none',
-            duration: 3000
-          })
-        } else {
-          wx.showToast({
-            title: errmsg || errMsg || '人脸识别失败,请稍后再试',
-            icon: 'none',
-            duration: 3000
-          })
-        }
+    // wx.startFacialRecognitionVerify({
+    //   name,
+    //   idCardNumber,
+    //   checkAliveType: '2',
+    //   success(res) {
+    //     console.log('刷脸认证结果: ', res)
+    //     if (res.errCode !== 0) {
+    //       wx.showToast({
+    //         title: '人脸识别失败,请稍后再试',
+    //         icon: 'none'
+    //       })
+    //       return
+    //     } else {
+    //       flow.navigateTo({
+    //         url: `../../pages/log-off/log-off?sessionInfo=${JSON.stringify(sessionInfo)}&verify_result=${res.verifyResult}`
+    //       })
+    //     }
+    //   },
+    //   fail: err => {
+    //     console.log('人脸识别err', err)
+    //     let {
+    //       errmsg,
+    //       errMsg,
+    //       errCode
+    //     } = err
+    //     if (errCode && errCode === 90100) {
+    //       wx.showToast({
+    //         title: '您已取消人脸识别',
+    //         icon: 'none',
+    //         duration: 3000
+    //       })
+    //     } else if (errCode && errCode === 10004) {
+    //       wx.showToast({
+    //         title: '人脸与身份信息不匹配',
+    //         icon: 'none',
+    //         duration: 3000
+    //       })
+    //     } else {
+    //       wx.showToast({
+    //         title: errmsg || errMsg || '人脸识别失败,请稍后再试',
+    //         icon: 'none',
+    //         duration: 3000
+    //       })
+    //     }
+    //   }
+    // })
+
+
+    const [err, res] = await utils.awaitTo(jingtongVerifyRequest.yzFaceVerifyWithIdCard2({
+      cid_type: sessionInfo.cid_type,
+      id_card_number: sessionInfo.cid,
+      name: sessionInfo.name
+    }))
+    console.log('原子核验结果->', err, res)
+    if (err) {
+      let {
+        errmsg = '', errMsg = '', errCode = '', errcode = ''
+      } = JSON.parse(err)
+      const resCode = errCode || errcode
+      console.log('===错误码===', resCode)
+
+      if (resCode && resCode === 90100) {
+        wx.showToast({
+          title: '您已取消人脸识别',
+          icon: 'none',
+          duration: 3000
+        })
+      } else if (resCode && resCode === 10004) {
+        wx.showToast({
+          title: '人脸与身份信息不匹配',
+          icon: 'none',
+          duration: 3000
+        })
+      } else if (resCode && resCode === 10003) {
+        wx.showToast({
+          title: '姓名或证件号码有误',
+          icon: 'none',
+          duration: 3000
+        })
+      } else {
+        wx.showToast({
+          title: errmsg || errMsg || '认证失败,请稍后再试',
+          icon: 'none',
+          duration: 3000
+        })
       }
-    })
+    } else {
+      flow.navigateTo({
+        url: `../../pages/log-off/log-off?sessionInfo=${JSON.stringify(sessionInfo)}&verify_result=${res.verify_result}`
+      })
+    }
   }
 })