weapps-plugin-jingtong-verify 1.3.9 → 1.4.1

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

@@ -24,10 +24,17 @@
           value="{{ formData.cid_type }}"
           label="证件类型"
           bind:change="handleChange"
+          required
           range="{{ cidTypeRange }}"
         ></g-picker>
       </view>
 
+      <!-- 外国人提示 -->
+      <view class="foreign-tip" wx:if="{{ formData.cid_type === '111' && showForeignTip }}">
+        <text>For foreign nationals, please click here to select International passport.</text>
+        <image src="../../images/close-circle.png" mode="widthFix" bind:tap="closeForeignTip" />
+      </view>
+
       <!-- 银行卡核验(港澳/台居住证) -->
       <view wx:if="{{ currentAuthType === 'cardAuth' }}">
         <view class="form-tip">
@@ -87,7 +94,7 @@
             placeholder="请输入本人姓名"
             value="{{ formData.strName || formData.name }}"
             clearable="{{ false }}"
-            showEye="{{ true }}"
+            showEye="{{ formData.name }}"
             isOpen="{{ !formData.strName }}"
             bind:change="handleChange"
             showQuestion="{{ true }}"
@@ -104,7 +111,7 @@
             placeholder="请输入本人证件号码"
             value="{{ formData.strCid || formData.id_card_number }}"
             clearable="{{ false }}"
-            showEye="{{ true }}"
+            showEye="{{ formData.id_card_number }}"
             isOpen="{{ !formData.strCid }}"         
             bind:change="handleChange"
             showQuestion="{{ true }}"
@@ -165,38 +172,115 @@
           </view>
         </view>
 
+        <!-- 港澳/台通行证、永居证、华侨护照 -->
         <view wx:else>
+          <!-- 证件号码 -->
           <view class="form-item-wrap">
             <g-input
               id="id_card_number"
-              data-star="strCid"
               label="证件号码"
               placeholder="请输入本人证件号码"
-              value="{{ formData.strCid || formData.id_card_number }}"
+              value="{{ formData.id_card_number }}"
               clearable="true"
               bind:change="handleChange"
             />
           </view>
-          <view class="form-item-wrap" wx:if="{{ formData.cid_type === '553' }}">
-          <g-picker
-            id="nation"
-            value="{{ formData.nation_name }}"
-            label="国籍"
-            mode="none"
-            placeholder="请选择国籍"
-            bind:tap="handleNationTap"
-          />
+
+          <!-- 证件有效期： 港澳通行证、台湾通行证、华侨护照-->
+          <view wx:if="{{ formData.cid_type !== '553' }}">
+            <view class="form-item-wrap">
+              <g-picker 
+                id="cid_expire_date"
+                mode="date"
+                value="{{ formData.cid_expire_date }}"
+                label="证件有效期"
+                placeholder="请选择证件有效期截止日期"
+                bind:change="handleChange"
+              >
+              </g-picker>
+            </view>
           </view>
 
-          <view class="form-item-wrap" wx:if="{{ formData.cid_type === '414' }}">
+          <!-- 国籍：台湾通行证和华侨没有 -->
+          <view class="form-item-wrap" wx:if="{{ formData.cid_type !== '511' && formData.cid_type !== '414' }}">
             <g-picker
               id="nation"
               value="{{ formData.nation_name }}"
               label="国籍"
               mode="none"
-              actionText=""
+              placeholder="请选择国籍"
+              bind:tap="handleNationTap"
+              actionText="选择"
             />
           </view>
+
+          <!-- 三证照：港澳通行证、台湾通行证、华侨护照 -->
+          <view wx:if="{{ formData.cid_type !== '553' }}">
+            <!-- 港澳居民来往内地通行证-外籍 -->
+            <view wx:if="{{ formData.cid_type === '516' && formData.nation !== 'CHN'}}">
+              <view class="form-item-wrap">
+                <g-picker
+                  id="sex"
+                  value="{{ formData.sex }}"
+                  label="性别"
+                  placeholder="请选择本人性别"
+                  bind:change="handleChange"
+                  range="{{ sexRangeZH }}"
+                  actionText="选择"
+                ></g-picker>
+              </view>
+
+              <view class="form-item-wrap">
+                <g-picker 
+                  id="birthday"
+                  mode="date"
+                  value="{{ formData.birthday }}"
+                  label="出生日期"
+                  placeholder="请选择本人出生日期"
+                  bind:change="handleChange"
+                >
+                </g-picker>
+              </view>
+            </view>
+            <view wx:else>
+              <view class="form-item-wrap">
+                <g-switch
+                  value="{{ formData.sbSwitch }}"
+                  showTip="{{ true }}"
+                  label="性别 / 出生日期"
+                  desc="性别和出生日期可选填，以便办理出生医学证明等相关服务"
+                  bind:change="handleChangeSwtich"
+                ></g-switch>
+              </view>
+              <view wx:if="{{ formData.sbSwitch }}" class="form-options">
+                <view class="form-item-wrap">
+                <g-picker
+                  id="sex"
+                  value="{{ formData.sex }}"
+                  label="性别"
+                  placeholder="请选择本人性别"
+                  bind:change="handleChange"
+                  range="{{ sexRangeZH }}"
+                  actionText="选择"
+                  required="{{ false }}"
+                ></g-picker>
+                </view>
+
+                <view class="form-item-wrap">
+                  <g-picker 
+                    id="birthday"
+                    mode="date"
+                    value="{{ formData.birthday }}"
+                    label="出生日期"
+                    placeholder="请选择本人出生日期"
+                    bind:change="handleChange"
+                    required="{{ false }}"
+                  >
+                  </g-picker>
+                </view>
+              </view>
+            </view>
+          </view>
         </view>
       </view>
 

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

@@ -74,4 +74,44 @@
 .tip-desc {
   color: #27282eff;
   font-size: 14px;
+}
+.form-options {
+  width: 750rpx;
+  background: linear-gradient(  #F5FAFF 0%, #F1F7FF 100%);
+  padding: 0 20rpx 20rpx;
+  box-sizing: border-box;
+}
+
+.foreign-tip {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+  margin: -12rpx 32rpx 0;
+  background: #EEF2F6;
+  border-radius: 8rpx;
+  padding: 24rpx 16rpx 24rpx 24rpx;
+  position: relative;
+}
+.foreign-tip::before {
+  content: '';
+  position: absolute;
+  border-left: 17rpx solid transparent;
+  border-top: 17rpx solid transparent;
+  border-bottom: 17rpx solid #EEF2F6;
+  border-right: 17rpx solid transparent;
+  top: -30rpx;
+  right: 18rpx;
+
+}
+.foreign-tip text {
+  font-weight: 500;
+  font-size: 26rpx;
+  color: #62667A;
+  line-height: 30rpx;
+}
+.foreign-tip image {
+  width: 40rpx;
+  height: 40rpx;
+  flex-shrink: 0;
 }

package/weapps-plugin-jingtong-verify/pages/log-off/log-off.js

@@ -96,6 +96,7 @@ Page({
     wx.removeStorageSync('tif.faceTimeStamp')
     wx.removeStorageSync('tif.CAUniqueId')
     wx.removeStorageSync('tif.lastLoginTime')
+    wx.removeStorageSync('tif.hideForeignTip')
     
     flow.navigateTo({
       url: '../logoff-success/logoff-success',

package/weapps-plugin-jingtong-verify/pages/nation-list/nation-list.js

@@ -1,5 +1,7 @@
 // pages/authenticate/countrySerchList/countrySerchList.js
-const { nation } = require("../../utils/country")
+const { nation, fullNation } = require("../../utils/country")
+const nationFull = fullNation()
+
 Page({
 
   /**
@@ -27,9 +29,20 @@ Page({
     return arr;
   },
 
+  whoNation() {
+    if (this.data.cid_type === '516') {
+      // 港澳居民来往内地通行证：加入中国
+      console.log('加入中国', nationFull.length)
+      return nationFull
+    } else {
+      console.log('国籍', nation.length)
+      return nation
+    }
+  },
+
   handleChange(e) {
     let { value } = e.detail
-    let nationsList = this.fuzzyQuery(nation, value)
+    let nationsList = this.fuzzyQuery(this.whoNation(), value)
     this.setData({
       nationsList
     })
@@ -57,12 +70,15 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
+    const { cid_type } = options
+    this.setData({
+      cid_type
+    })
+
     wx.hideShareMenu()
-    
     const language = wx.getStorageSync('tif.currentLanguage') || 'zh_CN'
-    const { cid_type } = options
     this.setData({
-      cid_type,
+      nationsList: this.whoNation(),
       language
     })
     this.initDomText(language)
@@ -91,8 +107,5 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function () {
-    this.setData({
-      nationsList: nation
-    })
   }
 })

package/weapps-plugin-jingtong-verify/pages/user-info/user-info.js

@@ -10,6 +10,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    showPage: true,
     name: '',
     star_name: '',
     sex: '',
@@ -17,10 +18,22 @@ Page({
     star_cid: '',
     phone: '',
     star_phone: '',
-    showModal: false,
+    phoneModal: false,
     showEye: false,
     authExpired: false,
-    showTipModal: false
+    showTipModal: false,
+    birthday: '',
+    canSave: false,
+    showFullInfoModal: false,
+    sexIndex: -1,
+    sexRangeZH: [
+      { name: '男', value: 1 },
+      { name: '女', value: 2 }
+    ],
+    fourTypeCert: false, // 港澳/台通行证、华侨护照和外国护照四类证件
+    showSBModal: false,
+    sbDesc: '',
+    showLeaveModal: false
   },
 
   /**
@@ -35,7 +48,7 @@ Page({
     })
     jingtongVerifyRequest.getSession({
       success: (res) => {
-        let { star_name, star_cid, phone, name, cid, face_time, realname_time, cid_type, openid } = res
+        let { star_name, star_cid, phone, name, cid, face_time, realname_time, cid_type, openid, birth_date = '' } = res
         let pho = /(\d{3})\d*(\d{4})/
         let sex = '未知'
         let authExpired = (!face_time && !realname_time) || !cid
@@ -51,13 +64,30 @@ Page({
           // Age = utils.parseIDCard(cid).age
         } else {
           let resSex = res.sex
-          if (resSex == 1) {
+          if (resSex === '1') {
             sex = '男'
-          } else if (resSex == 2) {
+          } else if (resSex === '2') {
             sex = '女'
           }
         }
+        // 港澳/台通行证、华侨护照三类证件
+        const fourTypeCertList = ['516', '511', '414']
+        const fourTypeCert = fourTypeCertList.includes(cid_type) || false
+
+        // 获取弹窗时间戳
+        let nowTimestamp = Date.now()
+        const stamp = wx.getStorageSync('tif.fullInfoModalStamp') || 0
+
+        let birthday = ''
+        if (birth_date) {
+          birthday = birth_date.slice(0, 4) + '-' + birth_date.slice(4, 6) + '-' + birth_date.slice(6, 8);
+        }
         this.setData({
+          cid_type,
+          sexIndex: sex === '未知' ? 0 : Number(res.sex) - 1,
+          birthday,
+          fourTypeCert,
+          showFullInfoModal: (fourTypeCert && (sex === '未知' || !birthday) && nowTimestamp > stamp) || false,
           star_name,
           name,
           sex,
@@ -77,7 +107,7 @@ Page({
   },
 
   // 显示换绑手机号码弹窗
-  showModal() {
+  showPhoneModal() {
     if (!this.data.authExpired) {
       // 上报事件
       SDKTrack('function_btn_click', {
@@ -85,9 +115,8 @@ Page({
         item_code: '110000000000511211993408000000', // 事项ID
         item_access: '19', // 业务入口
       })
-
       this.setData({
-        showModal: true
+        phoneModal: true
       })
     } else {
       wx.showToast({
@@ -106,41 +135,42 @@ Page({
   },
 
   // 弹框确认
-  confirmModal() {
+  confirmPhoneModal() {
     this.setData({
-      showModal: false
+      phoneModal: false
     })
   },
 
   // 获取手机号码
-  getPhoneNumberFun(e) {
+  async getPhoneNumberFun(e) {
     const params = Object.assign(e.detail, {
       source: '1'
     })
-    jingtongVerifyRequest.loginPhone(params).then(session => {
-      wx.showToast({
-        title: '换绑成功',
-        icon: 'none',
-        duration: 3000,
-        mask: true
-      })
-
-      // 登录成功回调 => 业务侧操作事项
-      wx.$_ServiceConfiguration && wx.$_ServiceConfiguration.methods && wx.$_ServiceConfiguration.methods._loginSuccessCallBack && wx.$_ServiceConfiguration.methods._loginSuccessCallBack(session)
-
-      let phone = session.phone
-      let pho = /(\d{3})\d*(\d{4})/
-
-      this.setData({
-        phone: wx.getStorageSync('tif.realPhone') || '', 
-        star_phone: phone ? phone.replace(pho, '$1****$2') : ''
-      })
-    }).catch(err => {
+    const [err, session] = await utils.awaitTo(jingtongVerifyRequest.loginPhone(params))
+    if (err) {
       console.log(err, '换绑手机号码')
       wx.showToast({
         title: err.errmsg || '换绑失败,请稍后再试',
         icon: 'none'
       })
+      return
+    }
+    wx.showToast({
+      title: '换绑成功',
+      icon: 'none',
+      duration: 3000,
+      mask: true
+    })
+
+    // 登录成功回调 => 业务侧操作事项
+    wx.$_ServiceConfiguration && wx.$_ServiceConfiguration.methods && wx.$_ServiceConfiguration.methods._loginSuccessCallBack && wx.$_ServiceConfiguration.methods._loginSuccessCallBack(session)
+
+    let phone = session.phone
+    let pho = /(\d{3})\d*(\d{4})/
+
+    this.setData({
+      phone: wx.getStorageSync('tif.realPhone') || '', 
+      star_phone: phone ? phone.replace(pho, '$1****$2') : ''
     })
   },
 
@@ -154,7 +184,124 @@ Page({
   // 关闭弹窗
   handleCloseModal() {
     this.setData({
-      showTipModal: false
+      showTipModal: false,
+      showSBModal: false,
+      showLeaveModal: false
+    })
+  },
+
+  // 关闭弹窗+记录10个自然日
+  handleFullInfoModalOk() {
+    this.setData({
+      showFullInfoModal: false
+    })
+    // 计算10个自然日后的时间戳
+    let nowTimestamp = Date.now()
+    let futureDate = new Date(nowTimestamp)
+    futureDate.setDate(futureDate.getDate() + 10)
+    let futureTimestamp = futureDate.getTime()
+    wx.setStorageSync('tif.fullInfoModalStamp', futureTimestamp)
+  },
+
+  // 性别
+  bindSexChange(e) {
+    const sexIndex = e.detail.value
+    this.setData({
+      sex: this.data.sexRangeZH[sexIndex].name,
+      sexIndex,
+      canSave: true
+    })
+  },
+
+  // 出生日期
+  bindBirthChange(e) {
+    this.setData({
+      birthday: e.detail.value,
+      canSave: true
+    })
+  },
+
+  // 保存信息
+  async toSave() {
+    const sex = this.data.sex
+    const birthday = this.data.birthday
+    if (sex === '未知') {
+      this.setData({
+        sbDesc: '您的性别信息尚未完善， ',
+        showSBModal: true
+      })
+      return
+    } else if (!birthday) {
+      this.setData({
+        sbDesc: '您的出生日期尚未完善， ',
+        showSBModal: true
+      })
+      return
+    }
+
+    const [err, data] = await utils.awaitTo(jingtongVerifyRequest.updateSB({
+      sex: this.data.sexRangeZH[this.data.sexIndex].value || '',
+      birthday
+    }))
+    if (err) {
+      console.log(err, '保存信息')
+      wx.showToast({
+        title: err.errmsg || '保存失败,请稍后再试',
+        icon: 'none'
+      })
+      return
+    }
+    console.log('更新信息', data)
+    wx.showToast({
+      title: '保存成功',
+      icon: 'none',
+      duration: 2000,
+      mask: true
+    })
+
+    this.setData({
+      canSave: false
+    })
+  },
+
+  onBeforeLeave() {
+    console.log('监听到返回上一页', this.data.canSave)
+    // 返回上一页的逻辑处理
+    if (this.data.canSave) {
+      this.setData({
+        showLeaveModal: true
+      })
+    } else {
+      console.log('返回上一页')
+      this.setData({
+        showPage: false
+      }, () => {
+        setTimeout(() => {
+          wx.navigateBack()
+        }, 10)
+      })
+    }
+  },
+
+  toBack() {
+    this.setData({
+      showLeaveModal: false
+    }, () => {
+      setTimeout(() => {
+        wx.navigateBack()
+      }, 10)
+    })
+  },
+
+  stopBack() {
+    this.setData({
+      showLeaveModal: false,
+      showPage: true
     })
+  },
+
+  preventSwipe() { 
+    /* 空函数阻止默认滑动 */
+    console.log('空函数阻止默认滑动')
   }
 })

package/weapps-plugin-jingtong-verify/pages/user-info/user-info.json

@@ -3,5 +3,6 @@
     "my-modal": "../../components/my-modal/my-modal",
     "tip-modal": "../../components/tip-modal/tip-modal"
   },
-  "navigationBarTitleText": "个人信息维护"
+  "navigationBarTitleText": "个人信息维护",
+  "disableSwipeBack": true
 }