weapps-plugin-jingtong-verify 1.5.3 → 1.5.4

package/package.json

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

package/weapps-plugin-jingtong-verify/pages/bank-card-login-forgot-face-setting/bank-card-login-forgot-face-setting.js

@@ -103,6 +103,8 @@ Page({
     showTipFaceModal: false,
     set_type: 3, // 1:人脸认证，2：银行卡，3：短信
     isIdCardSuccess: false, //第二步安全验证，验证身份证号是否当前本人的身份证号
+    isShowPasswordStrength: false,// 是否显示密码强度
+    submitSafeMode:'',
   },
   /**
    * 生命周期函数--监听页面加载
@@ -612,7 +614,8 @@ Page({
 
         this.setData({
           passwordStrength: Math.min(strength, 3), // 最多显示3个等级
-          passwordStrengthText: strengthText
+          passwordStrengthText: strengthText,
+          isShowPasswordStrength: true
         })
       }
     })
@@ -659,7 +662,8 @@ Page({
             this.setData({
               isIdCardSuccess: true
             })
-            this.toGetTailNumber(value)
+            this.sendVerificationCode()
+            // this.toGetTailNumber(value)
           }
         } else {
           wx.hideLoading()
@@ -716,17 +720,49 @@ Page({
       }
     })
   },
+  // 其他方式
+  handletoSendVerificationCode () {
+    console.log('启用sms验证')
+    try {
+      // 临时保存并移除 verification_code
+      const tempCode = this.data.formSafeData.verification_code
+      const tempFormSafeData = { ...this.data.formSafeData }
+      delete tempFormSafeData.verification_code
+      
+      this.setData({
+        submitSafeMode: 'other',
+        formSafeData: tempFormSafeData
+      })
+      
+      const form = this.selectComponent('#formSafe')
+      if (form && typeof form.handleSubmit === 'function') {
+        form.handleSubmit()
+      } else {
+        // 恢复 verification_code
+        this.setData({
+          formSafeData: { ...this.data.formSafeData, verification_code: tempCode },
+          submitSafeMode: ''
+        })
+      }
+    } catch (error) {
+      // 恢复 verification_code
+      this.setData({
+        formSafeData: { ...this.data.formSafeData, verification_code: tempCode },
+        submitSafeMode: ''
+      })
+    }
+  },
   /**
    * 发送验证码
    */
   sendVerificationCode () {
-    // if(!this.data.isIdCardSuccess){
-    //   wx.showToast({
-    //     title: '身份证号码验证没有通过，请重新验证',
-    //     icon: 'none'
-    //   });
-    //   return;
-    // }
+    if(!this.data.isIdCardSuccess){
+      wx.showToast({
+        title: '身份证号码验证没有通过，请重新填写',
+        icon: 'none'
+      });
+      return;
+    }
     if (this.data.isCountingDown) {
       return;
     }
@@ -877,6 +913,33 @@ Page({
   async handleSafeFormSubmit (e) {
     console.log('进行身份证号码、手机号，短信验证码信息验证')
     const formValid = e.detail.validStatus
+    const isSafeOther = this.data.submitSafeMode === 'other'
+    if (isSafeOther){
+      const customValid = this.data.language !== 'en' ? { valid: true, msg: '' } : this.validateFullname()
+      this.data.submitSafeMode = ''
+      if (!formValid || !customValid.valid) {
+        // 自定义校验字段有问题，获取表单错误列表
+        const formErrList = e.detail.value
+        // 如果表单校验有问题，自定义校验没问题，则显示表单校验错误提示
+        if (!formValid && customValid.valid) {
+          return
+        }
+        // 如果表单校验没有问题，自定义校验有问题，则显示自定义校验错误提示
+        if (formValid && !customValid.valid) {
+          return
+        }
+        return
+      }
+      const { formData, formSafeData } = this.data
+      let params = {
+        'id_card_number': formSafeData.id_card_number,  // 证件号码 
+        'name': formData.name,
+        'verify_type': '101', // 身份证 固定值101
+        'support_type': '0x40' // 4：姓名+证件号+有效起始及结束日期 0x40:姓名+证件号 0x42:姓名+证件号+人像
+      }
+      this.toOtherWay(params, 2, '')
+      return
+    }
     const customValid = this.data.language !== 'en' ? { valid: true, msg: '' } : this.validateFullname()
     if (!formValid || !customValid.valid) {
       // 自定义校验字段有问题，获取表单错误列表

package/weapps-plugin-jingtong-verify/pages/bank-card-login-forgot-face-setting/bank-card-login-forgot-face-setting.wxml

@@ -82,8 +82,7 @@
               value="{{ formSafeData.strCid || formSafeData.id_card_number }}"
               clearable="{{ true }}"
               isOpen="{{ !formSafeData.strCid }}" 
-              showQuestion="{{ true }}"
-              bind:showQuestionTip="showQuestionTip"
+              bind:change="handleSafeChange"
             />
                     
             <!-- bind:change="handleSafeChange" -->
@@ -128,7 +127,7 @@
               <view 
                 slot="append" 
                 class="verification-btn {{ isCountingDown ? 'disabled' : '' }}" 
-                bind:tap="sendVerificationCode"
+                bind:tap="handletoSendVerificationCode"
               >
                 {{ verificationText }}
               </view>
@@ -162,10 +161,10 @@
           <view class="form-item-wrap">
             <view class="form-item-header">
               <text class="form-label">设置新密码<text class="required-star">*</text></text>
-              <view class="password-strength-indicator">
+              <view class="password-strength-indicator"  wx:if="{{isShowPasswordStrength}}">
                 <view class="strength-bar">
-                  <view class="strength-segment weak {{ passwordStrength >= 1 ? 'active' : '' }}"></view>
-                  <view class="strength-segment medium {{ passwordStrength >= 2 ? 'active' : '' }}"></view>
+                  <view class="strength-segment {{ passwordStrength >= 3 ? 'strong' : passwordStrength >= 2 ? 'medium' : 'weak' }} {{ passwordStrength >= 1 ? 'active' : '' }}"></view>
+                  <view class="strength-segment  {{ passwordStrength >= 3 ? 'strong' : 'medium' }} {{ passwordStrength >= 2 ? 'active' : '' }}"></view>
                   <view class="strength-segment strong {{ passwordStrength >= 3 ? 'active' : '' }}"></view>
                 </view>
                 <view class="strength-text {{ passwordStrength >= 3 ? 'strong' : passwordStrength >= 2 ? 'medium' : 'weak' }}">

package/weapps-plugin-jingtong-verify/pages/bank-card-login-pwd-setting/bank-card-login-pwd-setting.wxml

@@ -28,8 +28,8 @@
               <text class="form-label">设置登录密码<text class="required-star">*</text></text>
               <view class="password-strength-indicator" wx:if="{{isShowPasswordStrength}}">
                 <view class="strength-bar">
-                  <view class="strength-segment weak {{ passwordStrength >= 1 ? 'active' : '' }}"></view>
-                  <view class="strength-segment medium {{ passwordStrength >= 2 ? 'active' : '' }}"></view>
+                  <view class="strength-segment {{ passwordStrength >= 3 ? 'strong' : passwordStrength >= 2 ? 'medium' : 'weak' }} {{ passwordStrength >= 1 ? 'active' : '' }}"></view>
+                  <view class="strength-segment {{ passwordStrength >= 3 ? 'strong' : 'medium' }} {{ passwordStrength >= 2 ? 'active' : '' }}"></view>
                   <view class="strength-segment strong {{ passwordStrength >= 3 ? 'active' : '' }}"></view>
                 </view>
                 <view class="strength-text {{ passwordStrength >= 3 ? 'strong' : passwordStrength >= 2 ? 'medium' : 'weak' }}">

package/weapps-plugin-jingtong-verify/pages/bank-card-verify/bank-card-verify.js

@@ -267,9 +267,9 @@ Page({
         // 当前时间
         const now = Date.now()
 
-        // 判断是否在10分钟内（1小时 = 3600 * 1000 毫秒）
-        const isWithinOneHour = (now - bankCardFailTime) < (10 * 60 * 1000)
-        console.log('当前仍在10分钟限制内')
+        // 判断是否在30分钟内（1小时 = 3600 * 1000 毫秒）
+        const isWithinOneHour = (now - bankCardFailTime) < (30 * 60 * 1000)
+        console.log('当前仍在30分钟限制内')
         if(isWithinOneHour){
           this.setData({
             showToOtherModal: true
@@ -425,10 +425,10 @@ Page({
           bankCardFailCount = 0
         }
         bankCardFailCount = bankCardFailCount + 1
-        constantVal.setStorageWithExpire(constantVal.bank_card_verify_fail_count, bankCardFailCount)
-        if(bankCardFailCount === 1){
-          // 设置10分钟后过期
-          constantVal.setStorageWithExpire(constantVal.bank_card_verify_fail_time, Date.now(), 10 * 60)
+        constantVal.setStorageWithExpire(constantVal.bank_card_verify_fail_count, bankCardFailCount, 5 * 60)
+        if(bankCardFailCount >= 3){
+          // 设置30分钟后过期
+          constantVal.setStorageWithExpire(constantVal.bank_card_verify_fail_time, Date.now(), 30 * 60)
         }
         if(errmsg){
           wx.showToast({
@@ -492,10 +492,10 @@ Page({
           bankCardFailCount = 0
         }
         bankCardFailCount = bankCardFailCount + 1
-        constantVal.setStorageWithExpire(constantVal.bank_card_verify_fail_count, bankCardFailCount)
-        if(bankCardFailCount === 1){
-          // 设置10分钟后过期
-          constantVal.setStorageWithExpire(constantVal.bank_card_verify_fail_time, Date.now(), 10 * 60)
+        constantVal.setStorageWithExpire(constantVal.bank_card_verify_fail_count, bankCardFailCount, 5 * 60)
+        if(bankCardFailCount >= 3){
+          // 设置30分钟后过期
+          constantVal.setStorageWithExpire(constantVal.bank_card_verify_fail_time, Date.now(), 30 * 60)
         }
         if(errmsg){
           wx.showToast({

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'
 const validator = require('../../components/gsd-ui/utils/validator')
+const constantVal = require("../../utils/constantVal")
 let cidType = '111'
 let Nation = 'CHN'
 
@@ -1590,6 +1591,11 @@ Page({
       title: '验证中…',
       mask: true
     })
+    // 验证是否在锁定期内，在的话，直接弹窗提示，并返回
+    let  bankCardFailTime = constantVal.getStorageWithExpire(constantVal.bank_card_verify_fail_time)
+    if(bankCardFailTime){
+
+    }
     // 身份二要素校验
     const { name, id_card_number } = this.data.formData
     const verifyIdCardParams = {