weapps-plugin-jingtong-verify 1.5.1 → 1.5.2

package/package.json

@@ -2,7 +2,7 @@
   "name": "weapps-plugin-jingtong-verify",
   "pluginName": "weapps-plugin-jingtong-verify",
   "pluginType": "mp",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "",
   "main": "sdk.js",
   "author": "tongyirenzheng",

package/sdk.js

@@ -1,5 +1,7 @@
 const jingtongVerifyRequest = require('./weapps-plugin-jingtong-verify/utils/request')
 const { nation } = require("./weapps-plugin-jingtong-verify/utils/country")
+// const jingtongVerifyRequest = require('./utils/request')
+// const { nation } = require("./utils/country")
 const {
   flow,
   config
@@ -24,6 +26,13 @@ const parseOptions = (options) => {
   return options
 }
 
+// 身份验证
+exports.goToFace = () => {
+  console.log('跳转到子包 === 身份验证服务')
+  return flow.createFlow('/weapps-plugin-jingtong-verify/pages/face-verify/face-verify', {
+    needUnite: 'false' // 需串联起来
+  })
+}
 // 获取会话
 exports.getSession = (options) => {
   // 对参数做兼容性处理
@@ -70,7 +79,29 @@ const toBindPhone = (source) => {
     source
   })
 }
-
+// 去设置登录密码
+exports.goToBankCardLoginPwdSetting = (options) => {
+  console.log('跳转到子包 === 设置登录密码')
+    // 对参数做兼容性处理
+    let optionsParse = parseOptions(options)
+  jingtongVerifyRequest.getSession({
+    success: res => {
+      console.log(res)
+      return flow.createFlow('/weapps-plugin-jingtong-verify/pages/bank-card-login-pwd-setting/bank-card-login-pwd-setting',{
+        "name": res.name,
+        "idCardNumber": res.cid,
+        "strCid": res.star_cid,
+        "cid_type": res.cid_type,
+        "verify_expire_time": res.verify_expire_time
+      })
+    },
+    fail: fail => {
+      console.log('getSession-fail', fail)
+      optionsParse && optionsParse.fail && optionsParse.fail(fail)
+    }
+  })
+  
+}
 // 比较两个时间 time1，time2均为日期类型
 // 判断当前日期与time1日期是否相差小于6月
 const completeDate = (time1, m) => {

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

@@ -344,6 +344,12 @@ const rules = {
         en: 'Please enter your login password'
       }
     },
+    verification_code: {
+      required: {
+        zh_CN: '请输入验证码',
+        en: 'Please enter the verification code'
+      }
+    },
   },
   // 忘记密码设置新密码
   bankCardSetNewPwdRules: {

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

@@ -192,6 +192,13 @@
   align-items: center;
   justify-content: center;
   border-radius: 10rpx;
+  color: #62667a;
+  text-align: center;
+  font-family: "PingFang SC";
+  font-size: 17px;
+  font-style: normal;
+  font-weight: 500;
+  line-height: normal;
 }
 
 .readonly-input input {

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

@@ -132,6 +132,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
       this.setData({
         formData: formData,
         formSafeData: formSafeData
@@ -157,16 +159,17 @@ Page({
       this.setData({
         currentStep: this.data.currentStep + 1
       });
-      if(this.data.currentStep == 1){
-        // this.getTailNumber()
-      }
+      // if(this.data.currentStep == 1){
+      //   this.getTailNumber()
+      // }
     }
   },
   /**
    * 获取手机号尾号并设置证件号码
    */
-  getTailNumber (e) {
-    let value = e.detail.value
+  getTailNumber () {
+    // let value = e.detail.value
+    let value = this.data.formSafeData.id_card_number
     if(value === '' || value === null){
       return
     }
@@ -181,19 +184,19 @@ Page({
       "support_type": '0x40' // 4：姓名+证件号+有效起始及结束日期 0x40:姓名+证件号 0x42:姓名+证件号+人像
     }
     console.log('结果')
-    console.log(this.toOtherWay(params, 2, value))
+    // console.log(this.toOtherWay(params, 2, value))
     
-    this.toOtherWay(params, 2, value)
-    // setTimeout(() => {
-    //   console.log(this.data.isIdCardSuccess)
-    //   // this.toGetTailNumber(value)
-    // }, 100)
+    // this.toOtherWay(params, 2, value)
+    setTimeout(() => {
+      // console.log(this.data.isIdCardSuccess)
+      this.toGetTailNumber(value)
+    }, 100)
   },
   toGetTailNumber (value) {
-    const { isIdCardSuccess } = this.data
-    if(!isIdCardSuccess){
-      return
-    }
+    // const { isIdCardSuccess } = this.data
+    // if(!isIdCardSuccess){
+    //   return
+    // }
     // let value = e.detail.value
     // const { id_card_number, strCid } = this.data.formSafeData
     // let { formSafeData } = this.data
@@ -645,11 +648,13 @@ Page({
         const { errcode }= res
         if(errcode === 0){
           wx.hideLoading()
+          // 判断type，1为信息确认，2为信息确认并获取手机号尾号，目前业务不需要走type=2
           if(type === 1) {
             this.setData({
               set_type: 3
             })
-            this.nextStep()
+            // 先去根据身份证校验手机号，正确才能走下一步，不然只能走人脸识别
+            this.toCheckPhoneByIdCard()
           } else {
             this.setData({
               isIdCardSuccess: true
@@ -672,17 +677,56 @@ Page({
       })
     }, 1500)
   },
+  /**
+   * 根据身份证校验手机号，正确才能走下一步，不然只能走人脸识别
+   */
+  toCheckPhoneByIdCard() {
+    const { id_card_number } = this.data.formData
+    const checkPhoneByIdCardParam = {
+      "id_card_number": id_card_number,
+      "phone_number": ''
+    }
+    jingtongVerifyRequest.getInfoCheck(checkPhoneByIdCardParam).then(res => {
+      const { errmsg, errcode }= res
+      if(errcode === 0){
+        if(res.data.phone_suffix) {
+          this.setData({
+            formSafeDataCodeMobile: res.data.phone_suffix,
+            phoneNumberEndTitle: '(尾号' + res.data.phone_suffix + ')'
+          })
+          // 下一步
+          this.nextStep()
+        } else {
+          wx.showToast({
+            title: '手机绑定状态异常，请使用人脸识别方式验证',
+            icon: 'none',
+            duration: 3000
+          })
+          this.setData({
+            formSafeDataCodeMobile: '',
+            phoneNumberEndTitle: ''
+          })
+        }
+      } else {
+        wx.showToast({
+          title: errmsg,
+          icon: 'none',
+          duration: 3000
+        })
+      }
+    })
+  },
   /**
    * 发送验证码
    */
   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;
     }
@@ -744,8 +788,8 @@ Page({
       // 调接口获取短信验证码
       jingtongVerifyRequest.sendSmsCode(phoneNumber).then(res => {
         console.log(res.data)
-        const { data } = res
-        if(data.errcode === 0){
+        const { data, errcode, errmsg } = res
+        if(errcode === 0){
           wx.showToast({
             title: '验证码已发送',
             icon: 'success'
@@ -754,12 +798,12 @@ Page({
           this.setData({
             isSendSms: true,
             retryCount: this.data.retryCount + 1,
-            formSafeDataCode: data.data.code,
+            formSafeDataCode: data.code,
             getFormSafeDataCodeTime: Date.now()
           });
         } else {
           wx.showToast({
-            title: '发送失败，请重试',
+            title: errmsg || '发送失败，稍后请重试',
             icon: 'none'
           });
         }
@@ -891,7 +935,34 @@ Page({
       })
       return
     }
-    this.nextStep()
+
+    // 接口校验验证码
+    const smsCodeParam = {
+      "mobile": formSafeData.phone_number,
+      "mobileCode": formSafeData.verification_code
+    }
+    jingtongVerifyRequest.verifySmsCode(smsCodeParam).then(res => {
+      const { errcode, errmsg } = res
+      if (errcode === 0) {
+        if(!res.data.success){
+          wx.showToast({
+            title: '验证码不正确，请重新输入',
+            icon: 'none',
+            duration: 2000
+          })
+          return
+        } else{
+          this.nextStep()
+        }
+      } else {
+        wx.showToast({
+          title: errmsg,
+          icon: 'none',
+          duration: 2000
+        })
+        return
+      }
+    })
   },
   /**
    * 确认设置密码
@@ -993,7 +1064,8 @@ Page({
           + '&cid_type=' + this.data.formData.cid_type
           + '&name=' + this.data.formData.name
           + '&verify_expire_time=' + this.data.formData.verify_expire_time
-          + '&source_type=2',
+          + '&source_type=2'
+          + '&checkType=2',
         })
       }, 100)
     })

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

@@ -51,14 +51,10 @@
               label="证件号码"
               placeholder="请输入本人证件号码"
               value="{{ formData.strCid || formData.id_card_number }}"
-              showEye="{{ formData.id_card_number }}"
-              isOpen="{{ !formData.strCid }}"   
               clearable="{{ false }}"
               class="readonly-input"
-              isOpen="{{ !formData.strCid }}"
               showQuestion="{{ true }}"
               bind:showQuestionTip="showQuestionTip"
-              bind:openEye="openEye"
             />
           </view>
         </g-form>
@@ -80,7 +76,7 @@
           bind:submit="handleSafeFormSubmit"
         >
           <view class="form-item-wrap">
-            <!-- <g-input
+            <g-input
               id="id_card_number"
               data-star="strCid"
               label="身份证号码"
@@ -88,16 +84,16 @@
               value="{{ formSafeData.strCid || formSafeData.id_card_number }}"
               clearable="{{ false }}"
               class="readonly-input"
-              isOpen="{{ !formSafeData.strCid }}"         
-              bind:change="handleSafeChange"
+              isOpen="{{ !formSafeData.strCid }}" 
               showQuestion="{{ true }}"
               bind:showQuestionTip="showQuestionTip"
-            /> -->
-            
+            />
+                    
+            <!-- bind:change="handleSafeChange" -->
               <!-- isOpen="{{ !formData.strCid }}"          -->
               <!-- bind:openEye="openEye" -->
               <!-- showEye="{{ formData.id_card_number }}" -->
-            <g-input
+            <!-- <g-input
               id="id_card_number"
               data-star="strCid"
               label="身份证号码"
@@ -108,7 +104,7 @@
               showQuestion="{{ true }}"
               bind:showQuestionTip="showQuestionTip"
               bind:blur="getTailNumber"
-            />
+            /> -->
           </view>
           <!-- 手机号码 -->
           <view class="form-item-wrap">
@@ -192,12 +188,13 @@
               bind:blur="handlePwdStrongChange"
             />
           </view>
-          <!-- 确认登录密码 -->
+          <!-- 确认新密码 -->
           <view class="form-item-wrap">
             <g-input
               id="bank_card_pwd_password"
-              label="确认登录密码"
+              label="确认新密码"
               placeholder="请再次输入新登录密码"
+              placeholder-class="bank-card-verify-placeholder"
               value="{{ formPwdData.bank_card_pwd_password }}"
               clearable="true"
               password="true"

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

@@ -194,6 +194,7 @@
   justify-content: center;
   border-radius: 10rpx;
   color: #CE0022;
+  font-size: 34rpx;
 }
 
 /* 步骤条以及内容 */

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

@@ -40,6 +40,7 @@
         <g-input
           id="bank_card_password"
           placeholder="请输入登录密码"
+          placeholder-class="bank-card-verify-placeholder"
           value="{{ formData.bank_card_password }}"
           clearable="true"
           password="true"
@@ -54,6 +55,7 @@
           id="bank_card_pwd_password"
           label="确认登录密码"
           placeholder="请再次输入登录密码"
+          placeholder-class="bank-card-verify-placeholder"
           value="{{ formData.bank_card_pwd_password }}"
           clearable="true"
           password="true"

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

@@ -2,7 +2,9 @@
 const jingtongVerifyRequest = require('../../utils/request')
 const constantVal = require("../../utils/constantVal")
 const rulesConfig = require("../../utils/rules")
+const MD5 = require("../../utils/md5")
 const utils = require("../../utils/index")
+const { flow } = require("@wecity/weda-plugin-utils");
 let cidType = '111'
 let Nation = 'CHN'
 Page({
@@ -22,7 +24,8 @@ Page({
       bank_phone:'', // 绑定手机号
       verify_expire_time: '', // 登录有效时间
       nation: 'CHN',
-      is_bind: '1'
+      is_bind: '1',
+      verification_code: '', // 验证码
     },
     rules: rulesConfig.bankCardRules('zh_CN'),
     validateType: {
@@ -38,6 +41,21 @@ Page({
       bank_phone(value) {
         return utils.validate.checkPhone(value).data
       },
+      // 新增验证码验证
+      verification_code(value) {
+        // 如果 source_type 为 2，跳过验证
+        if (this.data.source_type === '2') {
+          return true
+        }
+        // 验证码不能为空
+        if (!value || value.trim() === '') {
+          return false
+        }
+        // 验证码格式：4-8位数字或字母数字组合
+        // const codeReg = /^[a-zA-Z0-9]{4,8}$/
+        // return codeReg.test(value.trim())
+        return utils.validate.checkVerificationCode(value).data
+      }
     },
     idCardType: {
       '111': '1',// 大陆
@@ -71,21 +89,39 @@ Page({
     // 自定义校验提示文本
     customTipsMsg: '',
     source_type: '1', // 来源，1是没有设置密码，直接进入；2是重新设置密码的时候，人脸识别限制了，进来的
-    showTipModal: false
+    showTipModal: false,
+    // 获取验证参数
+    verificationText: '发送验证码',
+    countdown: 0,
+    isCountingDown: false,
+    isSendSms: true, // 是否发送验证码
+    maxRetryCount: 3, // 最大重试次数
+    retryCount: 0, // 当前重试次数
+    bankInfoSuccess: false, // 首次设置密码进入，银行卡信息核验是否成功，默认失败
+    formDataVerificationCode: '', // 接口返回的验证码
+    formDataCodeMobile: '', // 根据证件号码获取的手机号尾号
+    isFormDataCodeMobile: false, // 默认填写的手机号与实际手机号不匹配
+    checkType: '', //// 1:无密码和手机号，2：无密码有手机号，3:无手机号有密码
+    // 收不到验证码提示框
+    showNotGetVerificationCodeTipModal: false,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-    let { formData } = this.data
+    let { formData, checkType } = this.data
     formData.cardholder_name = options.name
     formData.id_card_number = options.id_card_number
     formData.strCid = options.strCid
     formData.verify_expire_time = options.verify_expire_time
+    checkType = options.checkType
     this.setData({
-      formData: formData
+      formData: formData,
+      checkType: checkType
     })
+    console.log('判断后面跳转类型')
+    console.log(this.data.checkType)
     if(options.source_type) {
       console.log('接收到类型')
       console.log(options.source_type)
@@ -194,11 +230,51 @@ Page({
         }
       }
     }
+    console.log('md加密验证码')
+    console.log(MD5(formData.verification_code).toString())
     // 点击确定出现该提示
     wx.showLoading({
       title: '验证中...',
       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
+    }
+    // 接口验证短信验证码
+    if(source_type !== '2'){
+      const verSmsCodeParam = {
+        "mobile": formData.bank_phone,
+        "monbileCode": formData.verification_code 
+      }
+      jingtongVerifyRequest.verifySmsCode(verSmsCodeParam).then(res => {
+        const { errcode, errmsg } = res
+        if(errcode !== 0){
+          wx.showToast({
+            title: errmgs,
+            icon: 'none',
+            duration: 2000
+          })
+          return
+        } else{
+          if(!res.data.success) {
+            wx.showToast({
+              title: '验证码不正确，请重新输入',
+              icon: 'none',
+              duration: 2000
+            })
+            return
+          }
+        }
+      })
+    }
     const param = {
       'id_card_number': formData.id_card_number,
       'type': 2,
@@ -270,16 +346,31 @@ Page({
         // 清空核验银行卡错误缓存
         constantVal.removeStorage(constantVal.bank_card_verify_fail_count)
         constantVal.removeStorage(constantVal.bank_card_verify_fail_time)
-
-        wx.showToast({
-          title: '验证成功，跳转中…',
-          icon: 'none',
-          duration: 1500
-        })
-        const { cardholder_name, id_card_number, strCid, cid_type, verify_expire_time } = formData
-        wx.navigateTo({
-          url: '/weapps-plugin-jingtong-verify/pages/bank-card-login-pwd-setting/bank-card-login-pwd-setting?name=' + cardholder_name + '&idCardNumber=' + id_card_number + '&strCid=' + utils.hideIdCard(id_card_number, '111') + '&cid_type=' + cid_type + '&verify_expire_time=' + verify_expire_time,
+        // 验证成功，这里跳转页面
+        jingtongVerifyRequest.getSession({
+          success: res => {
+            // 保存银行卡核验成功时间戳
+            let timeStamp = new Date().getTime()
+            wx.setStorageSync('tif.bankCardTimeStamp', timeStamp)
+            wx.setStorageSync('tif.formDataSuccess', res)
+          }
         })
+        
+        if(this.data.checkType === 3){
+          flow.redirectTo({
+            url: '../bind-phone/bind-phone?source=3'
+          })
+        } else {
+          wx.showToast({
+            title: '验证成功，跳转中…',
+            icon: 'none',
+            duration: 1500
+          })
+          const { cardholder_name, id_card_number, strCid, cid_type, verify_expire_time } = formData
+          wx.navigateTo({
+            url: '/weapps-plugin-jingtong-verify/pages/bank-card-login-pwd-setting/bank-card-login-pwd-setting?name=' + cardholder_name + '&idCardNumber=' + id_card_number + '&strCid=' + utils.hideIdCard(id_card_number, '111') + '&cid_type=' + cid_type + '&verify_expire_time=' + verify_expire_time,
+          })
+        }
       } else {
         const { errmsg } = res
         if(bankCardFailCount >= 3){
@@ -465,6 +556,218 @@ Page({
       showTipModal: false
     })
   },
+
+  // 发送验证码
+  sendVerificationCode() {
+    if (this.data.isCountingDown) {
+      return;
+    }
+
+    // 检查重试次数
+    if (this.data.retryCount >= this.data.maxRetryCount) {
+      wx.showToast({
+        title: '今日发送次数已达上限',
+        icon: 'none'
+      });
+      return;
+    }
+    const { formData } = this.data
+    if(formData.bank_phone === ''){
+      wx.showToast({
+        title: '手机号码与绑定手机号码不一致，请检查后输入',
+        icon: 'none',
+        duration: 2000
+      });
+      return;
+    }
+    // 验证手机号格式
+    if (!this.validatePhone(formData.bank_phone)) {
+      wx.showToast({
+        title: '请输入正确的手机号',
+        icon: 'none'
+      });
+      return;
+    }
+    // this.toGetPhoneCodeByIdCard()
+    this.checkBankCardInfo()
+    console.log(this.data.bankInfoSuccess)
+    
+  },
+  sendSmsCode(phoneNumber) {
+    wx.showLoading({
+      title: '发送中...'
+    });
+    // 调接口获取短信验证码
+    jingtongVerifyRequest.sendSmsCode(phoneNumber).then(res => {
+      console.log(res.data)
+      const { data, errcode, errmsg } = res
+      wx.hideLoading()
+      if(errcode === 0){
+        wx.showToast({
+          title: '验证码已发送',
+          icon: 'success'
+        });
+        this.startCountdown();
+        this.setData({
+          isSendSms: true,
+          retryCount: this.data.retryCount + 1,
+          formDataVerificationCode: data.code
+        });
+      } else {
+        wx.showToast({
+          title: errmsg || '发送失败，稍后请重试',
+          icon: 'none'
+        });
+      }
+    })
+  },
+  // 开始倒计时
+  startCountdown() {
+    this.setData({
+      countdown: 60,
+      isCountingDown: true,
+      verificationText: '已发送(60s)'
+    });
+
+    this.countdownTimer = setInterval(() => {
+      const newCountdown = this.data.countdown - 1;
+      
+      if (newCountdown <= 0) {
+        this.setData({
+          countdown: 0,
+          isCountingDown: false,
+          verificationText: '重新发送'
+        });
+        clearInterval(this.countdownTimer);
+        this.countdownTimer = null;
+      } else {
+        this.setData({
+          countdown: newCountdown,
+          verificationText: `已发送(${newCountdown}s)`
+        });
+      }
+    }, 1000);
+  },
+  // 获取手机号尾号并设置手机号是否匹配
+  toGetPhoneCodeByIdCard(){
+    const { formData } = this.data
+    const phoneCodeParam = {
+      "id_card_number" : formData.id_card_number,
+      "mobile": formData.bank_phone
+    }
+    jingtongVerifyRequest.getInfoCheck(phoneCodeParam).then(res => {
+      const { errcode, errmsg } = res
+      if(errcode === 0){
+        this.setData({
+          isFormDataCodeMobile: res.data.is_matched
+        })
+      } else {
+        wx.showToast({
+          title: errmsg,
+          icon: "none",
+          duration: 3000
+        })
+      }
+    })
+  },
+  // 验证手机号
+  validatePhone(phone) {
+    console.log(phone)
+    const phoneReg = /^1[3-9]\d{9}$/;
+    return phoneReg.test(phone);
+  },
+  // 银行卡号失焦检测
+  bankCardToCheckBankInfo() {
+    const { formData, source_type }= this.data
+    // 设置密码才进行检测，如果是忘记密码进入的，不走这里
+    if(source_type != 2){
+      // 手机号号是否填写，填写就进行银行卡核验
+      if(formData.phone_number){
+        console.log('填写了')
+        // this.checkBankCardInfo()
+      }
+    }
+  },
+  // 手机号失焦检测
+  phoneToCheckBankInfo(){
+    const { formData, source_type }= this.data
+    // 设置密码才进行检测，如果是忘记密码进入的，不走这里
+    if(source_type != 2) {
+      // 银行卡号是否填写，填写就进行银行卡核验
+      if(formData.bank_card_account){
+        console.log('填写了')
+        // this.checkBankCardInfo()
+      }
+    }
+  },
+  // 银行卡核验-仅核验
+  checkBankCardInfo() {
+    wx.showLoading({
+      title: '验证中…',
+    })
+    const { formData, idCardType }= this.data
+    console.log('参数')
+    console.log(formData)
+    const checkBankCardParam = {
+      'id_card_number': formData.id_card_number,
+      "cert_name": formData.cardholder_name,
+      "verify_type": '110',
+      "support_type": '110',
+      "id_type": idCardType[formData.cid_type],
+      "account_no": formData.bank_card_account,
+      "mobile": formData.bank_phone,
+      "isbind": 1,
+      "cid_type": "111"
+    }
+    jingtongVerifyRequest.setNewPwdToBankCardVerifyWithIdCard(checkBankCardParam).then(res =>{
+      console.log('请求结果')
+      console.log(res)
+      wx.hideLoading()
+      const { errcode, errmsg } = res
+      //核验通过，进行标记
+      if(errcode === 0){
+        this.setData({
+          bankInfoSuccess: true
+        })
+        // 手机号匹配，进行发送验证码
+        if(this.data.bankInfoSuccess){
+          const { formData } = this.data
+          this.sendSmsCode(formData.bank_phone)
+        }
+      } else {
+        wx.showToast({
+          title: errmsg,
+          icon: 'none',
+          duration: 3000
+        })
+        this.setData({
+          bankInfoSuccess: false
+        })
+      }
+    }).catch(error => {
+      wx.showToast({
+        title: '请求异常',
+        icon: 'none',
+        duration: 3000
+      })
+    })
+  }, 
+  /**
+   * 打开收不到验证码提示框
+   */
+  handleNotVerificationTipModal () {
+    this.setData({
+      showNotGetVerificationCodeTipModal: true
+    })
+  },
+  /**
+   * 关闭收不到验证码提示框
+   */
+  handleNotGetVerificationCodeTipModalCancel() {
+    this.setData({
+      showNotGetVerificationCodeTipModal: false
+    })
+  },
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */

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

@@ -68,6 +68,7 @@
           value="{{ formData.bank_card_account }}"
           clearable="true"
           bind:change="handleChange"
+          bind:blur="bankCardToCheckBankInfo"
         />
       </view>
       <view class="form-item-wrap">
@@ -79,9 +80,36 @@
           value="{{ formData.bank_phone }}"
           clearable="true"
           bind:change="handleChange"
+          bind:blur="phoneToCheckBankInfo"
         />
       </view>
-      <view class="describe-box" style="margin-top: 50rpx">
+      <!-- 验证码 -->
+      <view class="form-item-wrap"  wx:if="{{source_type != 2}}">
+        <g-input
+          id="verification_code"
+          label="验证码"
+          placeholder="请填写短信验证码"
+          value="{{ formData.verification_code }}"
+          clearable="true"
+          bind:change="handleChange"
+          append="true"
+        >
+          <view 
+            slot="append" 
+            class="verification-btn {{ isCountingDown ? 'disabled' : '' }}" 
+            bind:tap="sendVerificationCode"
+          >
+            {{ verificationText }}
+          </view>
+        </g-input>
+      </view>
+      <!-- 收不到验证码 -->
+      <view class="form-item-wrap"  wx:if="{{source_type != 2}}">
+        <view class="not_get_verification_code" bind:tap="handleNotVerificationTipModal">
+          收不到验证码?
+        </view>
+      </view>
+      <view class="describe-box" style="margin-top: 10rpx">
         <view class="special-describe-box" >
           <view>特别说明：</view>
           <view>您提供的银行卡号及其绑定手机号仅用于您的身份认证，北京市大数据中心不会留存你的银行卡信息</view>
@@ -117,4 +145,15 @@
   bind:cancel="handleModalOk" 
   desc1="1、如果您在公安局变更了您的姓名或证件号码等信息，请您填写变更后的身份信息进行登录。" 
   desc2="2、如果当前显示为他人信息（亲属/朋友等），请您删除后使用本人身份信息进行登录。"
+></tip-modal>
+
+<!-- 收不到验证码弹窗 -->
+<tip-modal 
+  visible="{{ showNotGetVerificationCodeTipModal }}" 
+  bind:cancel="handleNotGetVerificationCodeTipModalCancel"
+  xAlign="left" 
+  desc1="1、短信验证码会发送至您银行卡绑定的手机号。" 
+  desc2="2、请确认当前手机信号良好并已关闭飞行模式。" 
+  desc3="3、请检查短信是否被手机安全软件拦截。" 
+  desc4="4、如仍收不到短信验证码，请尝试使用人脸识别方式验证。" 
 ></tip-modal>

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

@@ -214,4 +214,45 @@
 /* 在现有样式中添加隐藏选择文字 */
 .readonly-picker .picker__action {
   display: none !important;
+}/* 短信验证码 */
+
+/* 收不到验证码 */
+.not_get_verification_code{
+  padding:40rpx; color: #ce0022;
+  font-family: "PingFang SC";
+  font-size: 34rpx;
+  font-style: normal;
+  font-weight: 500;
+  line-height: normal;
+  letter-spacing: -0.3px;
+  padding: 40rpx;
+}
+/* 验证码按钮样式 */
+.verification-btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  height: 64rpx;                 /* 胶囊高度 */
+  padding: 0 28rpx;               /* 左右内边距 */
+  background: #ce0022;            /* 红底 */
+  color: #ffffff;                 /* 白字 */
+  font-size: 28rpx;
+  white-space: nowrap;
+  border-radius: 40rpx;           /* 圆角形成胶囊 */
+  transition: opacity 0.2s ease;
+  cursor: pointer;
+  box-shadow: 0 4rpx 12rpx rgba(206, 0, 34, 0.18);
+}
+
+/* 倒计时状态样式 */
+.verification-btn.disabled {
+  background: #E6E6E6;           /* 灰底 */
+  color: #999999;                /* 灰字 */
+  box-shadow: none;
+  cursor: not-allowed;
+}
+
+/* 点击效果 */
+.verification-btn:active:not(.disabled) {
+  opacity: 0.85;
 }

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

@@ -192,7 +192,8 @@ Page({
     customTipsMsg: '',
     submitMode: '',
     // 防重复点击标记 - 基于接口返回状态
-    isSubmitting: false
+    isSubmitting: false,
+    checkType: 1, // 1:无密码和手机号，2：无密码有手机号，3:无手机号有密码
   },
 
   /**
@@ -1585,19 +1586,121 @@ Page({
   async toBankCardLogin() {
     // 判断是否是PC端登录
     await this.getDevice()
+    wx.showLoading({
+      title: '验证中…',
+      mask: true
+    })
+    // 身份二要素校验
+    const { name, id_card_number } = this.data.formData
+    const verifyIdCardParams = {
+      "id_card_number": id_card_number,
+      "name": name,
+      "verify_type": "101",
+      "support_type": "0x40"
+    }
+    jingtongVerifyRequest.verifyIdcard(verifyIdCardParams).then(res => {
+      console.log('获取身份证二要素核验结果')
+      console.log(res)
+      if(res.errcode === 0){
+        // 可进行
+      } else {
+        wx.showToast({
+          title: res.errmsg,
+          icon: 'none',
+          duration: 2000
+        })
+        this.data.submitMode = ''
+        this.data.isSubmitting = false
+        return
+      }
+      wx.hideLoading()
+    }).catch(error => {
+      this.data.submitMode = ''
+      this.data.isSubmitting = false
+      return
+    })
+    // 验证手机号
+    const infoCheckParam = {
+      "id_card_number": id_card_number,
+      "phone_number": ''
+    }
+    
+    let isPhoneNumber = false
+    jingtongVerifyRequest.getInfoCheck(infoCheckParam).then(res =>{
+      const { errmsg, errcode } = res
+      console.log(res)
+      if(errcode === 0){
+        if(res.data.phone_suffix){
+          isPhoneNumber = false
+          // 1:无密码和手机号，2：无密码有手机号，3：无手机号有密码
+          this.setData({
+            checkType:2
+          })
+        } else {
+          isPhoneNumber = true
+          // 1:无密码和手机号，2：无密码有手机号，3：无手机号有密码
+          this.setData({
+            checkType:3
+          })
+        }
+      } else{
+        isPhoneNumber = true
+      }
+    }).catch(error => {
+      this.data.submitMode = ''
+      this.data.isSubmitting = false
+      return
+    })
     jingtongVerifyRequest.checkPhonePwd(this.data.formData.id_card_number).then(res => {
       console.log(res)
+      wx.hideLoading()
       const { errmsg, errcode } = res
+      console.log(isPhoneNumber)
+      console.log(!res.data.is_new)
       if (errcode === 0) {
-        if(res.data.is_new){
+        // isPhoneNumber 为true,即系没有手机号，res.data.is_new为true即系无密码
+        if(isPhoneNumber && res.data.is_new){
+          // 1:无密码和手机号，2：无密码有手机号，3：无手机号有密码
+          this.setData({
+            checkType: 1
+          })
           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 {
+        } else if(isPhoneNumber && !res.data.is_new){
+           // isPhoneNumber 为true,即系没有手机号，res.data.is_new为true即系无密码
+          // 1:无密码和手机号，2：无密码有手机号，3：无手机号有密码
+          this.setData({
+            checkType: 3
+          })
+          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 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
+         })
+       } else {
           wx.navigateTo({
             url: '/weapps-plugin-jingtong-verify/pages/bank-card-login/bank-card-login?cardNumber='
               + this.data.formData.id_card_number

package/weapps-plugin-jingtong-verify/pages/login-help/login-help.wxss

@@ -97,7 +97,7 @@
 }
 
 .accordion-content.show {
-  max-height: 2000rpx; /* 放宽以容纳长内容 */
+  max-height: 3000rpx; /* 放宽以容纳长内容 */
 }
 
 /* 答案列表 */
@@ -107,7 +107,7 @@
 
 .answer-item {
   display: block;
-  font-size: 26rpx;
+  font-size: 32rpx;
   color: #62667A;
   line-height: 1.6;
   margin-bottom: 15rpx;

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

@@ -1426,6 +1426,36 @@ function _checkPhonePwd(options) {
     });
   })
 }
+
+// 根据证件号获取手机号后四位及根据证件号及手机号核验用户是否匹配
+function _infoCheck(options) {
+  console.log(options)
+  const paramsFull = {
+    'id_card_number': options.id_card_number,
+    'mobile': options.phone_number
+  }
+  return new Promise((resolve, reject) => {
+    const [tifhost] = getOptions(['tifhost'])
+    _request({
+      url: tifhost + '/api/info_check',
+      method: 'POST',
+      data: paramsFull,
+      success: res => {
+        console.log('接口返回结果')
+        let { errcode, data } = res.data
+        console.log(errcode)
+        if (errcode !== 0) {
+          console.log(JSON.stringify(res.data))
+          return resolve(res.data)
+        }
+        return resolve(res.data)
+      },
+      fail: err => {
+        return reject(JSON.stringify(err.data))
+      }
+    });
+  })
+}
 /**
  * 获取核验次数限制
  * id_card_number 证件号码
@@ -1755,9 +1785,9 @@ function _sendSmsCode(options) {
       success: res => {
         let { errcode, data } = res.data
         if (errcode !== 0) {
-          return reject(JSON.stringify(res.data))
+          return resolve(res.data)
         }
-        return resolve(res)
+        return resolve(res.data)
       },
       fail: err => {
         return reject(JSON.stringify(err.data))
@@ -1954,6 +1984,36 @@ function _setNewPwdToBankCardVerifyWithIdCard(options) {
   })
 }
 
+/**
+ * 验证码核验
+ * @param {*} options 
+ */
+function _verifySmsCode(options) {
+  console.log(options)
+  const paramsFull = {
+    'mobile': options.mobile,
+    'code': options.mobileCode
+  }
+  return new Promise((resolve, reject) => {
+    const [tifhost] = getOptions(['tifhost'])
+    _request({
+      url: tifhost + '/api/verify_sms_code',
+      method: 'POST',
+      data: paramsFull,
+      success: res => {
+        let { errcode, data } = res.data
+        if (errcode !== 0) {
+          return resolve(res.data)
+        }
+        return resolve(res.data)
+      },
+      fail: err => {
+        return reject(JSON.stringify(err.data))
+      }
+    });
+  })
+}
+
 
 module.exports = {
   init,
@@ -2035,6 +2095,9 @@ module.exports = {
   // 检查用户是否注册有密码
   checkPhonePwd:_checkPhonePwd,
 
+  // 根据证件号获取手机号后四位及根据证件号及手机号核验用户是否匹配
+  getInfoCheck:_infoCheck,
+
   // 获取核验次数限制
   getVerifyLimit:_getVerifyLimit,
 
@@ -2069,5 +2132,8 @@ module.exports = {
   setNewPwdToFaceVerifyWithIdCard:_setNewPwdToFaceVerifyWithIdCard,
 
   // 忘记密码 - 身份证 - 银行卡核验
-  setNewPwdToBankCardVerifyWithIdCard:_setNewPwdToBankCardVerifyWithIdCard
+  setNewPwdToBankCardVerifyWithIdCard:_setNewPwdToBankCardVerifyWithIdCard,
+  
+  // 短信验证码核验
+  verifySmsCode:_verifySmsCode
 }

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

@@ -290,7 +290,7 @@ const ForeignPassortRules = (language) => {
 // }
 // 银行卡
 const bankCardRules = (language) => {
-  const { cardholder_name, id_card_number, bank_card_account, bank_phone } = dict.rules.bankCardRules
+  const { cardholder_name, id_card_number, bank_card_account, bank_phone,verification_code } = dict.rules.bankCardRules
   return {
     id_card_number: [
       { type: 'required', message: `${id_card_number.required[language]}` },
@@ -307,6 +307,9 @@ const bankCardRules = (language) => {
     bank_phone: [
       { type: 'required', message: `${bank_phone.required[language]}` },
       { type: 'bank_phone', message: `${bank_phone.validate[language]}` }
+    ],
+    verification_code: [
+      { type: 'required', message: `${verification_code.required[language]}` }
     ]
   }
 }

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

@@ -875,6 +875,21 @@ function checkSpecialChar(value) {
   }
   return false;
 }
+function checkVerificationCode(value){
+  console.log('验证验证码')
+  console.log(value)
+  if (!value || value.trim() === '') {
+    return {
+      data: false,
+      msg: '请输入验证码'
+    };
+  }
+  return {
+    data: true,
+    msg: ''
+  };
+}
+
 
 export {
   checkAccount,
@@ -891,5 +906,6 @@ export {
   checkEmail,
   checkIDCard,
   removeSpaceFun,
-  checkHmtPassport
+  checkHmtPassport,
+  checkVerificationCode
 }