weapps-plugin-jingtong-verify 1.5.8 → 1.6.0

package/README.md

@@ -1,2 +1,2 @@
 # SDK #
-1.5.8
+1.6.0

package/package.json

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

@@ -732,7 +732,8 @@ Page({
       
       this.setData({
         submitSafeMode: 'other',
-        formSafeData: tempFormSafeData
+        formSafeData: tempFormSafeData,
+        _tempVerificationCode: tempCode  // 临时保存验证码
       })
       
       const form = this.selectComponent('#formSafe')
@@ -742,14 +743,16 @@ Page({
         // 恢复 verification_code
         this.setData({
           formSafeData: { ...this.data.formSafeData, verification_code: tempCode },
-          submitSafeMode: ''
+          submitSafeMode: '',
+          _tempVerificationCode: ''  // 清空临时验证码
         })
       }
     } catch (error) {
       // 恢复 verification_code
       this.setData({
         formSafeData: { ...this.data.formSafeData, verification_code: tempCode },
-        submitSafeMode: ''
+        submitSafeMode: '',
+        _tempVerificationCode: ''  // 清空临时保存验证码
       })
     }
   },
@@ -927,15 +930,31 @@ Page({
         const formErrList = e.detail.value
         // 如果表单校验有问题，自定义校验没问题，则显示表单校验错误提示
         if (!formValid && customValid.valid) {
+          // 校验通过，恢复 verification_code 并发送验证码
+          const tempCode = this.data._tempVerificationCode || ''
+          this.setData({
+            formSafeData: { ...this.data.formSafeData, verification_code: tempCode }
+          })
           return
         }
         // 如果表单校验没有问题，自定义校验有问题，则显示自定义校验错误提示
         if (formValid && !customValid.valid) {
+          // 校验通过，恢复 verification_code 并发送验证码
+          const tempCode = this.data._tempVerificationCode || ''
+          this.setData({
+            formSafeData: { ...this.data.formSafeData, verification_code: tempCode }
+          })
           return
         }
         return
       }
       const { formData, formSafeData } = this.data
+      
+      // 校验通过，恢复 verification_code 并发送验证码
+      const tempCode = this.data._tempVerificationCode || ''
+      this.setData({
+        formSafeData: { ...this.data.formSafeData, verification_code: tempCode }
+      })
       let params = {
         'id_card_number': formSafeData.id_card_number,  // 证件号码 
         'name': formData.name,
@@ -1014,7 +1033,7 @@ Page({
       if (errcode === 0) {
         if(!res.data.success){
           wx.showToast({
-            title: errmsg || '验证码校验失败，请重新输入。',
+            title: '验证码校验失败，请重新输入。',
             icon: 'none',
             duration: 2000
           })

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

@@ -44,9 +44,9 @@ Page({
       // 新增验证码验证
       verification_code(value) {
         // 如果 source_type 为 2，跳过验证
-        if (this.data.source_type === '2') {
-          return true
-        }
+        // if (this.data.source_type === '2') {
+        //   return true
+        // }
         // 验证码不能为空
         if (!value || value.trim() === '') {
           return false
@@ -106,7 +106,8 @@ Page({
     showNotGetVerificationCodeTipModal: false,
     submitMode: '',
     // 防重复点击标记 - 基于接口返回状态
-    isSubmitting: false
+    isSubmitting: false,
+    _tempVerificationCode: '',  // 临时存储验证码
   },
 
   /**
@@ -132,6 +133,29 @@ Page({
         source_type: options.source_type
       })
     }
+     // 修复 validateType.verification_code 中的 this 指向
+    const that = this
+    this.setData({
+      'validateType.verification_code': function(value, formData) {
+        // 通过闭包访问 Page 实例的 source_type
+        // if (that.data.source_type === '2') {
+        //   return true
+        // }
+        if (!value || value.trim() === '') {
+          return false
+        }
+        return utils.validate.checkVerificationCode(value).data
+      }
+    })
+    
+    // 如果 source_type === '2'，从 rules 中移除 verification_code
+    if (this.data.source_type === '2') {
+      // const tempRules = { ...this.data.rules }
+      // delete tempRules.verification_code
+      // this.setData({
+      //   rules: tempRules
+      // })
+    }
   },
   // 在 bank-card-verify.js 中添加
   preventInput: function(e) {
@@ -197,7 +221,10 @@ Page({
         // 如果表单校验有问题，自定义校验没问题，则显示表单校验错误提示
         if (!formValid && customValid.valid) {
           this.showCuntomErrTip(formErrList[0].message)
+          // 恢复 verification_code
+         const tempCode = this.data._tempVerificationCode || ''
           this.setData({
+            formData: { ...this.data.formData, verification_code: tempCode },
             isSubmitting: false
           })
           return
@@ -205,7 +232,10 @@ Page({
         // 如果表单校验没有问题，自定义校验有问题，则显示自定义校验错误提示
         if (formValid && !customValid.valid) {
           this.showCuntomErrTip(customValid.msg)
+          // 恢复 verification_code
+         const tempCode = this.data._tempVerificationCode || ''
           this.setData({
+            formData: { ...this.data.formData, verification_code: tempCode },
             isSubmitting: false
           })
           return
@@ -217,21 +247,41 @@ Page({
         } else {
           lastMsg = customValid.msg
         }
+         // 恢复 verification_code
+        const tempCode = this.data._tempVerificationCode || ''
         this.setData({
+          formData: { ...this.data.formData, verification_code: tempCode },
           submitMode: '',
           isSubmitting: false
         })
         this.showCuntomErrTip(lastMsg)
         wx.hideLoading()
         return
-      }
+      }    
+      // 校验通过，恢复 verification_code 并发送验证码
+      const tempCode = this.data._tempVerificationCode || ''
       this.setData({
+        formData: { ...this.data.formData, verification_code: tempCode },
         submitMode: '',
         isSubmitting: false
       })
       this.sendVerificationCode()
       return
     }
+    // if(this.data.source_type === 2){
+    //   // 临时保存并移除 verification_code
+    //   const tempCode = this.data.formData.verification_code
+    //   const tempFormData = { ...this.data.formData }
+    //   delete tempFormData.verification_code
+    //   // 同时从 rules 中移除 verification_code 的校验规则
+    //   const tempRules = { ...this.data.rules }
+    //   delete tempRules.verification_code
+    //   this.setData({
+    //     formData: tempFormData,
+    //     rules: tempRules,  // 使用不包含 verification_code 的 rules
+    //     _tempVerificationCode: tempCode  // 临时保存验证码
+    //   })
+    // }
     const customValid = this.data.language !== 'en' ? { valid: true, msg: '' } : this.validateFullname()
     if (!formValid || !customValid.valid) {
       // 自定义校验字段有问题，获取表单错误列表
@@ -296,71 +346,119 @@ Page({
     //   return
     // }
     // 接口验证短信验证码
-    if(source_type !== '2'){
+    let isVerifySmsCode = false
+    console.log('验证码参数')
+      console.log(formData)
       const verSmsCodeParam = {
         "mobile": formData.bank_phone,
-        "monbileCode": formData.verification_code 
+        "mobileCode": formData.verification_code 
       }
       jingtongVerifyRequest.verifySmsCode(verSmsCodeParam).then(res => {
         const { errcode, errmsg } = res
+        console.log('返回状态码')
+        console.log(errcode)
         if(errcode !== 0){
+          console.log('进入了')
           wx.showToast({
             title: errmsg,
             icon: 'none',
             duration: 2000
           })
-          return
+          isVerifySmsCode = true
         } else{
           if(!res.data.success) {
             wx.showToast({
-              title: errmsg || '验证码校验失败，请重新输入。',
+              title: '验证码校验失败，请重新输入。',
               icon: 'none',
               duration: 2000
             })
+            isVerifySmsCode = true
             return
+          } else {
+            this.toOpera()
           }
         }
+        console.log('没有返回')
       })
-    }
+    // if(source_type !== '2'){
+    //   console.log('验证码参数')
+    //   console.log(formData)
+    //   const verSmsCodeParam = {
+    //     "mobile": formData.bank_phone,
+    //     "mobileCode": formData.verification_code 
+    //   }
+    //   jingtongVerifyRequest.verifySmsCode(verSmsCodeParam).then(res => {
+    //     const { errcode, errmsg } = res
+    //     console.log('返回状态码')
+    //     console.log(errcode)
+    //     if(errcode !== 0){
+    //       console.log('进入了')
+    //       wx.showToast({
+    //         title: errmsg,
+    //         icon: 'none',
+    //         duration: 2000
+    //       })
+    //       isVerifySmsCode = true
+    //     } else{
+    //       if(!res.data.success) {
+    //         wx.showToast({
+    //           title: '验证码校验失败，请重新输入。',
+    //           icon: 'none',
+    //           duration: 2000
+    //         })
+    //         isVerifySmsCode = true
+    //         return
+    //       } else {
+    //         this.toOpera()
+    //       }
+    //     }
+    //     console.log('没有返回')
+    //   })
+    // } else {
+    //   setTimeout(() => {
+    //     this.toOpera()
+    //   }, 1200)
+    // }
+  },
+  toOpera() {
+    const { formData, idCardType, source_type } = this.data
     const param = {
       'id_card_number': formData.id_card_number,
       'type': 2,
       'isCount': true
     }
     // 接口返回验证成功出现这个提示
-    setTimeout(() => {
-      // 接口验证有没有超出限制次数
-      jingtongVerifyRequest.getVerifyLimit(param).then(res => {
-        console.log(res)
-        if (res.errcode === 0){
-          const { data } = res
-          if(data.times >= 3){
-            wx.hideLoading()
-            this.setData({
-              showToOtherModal: true
-            })
-          } else {
-            console.log(idCardType)
-            console.log(idCardType[formData.cid_type])
-            console.log('来源类型')
-            console.log(source_type)
-            wx.hideLoading()
-            if(source_type === '2'){
-              this.forgotVerify()
-            } else {
-              this.setPwdVerify()
-            }
-          }
-        } else {
+    // 接口验证有没有超出限制次数
+    jingtongVerifyRequest.getVerifyLimit(param).then(res => {
+      console.log(res)
+      if (res.errcode === 0){
+        const { data } = res
+        if(data.times >= 3){
           wx.hideLoading()
-          wx.showToast({
-            title: res.timeLimit,
-            icon: 'none',
-            duration: 1500
+          this.setData({
+            showToOtherModal: true
           })
+        } else {
+          console.log(idCardType)
+          console.log(idCardType[formData.cid_type])
+          console.log('来源类型')
+          console.log(source_type)
+          wx.hideLoading()
+          if(source_type === '2'){
+            this.forgotVerify()
+          } else {
+            this.setPwdVerify()
+          }
         }
-      })
-    }, 100)
+      } else {
+        wx.hideLoading()
+        wx.showToast({
+          title: res.timeLimit,
+          icon: 'none',
+          duration: 1500
+        })
+      }
+    })
   },
   // 设置密码进入
   setPwdVerify(){
@@ -467,7 +565,7 @@ Page({
       
       console.log('银行卡校验')
       console.log(res)
-      wx.hideLoading()
+      // wx.hideLoading()
       if(res.errcode === 0){
         // 保存银行卡核验成功时间戳
         let timeStamp = new Date().getTime()
@@ -626,7 +724,8 @@ Page({
       
       this.setData({
         submitMode: 'other',
-        formData: tempFormData
+        formData: tempFormData,
+        _tempVerificationCode: tempCode  // 临时保存验证码
       })
       
       const form = this.selectComponent('#form')
@@ -637,7 +736,8 @@ Page({
         this.setData({
           formData: { ...this.data.formData, verification_code: tempCode },
           submitMode: '',
-          isSubmitting: false
+          isSubmitting: false,
+          _tempVerificationCode: ''  // 清空临时值
         })
       }
     } catch (error) {
@@ -645,7 +745,8 @@ Page({
       this.setData({
         formData: { ...this.data.formData, verification_code: tempCode },
         submitMode: '',
-        isSubmitting: false
+        isSubmitting: false,
+        _tempVerificationCode: ''  // 清空临时值
       })
     }
   },

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

@@ -82,7 +82,7 @@
         />
       </view>
       <!-- 验证码 -->
-      <view class="form-item-wrap"  wx:if="{{source_type != 2}}">
+      <view class="form-item-wrap">
         <g-input
           id="verification_code"
           label="验证码"