weapps-plugin-jingtong-verify 1.4.1 → 1.4.2

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

@@ -1,203 +1,263 @@
-const rules = {
-  // 身份证
-  chinaRules: {
-    name: {
-      required: {
-        zh_CN: '请输入中文姓名',
-        en: 'Please enter a valid name'
-      },
-      validate: {
-        zh_CN: '请输入有效的姓名',
-        en: 'Please enter a valid name'
-      }
-    },
-    id_card_number: {
-      required: {
-        zh_CN: '请输入有效的证件号码',
-        en: 'Please enter a valid Passport number'
-      },
-      validate: {
-        zh_CN: '请输入有效的证件号码',
-        en: 'Please enter a valid Passport number'
-      }
-    },
-    verify_expire_time: {
-      required: {
-        zh_CN: '请选择登录有效期',
-        en: 'Please select a login validity period'
-      }
-    },
-    agree: {
-      required: {
-        zh_CN: '请阅读下文规则并勾选同意',
-        en: 'Please read the text below and tick the checkbox if you agree'
-      }
-    }
-  },
-
-  // 港澳台通行证+华侨护照+永居证
-  HMORules: {
-    name: {
-      required: {
-        zh_CN: '请输入证件上的姓名',
-        en: 'Please enter'
-      }
-    },
-    nation: {
-      required: {
-        zh_CN: '请选择国籍',
-        en: 'Please select your nationality'
-      }
-    },
-    sex: {
-      zh_CN: '请选择本人性别',
-      en: 'Please select your gender information'
-    },
-    birthday: {
-      zh_CN: '请选择本人出生日期',
-      en: 'Please select your date of birth'
-    },
-    id_card_number: {
-      required: {
-        zh_CN: '请输入有效的证件号码',
-        en: 'Please enter your passport No.'
-      },
-      validate: {
-        zh_CN: '请输入有效的证件号码',
-        en: 'Please enter your passport No.'
-      }
-    },
-    cid_expire_date: {
-      zh_CN: '请选择证件有效期截止日期',
-      en: 'Please select the expiration date of your passport'
-    },
-  },
-
-  // 外国护照
-  foreignerRules: {
-    id_card_number: {
-      required: {
-        zh_CN: '请输入护照号码',
-        en: 'Please enter your passport No.'
-      },
-      validate: {
-        zh_CN: '证件号码不允许汉字、全角字符、特殊字符',
-        en: 'Please enter your passport No.'
-      }
-    },
-    nation: {
-      required: {
-        zh_CN: '请选择国籍',
-        en: 'Please select your nationality'
-      }
-    },
-    sur_name: {
-      required: {
-        zh_CN: '请输入姓',
-        en: 'Please enter your surname'
-      },
-      validate: {
-        zh_CN: '不能输入小写字母',
-        en: 'Please enter capital letters'
-      },
-    },
-    first_name: {
-      required: {
-        zh_CN: '请输入名',
-        en: 'Please enter your given names'
-      },
-      validate: {
-        zh_CN: '不能输入小写字母',
-        en: 'Please enter capital letters'
-      },
-    },
-    sex: {
-      zh_CN: '请选择性别',
-      en: 'Please select your gender information'
-    },
-    birthday: {
-      zh_CN: '请选择出生日期',
-      en: 'Please select your date of birth'
-    },
-    cid_expire_date: {
-      zh_CN: '请选择护照有效期',
-      en: 'Please select the expiration date of your passport'
-    },
-    phone: {
-      required: {
-        zh_CN: '请输入手机号码',
-        en: 'Please enter your mobile phone number'
-      }
-    }
-  },
-
-  // 银行卡
-  cardRules: {
-    id_card_number: {
-      required: {
-        zh_CN: '请输入证件号码',
-        en: '请输入证件号码'
-      },
-      validate: {
-        zh_CN: '请输入有效的证件号码',
-        en: '请输入有效的证件号码'
-      }
-    },
-    bank_account: {
-      required: {
-        zh_CN: '请输入银行卡卡号(支持国内各主要银行)',
-        en: '请输入银行卡卡号(支持国内各主要银行)'
-      }
-    },
-    name: {
-      required: {
-        zh_CN: '请输入银行卡绑定证件姓名',
-        en: '请输入银行卡绑定证件姓名'
-      }
-    },
-    phone: {
-      required: {
-        zh_CN: '请输入银行卡绑定手机号码',
-        en: '请输入银行卡绑定手机号码'
-      }
-    }
-  },
-
-  // 居住证
-  residenceAuthRules: {
-    name: {
-      required: {
-        zh_CN: '请输入本人姓名',
-        en: '请输入本人姓名'
-      },
-    },
-    id_card_number: {
-      required: {
-        zh_CN: '请输入本人居住证号码',
-        en: '请输入本人居住证号码'
-      },
-      validate: {
-        zh_CN: '请输入有效的居住证号码',
-        en: '请输入有效的居住证号码'
-      }
-    },
-    validity_period: {
-      required: {
-        zh_CN: '请选择居住证有效期起始日期',
-        en: '请选择居住证有效期起始日期'
-      }
-    },
-    passport_number: {
-      required: {
-        zh_CN: '请输入本人通行证号码',
-        en: '请输入本人通行证号码'
-      },
-      validate: {
-        zh_CN: '请输入有效的通行证号码',
-        en: '请输入有效的通行证号码'
-      }
-    }
-  }
-}
-
-module.exports = { rules }
+const rules = {
+  // 身份证
+  chinaRules: {
+    name: {
+      required: {
+        zh_CN: '请输入中文姓名',
+        en: 'Please enter a valid name'
+      },
+      validate: {
+        zh_CN: '请输入有效的姓名',
+        en: 'Please enter a valid name'
+      }
+    },
+    id_card_number: {
+      required: {
+        zh_CN: '请输入有效的证件号码',
+        en: 'Please enter a valid Passport number'
+      },
+      validate: {
+        zh_CN: '请输入有效的证件号码',
+        en: 'Please enter a valid Passport number'
+      }
+    },
+    verify_expire_time: {
+      required: {
+        zh_CN: '请选择登录有效期',
+        en: 'Please select a login validity period'
+      }
+    },
+    agree: {
+      required: {
+        zh_CN: '请阅读下文规则并勾选同意',
+        en: 'Please read the text below and tick the checkbox if you agree'
+      }
+    }
+  },
+
+  // 港澳台通行证+华侨护照+永居证
+  HMORules: {
+    name: {
+      required: {
+        zh_CN: '请输入证件上的姓名',
+        en: 'Please enter'
+      }
+    },
+    nation: {
+      required: {
+        zh_CN: '请选择国籍',
+        en: 'Please select your nationality'
+      }
+    },
+    sex: {
+      zh_CN: '请选择本人性别',
+      en: 'Please select your gender information'
+    },
+    birthday: {
+      zh_CN: '请选择本人出生日期',
+      en: 'Please select your date of birth'
+    },
+    id_card_number: {
+      required: {
+        zh_CN: '请输入有效的证件号码',
+        en: 'Please enter your passport No.'
+      },
+      validate: {
+        zh_CN: '请输入有效的证件号码',
+        en: 'Please enter your passport No.'
+      }
+    },
+    cid_expire_date: {
+      zh_CN: '请选择证件有效期截止日期',
+      en: 'Please select the expiration date of your passport'
+    },
+  },
+
+  // 外国护照
+  foreignerRules: {
+    id_card_number: {
+      required: {
+        zh_CN: '请输入护照号码',
+        en: 'Please enter your passport No.'
+      },
+      validate: {
+        zh_CN: '证件号码不允许汉字、全角字符、特殊字符',
+        en: 'Please enter your passport No.'
+      }
+    },
+    nation: {
+      required: {
+        zh_CN: '请选择国籍',
+        en: 'Please select your nationality'
+      }
+    },
+    sur_name: {
+      required: {
+        zh_CN: '请输入姓',
+        en: 'Please enter your surname'
+      },
+      validate: {
+        zh_CN: '不能输入小写字母',
+        en: 'Please enter capital letters'
+      },
+    },
+    first_name: {
+      required: {
+        zh_CN: '请输入名',
+        en: 'Please enter your given names'
+      },
+      validate: {
+        zh_CN: '不能输入小写字母',
+        en: 'Please enter capital letters'
+      },
+    },
+    sex: {
+      zh_CN: '请选择性别',
+      en: 'Please select your gender information'
+    },
+    birthday: {
+      zh_CN: '请选择出生日期',
+      en: 'Please select your date of birth'
+    },
+    cid_expire_date: {
+      zh_CN: '请选择护照有效期',
+      en: 'Please select the expiration date of your passport'
+    },
+    phone: {
+      required: {
+        zh_CN: '请输入手机号码',
+        en: 'Please enter your mobile phone number'
+      }
+    }
+  },
+
+  // 外国护照(人脸识别)
+  foreignerRulesFace: {
+    id_card_number: {
+      required: {
+        zh_CN: '请输入护照号码',
+        en: 'Please enter your passport No.'
+      },
+      validate: {
+        zh_CN: '证件号码不允许汉字、全角字符、特殊字符',
+        en: 'Please enter your passport No.'
+      }
+    },
+    nation: {
+      required: {
+        zh_CN: '请选择国籍',
+        en: 'Please select your nationality'
+      }
+    },
+    sur_name: {
+      required: {
+        zh_CN: '请输入姓',
+        en: 'Please enter your surname'
+      },
+      validate: {
+        zh_CN: '不能输入小写字母',
+        en: 'Please enter capital letters'
+      },
+    },
+    first_name: {
+      required: {
+        zh_CN: '请输入名',
+        en: 'Please enter your given names'
+      },
+      validate: {
+        zh_CN: '不能输入小写字母',
+        en: 'Please enter capital letters'
+      },
+    },
+    sex: {
+      zh_CN: '请选择性别',
+      en: 'Please select your gender information'
+    },
+    birthday: {
+      zh_CN: '请选择出生日期',
+      en: 'Please select your date of birth'
+    },
+    cid_expire_date: {
+      zh_CN: '请选择护照有效期',
+      en: 'Please select the expiration date of your passport'
+    },
+    phone: {
+      required: {
+        zh_CN: '请输入手机号码',
+        en: 'Please enter your mobile phone number'
+      }
+    }
+  },
+
+  // 银行卡
+  cardRules: {
+    id_card_number: {
+      required: {
+        zh_CN: '请输入证件号码',
+        en: '请输入证件号码'
+      },
+      validate: {
+        zh_CN: '请输入有效的证件号码',
+        en: '请输入有效的证件号码'
+      }
+    },
+    bank_account: {
+      required: {
+        zh_CN: '请输入银行卡卡号(支持国内各主要银行)',
+        en: '请输入银行卡卡号(支持国内各主要银行)'
+      }
+    },
+    name: {
+      required: {
+        zh_CN: '请输入银行卡绑定证件姓名',
+        en: '请输入银行卡绑定证件姓名'
+      }
+    },
+    phone: {
+      required: {
+        zh_CN: '请输入银行卡绑定手机号码',
+        en: '请输入银行卡绑定手机号码'
+      }
+    }
+  },
+
+  // 居住证
+  residenceAuthRules: {
+    name: {
+      required: {
+        zh_CN: '请输入本人姓名',
+        en: '请输入本人姓名'
+      },
+    },
+    id_card_number: {
+      required: {
+        zh_CN: '请输入本人居住证号码',
+        en: '请输入本人居住证号码'
+      },
+      validate: {
+        zh_CN: '请输入有效的居住证号码',
+        en: '请输入有效的居住证号码'
+      }
+    },
+    validity_period: {
+      required: {
+        zh_CN: '请选择居住证有效期起始日期',
+        en: '请选择居住证有效期起始日期'
+      }
+    },
+    passport_number: {
+      required: {
+        zh_CN: '请输入本人通行证号码',
+        en: '请输入本人通行证号码'
+      },
+      validate: {
+        zh_CN: '请输入有效的通行证号码',
+        en: '请输入有效的通行证号码'
+      }
+    }
+  }
+}
+
+module.exports = {
+  rules
+}

package/weapps-plugin-jingtong-verify/pages/bind-phone/bind-phone.js

@@ -1,87 +1,87 @@
-// weapps-plugin-jingtong-verify/pages/bind-phone/bind-phone.js
-const jingtongVerifyRequest = require('../../utils/request')
-const utils = require("../../utils/index")
-const { flow } = require("@wecity/weda-plugin-utils");
-
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    source: ''
-  },
-
-  // 微信获取手机号码授权
-  async getPhoneNumber(e) {
-    console.log('微信获取手机号码授权', e)
-    if (e.detail.iv) {
-      const params = Object.assign(e.detail, {
-        source: this.data.source || ''
-      })
-      const [err1, session] = await utils.awaitTo(jingtongVerifyRequest.loginPhone(params))
-      if (err1) {
-        wx.showToast({
-          title: err1.errmsg || '手机号码获取失败',
-          icon: 'none',
-          mask: true
-        })
-
-        // 解决用户未找到的问题:跳转到认证信息填写页面
-        if (err1.errcode === 2034) {
-          setTimeout(() => {
-            flow.redirectTo({
-              url: '../face-verify/face-verify?needUnite=true'
-            })
-          }, 1500)
-        }
-        return
-      }
-
-      wx.showToast({
-        title: '绑定成功, 跳转中…',
-        icon: 'none',
-        duration: 5000,
-        mask: true
-      })
-
-      // 登录成功回调 => 业务侧操作事项
-      wx.$_ServiceConfiguration && wx.$_ServiceConfiguration.methods && wx.$_ServiceConfiguration.methods._loginSuccessCallBack && wx.$_ServiceConfiguration.methods._loginSuccessCallBack(session)
-
-      const [err2, token] = await utils.awaitTo(jingtongVerifyRequest.personToken({ source: '8' }))
-      if (err2) {
-        return
-      }
-
-      //  埋点 - 个人用户实体全属性上报
-      let last_login_time = utils.getCurrentTime()
-      wx.setStorageSync('tif.lastLoginTime', last_login_time)
-      const data = Object.assign(session, {
-        user_status: '1',
-        last_login_time,
-        user_date_of_birth: session.cid_type === '111' ? utils.getBirthByIDCard(session.cid) : ''
-      })
-      await utils.awaitTo(jingtongVerifyRequest.userEntityReport(data))
-
-      // 返回主包
-      setTimeout(() => {
-        flow.resolve({
-          token
-        })
-      }, 1200)
-    } else {
-      wx.showToast({
-        title: '您的微信版本太低，无法授权',
-        icon: 'none'
-      })
-    }
-  },
-
-  onLoad(options) {
-    console.log('参数', options)
-    this.setData({
-      source: options && options.source || ''
-    })
-    wx.hideShareMenu()
-  }
+// weapps-plugin-jingtong-verify/pages/bind-phone/bind-phone.js
+const jingtongVerifyRequest = require('../../utils/request')
+const utils = require("../../utils/index")
+const { flow } = require("@wecity/weda-plugin-utils");
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    source: ''
+  },
+
+  // 微信获取手机号码授权
+  async getPhoneNumber(e) {
+    console.log('微信获取手机号码授权', e)
+    if (e.detail.iv) {
+      const params = Object.assign(e.detail, {
+        source: this.data.source || ''
+      })
+      const [err1, session] = await utils.awaitTo(jingtongVerifyRequest.loginPhone(params))
+      if (err1) {
+        wx.showToast({
+          title: err1.errmsg || '手机号码获取失败',
+          icon: 'none',
+          mask: true
+        })
+
+        // 解决用户未找到的问题:跳转到认证信息填写页面
+        if (err1.errcode === 2034) {
+          setTimeout(() => {
+            flow.redirectTo({
+              url: '../face-verify/face-verify?needUnite=true'
+            })
+          }, 1500)
+        }
+        return
+      }
+
+      wx.showToast({
+        title: '绑定成功, 跳转中…',
+        icon: 'none',
+        duration: 5000,
+        mask: true
+      })
+
+      // 登录成功回调 => 业务侧操作事项
+      wx.$_ServiceConfiguration && wx.$_ServiceConfiguration.methods && wx.$_ServiceConfiguration.methods._loginSuccessCallBack && wx.$_ServiceConfiguration.methods._loginSuccessCallBack(session)
+
+      const [err2, token] = await utils.awaitTo(jingtongVerifyRequest.personToken({ source: '8' }))
+      if (err2) {
+        return
+      }
+
+      //  埋点 - 个人用户实体全属性上报
+      let last_login_time = utils.getCurrentTime()
+      wx.setStorageSync('tif.lastLoginTime', last_login_time)
+      const data = Object.assign(session, {
+        user_status: '1',
+        last_login_time,
+        user_date_of_birth: session.cid_type === '111' ? utils.getBirthByIDCard(session.cid) : ''
+      })
+      await utils.awaitTo(jingtongVerifyRequest.userEntityReport(data))
+
+      // 返回主包
+      setTimeout(() => {
+        flow.resolve({
+          token
+        })
+      }, 1200)
+    } else {
+      wx.showToast({
+        title: '您的微信版本太低，无法授权',
+        icon: 'none'
+      })
+    }
+  },
+
+  onLoad(options) {
+    console.log('参数', options)
+    this.setData({
+      source: options && options.source || ''
+    })
+    wx.hideShareMenu()
+  }
 })

package/weapps-plugin-jingtong-verify/pages/bind-phone/bind-phone.json

@@ -1,7 +1,7 @@
-{
-  "component": true,
-  "usingComponents": {
-    "g-button-group": "../../components/gsd-ui/g-button-group"
-  },
-  "navigationBarTitleText": "手机绑定"
+{
+  "component": true,
+  "usingComponents": {
+    "g-button-group": "../../components/gsd-ui/g-button-group"
+  },
+  "navigationBarTitleText": "手机绑定"
 }