weapps-plugin-jingtong-verify 1.5.1 → 1.5.3

package/README.md

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

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.3",
   "description": "",
   "main": "sdk.js",
   "author": "tongyirenzheng",
@@ -18,4 +18,4 @@
     "crypto-js": "^3.3.0",
     "miniprogram-sm-crypto": "^0.3.13"
   }
-}
+}

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,35 @@ const rules = {
         en: 'Please enter your login password'
       }
     },
+    verification_code: {
+      required: {
+        zh_CN: '请输入验证码',
+        en: 'Please enter the verification code'
+      }
+    },
+  },
+  // 设置密码
+  bankCardSetPwdRules: {
+    bank_card_password: {
+      required: {
+        zh_CN: '请输入登录密码',
+        en: 'Please enter your login password'
+      },
+      validate: {
+        zh_CN: '请输入有效登录密码',
+        en: 'Please enter your login password'
+      }
+    },
+    bank_card_pwd_password: {
+      required: {
+        zh_CN: '请再次输入登录密码',
+        en: 'Please enter your login password again'
+      },
+      validate: {
+        zh_CN: '两次密码输入不一致',
+        en: 'Please enter your login password again'
+      }
+    },
   },
   // 忘记密码设置新密码
   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

@@ -58,7 +58,7 @@ Page({
       bank_card_password: '',
       bank_card_pwd_password: ''
     },
-    pwdRules: rulesConfig.bankCardSetPwdRules('zh_CN'),
+    pwdRules: rulesConfig.bankCardSetNewPwdRules('zh_CN'),
     validatePwdType: {
       bank_card_password(value) {
         return utils.validate.checkBankCardLoginPwd(value).data
@@ -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

@@ -9,7 +9,7 @@
       <image src="../../images/Frame.png" mode="aspectFit" class="img"></image>
     </view>
     <view class="title">{{ language == 'zh_CN' ? '设置新登录密码' : 'Set new login password' }}</view>
-    <view class="title_describe">{{ language == 'zh_CN' ? '保护您个人信息更安全' : 'Protect your personal information more securely' }}</view>
+    <view class="title_describe">{{ language == 'zh_CN' ? '新登录密码设置后原密码将会失效' : 'After setting the new login password, the original password will become invalid' }}</view>
   </view>
   <view class="content-box" wx:if="{{ language === 'zh_CN' }}">
     <!-- 完整配置 -->
@@ -51,14 +51,8 @@
               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,24 +74,23 @@
           bind:submit="handleSafeFormSubmit"
         >
           <view class="form-item-wrap">
-            <!-- <g-input
+            <g-input
               id="id_card_number"
               data-star="strCid"
               label="身份证号码"
               placeholder="请输入本人证件号码"
               value="{{ formSafeData.strCid || formSafeData.id_card_number }}"
-              clearable="{{ false }}"
-              class="readonly-input"
-              isOpen="{{ !formSafeData.strCid }}"         
-              bind:change="handleSafeChange"
+              clearable="{{ true }}"
+              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 +101,7 @@
               showQuestion="{{ true }}"
               bind:showQuestionTip="showQuestionTip"
               bind:blur="getTailNumber"
-            />
+            /> -->
           </view>
           <!-- 手机号码 -->
           <view class="form-item-wrap">
@@ -192,12 +185,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

@@ -187,13 +187,14 @@
 
 .other-way-btn{
   width: 100%;
-  height: 76rpx;
+  height: 96rpx;
   border: 1px solid #CE0022;
   display: flex;
   align-items: center;
   justify-content: center;
   border-radius: 10rpx;
   color: #CE0022;
+  font-size: 34rpx;
 }
 
 /* 步骤条以及内容 */
@@ -306,7 +307,7 @@
 .not_get_verification_code{
   padding:40rpx; color: #ce0022;
   font-family: "PingFang SC";
-  font-size: 34rpx;
+  font-size: 28rpx;
   font-style: normal;
   font-weight: 500;
   line-height: normal;

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

@@ -29,6 +29,7 @@ Page({
         return utils.validate.checkBankCardLoginPwd(value).data && utils.validate.checkConfirmPwd(value, formData.bank_card_password).data
       }, // 记录是否已经登录成功
     },
+    isShowPasswordStrength: false,// 是否显示密码强度
     passwordStrength: 0, // 密码强度等级 0-3
     passwordStrengthText: '弱',
     // 是否显示自定义校验提示
@@ -181,7 +182,8 @@ Page({
 
         this.setData({
           passwordStrength: strength, // 弱=1，中=2，强=3
-          passwordStrengthText: strengthText
+          passwordStrengthText: strengthText,
+          isShowPasswordStrength: true
         })
       }
     })

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

@@ -26,7 +26,7 @@
       <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>
@@ -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-login-pwd-setting/bank-card-login-pwd-setting.wxss

@@ -202,15 +202,15 @@
 }
 
 .strength-segment.weak.active {
-  background-color: #ff4757;
+  background-color: #CE0022;
 }
 
 .strength-segment.medium.active {
-  background-color: #ffa502;
+  background-color: #EE8610;
 }
 
 .strength-segment.strong.active {
-  background-color: #2ed573;
+  background-color: #21C58A;
 }
 
 .strength-text {