weapps-plugin-jingtong-verify 1.5.4 → 1.5.6

package/README.md

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

package/package.json

@@ -2,7 +2,7 @@
   "name": "weapps-plugin-jingtong-verify",
   "pluginName": "weapps-plugin-jingtong-verify",
   "pluginType": "mp",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "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

@@ -650,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
             })
@@ -663,6 +663,7 @@ Page({
               isIdCardSuccess: true
             })
             this.sendVerificationCode()
+            wx.hideLoading()
             // this.toGetTailNumber(value)
           }
         } else {
@@ -756,6 +757,9 @@ Page({
    * 发送验证码
    */
   sendVerificationCode () {
+    wx.showLoading({
+      title: '发送中',
+    })
     if(!this.data.isIdCardSuccess){
       wx.showToast({
         title: '身份证号码验证没有通过，请重新填写',
@@ -768,13 +772,13 @@ Page({
     }
 
     // 检查重试次数
-    if (this.data.retryCount >= this.data.maxRetryCount) {
-      wx.showToast({
-        title: '今日发送次数已达上限',
-        icon: 'none'
-      });
-      return;
-    }
+    // if (this.data.retryCount >= this.data.maxRetryCount) {
+    //   wx.showToast({
+    //     title: '今日发送次数已达上限',
+    //     icon: 'none'
+    //   });
+    //   return;
+    // }
     console.log(this.data.formSafeData)
     console.log(this.data.formSafeData.phone_number)
     const { phone_number } = this.data.formSafeData
@@ -833,14 +837,15 @@ Page({
           this.startCountdown();
           this.setData({
             isSendSms: true,
-            retryCount: this.data.retryCount + 1,
+            // retryCount: this.data.retryCount + 1,
             formSafeDataCode: data.code,
             getFormSafeDataCodeTime: Date.now()
           });
         } else {
           wx.showToast({
             title: errmsg || '发送失败，稍后请重试',
-            icon: 'none'
+            icon: 'none',
+            duration: 2500
           });
         }
       })

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.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

@@ -217,18 +217,18 @@ Page({
         } else {
           lastMsg = customValid.msg
         }
-        this.showCuntomErrTip(lastMsg)
-        this.data.submitMode = ''
-        this.data.isSubmitting = false
-        wx.hideLoading()
         this.setData({
+          submitMode: '',
           isSubmitting: false
         })
+        this.showCuntomErrTip(lastMsg)
+        wx.hideLoading()
         return
       }
       this.setData({
         formData: { ...this.data.formData, verification_code: tempCode },
-        submitMode: ''
+        submitMode: '',
+        isSubmitting: false
       })
       this.sendVerificationCode()
       return
@@ -657,13 +657,13 @@ Page({
     }
 
     // 检查重试次数
-    if (this.data.retryCount >= this.data.maxRetryCount) {
-      wx.showToast({
-        title: '今日发送次数已达上限',
-        icon: 'none'
-      });
-      return;
-    }
+    // if (this.data.retryCount >= this.data.maxRetryCount) {
+    //   wx.showToast({
+    //     title: '今日发送次数已达上限',
+    //     icon: 'none'
+    //   });
+    //   return;
+    // }
     const { formData } = this.data
     if(formData.bank_phone === ''){
       wx.showToast({
@@ -703,13 +703,13 @@ Page({
         this.startCountdown();
         this.setData({
           isSendSms: true,
-          retryCount: this.data.retryCount + 1,
           formDataVerificationCode: data.code
         });
       } else {
         wx.showToast({
           title: errmsg || '发送失败，稍后请重试',
-          icon: 'none'
+          icon: 'none',
+          duration: 2500
         });
       }
     })

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

@@ -195,6 +195,7 @@ Page({
     // 防重复点击标记 - 基于接口返回状态
     isSubmitting: false,
     checkType: 1, // 1:无密码和手机号，2：无密码有手机号，3:无手机号有密码
+    showOtherWayTipModal: false, // 提示
   },
 
   /**
@@ -1392,7 +1393,8 @@ Page({
       showFaceModal: false,
       showLockFaceModal: false,
       showCardModal: false,
-      showTipModal: false
+      showTipModal: false,
+      showOtherWayTipModal: false
     })
   },
 
@@ -1594,7 +1596,21 @@ Page({
     // 验证是否在锁定期内，在的话，直接弹窗提示，并返回
     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

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>