weapps-plugin-jingtong-verify 1.5.2 → 1.5.4

package/README.md

@@ -1,2 +1,2 @@
 # SDK #
-1.5.1
+1.5.3

package/package.json

@@ -2,7 +2,7 @@
   "name": "weapps-plugin-jingtong-verify",
   "pluginName": "weapps-plugin-jingtong-verify",
   "pluginType": "mp",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "",
   "main": "sdk.js",
   "author": "tongyirenzheng",
@@ -18,4 +18,4 @@
     "crypto-js": "^3.3.0",
     "miniprogram-sm-crypto": "^0.3.13"
   }
-}
+}

package/weapps-plugin-jingtong-verify/i18n/rules.js

@@ -351,6 +351,29 @@ const rules = {
       }
     },
   },
+  // 设置密码
+  bankCardSetPwdRules: {
+    bank_card_password: {
+      required: {
+        zh_CN: '请输入登录密码',
+        en: 'Please enter your login password'
+      },
+      validate: {
+        zh_CN: '请输入有效登录密码',
+        en: 'Please enter your login password'
+      }
+    },
+    bank_card_pwd_password: {
+      required: {
+        zh_CN: '请再次输入登录密码',
+        en: 'Please enter your login password again'
+      },
+      validate: {
+        zh_CN: '两次密码输入不一致',
+        en: 'Please enter your login password again'
+      }
+    },
+  },
   // 忘记密码设置新密码
   bankCardSetNewPwdRules: {
     bank_card_password: {

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

@@ -58,7 +58,7 @@ Page({
       bank_card_password: '',
       bank_card_pwd_password: ''
     },
-    pwdRules: rulesConfig.bankCardSetPwdRules('zh_CN'),
+    pwdRules: rulesConfig.bankCardSetNewPwdRules('zh_CN'),
     validatePwdType: {
       bank_card_password(value) {
         return utils.validate.checkBankCardLoginPwd(value).data
@@ -103,6 +103,8 @@ Page({
     showTipFaceModal: false,
     set_type: 3, // 1:人脸认证，2：银行卡，3：短信
     isIdCardSuccess: false, //第二步安全验证，验证身份证号是否当前本人的身份证号
+    isShowPasswordStrength: false,// 是否显示密码强度
+    submitSafeMode:'',
   },
   /**
    * 生命周期函数--监听页面加载
@@ -132,8 +134,8 @@ Page({
       formData.cid_type = options.cid_type
       formData.verify_expire_time = options.verify_expire_time
       formSafeData.cid_type = options.cid_type
-      formSafeData.id_card_number = options.idCardNumber
-      formSafeData.strCid = options.strCid
+      // formSafeData.id_card_number = options.idCardNumber
+      // formSafeData.strCid = options.strCid
       this.setData({
         formData: formData,
         formSafeData: formSafeData
@@ -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

@@ -9,7 +9,7 @@
       <image src="../../images/Frame.png" mode="aspectFit" class="img"></image>
     </view>
     <view class="title">{{ language == 'zh_CN' ? '设置新登录密码' : 'Set new login password' }}</view>
-    <view class="title_describe">{{ language == 'zh_CN' ? '保护您个人信息更安全' : 'Protect your personal information more securely' }}</view>
+    <view class="title_describe">{{ language == 'zh_CN' ? '新登录密码设置后原密码将会失效' : 'After setting the new login password, the original password will become invalid' }}</view>
   </view>
   <view class="content-box" wx:if="{{ language === 'zh_CN' }}">
     <!-- 完整配置 -->
@@ -53,8 +53,6 @@
               value="{{ formData.strCid || formData.id_card_number }}"
               clearable="{{ false }}"
               class="readonly-input"
-              showQuestion="{{ true }}"
-              bind:showQuestionTip="showQuestionTip"
             />
           </view>
         </g-form>
@@ -82,11 +80,9 @@
               label="身份证号码"
               placeholder="请输入本人证件号码"
               value="{{ formSafeData.strCid || formSafeData.id_card_number }}"
-              clearable="{{ false }}"
-              class="readonly-input"
+              clearable="{{ true }}"
               isOpen="{{ !formSafeData.strCid }}" 
-              showQuestion="{{ true }}"
-              bind:showQuestionTip="showQuestionTip"
+              bind:change="handleSafeChange"
             />
                     
             <!-- bind:change="handleSafeChange" -->
@@ -131,7 +127,7 @@
               <view 
                 slot="append" 
                 class="verification-btn {{ isCountingDown ? 'disabled' : '' }}" 
-                bind:tap="sendVerificationCode"
+                bind:tap="handletoSendVerificationCode"
               >
                 {{ verificationText }}
               </view>
@@ -165,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-forgot-face-setting/bank-card-login-forgot-face-setting.wxss

@@ -187,7 +187,7 @@
 
 .other-way-btn{
   width: 100%;
-  height: 76rpx;
+  height: 96rpx;
   border: 1px solid #CE0022;
   display: flex;
   align-items: center;
@@ -307,7 +307,7 @@
 .not_get_verification_code{
   padding:40rpx; color: #ce0022;
   font-family: "PingFang SC";
-  font-size: 34rpx;
+  font-size: 28rpx;
   font-style: normal;
   font-weight: 500;
   line-height: normal;

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

@@ -29,6 +29,7 @@ Page({
         return utils.validate.checkBankCardLoginPwd(value).data && utils.validate.checkConfirmPwd(value, formData.bank_card_password).data
       }, // 记录是否已经登录成功
     },
+    isShowPasswordStrength: false,// 是否显示密码强度
     passwordStrength: 0, // 密码强度等级 0-3
     passwordStrengthText: '弱',
     // 是否显示自定义校验提示
@@ -181,7 +182,8 @@ Page({
 
         this.setData({
           passwordStrength: strength, // 弱=1，中=2，强=3
-          passwordStrengthText: strengthText
+          passwordStrengthText: strengthText,
+          isShowPasswordStrength: true
         })
       }
     })

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

@@ -26,10 +26,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.wxss

@@ -202,15 +202,15 @@
 }
 
 .strength-segment.weak.active {
-  background-color: #ff4757;
+  background-color: #CE0022;
 }
 
 .strength-segment.medium.active {
-  background-color: #ffa502;
+  background-color: #EE8610;
 }
 
 .strength-segment.strong.active {
-  background-color: #2ed573;
+  background-color: #21C58A;
 }
 
 .strength-text {

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

@@ -104,6 +104,9 @@ Page({
     checkType: '', //// 1:无密码和手机号，2：无密码有手机号，3:无手机号有密码
     // 收不到验证码提示框
     showNotGetVerificationCodeTipModal: false,
+    submitMode: '',
+    // 防重复点击标记 - 基于接口返回状态
+    isSubmitting: false
   },
 
   /**
@@ -184,7 +187,52 @@ Page({
   },
   // 确认提交表单
   async handleFormSubmit(e) {
+    const isOther = this.data.submitMode === 'other'
     const formValid = e.detail.validStatus
+    if (isOther) {
+      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)
+          this.setData({
+            isSubmitting: false
+          })
+          return
+        }
+        // 如果表单校验没有问题，自定义校验有问题，则显示自定义校验错误提示
+        if (formValid && !customValid.valid) {
+          this.showCuntomErrTip(customValid.msg)
+          this.setData({
+            isSubmitting: false
+          })
+          return
+        }
+        // 如果两者都有问题，则判断显示谁
+        let lastMsg = ''
+        if (formErrList.some(i => ["id_card_number", "nation"].includes(i.name))) {
+          lastMsg = formErrList[0].message
+        } else {
+          lastMsg = customValid.msg
+        }
+        this.showCuntomErrTip(lastMsg)
+        this.data.submitMode = ''
+        this.data.isSubmitting = false
+        wx.hideLoading()
+        this.setData({
+          isSubmitting: false
+        })
+        return
+      }
+      this.setData({
+        formData: { ...this.data.formData, verification_code: tempCode },
+        submitMode: ''
+      })
+      this.sendVerificationCode()
+      return
+    }
     const customValid = this.data.language !== 'en' ? { valid: true, msg: '' } : this.validateFullname()
     if (!formValid || !customValid.valid) {
       // 自定义校验字段有问题，获取表单错误列表
@@ -219,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
@@ -377,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({
@@ -444,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({
@@ -557,6 +605,51 @@ Page({
     })
   },
 
+  // 发送验证码
+  async sendVerificationCodeVerify() {
+    // 检查是否正在处理中
+    if (this.data.isSubmitting) {
+      console.log('正在处理中，请勿重复点击')
+      wx.showToast({
+        title: '正在处理中，请稍候...',
+        icon: 'none',
+        duration: 1500
+      })
+      return
+    }
+    // 立即设置处理状态，防止重复点击
+    this.data.isSubmitting = true
+    try {
+      // 临时保存并移除 verification_code
+      const tempCode = this.data.formData.verification_code
+      const tempFormData = { ...this.data.formData }
+      delete tempFormData.verification_code
+      
+      this.setData({
+        submitMode: 'other',
+        formData: tempFormData
+      })
+      
+      const form = this.selectComponent('#form')
+      if (form && typeof form.handleSubmit === 'function') {
+        form.handleSubmit()
+      } else {
+        // 恢复 verification_code
+        this.setData({
+          formData: { ...this.data.formData, verification_code: tempCode },
+          submitMode: '',
+          isSubmitting: false
+        })
+      }
+    } catch (error) {
+      // 恢复 verification_code
+      this.setData({
+        formData: { ...this.data.formData, verification_code: tempCode },
+        submitMode: '',
+        isSubmitting: false
+      })
+    }
+  },
   // 发送验证码
   sendVerificationCode() {
     if (this.data.isCountingDown) {

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

@@ -53,9 +53,7 @@
           showEye="{{ formData.id_card_number }}"
           isOpen="{{ !formData.strCid }}"   
           bind:change="handleChange"
-          showQuestion="{{ true }}"
           class="readonly-input"
-          bind:showQuestionTip="showQuestionTip"
           bind:openEye="openEye"
         />
       </view>
@@ -97,7 +95,7 @@
           <view 
             slot="append" 
             class="verification-btn {{ isCountingDown ? 'disabled' : '' }}" 
-            bind:tap="sendVerificationCode"
+            bind:tap="sendVerificationCodeVerify"
           >
             {{ verificationText }}
           </view>

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

@@ -220,7 +220,7 @@
 .not_get_verification_code{
   padding:40rpx; color: #ce0022;
   font-family: "PingFang SC";
-  font-size: 34rpx;
+  font-size: 28rpx;
   font-style: normal;
   font-weight: 500;
   line-height: normal;

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 = {
@@ -1688,18 +1694,18 @@ Page({
           })
         } 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
-         })
+          // 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='

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

@@ -144,7 +144,7 @@
 
 .other-way-btn{
   width: 100%;
-  height: 76rpx;
+  height: 96rpx;
   border: 1px solid;
   display: flex;
   align-items: center;

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

@@ -316,6 +316,20 @@ const bankCardRules = (language) => {
 
 // 设置密码
 const bankCardSetPwdRules = (language) => {
+  const { bank_card_password, bank_card_pwd_password } = dict.rules.bankCardSetPwdRules
+  return {
+    bank_card_password: [
+      { type: 'required', message: `${bank_card_password.required[language]}` },
+      { type: 'bank_card_password', message: `${bank_card_password.validate[language]}` }
+    ],
+    bank_card_pwd_password: [
+      { type: 'required', message: `${bank_card_pwd_password.required[language]}` },
+      { type: 'bank_card_pwd_password', message: `${bank_card_pwd_password.validate[language]}` }
+    ]
+  }
+}
+// 设置新密码
+const bankCardSetNewPwdRules = (language) => {
   const { bank_card_password, bank_card_pwd_password } = dict.rules.bankCardSetNewPwdRules
   return {
     bank_card_password: [
@@ -384,6 +398,7 @@ module.exports = {
   residenceRules,
   bankCardRules,
   bankCardSetPwdRules,
+  bankCardSetNewPwdRules,
   bankCardLoginPwdRules,
   setNewPwdInfoRules,
   safeVerificationInfoRules