update

app.json

@@ -17,7 +17,9 @@
     "pages/index/hotelDetails/hotelDetails",
     "pages/index/mealDetail/mealDetail",
     "pages/index/strateDateil/strateDateil",
-    "pages/Clockin/Clockin"
+    "pages/Clockin/Clockin",
+    "pages/validateForm/allPerson",
+    "pages/validateForm/yzCard/yzCard"
   ],
   "window": {
     "backgroundTextStyle": "light",

app.wxss

@@ -8,6 +8,9 @@
   padding: 200rpx 0;
   box-sizing: border-box;
 } 
+.f50{
+  font-size: 50rpx;
+}
 .f42{
   font-size: 42rpx;
 }

pages/index/index.js

@@ -254,7 +254,7 @@ Page({
   },
   goCard(){
     wx.navigateTo({
-      url: '/pages/validateForm/validate/validate'
+      url: `/pages/validateForm/validate/validate?TCID${this.data.tcid}`
     })
   },
   getUserInfo: function(e) {

pages/validateForm/allPerson.js

+const app = getApp()
+Page({
+  /** 
+   * 页面的初始数据 
+   */
+  data: {
+    isActive: null,
+    listMain: [],
+    listTitles: [],
+    fixedTitle: null,
+    toView: 'inToView0',
+    oHeight: [],
+    scroolHeight: 0,
+    msg: {
+      TCID: '7003'
+    },
+    choosetype:0,
+  },
+  //点击右侧字母导航定位触发
+  scrollToViewFn: function(e) {
+    var that = this;
+    var _id = e.target.dataset.id;
+    for (var i = 0; i < that.data.listMain.length; ++i) {
+      if (that.data.listMain[i].id === _id) {
+        that.setData({
+          isActive: _id,
+          toView: 'inToView' + _id
+        })
+        break
+      }
+    }
+  },
+  toBottom: function(e) {
+    
+  },
+  getPerson(e){
+    console.log("e",e);
+    let info = e.currentTarget.dataset.item;
+    let choosetype = this.data.choosetype;
+    let TCID = this.data.msg.TCID;
+    wx.navigateTo({
+      url: `/pages/validateForm/yzCard/yzCard?Name=${info.Name}&IdCard=${info.IdCard}&PassportNo=${info.PassportNo}&choosetype=${choosetype}&TCID=${TCID}`,
+    })
+
+  },
+  // 页面滑动时触发
+  onPageScroll: function(e) {
+    this.setData({
+      scroolHeight: e.detail.scrollTop
+    });
+    for (let i in this.data.oHeight) {
+      if (e.detail.scrollTop < this.data.oHeight[i].height) {
+        this.setData({
+          isActive: this.data.oHeight[i].key,
+          fixedTitle: this.data.oHeight[i].name
+        });
+        return false;
+      }
+    }
+
+  },
+  getData() {
+    let that=this;
+    app.$api('b2b_get_GetMXYTravelGuestInfo', this.data.msg).then(res => {
+      let arr=[];
+      arr = that.sortName(res, 'Name')
+      console.log("arr",arr);
+
+      let newArr = [];
+      arr.forEach((item, i) => {
+        let index = -1;
+        let isExists = newArr.some((newItem, j) => {
+          if (item.ESurName == newItem.ESurName) {
+            index = j;
+            return true;
+          }
+        })
+        if (!isExists) {
+          newArr.push({
+            id:i,
+            ESurName: item.ESurName,
+            brands: [item]
+          })
+        } else {
+          newArr[index].brands.push(item);
+        }
+      })
+      newArr.forEach(item=>{
+        item.ESurName = item.ESurName.toUpperCase();
+      })
+        that.setData({
+          listMain: newArr
+        });
+
+    }).catch(err => {})
+  },
+  sortName(arr, eachName){
+    arr.forEach(function (item) {
+      let temp = item[eachName];
+      item.sortName = temp;
+    });
+    let resultArray = arr.sort(
+      function compareFunction(param1, param2) {
+        return param1.sortName.localeCompare(param2.sortName, "zh");
+      }
+    );
+    return resultArray;
+  },
+  onLoad: function(options) {
+    var that = this;
+    that.getData();
+    console.log("options", options)
+    if(options.type){
+      this.setData({
+        choosetype: options.type
+      })
+    }
+    if (options.TCID) {
+      let msg=this.data.msg;
+      msg.TCID = options.TCID;
+      this.setData({
+        msg: msg
+      })
+    }
+  }
+})
\ No newline at end of file

pages/validateForm/allPerson.json

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "姓名核对",
+  "navigationStyle": "default"
+}
\ No newline at end of file

pages/validateForm/allPerson.wxml

+<view >
+<!-- 左侧列表内容部分 -->
+  <scroll-view class="content" enable-back-to-top scroll-into-view="{{toView}}" scroll-y="true" scroll-with-animation="true" bindscroll="onPageScroll"> 
+    <view wx:for="{{listMain}}" wx:for-item="group" wx:key="{{group.id}}"  id="{{ 'inToView'+group.id}}" data-id='{{group.id}}'> 
+      <view class="address_top" >{{group.ESurName}}</view> 
+        <view wx:for="{{group.brands}}" wx:for-item="item" wx:key="{{item.brandId}}"> 
+          <view bindtap="getPerson" data-item="{{item}}" class="address_bottom" data-id='{{item.brandId}}'>
+          <image style="width:70rpx;height:70rpx;margin-right:22rpx" src="../../images/index/person.png"></image>
+          <text class="name">{{item.Name}}</text>
+          </view> 
+        </view> 
+    </view> 
+  </scroll-view> 
+  <!-- 顶部固定分类 -->
+  <!-- <view class="list-fixed {{fixedTitle=='' ? 'hide':''}}" style="transform:translate3d(0,{{fixedTop}}px,0);">
+    <view class="fixed-title">
+    {{fixedTitle}}
+    </view>
+  </view> -->
+  <!-- 右侧字母导航 -->
+  <view class="orientation_region"> 
+    <!-- <view class="orientation"></view>  -->
+      <block wx:for="{{listMain}}"  wx:key="{{item.id}}"> 
+        <view class="orientation_city  {{isActive==item.id ? 'active':'' }}" bindtap="scrollToViewFn" data-id="{{item.id}}" >
+        {{item.ESurName}}
+        </view> 
+    </block> 
+  </view>  
+</view>
\ No newline at end of file

pages/validateForm/allPerson.wxss

+page {
+  height: 100%;
+}
+
+.content {
+  padding-bottom: 20rpx;
+  box-sizing: border-box;
+  height: 100%;
+  position: fixed;
+}
+
+.location {
+  width: 100%;
+}
+
+.location_top {
+  height: 76rpx;
+  line-height: 76rpx;
+  background: #f4f4f4;
+  color: #606660;
+  font-size: 28rpx;
+  padding: 0 20rpx;
+}
+
+.location_bottom {
+  height: 140rpx;
+  line-height: 140rpx;
+  color: #d91f16;
+  font-size: 28rpx;
+  border-top: 2rpx #ebebeb solid;
+  border-bottom: 2rpx #ebebeb solid;
+  padding: 0 20rpx;
+  align-items: center;
+  display: -webkit-flex;
+}
+
+.address_top {
+  height: 44rpx;
+  line-height: 44rpx;
+  background: #FAFAFA;
+  font-size: 30rpx;
+  padding: 0 30rpx;
+  font-weight: 700;
+}
+
+.address_bottom {
+  height: 130rpx;
+  background: #fff;
+  color: #111111;
+  font-size: 30rpx;
+  padding: 0 20rpx;
+  
+  margin-left: 15rpx;
+  display: flex;
+  align-items: center;
+  position: relative;
+}
+.address_bottom image{
+  position: absolute;
+
+}
+ .address_bottom .name{
+  border-bottom: 1px #E2E2E2 solid;
+  display: inline-flex;
+  width: 100%;
+  padding-left: 95rpx;
+  box-sizing: border-box;
+  line-height: 130rpx;
+}
+
+.location_img {
+  width: 48rpx;
+  height: 48rpx;
+  position: absolute;
+  right: 20rpx;
+  top: 125rpx;
+}
+
+.add_city {
+  width: 228rpx;
+  height: 60rpx;
+  line-height: 60rpx;
+  text-align: center;
+  border: 2rpx solid #ebebeb;
+  color: #000;
+  margin-right: 20rpx;
+}
+
+.add_citying {
+  width: 228rpx;
+  height: 60rpx;
+  line-height: 60rpx;
+  text-align: center;
+  border: 2rpx solid #09bb07;
+  color: #09bb07;
+  margin-right: 20rpx;
+}
+
+.orientation {
+  white-space: normal;
+  display: inline-block;
+  width: 45rpx;
+  height: 50rpx;
+  font-size: 28rpx;
+  font-weight: bold;
+  color: rgb(88, 87, 87);
+  text-align: center;
+}
+
+.orientation_region {
+  padding: 5px 0px;
+  width: 45rpx;
+  font-size: 22rpx;
+  position: fixed;
+  top: 50%;
+  right: 6rpx;
+  transform: translate(0, -50%);
+  border-radius: 10px;
+  color:#BCBCBC;
+}
+
+.orientation_city {
+  height: 40rpx;
+  line-height: 40rpx;
+  color: #000;
+  text-align: center;
+}
+
+.active {
+  color: #FF3166;
+}
+
+.list-fixed {
+  position: fixed;
+  width: 100%;
+  z-index: 999;
+  height: 56rpx;
+  line-height: 56rpx;
+  background: #ebebeb;
+  color: #999;
+  font-size: 28rpx;
+  padding: 0 20rpx;
+  z-index: 9999;
+}
+
+.fixed-title {
+  color: #2cc1d1;
+}

pages/validateForm/validate/validate.js

@@ -5,14 +5,19 @@ Page({
    * 页面的初始数据
    */
   data: {
-    chosenType:-1
+    chosenType:-1,
+    TCID:'7003'
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    if (options.TCID) {
+      this.setData({
+        TCID: options.TCID
+      })
+    }
   },
 
   /**
@@ -24,7 +29,7 @@ Page({
   goToNextValidate: function () {
     if (this.data.chosenType!=-1){
       wx.navigateTo({
-        url: '/pages/validateForm/validateEnd/validateEnd?type=' + this.data.chosenType,
+        url: '/pages/validateForm/allPerson?type=' + this.data.chosenType,
       })
     }else{
       wx.showToast({

pages/validateForm/yzCard/yzCard.js

+// pages/validateForm/yzCard/yzCard.js
+const app = getApp()
+var util = require('../../../utils/util.js')
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    arr: ['', '', '', '', '', ''],
+    numNo: '',
+    msg: {
+      IdCard: "510102194902023508",
+      Name: "付淑清",
+      PassportNo: "ED3495877",
+      choosetype:"1",
+      TCID:'7003',
+    },
+    focusList: [true, false, false, false, false, false],
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function(options) {
+    console.log("options", options);
+    let msg = this.data.msg;
+    if (options.IdCard) {
+      msg = {
+        IdCard: options.IdCard,
+        Name: options.Name,
+        PassportNo: options.PassportNo,
+        choosetype: options.choosetype,
+        TCID: options.TCID,
+      }
+      this.setData({
+        msg:msg
+      })
+    }
+
+  },
+  numer(e) {
+    let index = e.currentTarget.dataset.index;
+    let val = e.detail.value;
+    let arr = this.data.arr;
+    let focusList = this.data.focusList;
+    
+    arr[index] = val;
+    focusList[index] = false;
+    if (index<5){
+      focusList[index + 1] = true;
+    }
+    this.setData({
+      arr: arr,
+      focusList: focusList
+    })
+    console.log("arr", arr)
+  },
+  yzBtn() {
+    let arr = this.data.arr;
+    let msg = this.data.msg;
+    let number = arr[0] + arr[1] + arr[2] + arr[3] + arr[4] + arr[5];
+    console.log("number", number)
+    let str='';
+    let tips='';
+    let info = {
+      type: msg.choosetype,
+      TCID: msg.TCID,
+      Number: '',
+    };
+    if (msg.choosetype=='1'){
+      str=msg.IdCard.substring(msg.IdCard.length - 6);
+      tips ="身份证号码";
+      info.Number = msg.IdCard;
+    }
+    if (msg.choosetype == '2') {
+      str = msg.PassportNo.substring(msg.PassportNo.length - 6);
+      tips = "护照";
+      info.Number = msg.PassportNo;
+
+
+    }
+    if (str != number){
+      util.showToast('text', tips+'不一致！', { duration: 3000 })
+      return;
+    }
+   
+    app.$api('b2b_get_GetMXYTravelOrderInfo', info).then(res => {
+      console.log("res", res);
+      if (res.IsOK == 1) {
+        let userInfo = res.Info
+        wx.setStorageSync('userInfo', userInfo)
+        wx.switchTab({ url: '/pages/index/index' })
+      }
+    }).catch(err => { })
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function() {
+
+  }
+})
\ No newline at end of file

pages/validateForm/yzCard/yzCard.json

+{
+  "usingComponents": {},
+  "navigationBarTitleText": "核对",
+  "navigationStyle": "default"
+
+}
\ No newline at end of file

pages/validateForm/yzCard/yzCard.wxml

+<view class="card">
+  <view>
+    <image style="width:70rpx;height:70rpx;margin-right:40rpx;position:relative;top:16rpx" src="../../../images/index/person.png"></image>
+    <text class="bold f50">{{msg.Name}}，欢迎您</text>
+  </view>
+  <view class="f26" style="margin-top:136rpx;color:#BCBCBC;">
+    请输入
+    <text wx:if="{{msg.choosetype=='1'}}">身份证号码</text>
+    <text wx:if="{{msg.choosetype=='2'}}">护照</text>
+    后6位核对身份
+  </view>
+  <view class="inputView">
+    <input bindinput="numer" focus="{{focusList[0]}}" data-index="{{0}}"  class="input" type="number" maxlength="1" placeholder="" />
+    <input bindinput="numer" focus="{{focusList[1]}}" data-index="{{1}}"  class="input" type="number" maxlength="1" placeholder="" />
+    <input bindinput="numer" focus="{{focusList[2]}}" data-index="{{2}}"  class="input" type="number" maxlength="1" placeholder="" />
+    <input bindinput="numer" focus="{{focusList[3]}}" data-index="{{3}}"  class="input" type="number" maxlength="1" placeholder="" />
+    <input bindinput="numer" focus="{{focusList[4]}}" data-index="{{4}}"  class="input" type="number" maxlength="1" placeholder="" />
+    <input bindinput="numer" focus="{{focusList[5]}}" data-index="{{5}}"  class="input" type="number" maxlength="1" placeholder="" />
+    
+  </view>
+  <view class="btn" style="text-align:center">
+    <image bindtap="yzBtn" style="width:158rpx;height:158rpx" src="http://imgfile.oytour.com/New/Upload/Cloud/2020-02/20200213050648265.png"></image>
+  </view>
+</view>

pages/validateForm/yzCard/yzCard.wxss

+/* pages/validateForm/yzCard/yzCard.wxss */
+.card{
+  padding:20rpx 30rpx;
+  box-sizing: border-box;
+  width: 100%;
+}
+.inputView{
+  margin-top:40rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+.inputView .input{
+  display: inline-block;
+  width:78rpx;
+  border-bottom: 2rpx solid #E2E2E2;
+  font-size: 60rpx;
+  font-weight: 700;
+  padding:20rpx 0 30rpx 0;
+  text-align: center;
+  color: #111111;
+  height: 70rpx;
+  line-height: 70rpx;
+}
+.btn{
+  position: fixed;
+  width: 100%;
+  bottom: 60rpx;
+}
\ No newline at end of file

project.config.json

@@ -123,6 +123,20 @@
 					"id": -1,
 					"name": "打卡",
 					"pathName": "pages/Clockin/Clockin",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "所有人",
+					"pathName": "pages/validateForm/allPerson",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "验证身份",
+					"pathName": "pages/validateForm/yzCard/yzCard",
 					"scene": null
 				}
 			]