weapps-plugin-jingtong-verify 1.5.3 → 1.5.5

package/README.md

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

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.5",
   "description": "",
   "main": "sdk.js",
   "author": "tongyirenzheng",

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

@@ -44,6 +44,8 @@ Page({
       '553': 9,
       '700': 3
     },
+    showLoginFailTipModal: false, // 登录失败次数锁定
+    showLoginFailTipTitle: '', // 登录失败次数锁定
   },
 
   /**
@@ -118,10 +120,14 @@ Page({
           // TODO: 执行判断失败次数是否大于等于5次
           if(failCount >= 5){
             // 点击确定出现该提示
-            wx.showToast({
-              title: '1小时内连续错误5次，已锁定账号，1小时后重试',
-              icon: 'none',
-              duration: 2000
+            // wx.showToast({
+            //   title: '1小时内连续错误5次，已锁定账号，1小时后重试',
+            //   icon: 'none',
+            //   duration: 2000
+            // })
+            this.setData({
+              showLoginFailTipModal: true,
+              showLoginFailTipTitle:'1小时内连续错误5次，已锁定账号，1小时后重试'
             })
             return
           }
@@ -136,10 +142,14 @@ Page({
       
     } else{
       // 点击确定出现该提示
-      wx.showToast({
-        title: '当天累计错误超10次，已锁定账号，24小时后重试',
-        icon: 'none',
-        duration: 2000
+      // wx.showToast({
+      //   title: '当天累计错误超10次，已锁定账号，24小时后重试',
+      //   icon: 'none',
+      //   duration: 2000
+      // })
+      this.setData({
+        showLoginFailTipModal: true,
+        showLoginFailTipTitle: '当天累计错误超10次，已锁定账号，24小时后重试'
       })
       return
     }
@@ -208,11 +218,14 @@ Page({
         constantVals.setStorageWithExpire(constantVals.bank_card_login_fail_time, Date.now())
       }
       // 点击确定出现该提示
-      wx.showToast({
-        title: errmsg,
-        icon: 'none',
-        duration: 2000
+      this.setData({
+        showLoginFailTipTitle: errmsg
       })
+      // wx.showToast({
+      //   title: errmsg,
+      //   icon: 'none',
+      //   duration: 2000
+      // })
     } else{
       console.log('直接账密登录-登录成功')
       console.log(session)
@@ -437,6 +450,11 @@ Page({
       login_validity_period: this.data.formData.verify_expire_time / 24 || '' // 免登录时间
     })
   },
+  handleModalOk(){
+    this.setData({
+      showLoginFailTipModal: false
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

package/weapps-plugin-jingtong-verify/pages/bank-card-login/bank-card-login.json

@@ -1,7 +1,8 @@
 {
   "usingComponents": {
     "g-form": "../../components/gsd-ui/g-form/index",
-    "g-input": "../../components/gsd-ui/g-input/index"
+    "g-input": "../../components/gsd-ui/g-input/index",
+    "tip-modal": "../../components/tip-modal/tip-modal"
   },
   "navigationBarTitleText": "账密登录"
 }

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

@@ -70,4 +70,10 @@
       </view>
     </view>
   </view>
-</view>
+</view>
+<!-- 登录失败次数锁定提示 -->
+<tip-modal 
+  visible="{{ showLoginFailTipModal }}" 
+  bind:cancel="handleModalOk"
+  desc1="{{showLoginFailTipTitle}}"
+></tip-modal>

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
         })
       }
     })
@@ -647,9 +650,9 @@ Page({
         console.log(res)
         const { errcode }= res
         if(errcode === 0){
-          wx.hideLoading()
           // 判断type，1为信息确认，2为信息确认并获取手机号尾号，目前业务不需要走type=2
           if(type === 1) {
+             wx.hideLoading()
             this.setData({
               set_type: 3
             })
@@ -659,7 +662,9 @@ Page({
             this.setData({
               isIdCardSuccess: true
             })
-            this.toGetTailNumber(value)
+            this.sendVerificationCode()
+            wx.hideLoading()
+            // this.toGetTailNumber(value)
           }
         } else {
           wx.hideLoading()
@@ -716,17 +721,52 @@ 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;
-    // }
+    wx.showLoading({
+      title: '发送中',
+    })
+    if(!this.data.isIdCardSuccess){
+      wx.showToast({
+        title: '身份证号码验证没有通过，请重新填写',
+        icon: 'none'
+      });
+      return;
+    }
     if (this.data.isCountingDown) {
       return;
     }
@@ -877,6 +917,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-forgot-face-setting/bank-card-login-forgot-face-setting.wxss

@@ -334,7 +334,7 @@
 .password-strength-indicator {
   display: flex;
   align-items: center;
-  gap: 50rpx;
+  gap: 25rpx;
 }
 
 .strength-bar {
@@ -365,6 +365,7 @@
 .strength-text {
   font-size: 28rpx;
   font-weight: bold;
+  padding-right: 20rpx;
 }
 
 .strength-text.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-login-pwd-setting/bank-card-login-pwd-setting.wxss

@@ -185,7 +185,7 @@
 .password-strength-indicator {
   display: flex;
   align-items: center;
-  gap: 50rpx;
+  gap: 25rpx;
 }
 
 .strength-bar {
@@ -216,6 +216,7 @@
 .strength-text {
   font-size: 28rpx;
   font-weight: bold;
+  padding-right: 20rpx;
 }
 
 .strength-text.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'
 
@@ -194,6 +195,7 @@ Page({
     // 防重复点击标记 - 基于接口返回状态
     isSubmitting: false,
     checkType: 1, // 1:无密码和手机号，2：无密码有手机号，3:无手机号有密码
+    showOtherWayTipModal: false, // 提示
   },
 
   /**
@@ -1391,7 +1393,8 @@ Page({
       showFaceModal: false,
       showLockFaceModal: false,
       showCardModal: false,
-      showTipModal: false
+      showTipModal: false,
+      showOtherWayTipModal: false
     })
   },
 
@@ -1590,6 +1593,25 @@ Page({
       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 = {

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

@@ -514,3 +514,9 @@
   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/login-manage-setting/login-manage-setting.js

@@ -20,7 +20,8 @@ Page({
       24: '1天免登录',
       168: '7天免登录',
       720: '30天免登录'
-    }
+    },
+    isShowUpdatePwd: false
   },
 
   /**
@@ -63,6 +64,7 @@ Page({
           loginWay: loginWay
         })
       }
+      this.getShowUpdatePwd(cid)
       //  if (cid_type === '516') {
       //    this.setData({
       //     exitHmSession: true,
@@ -82,6 +84,37 @@ Page({
       }
     })
   },
+  getShowUpdatePwd(value) {
+    jingtongVerifyRequest.checkPhonePwd(value).then(res => {
+      const { errmsg, errcode } = res
+      if(errcode === 0){
+        if(!res.data.is_new){
+          this.setData({
+            isShowUpdatePwd: true
+          })
+        } else {
+          this.setData({
+            isShowUpdatePwd: false
+          })
+        }
+      } else {
+        wx.showToast({
+          title: errmsg,
+          icon: 'none',
+          duration: 2000,
+        })
+      }
+    }).catch(error => {
+      console.log('异常')
+      console.log(error)
+      const { errmsg } = error
+      wx.showToast({
+        title: errmsg,
+        icon: 'none',
+        duration: 2000,
+      })
+    })
+  },
   // 跳转登录管理页面
   goToLoginWag() {
     // 上报事件

package/weapps-plugin-jingtong-verify/pages/login-manage-setting/login-manage-setting.wxml

@@ -7,7 +7,7 @@
         <image src="../../images/Vector.png" mode="" class="img" wx:if="{{ loginWay }}"/>
       </view>
     </view>
-    <view class="cell" catchtap="goToUpdatePwd">
+    <view class="cell" catchtap="goToUpdatePwd" wx:if="{{isShowUpdatePwd}}">
       <view class="label">
         修改登录密码
       </view>