weapps-plugin-jingtong-verify 1.6.0 → 1.6.1

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

@@ -4,8 +4,6 @@ const utils = require("../../utils/index")
 const { flow } = require("@wecity/weda-plugin-utils");
 const rulesConfig = require("../../utils/rules")
 import { SDKTrack, setAccountInfo } from '../../utils/QDTrackerNew/QDTrackerMain'
-const validator = require('../../components/gsd-ui/utils/validator')
-const constantVal = require("../../utils/constantVal")
 let cidType = '111'
 let Nation = 'CHN'
 
@@ -22,7 +20,7 @@ Page({
       strCid: '', // 身份证号码（脱敏）
       id_card_number: '',  // 证件号码
       strBankCount: '', // 银行卡卡号（脱敏）
-      bank_account: '',
+      bank_account: '', 
       nation: 'CHN', // 国籍
       nation_name: '中国',
       sur_name: '', // 姓
@@ -190,12 +188,7 @@ Page({
     // 是否显示自定义校验提示
     showCustomTips: false,
     // 自定义校验提示文本
-    customTipsMsg: '',
-    submitMode: '',
-    // 防重复点击标记 - 基于接口返回状态
-    isSubmitting: false,
-    checkType: 1, // 1:无密码和手机号，2：无密码有手机号，3:无手机号有密码
-    showOtherWayTipModal: false, // 提示
+    customTipsMsg: ''
   },
 
   /**
@@ -271,7 +264,7 @@ Page({
   // 生命周期函数--监听页面显示
   onShow: function () {
     wx.hideShareMenu()
-
+    
     // 获取国籍
     let pages = getCurrentPages()
     let currentPage = pages[pages.length - 1]
@@ -317,7 +310,7 @@ Page({
 
   /**
    * 获取/设置人脸失败次数
-   * @param {*} count
+   * @param {*} count 
    * count:true  设置次数+1
    * count:false 获取次数
    */
@@ -332,7 +325,7 @@ Page({
     this.setData({
       isKidsOrOld
     })
-
+    
     return new Promise((resolve, reject) => {
       jingtongVerifyRequest.operateFaceFailCount({
         count,
@@ -449,7 +442,7 @@ Page({
       this.setData({
         formData
       })
-    }
+    } 
     // else if (cid_type === '516' && this.data.exitHmSession) {
     //   console.log('存在可回显的HM数据', this.data.HmSession)
     //   const { star_name, name, star_cid, cid, verify_expire_time, nation } = this.data.HmSession
@@ -512,7 +505,7 @@ Page({
       value = value.trim()
       console.log('==删除前后空格==', value, '==删除前后空格==')
     }
-
+  
     let starId = e.target.dataset.star
     // 切换“证件类型”
     let oldCidType = this.data.formData.cid_type
@@ -714,40 +707,7 @@ Page({
   },
 
   async handleFormSubmit(e) {
-    const isOther = this.data.submitMode === 'other'
     const formValid = e.detail.validStatus
-    if (isOther) {
-      wx.showLoading({
-        title: '加载中…',
-        mask: true
-      })
-      // 自定义英文名校验（与现有一致）
-      const customValid = this.data.language !== 'en' ? { valid: true, msg: '' } : this.validateFullname()
-
-      if (!formValid || !customValid.valid) {
-        // 与现有提示优先级一致
-        const formErrList = e.detail.value || []
-        if (!formValid && customValid.valid) {
-          this.showCuntomErrTip(formErrList[0].message)
-        } else if (formValid && !customValid.valid) {
-          this.showCuntomErrTip(customValid.msg)
-        } else {
-          const needPrior = formErrList.find(i => ["id_card_number", "nation"].includes(i.name))
-          const lastMsg = needPrior ? needPrior.message : customValid.msg
-          this.showCuntomErrTip(lastMsg)
-        }
-        this.data.submitMode = ''
-        this.data.isSubmitting = false
-        wx.hideLoading()
-        return
-      }
-
-      // 通过后再跳"其他方式"业务（可按需补入参清洗，沿用 handleFormSubmit 的清洗逻辑）
-      this.toBankCardLogin()
-      // 注意：isSubmitting 状态在 toBankCardLogin 方法中重置
-      return
-    }
-    // const formValid = e.detail.validStatus
     const customValid = this.data.language !== 'en' ? { valid: true, msg: '' } : this.validateFullname()
     if (!formValid || !customValid.valid) {
       // 自定义校验字段有问题，获取表单错误列表
@@ -1123,7 +1083,7 @@ Page({
           }
         }
       })
-    }
+    } 
   },
 
   // 外国人护照核验不通过逻辑
@@ -1164,7 +1124,7 @@ Page({
       })
       return
     }
-
+    
     const [err, res] = await utils.awaitTo(jingtongVerifyRequest.passportAuth(formData))
     if (err) {
       console.log('外国人护照核验接口认证失败', err)
@@ -1188,7 +1148,7 @@ Page({
 
   // 外国人护照核验通过
   passportAuthSuccess() {
-    // 调用删除接口/静默登录并返回session信息
+    // 调用删除接口/静默登录并返回session信息  
     jingtongVerifyRequest.deletePassportAuth({
       success: session => {
         console.log('返回session信息', session)
@@ -1393,8 +1353,7 @@ Page({
       showFaceModal: false,
       showLockFaceModal: false,
       showCardModal: false,
-      showTipModal: false,
-      showOtherWayTipModal: false
+      showTipModal: false
     })
   },
 
@@ -1586,227 +1545,4 @@ Page({
       msg: valid ? '' : msg
     }
   },
-  async toBankCardLogin() {
-    // 判断是否是PC端登录
-    await this.getDevice()
-    wx.showLoading({
-      title: '验证中…',
-      mask: true
-    })
-    // 验证是否在锁定期内，在的话，直接弹窗提示，并返回
-    let  bankCardFailTime = constantVal.getStorageWithExpire(constantVal.bank_card_verify_fail_time)
-    if(bankCardFailTime){
-      // 当前时间
-      const now = Date.now()
-
-      // 判断是否在30分钟内（1小时 = 3600 * 1000 毫秒）
-      const isWithinOneHour = (now - bankCardFailTime) < (30 * 60 * 1000)
-      if(isWithinOneHour){
-        console.log('当前仍在10分钟限制内')
-        this.setData({
-          showOtherWayTipModal: true
-        })
-        wx.showToast({
-          title: '还存在银行卡验证失败锁定期内，请稍后再试',
-        })
-        return
-      }
-    }
-    // 身份二要素校验
-    const { name, id_card_number } = this.data.formData
-    const verifyIdCardParams = {
-      "id_card_number": id_card_number,
-      "name": name,
-      "verify_type": "101",
-      "support_type": "0x40"
-    }
-    jingtongVerifyRequest.verifyIdcard(verifyIdCardParams).then(res => {
-      console.log('获取身份证二要素核验结果')
-      console.log(res)
-      if(res.errcode === 0){
-        // 可进行
-      } else {
-        wx.showToast({
-          title: res.errmsg,
-          icon: 'none',
-          duration: 2000
-        })
-        this.data.submitMode = ''
-        this.data.isSubmitting = false
-        return
-      }
-      wx.hideLoading()
-    }).catch(error => {
-      this.data.submitMode = ''
-      this.data.isSubmitting = false
-      return
-    })
-    // 验证手机号
-    const infoCheckParam = {
-      "id_card_number": id_card_number,
-      "phone_number": ''
-    }
-    
-    let isPhoneNumber = false
-    jingtongVerifyRequest.getInfoCheck(infoCheckParam).then(res =>{
-      const { errmsg, errcode } = res
-      console.log(res)
-      if(errcode === 0){
-        if(res.data.phone_suffix){
-          isPhoneNumber = false
-          // 1:无密码和手机号，2：无密码有手机号，3：无手机号有密码
-          this.setData({
-            checkType:2
-          })
-        } else {
-          isPhoneNumber = true
-          // 1:无密码和手机号，2：无密码有手机号，3：无手机号有密码
-          this.setData({
-            checkType:3
-          })
-        }
-      } else{
-        isPhoneNumber = true
-      }
-    }).catch(error => {
-      this.data.submitMode = ''
-      this.data.isSubmitting = false
-      return
-    })
-    jingtongVerifyRequest.checkPhonePwd(this.data.formData.id_card_number).then(res => {
-      console.log(res)
-      wx.hideLoading()
-      const { errmsg, errcode } = res
-      console.log(isPhoneNumber)
-      console.log(!res.data.is_new)
-      if (errcode === 0) {
-        // isPhoneNumber 为true,即系没有手机号，res.data.is_new为true即系无密码
-        if(isPhoneNumber && res.data.is_new){
-          // 1:无密码和手机号，2：无密码有手机号，3：无手机号有密码
-          this.setData({
-            checkType: 1
-          })
-          wx.navigateTo({
-            url: '/weapps-plugin-jingtong-verify/pages/bank-card-verify/bank-card-verify?id_card_number='+ this.data.formData.id_card_number
-            + '&cid_type=' + this.data.formData.cid_type
-            + '&name=' + this.data.formData.name
-            + '&strCid=' + this.data.formData.strCid
-            + '&verify_expire_time=' + this.data.formData.verify_expire_time
-            + '&checkType=' + this.data.checkType
-          })
-        } else if(isPhoneNumber && !res.data.is_new){
-           // isPhoneNumber 为true,即系没有手机号，res.data.is_new为true即系无密码
-          // 1:无密码和手机号，2：无密码有手机号，3：无手机号有密码
-          this.setData({
-            checkType: 3
-          })
-          wx.navigateTo({
-            url: '/weapps-plugin-jingtong-verify/pages/bank-card-verify/bank-card-verify?id_card_number='+ this.data.formData.id_card_number
-            + '&cid_type=' + this.data.formData.cid_type
-            + '&name=' + this.data.formData.name
-            + '&strCid=' + this.data.formData.strCid
-            + '&verify_expire_time=' + this.data.formData.verify_expire_time
-            + '&checkType=' + this.data.checkType
-          })
-        } else if(!isPhoneNumber && res.data.is_new){
-          // isPhoneNumber 为true,即系没有手机号，res.data.is_new为true即系无密码
-          // 1:无密码和手机号，2：无密码有手机号，3：无手机号有密码
-          this.setData({
-            checkType: 2
-          })
-          wx.navigateTo({
-            url: '/weapps-plugin-jingtong-verify/pages/bank-card-verify/bank-card-verify?id_card_number='+ this.data.formData.id_card_number
-            + '&cid_type=' + this.data.formData.cid_type
-            + '&name=' + this.data.formData.name
-            + '&strCid=' + this.data.formData.strCid
-            + '&verify_expire_time=' + this.data.formData.verify_expire_time
-            + '&checkType=' + this.data.checkType
-          })
-       } else {
-          wx.navigateTo({
-            url: '/weapps-plugin-jingtong-verify/pages/bank-card-login/bank-card-login?cardNumber='
-              + this.data.formData.id_card_number
-              + '&cid_type=' + this.data.formData.cid_type
-              + '&name=' + this.data.formData.name
-              + '&strCid=' + this.data.formData.strCid
-              + '&verify_expire_time=' + this.data.formData.verify_expire_time
-          })
-        }
-        wx.hideLoading()
-        // 成功跳转后重置防重复点击标记
-        this.data.isSubmitting = false
-      } else {
-        wx.showToast({
-          title: errmsg,
-          icon: 'none',
-          duration: 2000,
-        })
-        // 出错时重置防重复点击标记
-        this.data.isSubmitting = false
-      }
-    }).catch(error => {
-      console.log('异常')
-      console.log(error)
-      const { errcode, errmsg } = error
-      wx.showToast({
-        title: errmsg,
-        icon: 'none',
-        duration: 2000,
-      })
-      // 出错时重置防重复点击标记
-      this.data.isSubmitting = false
-    })
-    this.data.submitMode = ''
-    this.data.isSubmitting = false
-  },
-  // 防重复点击的点击处理方法
-  async handletoOther() {
-    console.log('点击其他方式')
-    
-    // 检查是否正在处理中
-    if (this.data.isSubmitting) {
-      console.log('正在处理中，请勿重复点击')
-      wx.showToast({
-        title: '正在处理中，请稍候...',
-        icon: 'none',
-        duration: 1500
-      })
-      return
-    }
-
-    // 立即设置处理状态，防止重复点击
-    this.data.isSubmitting = true
-    
-    try {
-      console.log('跳转其他页面')
-      // console.log(this.data.formData)
-      // console.log(this.data.formData.name)
-      // console.log(this.data.formData.id_card_number)
-      // console.log(this.data.formData.cid_type)
-
-      // 方案B
-      this.data.submitMode = 'other'     // 设置来源标记
-      const form = this.selectComponent('#form')
-      if (form && typeof form.handleSubmit === 'function') {
-        // 触发表单的内置校验流程，结果会回调到 handleFormSubmit
-        form.handleSubmit()
-        // 注意：这里不重置 isSubmitting，等待 handleFormSubmit 中的处理完成
-      } else {
-        wx.showToast({ title: '表单未就绪，请稍后再试', icon: 'none' })
-        // 表单未就绪时立即重置状态
-        this.data.isSubmitting = false
-      }
-    } catch (error) {
-      console.error('handletoOther 执行出错:', error)
-      // 出错时重置状态
-      this.data.isSubmitting = false
-    }
-  },
-  handletoLoginHelp () {
-    console.log('点击登录帮助')
-    console.log('跳转其他页面')
-    wx.navigateTo({
-      url: '/weapps-plugin-jingtong-verify/pages/login-help/login-help',
-    })
-  }
-})
+})

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

@@ -302,7 +302,7 @@
       </view>
 
       <!-- 共有：协议勾选 -->
-      <view class="agree-box" style="margin-top: 30rpx">
+      <view class="agree-box" style="margin-top: 50rpx">
         <g-agree id="agree" bind:change="handleChange" value="{{ formData.agree }}">
           <view>
             <text>{{ agreeInfo }}</text>
@@ -316,18 +316,6 @@
         </g-agree>
       </view>
     </g-form>
-    <!-- 其他方式   start -->
-    <view class="other-way" wx:if="{{ formData.cid_type === '111' }}">
-      <view class="other-way-btn" bind:tap="handletoOther">
-        其他方式
-      </view>
-    </view>
-    <view class="login-help">
-      <view class="login-help-btn" bind:tap="handletoLoginHelp">
-        登录帮助
-      </view>
-    </view>
-    <!-- 其他方式   end -->
   </view>
 
   <!-- 英文版：证件类型为外国人护照 -->
@@ -514,9 +502,3 @@
   bind:CancelBtn="cancelFaceErrorModal" 
   bind:ConfirmBtn="okFaceErrorModal" 
 ></face-error-modal>
-<!-- 其他方式锁定提示 -->
-<tip-modal 
-  visible="{{ showOtherWayTipModal }}" 
-  bind:cancel="handleModalOk"
-  desc1="因您多次人脸识别验证未能通过，为保障账户安全，人脸识别的验证方式已暂时锁定，待锁定时效(10分钟)结束后，重新尝试人脸识别验证。"
-></tip-modal>

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

@@ -36,7 +36,7 @@
 .img-box {
   width: 160rpx;
   height: 160rpx;
-  margin: 46rpx 0 32rpx; 
+  margin: 56rpx 0 52rpx; 
 }
 
 .img {
@@ -131,56 +131,4 @@
   box-sizing: border-box;
   top: 0rpx;
   width: 100%;
-}
-
-.other-way{
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding-left:40rpx;
-  padding-right: 40rpx;
-  padding-top: 30rpx;
-}
-
-.other-way-btn{
-  width: 100%;
-  height: 96rpx;
-  border: 1px solid;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 10rpx;
-  border: 1px solid #CE0022;
-  color: #ce0022;
-  text-align: center;
-  font-family: "PingFang SC";
-  font-size: 17px;
-  font-style: normal;
-  font-weight: 500;
-  line-height: normal;
-}
-
-.login-help{
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding-left:40rpx;
-  padding-right: 40rpx;
-  padding-top: 30rpx;
-}
-
-.login-help-btn{
-  width: 100%;
-  height: 76rpx;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 10rpx;
-  color: #62667a;
-  text-align: center;
-  font-family: "PingFang SC";
-  font-size: 17px;
-  font-style: normal;
-  font-weight: 500;
-  line-height: normal;
 }

package/weapps-plugin-jingtong-verify/pages/nation-list/nation-list.js

@@ -20,9 +20,19 @@ Page({
    * @return {Array}           查询的结果
    */
   fuzzyQuery(list, keyWord) {
-    let arr = [];
+    // let arr = [];
+    // for (let i = 0; i < list.length; i++) {
+    //   if (list[i].name.match(keyWord) != null) {
+    //     arr.push(list[i]);
+    //   }
+    // }
+    // return arr;
+    const arr = [];
+    // 先将关键词转为小写（避免keyWord本身有大小写）
+    const lowerKeyWord = keyWord.toLowerCase();
     for (let i = 0; i < list.length; i++) {
-      if (list[i].name.match(keyWord) != null) {
+      // 将name也转为小写，再用includes匹配（简单场景）
+      if (list[i].name.toLowerCase().includes(lowerKeyWord)) {
         arr.push(list[i]);
       }
     }

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

@@ -160,17 +160,14 @@ Page({
   // 跳转登录管理页面
   goToLoginManage() {
     // 上报事件
-    // SDKTrack('function_btn_click', {
-    //   item_type: '8', // 业务分类
-    //   item_code: '110000000000511111993403700000', // 事项ID
-    //   item_access: '', // 业务入口
-    // })
+    SDKTrack('function_btn_click', {
+      item_type: '8', // 业务分类
+      item_code: '110000000000511111993403700000', // 事项ID
+      item_access: '', // 业务入口
+    })
 
-    // flow.navigateTo({
-    //   url: '../../pages/login-manage/login-manage'
-    // })
-    wx.navigateTo({
-      url: '../../pages/login-manage-setting/login-manage-setting'
+    flow.navigateTo({
+      url: '../../pages/login-manage/login-manage'
     })
   },