weapps-plugin-jingtong-verify 1.3.8 → 1.4.0

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

@@ -24,6 +24,7 @@
           value="{{ formData.cid_type }}"
           label="证件类型"
           bind:change="handleChange"
+          required
           range="{{ cidTypeRange }}"
         ></g-picker>
       </view>
@@ -165,38 +166,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,10 @@
 .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;
 }

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,29 @@ 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', '700']
+        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({
+          sexIndex: sex === '未知' ? 0 : Number(res.sex) - 1,
+          birthday,
+          fourTypeCert,
+          showFullInfoModal: (fourTypeCert && (sex === '未知' || !birthday) && nowTimestamp > stamp) || false,
           star_name,
           name,
           sex,
@@ -77,7 +106,7 @@ Page({
   },
 
   // 显示换绑手机号码弹窗
-  showModal() {
+  showPhoneModal() {
     if (!this.data.authExpired) {
       // 上报事件
       SDKTrack('function_btn_click', {
@@ -85,9 +114,8 @@ Page({
         item_code: '110000000000511211993408000000', // 事项ID
         item_access: '19', // 业务入口
       })
-
       this.setData({
-        showModal: true
+        phoneModal: true
       })
     } else {
       wx.showToast({
@@ -106,41 +134,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 +183,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
 }

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

@@ -1,61 +1,135 @@
 <!--weapps-plugin-jingtong-verify/pages/user-info/user-info.wxml-->
-<view>
-  <view class="top-box">
-    <text class="title">基础信息</text>
-    <image src="{{ showEye ? '../../images/preview-open.png' : '../../images/preview-close.png' }}" mode="" class="icon" catchtap="changeEye"/>
-  </view>
-  <view class="content-box">
-    <view class="cell">
-      <view class="cell-flex">
-        <text class="label">姓名</text>
-        <image src="../../images/question.png" mode="widthFix" catch:tap="showTip" />
+<view wx:if="{{ showPage }}">
+  <page-container show="{{ showPage }}" position="center" duration="{{ false }}" overlay="{{ false }}" custom-style="height:100vh;overflow-y:scroll;" bind:beforeleave="onBeforeLeave" catch:touchmove="preventSwipe">
+    <view>
+      <view class="top-box">
+      <text class="title">基础信息</text>
+      <image src="{{ showEye ? '../../images/preview-open.png' : '../../images/preview-close.png' }}" mode="" class="icon" catchtap="changeEye"/>
       </view>
+      <view class="content-box">
+        <view class="cell">
+          <view class="cell-flex">
+            <text class="label">姓名</text>
+            <image src="../../images/question.png" mode="widthFix" catch:tap="showTip" />
+          </view>
+          <text class="content">{{ showEye ? name : star_name }}</text>
+        </view>
 
-      <text class="content">{{ showEye ? name : star_name }}</text>
-    </view>
+        <!-- 只限港澳/台通行证、华侨护照和外国护照四类证件可以补填 -->
+        <view wx:if="{{ fourTypeCert }}">
+          <view class="cell">
+            <text class="label">性别</text>
+            <view class="content">
+              <picker bindchange="bindSexChange" range="{{ sexRangeZH }}" mode="selector" range-key="name" value="{{ sexIndex }}">
+                <view>
+                  <text class="to-full" wx:if="{{ sex === '未知' }}">去完善</text>
+                  <text wx:else>{{ sex }}</text>
+                  <image src="../../images/Vector.png" mode="" class="img" />
+                </view>
+              </picker>
+            </view>
+          </view>
+          <view class="cell">
+            <text class="label">出生日期</text>
+            <view class="content">
+              <picker bindchange="bindBirthChange" mode="date" value="{{ birthday }}">
+                <view>
+                  <text class="to-full" wx:if="{{ !birthday }}">去完善</text>
+                  <text wx:else>{{ birthday }}</text>
+                  <image src="../../images/Vector.png" mode="" class="img" />
+                </view>
+              </picker>
+            </view>
+          </view>
+        </view>
 
-    <view class="cell">
-      <text class="label">性别</text>
-      <text class="content">{{ sex }}</text>
-    </view>
+        <view class="cell" wx:else>
+          <text class="label">性别</text>
+          <text class="content">
+            <text>{{ sex }}</text>
+          </text>
+        </view>
 
-    <view class="cell">
-      <view class="cell-flex">
-        <text class="label">证件号码</text>
-        <image src="../../images/question.png" mode="widthFix" catch:tap="showTip" />
-      </view>
-      <text class="content">{{ showEye ? cid : star_cid }}</text>
-    </view>
+        <view class="cell">
+          <view class="cell-flex">
+            <text class="label">证件号码</text>
+            <image src="../../images/question.png" mode="widthFix" catch:tap="showTip" />
+          </view>
+          <text class="content">{{ showEye ? cid : star_cid }}</text>
+        </view>
 
-    <view class="cell">
-      <text class="label">换绑手机号</text>
-      <view class="content" catchtap="showModal">
-        <text>{{ showEye ? phone : star_phone }}</text> 
-        <image src="../../images/Vector.png" mode="" class="img" wx:if="{{ phone }}"/>
+        <view class="cell">
+          <text class="label">换绑手机号</text>
+          <view class="content" catchtap="showPhoneModal">
+            <text>{{ showEye ? phone : star_phone }}</text> 
+            <image src="../../images/Vector.png" mode="" class="img" wx:if="{{ phone }}"/>
+          </view>
+        </view>
+      </view>
+      <view class="bottom-box" wx:if="{{ fourTypeCert }}">
+        <button class="btn" bindtap="toSave" wx:if="{{ canSave }}">保存</button>
+        <button class="btn btn-disabled" wx:else>保存</button>
       </view>
     </view>
-  </view>
+  </page-container>
+</view>
 
-  <my-modal 
-    title="提示" 
-    Confirm="true" 
-    confirmColor="#ce0022"
-    Cancel="true"  
-    visible="{{ showModal }}" 
-    bind:ConfirmBtn="confirmModal"
-    bind:CancelBtn="confirmModal"  
-    confirmOpenType="getPhoneNumber" 
-    bind:getPhoneNumberFun="getPhoneNumberFun">
-  <view>
-    您修改的是统一身份认证平台绑定的手机号:  <text style="color: #ce0022">{{ phone }}</text>
-  </view>
-  </my-modal>
-
-  <!-- 姓名、证件号码提示弹窗 -->
-  <tip-modal 
-    visible="{{ showTipModal }}" 
-    bind:cancel="handleCloseModal" 
-    desc1="1、如果您在公安局变更了您的姓名或证件号码等信息，请您退出京通小程序后填写变更后的身份信息重新登录。" 
-    desc2="2、如果当前显示为他人信息（亲属/朋友等），请您退出京通小程序后使用本人身份信息重新登录。"
-  ></tip-modal>
+<!-- 绑定手机号码 -->
+<my-modal 
+  title="提示" 
+  Confirm="true" 
+  confirmColor="#ce0022"
+  Cancel="true"  
+  visible="{{ phoneModal }}" 
+  bind:ConfirmBtn="confirmPhoneModal"
+  bind:CancelBtn="confirmPhoneModal"  
+  confirmOpenType="getPhoneNumber" 
+  bind:getPhoneNumberFun="getPhoneNumberFun">
+<view>
+  您修改的是统一身份认证平台绑定的手机号:  <text style="color: #ce0022">{{ phone }}</text>
 </view>
+</my-modal>
+
+<!-- 姓名、证件号码提示弹窗 -->
+<tip-modal 
+  visible="{{ showTipModal }}" 
+  bind:cancel="handleCloseModal" 
+  desc1="1、如果您在公安局变更了您的姓名或证件号码等信息，请您退出京通小程序后填写变更后的身份信息重新登录。" 
+  desc2="2、如果当前显示为他人信息（亲属/朋友等），请您退出京通小程序后使用本人身份信息重新登录。"
+></tip-modal>
+
+<!-- 完善信息弹窗 -->
+<tip-modal 
+  visible="{{ showFullInfoModal }}" 
+  bind:cancel="handleFullInfoModalOk"
+  xAlign="center" 
+  desc1="为了您更便捷使用京通服务，请完善 个人信息并确保信息的真实有效" 
+></tip-modal>
+
+<!-- 完善性别、出生日期弹窗 -->
+<tip-modal 
+  visible="{{ showSBModal }}"
+  xAlign="center"
+  bind:cancel="handleCloseModal" 
+  desc1="{{ sbDesc }}" 
+  desc2="需补充后才能保存" 
+></tip-modal>
+
+<!-- 离开页面未保存提示弹窗 -->
+<my-modal 
+  title="温馨提示" 
+  Confirm="true" 
+  Cancel="true"
+  ConfirmText="去保存"
+  CancelText="直接离开"
+  confirmColor="#ce0022" 
+  cancelColor="#999" 
+  visible="{{ showLeaveModal }}" 
+  bindConfirmBtn="stopBack" 
+  bindCancelBtn="toBack">
+  <view class="leave-modal">
+    <view>您已修改的信息尚未保存，</view>
+    <view>确定直接离开吗？</view>
+  </view>
+</my-modal>
+