weapps-plugin-jingtong-verify 1.5.7 → 1.5.9

package/README.md

@@ -1,2 +1,2 @@
 # SDK #
-1.5.7
+1.5.9

package/package.json

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

@@ -843,7 +843,7 @@ Page({
           });
         } else {
           wx.showToast({
-            title: errmsg || '发送失败，稍后请重试',
+            title: errmsg || '验证码获取已超10次，请明天再试。',
             icon: 'none',
             duration: 2500
           });
@@ -994,15 +994,15 @@ Page({
       })
       return
     }
-    const ms5Code = MD5(this.data.formSafeData.verification_code).toString()
-    if ( formSafeDataCode !== ms5Code) {
-      wx.showToast({
-        title: '验证码不一致，请重新输入',
-        icon: 'none',
-        duration: 2000
-      })
-      return
-    }
+    // const ms5Code = MD5(this.data.formSafeData.verification_code).toString()
+    // if ( formSafeDataCode !== ms5Code) {
+    //   wx.showToast({
+    //     title: '验证码不一致，请重新输入',
+    //     icon: 'none',
+    //     duration: 2000
+    //   })
+    //   return
+    // }
 
     // 接口校验验证码
     const smsCodeParam = {
@@ -1014,7 +1014,7 @@ Page({
       if (errcode === 0) {
         if(!res.data.success){
           wx.showToast({
-            title: '验证码不正确，请重新输入',
+            title: errmsg || '验证码校验失败，请重新输入。',
             icon: 'none',
             duration: 2000
           })
@@ -1024,7 +1024,7 @@ Page({
         }
       } else {
         wx.showToast({
-          title: errmsg,
+          title: errmsg || '验证码校验失败，请重新输入。',
           icon: 'none',
           duration: 2000
         })

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

@@ -285,17 +285,18 @@ Page({
       mask: true // 防止用户点击
     })
     const { formDataVerificationCode } = this.data
-    const ms5Code = MD5(formData.verification_code).toString()
-    if ( formDataVerificationCode !== ms5Code) {
-      wx.showToast({
-        title: '验证码不一致，请重新输入',
-        icon: 'none',
-        duration: 2000
-      })
-      wx.hideLoading()
-      return
-    }
+    // const ms5Code = MD5(formData.verification_code).toString()
+    // if ( formDataVerificationCode !== ms5Code) {
+    //   wx.hideLoading()
+    //   wx.showToast({
+    //     title: '验证码不一致，请重新输入',
+    //     icon: 'none',
+    //     duration: 2000
+    //   })
+    //   return
+    // }
     // 接口验证短信验证码
+    let isVerifySmsCode = false
     if(source_type !== '2'){
       const verSmsCodeParam = {
         "mobile": formData.bank_phone,
@@ -303,64 +304,72 @@ Page({
       }
       jingtongVerifyRequest.verifySmsCode(verSmsCodeParam).then(res => {
         const { errcode, errmsg } = res
+        console.log('返回状态码')
+        console.log(errcode)
         if(errcode !== 0){
+          console.log('进入了')
           wx.showToast({
-            title: errmgs,
+            title: errmsg,
             icon: 'none',
             duration: 2000
           })
-          return
+          isVerifySmsCode = true
         } else{
           if(!res.data.success) {
             wx.showToast({
-              title: '验证码不正确，请重新输入',
+              title: errmsg || '验证码校验失败，请重新输入。',
               icon: 'none',
               duration: 2000
             })
+            isVerifySmsCode = true
             return
+          } else {
+            this.toOpera()
           }
         }
+        console.log('没有返回')
       })
     }
+  },
+  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(){
@@ -706,7 +715,7 @@ Page({
         });
       } else {
         wx.showToast({
-          title: errmsg || '发送失败，稍后请重试',
+          title: errmsg || '验证码获取已超10次，请明天再试。',
           icon: 'none',
           duration: 2500
         });