weapps-plugin-jingtong-verify 1.6.1 → 1.6.2-beta.2

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": "手机绑定"
 }

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

@@ -1,20 +1,20 @@
-<view>
-  <view class="top-box">
-    <image src="../../images/phone.png" mode="" style="width: 272px; height: 229px;"/>
-  </view>
-  <view class="content-box">
-    <text class="title">绑定手机号码</text>
-    <view class="important-info">
-      （同步注册到北京市统一身份认证平台）
-    </view>
-    <view class="info">
-      信息将与当前微信绑定（用于身份验证）
-    </view>
-  </view>
-  <view class="bottom-box">
-    <button class="btn" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">
-      <text class="cn">从微信获取，完成绑定</text>
-      <text class="en">You can access your phone number from WeChat to complete the bonding process.</text> 
-    </button>
-  </view>
-</view>
+<view>
+  <view class="top-box">
+    <image src="../../images/phone.png" mode="" style="width: 272px; height: 229px;"/>
+  </view>
+  <view class="content-box">
+    <text class="title">绑定手机号码</text>
+    <view class="important-info">
+      （同步注册到北京市统一身份认证平台）
+    </view>
+    <view class="info">
+      信息将与当前微信绑定（用于身份验证）
+    </view>
+  </view>
+  <view class="bottom-box">
+    <button class="btn" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">
+      <text class="cn">从微信获取，完成绑定</text>
+      <text class="en">You can access your phone number from WeChat to complete the bonding process.</text> 
+    </button>
+  </view>
+</view>

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

@@ -1,52 +1,52 @@
-/* weapps-plugin-jingtong-verify/pages/bind-phone/bind-phone.wxss */
-.top-box {
-  display: flex;
-  justify-content: center;
-  margin-top: 166rpx;
-}
-.btn {
-  background: rgba(206, 0, 34, 1);
-  color: #ffffff;
-  width: 686rpx !important;
-  border-radius: 16rpx;
-  padding: 24rpx 28rpx;
-  box-shadow: 0 24rpx 48rpx 0 rgba(206, 0, 34, 0.15);
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  font-weight: normal;
-}
-.btn .cn {
-  font-size: 34rpx;
-  line-height: 40rpx;
-  margin-bottom: 12rpx;
-}
-.btn .en {
-  font-size: 26rpx;
-  line-height: 30rpx;
-}
-.content-box {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-}
-.title {
-  font-size: 48rpx;
-  color: #27282E;
-  font-weight: 400;
-  margin-bottom: 12rpx;
-}
-.important-info {
-  color: rgba(206, 0, 34, 1);
-  font-weight: 400;
-  font-size: 32rpx;
-  margin-bottom: 20rpx;
-}
-.info {
-  color: #999999;
-  font-size: 28rpx;
-  font-weight: 500;
-  margin-bottom: 84rpx;
+/* weapps-plugin-jingtong-verify/pages/bind-phone/bind-phone.wxss */
+.top-box {
+  display: flex;
+  justify-content: center;
+  margin-top: 166rpx;
+}
+.btn {
+  background: rgba(206, 0, 34, 1);
+  color: #ffffff;
+  width: 686rpx !important;
+  border-radius: 16rpx;
+  padding: 24rpx 28rpx;
+  box-shadow: 0 24rpx 48rpx 0 rgba(206, 0, 34, 0.15);
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  font-weight: normal;
+}
+.btn .cn {
+  font-size: 34rpx;
+  line-height: 40rpx;
+  margin-bottom: 12rpx;
+}
+.btn .en {
+  font-size: 26rpx;
+  line-height: 30rpx;
+}
+.content-box {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+}
+.title {
+  font-size: 48rpx;
+  color: #27282E;
+  font-weight: 400;
+  margin-bottom: 12rpx;
+}
+.important-info {
+  color: rgba(206, 0, 34, 1);
+  font-weight: 400;
+  font-size: 32rpx;
+  margin-bottom: 20rpx;
+}
+.info {
+  color: #999999;
+  font-size: 28rpx;
+  font-weight: 500;
+  margin-bottom: 84rpx;
 }

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

@@ -1,168 +1,168 @@
-// weapps-plugin-jingtong-verify/pages/confirm-phone/confirm-phone.js
-const jingtongVerifyRequest = require('../../utils/request')
-const utils = require("../../utils/index")
-const { flow } = require("@wecity/weda-plugin-utils");
-
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    phone: '',
-    caPhone: '',
-    isClick: true
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow() {
-    wx.hideShareMenu()
-
-    let pho = /(\d{3})\d*(\d{4})/
-    jingtongVerifyRequest.getSession({
-      success: res => {
-        const { phone, caPhone } = res
-        this.setData({
-          phone: phone ? phone.replace(pho, '$1****$2') : '',
-          caPhone: caPhone ? caPhone.replace(pho, '$1****$2') : ''
-        })
-      }
-    })
-  },
-
-  // 微信获取手机号码授权
-  async getPhoneNumber(e) {
-    console.log('微信获取手机号授权', e)
-    if (e.detail.iv) {
-      const params = Object.assign(e.detail, {
-        source: '7'
-      })
-      const [err, session] = await utils.awaitTo(jingtongVerifyRequest.loginPhone(params))
-      if (err) {
-        wx.showToast({
-          title: err.errmsg || '手机号码获取失败',
-          icon: 'none',
-          mask: true
-        })
-
-        // 解决用户未找到的问题:跳转到认证信息填写页面
-        if (err.errcode === 2034) {
-          setTimeout(() => {
-            flow.redirectTo({
-              url: '../face-verify/face-verify?needUnite=true'
-            })
-          }, 1500)
-        }
-        return
-      }
-
-      wx.showToast({
-        title: '换绑成功, 跳转中…',
-        icon: 'none',
-        duration: 5000,
-        mask: true
-      })
-
-      // 登录成功回调 => 业务侧操作事项
-      this.loginSuccessCallBack(session)
-
-      let { phone, caPhone } = session
-      let pho = /(\d{3})\d*(\d{4})/
-      this.setData({
-        phone: phone ? phone.replace(pho, '$1****$2') : '',
-        caPhone: caPhone ? caPhone.replace(pho, '$1****$2') : ''
-      })
-
-      // 获取personToken、触发埋点事件上报
-      this.handleLastProcess('9', session)
-    } else {
-      wx.showToast({
-        title: '您的微信版本太低，无法授权',
-        icon: 'none'
-      })
-    }
-  },
-
-  // 节流处理 -- 确认手机号码
-  async throttle(delay) {
-    if (this.data.isClick) {
-      this.setData({ 
-        isClick: false 
-      })
-
-      const [err, session] = await utils.awaitTo(jingtongVerifyRequest.confirmPhone())
-
-      setTimeout(() => {
-        this.setData({
-          isClick: true
-        })
-      }, delay);
-
-      if (err) {
-        wx.showToast({
-          title: err.errmsg || '确认失败,请稍后再试',
-          icon: 'none'
-        })
-        return
-      }
-
-      wx.showToast({
-        title: '确认成功, 跳转中…',
-        icon: 'none',
-        duration: 5000,
-        mask: true
-      })
-
-      // 登录成功回调 => 业务侧操作事项
-      this.loginSuccessCallBack(session)
-
-      // 获取personToken、触发埋点事件上报
-      this.handleLastProcess('10', session)
-    }
-  },
-
-  // 主包成功回调
-  loginSuccessCallBack(session) {
-    wx.$_ServiceConfiguration && wx.$_ServiceConfiguration.methods && wx.$_ServiceConfiguration.methods._loginSuccessCallBack && wx.$_ServiceConfiguration.methods._loginSuccessCallBack(session)
-  },
-
-  // 获取personToken、触发埋点事件上报
-  async handleLastProcess(source, session) {
-    const [err, token] = await utils.awaitTo(jingtongVerifyRequest.personToken({ source }))
-    if (err) {
-      // 解决用户未找到的问题:跳转到认证信息填写页面
-      let errcode = JSON.parse(err).data.errcode || ''
-      if (errcode && errcode === 2034) {
-        setTimeout(() => {
-          flow.redirectTo({
-            url: '../face-verify/face-verify?needUnite=true'
-          })
-        }, 1500)
-      }
-      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)
-  },
-
-  // 确认手机号码
-  confirmPhone() {
-    this.throttle(2000)
-  }
+// weapps-plugin-jingtong-verify/pages/confirm-phone/confirm-phone.js
+const jingtongVerifyRequest = require('../../utils/request')
+const utils = require("../../utils/index")
+const { flow } = require("@wecity/weda-plugin-utils");
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    phone: '',
+    caPhone: '',
+    isClick: true
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+    wx.hideShareMenu()
+
+    let pho = /(\d{3})\d*(\d{4})/
+    jingtongVerifyRequest.getSession({
+      success: res => {
+        const { phone, caPhone } = res
+        this.setData({
+          phone: phone ? phone.replace(pho, '$1****$2') : '',
+          caPhone: caPhone ? caPhone.replace(pho, '$1****$2') : ''
+        })
+      }
+    })
+  },
+
+  // 微信获取手机号码授权
+  async getPhoneNumber(e) {
+    console.log('微信获取手机号授权', e)
+    if (e.detail.iv) {
+      const params = Object.assign(e.detail, {
+        source: '7'
+      })
+      const [err, session] = await utils.awaitTo(jingtongVerifyRequest.loginPhone(params))
+      if (err) {
+        wx.showToast({
+          title: err.errmsg || '手机号码获取失败',
+          icon: 'none',
+          mask: true
+        })
+
+        // 解决用户未找到的问题:跳转到认证信息填写页面
+        if (err.errcode === 2034) {
+          setTimeout(() => {
+            flow.redirectTo({
+              url: '../face-verify/face-verify?needUnite=true'
+            })
+          }, 1500)
+        }
+        return
+      }
+
+      wx.showToast({
+        title: '换绑成功, 跳转中…',
+        icon: 'none',
+        duration: 5000,
+        mask: true
+      })
+
+      // 登录成功回调 => 业务侧操作事项
+      this.loginSuccessCallBack(session)
+
+      let { phone, caPhone } = session
+      let pho = /(\d{3})\d*(\d{4})/
+      this.setData({
+        phone: phone ? phone.replace(pho, '$1****$2') : '',
+        caPhone: caPhone ? caPhone.replace(pho, '$1****$2') : ''
+      })
+
+      // 获取personToken、触发埋点事件上报
+      this.handleLastProcess('9', session)
+    } else {
+      wx.showToast({
+        title: '您的微信版本太低，无法授权',
+        icon: 'none'
+      })
+    }
+  },
+
+  // 节流处理 -- 确认手机号码
+  async throttle(delay) {
+    if (this.data.isClick) {
+      this.setData({ 
+        isClick: false 
+      })
+
+      const [err, session] = await utils.awaitTo(jingtongVerifyRequest.confirmPhone())
+
+      setTimeout(() => {
+        this.setData({
+          isClick: true
+        })
+      }, delay);
+
+      if (err) {
+        wx.showToast({
+          title: err.errmsg || '确认失败,请稍后再试',
+          icon: 'none'
+        })
+        return
+      }
+
+      wx.showToast({
+        title: '确认成功, 跳转中…',
+        icon: 'none',
+        duration: 5000,
+        mask: true
+      })
+
+      // 登录成功回调 => 业务侧操作事项
+      this.loginSuccessCallBack(session)
+
+      // 获取personToken、触发埋点事件上报
+      this.handleLastProcess('10', session)
+    }
+  },
+
+  // 主包成功回调
+  loginSuccessCallBack(session) {
+    wx.$_ServiceConfiguration && wx.$_ServiceConfiguration.methods && wx.$_ServiceConfiguration.methods._loginSuccessCallBack && wx.$_ServiceConfiguration.methods._loginSuccessCallBack(session)
+  },
+
+  // 获取personToken、触发埋点事件上报
+  async handleLastProcess(source, session) {
+    const [err, token] = await utils.awaitTo(jingtongVerifyRequest.personToken({ source }))
+    if (err) {
+      // 解决用户未找到的问题:跳转到认证信息填写页面
+      let errcode = JSON.parse(err).data.errcode || ''
+      if (errcode && errcode === 2034) {
+        setTimeout(() => {
+          flow.redirectTo({
+            url: '../face-verify/face-verify?needUnite=true'
+          })
+        }, 1500)
+      }
+      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)
+  },
+
+  // 确认手机号码
+  confirmPhone() {
+    this.throttle(2000)
+  }
 })

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

@@ -1,4 +1,4 @@
-{
-  "usingComponents": {},
-  "navigationBarTitleText": "手机号确认"
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "手机号确认"
 }