update

app.js

@@ -47,7 +47,9 @@ import PAGE_CONFIG from './config/pageConfig.js'
 const { Provider } = WeAppRedux;
 const store = createStore(reducer) // redux store
 let md5 = require('utils/md5.js')
-let netUrl = 'http://testapi.oytour.com/api/common/post';
+// let netUrl = 'http://testapi.oytour.com/api/common/post';
+let netUrl = 'https://reborn.oytour.com/api/common/post';
+
 App(
   Provider(store)(
     {

pages/index/index.js

@@ -20,7 +20,6 @@ Page({
     todayMsg:{
       ConfigId:0,
       TCID:'',
-      // Date: util.YYMMDD(new Date()),
       Date: '2019-11-03',
       GuestId:0,
       

pages/index/index.wxml

@@ -22,7 +22,7 @@
 <view class="Index">
   <view class="titleContent">
     <view class="f40" style="font-weight:600">{{dataInfo.LtName}} 
-      <view style="float:right;position:relative;top:8rpx" bindtap="dYBtn">
+      <view hidden="{{loginState}}" style="float:right;position:relative;top:8rpx" bindtap="dYBtn">
         <image style="width:50rpx;height:50rpx" src="../../images/more.png"></image>
       </view>
     </view>
@@ -55,8 +55,8 @@
     <view style="font-size:30rpx;font-weight:700;padding-left:30rpx">重要时间</view>
     <swiper bindtap="seeFight" class="swiper-box" style="height:240rpx" indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}">
       <block>
-        <swiper-item style="padding: 0 30rpx;box-sizing: border-box;">
-          <view class="item">
+        <swiper-item>
+          <view class="item" style="padding: 0 30rpx;box-sizing: border-box;">
             <view class="itemView">
               <image style="width:44rpx;height:44rpx" src="../../images/index/time.png"></image>
               <text class="title">集合时间</text>
@@ -76,8 +76,8 @@
         </swiper-item>
       </block>
       <block>
-        <swiper-item style="padding: 0 30rpx;box-sizing: border-box;">
-          <view class="item">
+        <swiper-item>
+          <view class="item"  style="padding: 0 30rpx;box-sizing: border-box;">
             <!-- <view class="itemView">
               <image style="width:44rpx;height:44rpx" src="../../images/index/time.png"></image>
               <text class="title">集合时间</text>

pages/index/tripDay/tripDay.js

@@ -13,6 +13,8 @@ Page({
     },
     dataInfo:{},
     dayInfo:{},
+    isDirect:1,
+    suffix:''
   },
 
   /**
@@ -33,6 +35,7 @@ Page({
     that.getData()
   },
   getData(){
+    let that=this;
     let msg=this.data.msg
     app.$api('b2b_get_GetMXYTravelJourneyInfo', msg ).then(res => {
       let dayInfo={
@@ -57,16 +60,46 @@ Page({
         }
         if (item.Type && item.Type == 3) {
           dayInfo.hotelList.push(item);
+
         }
       })
       this.setData({
         dataInfo:res,
-        dayInfo: dayInfo
+        dayInfo: dayInfo,
+        isDirect: res.isDirect
       })
       console.log("dataInfo", this.data.dataInfo)
       console.log("dayInfo", dayInfo)
+      that.getHotelSuffix();
     }).catch(err => { })
   },
+  getHotelSuffix() {
+    let List = this.data.dayInfo.hotelList;
+    let isDirect = this.data.isDirect;
+    let suffix = "";
+  
+    if (List.length > 1) {
+      if (isDirect === 1) {
+        suffix = "或同級"
+      }
+    } else {
+      
+      if (List.length == 1 && List[0].childItem.HotelName != '温馨的家' && List[0].childItem.HotelName != '机场附近酒店') {
+        
+        if (List[0].childItem.Status == 1) {
+          suffix = "【保证入住】"
+          
+        } else {
+          if (isDirect === 1) {
+            suffix = "或同級"
+          }
+        }
+      }
+    }
+    this.setData({
+      suffix: suffix,
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/index/tripDay/tripDay.wxml

@@ -49,7 +49,10 @@
       <text class="circle"></text>
       <view>
         <text class="f22 c99">酒店</text>
-        <text style="margin:0 6rpx 0 30rpx" class="f26 bold">{{item.childItem.HotelName}}</text>
+        <text wx:if="{{dayInfo.hotelList.length>0}}" style="margin:0 6rpx 0 30rpx;display:inline-block" class="f26 bold">{{item.childItem.HotelName}}
+        </text>
+        <text>{{suffix}}</text>
+        <text wx:if="{{dayInfo.hotelList.length==0}}" style="margin:0 6rpx 0 30rpx;" class="f26 bold">本日无酒店安排</text>
       </view>
       <!-- <view wx:for="{{item.childItem.ImaArray}}" wx:key="index" wx:for-item="img" class="img">
         <image wx:if="{{img.Url && img.Url!=''}}" src="{{img.Url}}"></image>

pages/validateForm/yzCard/yzCard.js

@@ -16,6 +16,7 @@ Page({
       choosetype:"1",
       TCID:'7003',
     },
+    focusShow:true,
     focusList: [true, false, false, false, false, false],
     
   },
@@ -43,19 +44,17 @@ Page({
   numer(e) {
     let index = e.currentTarget.dataset.index;
     let val = e.detail.value;
-    let arr = this.data.arr;
-    let focusList = this.data.focusList;
+    let newArr = val.split('');
+    console.log("newArr", newArr)
     
-    arr[index] = val;
-    focusList[index] = false;
-    if (index<5){
-      focusList[index + 1] = true;
-    }
     this.setData({
-      arr: arr,
-      focusList: focusList
+      arr: newArr
+    })
+  },
+  showKeyboard(){
+    this.setData({
+      focusShow: true
     })
-    console.log("arr", arr)
   },
   yzBtn() {
     let arr = this.data.arr;

pages/validateForm/yzCard/yzCard.wxml

@@ -10,12 +10,21 @@
     后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="{{focusShow}}" data-index="{{0}}"  class="input" maxlength="6" placeholder="" />
+    <view catchtap='showKeyboard' class="flex" style="width:100%">
+      <view class="view">{{arr[0] == "undefind" ? "" : arr[0]}}</view>
+      <view class="view">{{arr[1] == "undefind" ? "" : arr[1]}}</view>
+      <view class="view">{{arr[2] == "undefind" ? "" : arr[2]}}</view>
+      <view class="view">{{arr[3] == "undefind" ? "" : arr[3]}}</view>
+      <view class="view">{{arr[4] == "undefind" ? "" : arr[4]}}</view>
+      <view class="view">{{arr[5] == "undefind" ? "" : arr[5]}}</view>
+    </view>
+    
+    <!-- <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="" />
+    <input bindinput="numer" focus="{{focusList[5]}}" data-index="{{5}}"  class="input" type="number" maxlength="1" placeholder="" /> -->
     
   </view>
   <view class="btn" style="text-align:center">

pages/validateForm/yzCard/yzCard.wxss

@@ -6,11 +6,22 @@
 }
 .inputView{
   margin-top:40rpx;
+  position: relative;
+}
+.inputView .flex{
   display: flex;
   align-items: center;
   justify-content: space-between;
 }
 .inputView .input{
+  position: absolute;
+  top: 0;
+  opacity: 0!important;
+  color: transparent;
+  width: 0;
+  height: 0;
+}
+.inputView .view{
   display: inline-block;
   width:78rpx;
   border-bottom: 2rpx solid #E2E2E2;