weapps-plugin-jingtong-verify 1.4.0 → 1.4.1-dev

package/sdk.js

@@ -1,290 +1,290 @@
-const jingtongVerifyRequest = require('./weapps-plugin-jingtong-verify/utils/request')
-const { nation } = require("./weapps-plugin-jingtong-verify/utils/country")
-const {
-  flow,
-  config
-} = require('@wecity/weda-plugin-utils')
-
-// 统一插件配置
-exports.init = (options) => {
-  console.log('设置配置', options)
-  jingtongVerifyRequest.init(options)
-}
-
-// 对业务侧入参进行拦截和兼容
-const parseOptions = (options) => {
-  const optionsType = Object.prototype.toString.call(options)
-  console.log('===处理前options===', options)
-  if ((options && optionsType !== '[object Object]') || (optionsType === '[object Null]')) {
-    console.error('业务侧入参不合法！！入参的数据类型必须为对象')
-    options = {}
-  }
-  options = Object.assign({}, options)
-  console.log('== 处理后options ==', options)
-  return options
-}
-
-// 获取会话
-exports.getSession = (options) => {
-  // 对参数做兼容性处理
-  let optionsParse = parseOptions(options)
-
-  jingtongVerifyRequest.getSession({
-    success: res => {
-      optionsParse && optionsParse.success && optionsParse.success(res)
-    },
-    fail: fail => {
-      console.log('getSession-fail', fail)
-      optionsParse && optionsParse.fail && optionsParse.fail(fail)
-    }
-  })
-}
-
-// 个人信息
-exports.goToUserInfo = () => {
-  console.log('跳转到子包 === 个人信息服务')
-  return flow.createFlow('/weapps-plugin-jingtong-verify/pages/user-info/user-info')
-}
-
-// 设置
-exports.goToSetting = () => {
-  console.log('跳转到子包 === 设置服务')
-  return flow.createFlow('/weapps-plugin-jingtong-verify/pages/setting/setting')
-}
-
-// 身份验证
-const toVerify = () => {
-  return flow.createFlow('/weapps-plugin-jingtong-verify/pages/face-verify/face-verify', {
-    needUnite: 'true' // 需串联起来
-  })
-}
-
-// 确认手机号码
-const toConfirmPhone = () => {
-  return flow.createFlow('/weapps-plugin-jingtong-verify/pages/confirm-phone/confirm-phone')
-}
-
-// 绑定手机号码
-const toBindPhone = (source) => {
-  return flow.createFlow('/weapps-plugin-jingtong-verify/pages/bind-phone/bind-phone', {
-    source
-  })
-}
-
-// 比较两个时间 time1，time2均为日期类型
-// 判断当前日期与time1日期是否相差小于6月
-const completeDate = (time1, m) => {
-  var diffyear = new Date().getFullYear() - time1.getFullYear();
-  var diffmonth = diffyear * 12 + new Date().getMonth() - time1.getMonth();
-  if (diffmonth < 0) {
-    return false;
-  }
-
-  var diffDay = new Date().getDate() - time1.getDate();
-  if (diffmonth < m || (diffmonth == m && diffDay <= 0)) {
-    if (diffmonth == m && diffDay == 0) {
-      var timeA = time1.getHours() * 3600 + 60 * time1.getMinutes() + time1.getSeconds();
-      var timeB = new Date().getHours() * 3600 + 60 * new Date().getMinutes() + new Date().getSeconds();
-      if (timeB - timeA > 0) {
-        return false;
-      }
-    }
-    return true;
-  }
-  return false;
-}
-
-// 串通业务总接口
-exports.getPersonToken = (options) => {
-  // 对参数做兼容性处理
-  let optionsParse = parseOptions(options)
-
-  jingtongVerifyRequest.getSession({
-    success: res => {
-      if (!res.face_time && !res.realname_time) {
-        // 未身份验证/身份验证已过期
-        toVerify().then(res => {
-          optionsParse && optionsParse.success && optionsParse.success(res)
-        })
-      } else {
-        // 身份验证未过期 => 判断有无手机号码
-        if (res.has_phone) {
-          const { tel_confirm_time } = res
-          if (res.phone !== res.caPhone && tel_confirm_time && (!completeDate(new Date(Number(tel_confirm_time + '000')), 6))) {
-            // 【phone与caPhone不同】且【tel_confirm_time大于6个月】
-            toConfirmPhone().then(res => {
-              optionsParse && optionsParse.success && optionsParse.success(res)
-            })
-          } else {
-            // 手机号码未过期
-            jingtongVerifyRequest.personToken({
-              from: 'sdk'
-            }).then(data => {
-              optionsParse && optionsParse.success && optionsParse.success({
-                token: data
-              })
-            }).catch(err => {
-              console.log(JSON.parse(err))
-              if (err && err === '4035') {
-                // 无手机号码 => 绑定手机号码
-                toBindPhone('5').then(res => {
-                  optionsParse && optionsParse.success && optionsParse.success(res)
-                })
-              }
-            })
-          }
-        } else {
-          // 无手机号码 => 绑定手机号码
-          toBindPhone('6').then(res => {
-            optionsParse && optionsParse.success && optionsParse.success(res)
-          })
-        }
-      }
-    },
-    fail: err => {
-      console.log('getSession-fail', err)
-      optionsParse && optionsParse.fail && optionsParse.fail(err)
-    }
-  })
-}
-
-// 外国护照认证
-const toPassportVerify = () => {
-  return flow.createFlow('/weapps-plugin-jingtong-verify/pages/passport-verify/passport-verify', {
-    needUnite: 'true' // 需串联起来
-  })
-}
-
-// 串通业务总接口 -- 外国护照入口
-exports.getPersonTokenPassport = (options) => {
-  // 对参数做兼容性处理
-  let optionsParse = parseOptions(options)
-
-  jingtongVerifyRequest.getSession({
-    success: res => {
-      if (!res.face_time && !res.realname_time) {
-        // 未身份验证/身份验证已过期
-        toPassportVerify().then(res => {
-          optionsParse && optionsParse.success && optionsParse.success(res)
-        })
-      } else {
-        // 身份验证未过期 => 判断有无手机号码
-        if (res.has_phone) {
-          const { tel_confirm_time } = res
-          if (res.phone !== res.caPhone && tel_confirm_time && (!completeDate(new Date(Number(tel_confirm_time + '000')), 6))) {
-            // 【phone与caPhone不同】且【tel_confirm_time大于6个月】
-            toConfirmPhone().then(res => {
-              optionsParse && optionsParse.success && optionsParse.success(res)
-            })
-          } else {
-            // 手机号码未过期
-            jingtongVerifyRequest.personToken({
-              from: 'sdk'
-            }).then(data => {
-              optionsParse && optionsParse.success && optionsParse.success({
-                token: data
-              })
-            }).catch(err => {
-              console.log(JSON.parse(err))
-              if (err && err === '4035') {
-                // 无手机号码 => 绑定手机号码
-                toBindPhone('5').then(res => {
-                  optionsParse && optionsParse.success && optionsParse.success(res)
-                })
-              }
-            })
-          }
-        } else {
-          // 无手机号码 => 绑定手机号码
-          toBindPhone('6').then(res => {
-            optionsParse && optionsParse.success && optionsParse.success(res)
-          })
-        }
-      }
-    },
-    fail: err => {
-      console.log('getSession-fail', err)
-      optionsParse && optionsParse.fail && optionsParse.fail(err)
-    }
-  })
-}
-
-// 退出登录（非页面）
-exports.toLogOut = (options) => {
-  // 对参数做兼容性处理
-  let optionsParse = parseOptions(options)
-
-  // 将弹窗标识设置为不需要弹窗
-  jingtongVerifyRequest.setUserReadStatus(false).then(() => {
-    console.log('设置弹窗标识成功')
-
-    jingtongVerifyRequest.logOut().then(() => {
-      optionsParse && optionsParse.success && optionsParse.success()
-    }).catch(err => {
-      console.log('退出登录err', err)
-      optionsParse && optionsParse.fail && optionsParse.fail(err)
-    })
-  }).catch(err => {
-    console.log('设置弹窗标识失败', err)
-  })
-}
-
-// 获取弹窗标识
-exports.getUserReadStatus = (options) => {
-  // 对参数做兼容性处理
-  let optionsParse = parseOptions(options)
-
-  jingtongVerifyRequest.getUserReadStatus().then(res => {
-    optionsParse && optionsParse.success && optionsParse.success(res)
-  }).catch(err => {
-    optionsParse && optionsParse.fail && optionsParse.fail(err)
-  })
-}
-
-// 设置弹窗标识（入参默认为不需要弹窗）
-exports.setUserReadStatus = (options) => {
-  // 对参数做兼容性处理
-  let optionsParse = parseOptions(options)
-
-  const status = optionsParse && optionsParse.needRead || false
-  console.log('业务侧入参的弹窗标识', status)
-  jingtongVerifyRequest.setUserReadStatus(status).then(() => {
-    console.log('设置弹窗标识成功')
-  }).catch(err => {
-    console.log('设置弹窗标识失败', err)
-  })
-}
-
-// 拉起人脸识别，返回结果
-exports.toFaceVerifyAll = (options) => {
-  // 对参数做兼容性处理
-  let optionsParse = parseOptions(options)
-
-  jingtongVerifyRequest.fetchFaceVerify({
-    params: optionsParse.params,
-    success: res => {
-      console.log('=====人脸识别成功=====', res)
-      optionsParse && optionsParse.success && optionsParse.success(res)
-    },
-    fail: err => {
-      console.log('=====人脸识别失败=====', err)
-      optionsParse && optionsParse.fail && optionsParse.fail(err)
-    }
-  })
-}
-
-// 获取国籍列表
-exports.getNationList = () => {
-  return nation || []
-}
-
-// 语言国际化
-exports.setLocalLanguage = (options) => {
-  // 对参数做兼容性处理
-  let optionsParse = parseOptions(options)
-
-  Object.assign(optionsParse, {
-    language: optionsParse.language || 'zh_CN'
-  })
-  wx.setStorageSync('tif.currentLanguage', optionsParse.language)
+const jingtongVerifyRequest = require('./weapps-plugin-jingtong-verify/utils/request')
+const { nation } = require("./weapps-plugin-jingtong-verify/utils/country")
+const {
+  flow,
+  config
+} = require('@wecity/weda-plugin-utils')
+
+// 统一插件配置
+exports.init = (options) => {
+  console.log('设置配置', options)
+  jingtongVerifyRequest.init(options)
+}
+
+// 对业务侧入参进行拦截和兼容
+const parseOptions = (options) => {
+  const optionsType = Object.prototype.toString.call(options)
+  console.log('===处理前options===', options)
+  if ((options && optionsType !== '[object Object]') || (optionsType === '[object Null]')) {
+    console.error('业务侧入参不合法！！入参的数据类型必须为对象')
+    options = {}
+  }
+  options = Object.assign({}, options)
+  console.log('== 处理后options ==', options)
+  return options
+}
+
+// 获取会话
+exports.getSession = (options) => {
+  // 对参数做兼容性处理
+  let optionsParse = parseOptions(options)
+
+  jingtongVerifyRequest.getSession({
+    success: res => {
+      optionsParse && optionsParse.success && optionsParse.success(res)
+    },
+    fail: fail => {
+      console.log('getSession-fail', fail)
+      optionsParse && optionsParse.fail && optionsParse.fail(fail)
+    }
+  })
+}
+
+// 个人信息
+exports.goToUserInfo = () => {
+  console.log('跳转到子包 === 个人信息服务')
+  return flow.createFlow('/weapps-plugin-jingtong-verify/pages/user-info/user-info')
+}
+
+// 设置
+exports.goToSetting = () => {
+  console.log('跳转到子包 === 设置服务')
+  return flow.createFlow('/weapps-plugin-jingtong-verify/pages/setting/setting')
+}
+
+// 身份验证
+const toVerify = () => {
+  return flow.createFlow('/weapps-plugin-jingtong-verify/pages/face-verify/face-verify', {
+    needUnite: 'true' // 需串联起来
+  })
+}
+
+// 确认手机号码
+const toConfirmPhone = () => {
+  return flow.createFlow('/weapps-plugin-jingtong-verify/pages/confirm-phone/confirm-phone')
+}
+
+// 绑定手机号码
+const toBindPhone = (source) => {
+  return flow.createFlow('/weapps-plugin-jingtong-verify/pages/bind-phone/bind-phone', {
+    source
+  })
+}
+
+// 比较两个时间 time1，time2均为日期类型
+// 判断当前日期与time1日期是否相差小于6月
+const completeDate = (time1, m) => {
+  var diffyear = new Date().getFullYear() - time1.getFullYear();
+  var diffmonth = diffyear * 12 + new Date().getMonth() - time1.getMonth();
+  if (diffmonth < 0) {
+    return false;
+  }
+
+  var diffDay = new Date().getDate() - time1.getDate();
+  if (diffmonth < m || (diffmonth == m && diffDay <= 0)) {
+    if (diffmonth == m && diffDay == 0) {
+      var timeA = time1.getHours() * 3600 + 60 * time1.getMinutes() + time1.getSeconds();
+      var timeB = new Date().getHours() * 3600 + 60 * new Date().getMinutes() + new Date().getSeconds();
+      if (timeB - timeA > 0) {
+        return false;
+      }
+    }
+    return true;
+  }
+  return false;
+}
+
+// 串通业务总接口
+exports.getPersonToken = (options) => {
+  // 对参数做兼容性处理
+  let optionsParse = parseOptions(options)
+
+  jingtongVerifyRequest.getSession({
+    success: res => {
+      if (!res.face_time && !res.realname_time) {
+        // 未身份验证/身份验证已过期
+        toVerify().then(res => {
+          optionsParse && optionsParse.success && optionsParse.success(res)
+        })
+      } else {
+        // 身份验证未过期 => 判断有无手机号码
+        if (res.has_phone) {
+          const { tel_confirm_time } = res
+          if (res.phone !== res.caPhone && tel_confirm_time && (!completeDate(new Date(Number(tel_confirm_time + '000')), 6))) {
+            // 【phone与caPhone不同】且【tel_confirm_time大于6个月】
+            toConfirmPhone().then(res => {
+              optionsParse && optionsParse.success && optionsParse.success(res)
+            })
+          } else {
+            // 手机号码未过期
+            jingtongVerifyRequest.personToken({
+              from: 'sdk'
+            }).then(data => {
+              optionsParse && optionsParse.success && optionsParse.success({
+                token: data
+              })
+            }).catch(err => {
+              console.log(JSON.parse(err))
+              if (err && err === '4035') {
+                // 无手机号码 => 绑定手机号码
+                toBindPhone('5').then(res => {
+                  optionsParse && optionsParse.success && optionsParse.success(res)
+                })
+              }
+            })
+          }
+        } else {
+          // 无手机号码 => 绑定手机号码
+          toBindPhone('6').then(res => {
+            optionsParse && optionsParse.success && optionsParse.success(res)
+          })
+        }
+      }
+    },
+    fail: err => {
+      console.log('getSession-fail', err)
+      optionsParse && optionsParse.fail && optionsParse.fail(err)
+    }
+  })
+}
+
+// 外国护照认证
+const toPassportVerify = () => {
+  return flow.createFlow('/weapps-plugin-jingtong-verify/pages/passport-verify/passport-verify', {
+    needUnite: 'true' // 需串联起来
+  })
+}
+
+// 串通业务总接口 -- 外国护照入口
+exports.getPersonTokenPassport = (options) => {
+  // 对参数做兼容性处理
+  let optionsParse = parseOptions(options)
+
+  jingtongVerifyRequest.getSession({
+    success: res => {
+      if (!res.face_time && !res.realname_time) {
+        // 未身份验证/身份验证已过期
+        toPassportVerify().then(res => {
+          optionsParse && optionsParse.success && optionsParse.success(res)
+        })
+      } else {
+        // 身份验证未过期 => 判断有无手机号码
+        if (res.has_phone) {
+          const { tel_confirm_time } = res
+          if (res.phone !== res.caPhone && tel_confirm_time && (!completeDate(new Date(Number(tel_confirm_time + '000')), 6))) {
+            // 【phone与caPhone不同】且【tel_confirm_time大于6个月】
+            toConfirmPhone().then(res => {
+              optionsParse && optionsParse.success && optionsParse.success(res)
+            })
+          } else {
+            // 手机号码未过期
+            jingtongVerifyRequest.personToken({
+              from: 'sdk'
+            }).then(data => {
+              optionsParse && optionsParse.success && optionsParse.success({
+                token: data
+              })
+            }).catch(err => {
+              console.log(JSON.parse(err))
+              if (err && err === '4035') {
+                // 无手机号码 => 绑定手机号码
+                toBindPhone('5').then(res => {
+                  optionsParse && optionsParse.success && optionsParse.success(res)
+                })
+              }
+            })
+          }
+        } else {
+          // 无手机号码 => 绑定手机号码
+          toBindPhone('6').then(res => {
+            optionsParse && optionsParse.success && optionsParse.success(res)
+          })
+        }
+      }
+    },
+    fail: err => {
+      console.log('getSession-fail', err)
+      optionsParse && optionsParse.fail && optionsParse.fail(err)
+    }
+  })
+}
+
+// 退出登录（非页面）
+exports.toLogOut = (options) => {
+  // 对参数做兼容性处理
+  let optionsParse = parseOptions(options)
+
+  // 将弹窗标识设置为不需要弹窗
+  jingtongVerifyRequest.setUserReadStatus(false).then(() => {
+    console.log('设置弹窗标识成功')
+
+    jingtongVerifyRequest.logOut().then(() => {
+      optionsParse && optionsParse.success && optionsParse.success()
+    }).catch(err => {
+      console.log('退出登录err', err)
+      optionsParse && optionsParse.fail && optionsParse.fail(err)
+    })
+  }).catch(err => {
+    console.log('设置弹窗标识失败', err)
+  })
+}
+
+// 获取弹窗标识
+exports.getUserReadStatus = (options) => {
+  // 对参数做兼容性处理
+  let optionsParse = parseOptions(options)
+
+  jingtongVerifyRequest.getUserReadStatus().then(res => {
+    optionsParse && optionsParse.success && optionsParse.success(res)
+  }).catch(err => {
+    optionsParse && optionsParse.fail && optionsParse.fail(err)
+  })
+}
+
+// 设置弹窗标识（入参默认为不需要弹窗）
+exports.setUserReadStatus = (options) => {
+  // 对参数做兼容性处理
+  let optionsParse = parseOptions(options)
+
+  const status = optionsParse && optionsParse.needRead || false
+  console.log('业务侧入参的弹窗标识', status)
+  jingtongVerifyRequest.setUserReadStatus(status).then(() => {
+    console.log('设置弹窗标识成功')
+  }).catch(err => {
+    console.log('设置弹窗标识失败', err)
+  })
+}
+
+// 拉起人脸识别，返回结果
+exports.toFaceVerifyAll = (options) => {
+  // 对参数做兼容性处理
+  let optionsParse = parseOptions(options)
+
+  jingtongVerifyRequest.fetchFaceVerify({
+    params: optionsParse.params,
+    success: res => {
+      console.log('=====人脸识别成功=====', res)
+      optionsParse && optionsParse.success && optionsParse.success(res)
+    },
+    fail: err => {
+      console.log('=====人脸识别失败=====', err)
+      optionsParse && optionsParse.fail && optionsParse.fail(err)
+    }
+  })
+}
+
+// 获取国籍列表
+exports.getNationList = () => {
+  return nation || []
+}
+
+// 语言国际化
+exports.setLocalLanguage = (options) => {
+  // 对参数做兼容性处理
+  let optionsParse = parseOptions(options)
+
+  Object.assign(optionsParse, {
+    language: optionsParse.language || 'zh_CN'
+  })
+  wx.setStorageSync('tif.currentLanguage', optionsParse.language)
 }

package/weapps-plugin-jingtong-verify/components/card-modal/card-modal.js

@@ -1,31 +1,31 @@
-
-Component({
-  /**
-   * 组件的属性列表
-   */
-  properties: {
-    visible: {
-      type: Boolean,
-      value: false
-    }
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-    content: ''
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-    handleOk() {
-      this.triggerEvent('ok')
-    },
-    handleCancel() {
-      this.triggerEvent('cancel')
-    }
-  }
-})
+
+Component({
+  /**
+   * 组件的属性列表
+   */
+  properties: {
+    visible: {
+      type: Boolean,
+      value: false
+    }
+  },
+
+  /**
+   * 组件的初始数据
+   */
+  data: {
+    content: ''
+  },
+
+  /**
+   * 组件的方法列表
+   */
+  methods: {
+    handleOk() {
+      this.triggerEvent('ok')
+    },
+    handleCancel() {
+      this.triggerEvent('cancel')
+    }
+  }
+})

package/weapps-plugin-jingtong-verify/components/card-modal/card-modal.json

@@ -1,4 +1,4 @@
-{
-  "component": true,
-  "usingComponents": {}
+{
+  "component": true,
+  "usingComponents": {}
 }

package/weapps-plugin-jingtong-verify/components/card-modal/card-modal.wxml

@@ -1,10 +1,10 @@
-<view wx:if="{{ visible }}" class="modal-view">
-  <view class="modal-box">
-    <view class="content">
-      <view class="title">温馨提示</view>
-      <view class="desc">当前认证方式维护中，您可使用【银行卡认证方式】继续登录，感谢您的理解。</view>
-      <view class="btn btn-know" catch:tap="handleOk">使用银行卡认证方式登录</view>
-      <view class="btn btn-cancel" catch:tap="handleCancel">取消</view>
-    </view>
-  </view>
+<view wx:if="{{ visible }}" class="modal-view">
+  <view class="modal-box">
+    <view class="content">
+      <view class="title">温馨提示</view>
+      <view class="desc">当前认证方式维护中，您可使用【银行卡认证方式】继续登录，感谢您的理解。</view>
+      <view class="btn btn-know" catch:tap="handleOk">使用银行卡认证方式登录</view>
+      <view class="btn btn-cancel" catch:tap="handleCancel">取消</view>
+    </view>
+  </view>
 </view>