Merge branch 'master' into dev_scene

app.js

@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest114? true : false;
+            data.isTest = data.isTest126? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

pages/index/index.wxml

@@ -4,7 +4,7 @@
 <view class="bg" wx:if="{{!isTest}}" style="background-image: url({{indexSeason.background}});">
     <!-- 顶部banner -->
     <view style="position:relative;z-index: 1;">
-        <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
+        <swiper class="swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
             bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular
             indicator-dots 	indicator-active-color="#fff">
             <block wx:for="{{banner}}" wx:key="index">
@@ -70,7 +70,7 @@
         <view class="content-box">
             <!-- 苏城环游记 todo-->
             <view class="small-swiper-box"  wx:if="{{ztbanner.length>0 && func_data.tour_guide}}">
-                <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
+                <swiper class="small-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="ztBannerIndex">
                 <block wx:for="{{ztbanner}}" wx:key="index">
                     <swiper-item bindtap="bannerClick" data-item="{{item}}">
@@ -134,7 +134,7 @@
                     </view>
                     <!-- 右边的banner -->
                     <view class="xpth-banner" wx:if="{{xpth&&xpth.adv&&xpth.adv.length>0}}">
-                        <swiper class="xpth-banner-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
+                        <swiper class="xpth-banner-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
                         bindchange="changeBannerIndex" data-keyname="XPathBannerIndex">
                         <block wx:for="{{xpth.adv}}" wx:key="index">
                             <swiper-item bindtap="bannerClick" data-item="{{item}}" data-source="限时特惠">
@@ -152,7 +152,7 @@
             </view>
 
             <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0 && func_data.banner_mini}}">
-                <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
+                <swiper class="small-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="smBannerIndex">
                 <block wx:for="{{xiaobanner}}" wx:key="index">
                     <swiper-item bindtap="bannerClick" data-item="{{item}}" style="position: relative;">
@@ -286,7 +286,7 @@
     <!-- 广告弹窗 -->
     <view class="zzc" bindtap="closeAdv" wx:if="{{showAdv}}"></view>
     <view class="alertavd" wx:if="{{showAdv}}">
-        <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
+        <swiper class="alertsp" indicator-dots='{{true}}' indicator-color="rgba(255,255,255,0.5)" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" indicator-active-color="white">
             <block wx:for="{{alertSwipeList}}" wx:key="index">
             <swiper-item data-item="{{item}}" bindtap="bannerClick">
                 <image src="{{item.head_img}}" style="width: 100%; height:100%; border-radius: 10rpx;" mode="aspectFill"></image>
@@ -321,7 +321,7 @@
 <view class="bg" wx:else style="background-image: url({{indexSeason.background}});">
     <!-- 顶部banner -->
     <view style="position:relative;z-index: 1;">
-        <swiper class="swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
+        <swiper class="swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
             bindchange="changeBannerIndex" data-keyname="activeBannerIndex" circular>
             <block wx:for="{{banner}}" wx:key="index">
             <swiper-item data-item="{{item}}">
@@ -347,7 +347,7 @@
         <view class="content-box">
             <!-- 苏城环游记 todo-->
             <view class="small-swiper-box"  wx:if="{{ztbanner.length>0 && func_data.tour_guide}}">
-                <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
+                <swiper class="small-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="ztBannerIndex">
                 <block wx:for="{{ztbanner}}" wx:key="index">
                     <swiper-item data-item="{{item}}">
@@ -361,7 +361,7 @@
 
 
         <view class="small-swiper-box"  wx:if="{{xiaobanner.length>0 && func_data.banner_mini}}">
-                <swiper class="small-swiper" autoplay="{{true}}" interval="{{3000}}" duration="{{300}}" 
+                <swiper class="small-swiper" autoplay="{{false}}" interval="{{3000}}" duration="{{300}}" 
                 bindchange="changeBannerIndex" data-keyname="smBannerIndex">
                 <block wx:for="{{xiaobanner}}" wx:key="index">
                     <swiper-item  data-item="{{item}}" style="position: relative;">

pages/info/sceneProductInfo/index.js

@@ -857,6 +857,15 @@ Page({
         })
         
     }else {
+        // 如果是预定须知
+        if (showSkuIndex == 1) {
+            this.setData({
+                bookingInfo: e.currentTarget.dataset.sku.sku_model,
+                bookingInfoTitle: e.currentTarget.dataset.sku.sku_name
+            })
+            return
+        }
+
         let skuIndex = this.data.skuList.findIndex(v=>v.id == sku.sku.id)
 
       this.setData({

pages/info/sceneProductInfo/index.wxml

@@ -42,8 +42,8 @@
 
 <view class="tab-info-container" wx:if="{{info}}">
     <view class="tab-item {{showTabIndex==0?'active':''}}" bind:tap="changeTabIndex" data-value="0">预订</view>
-    <view class="tab-item {{showTabIndex==1?'active':''}}" bind:tap="changeTabIndex" data-value="1">评价/问答</view>
     <view class="tab-item {{showTabIndex==2?'active':''}}" bind:tap="changeTabIndex" data-value="2">详情/政策</view>
+    <view class="tab-item {{showTabIndex==1?'active':''}}" bind:tap="changeTabIndex" data-value="1">评价/问答</view>
 </view>
 
 <view class="sku-type-container" wx:if="{{info&&showTabIndex==0}}">
@@ -154,13 +154,14 @@
   <view class="mask" wx:if="{{showDate}}">
     <view class="mask-bg" bindtap="hideDate"></view>
     <view class="mask-content1">
+    <view class="iconfont icon-close" bindtap="hideDate"></view>
         <view class="mask-top-menu">
             <view class="{{skuShowIndex==0?'active':''}}" bind:tap="changeSimpleVal" data-keyname="skuShowIndex" data-val="0">预订选择</view>
             <view class="{{skuShowIndex==1?'active':''}}" bind:tap="changeSimpleVal" data-keyname="skuShowIndex" data-val="1">预订须知</view>
         </view>
 
         <scroll-view class="mask-scroll-content" scroll-y scroll-into-view="{{skuShowDomId}}" scroll-with-animation>
-            <!-- <view class="iconfont icon-close" bindtap="hideDate"></view> -->
+            
             <date id="sku-show-0" wx:if="{{showDate2}}" bind:onChangeDate="changeDate" bind:onChangeTime="changeTime"
             product="{{product}}" datePrice="{{skuPriceDate}}" endDays="{{30}}"></date>
 

pages/info/sceneProductInfo/index.wxss

@@ -934,8 +934,8 @@ line-height: 40rpx;
 }
 .icon-close {
   position: absolute;
-  top: 30rpx;
-  right: 30rpx;
+  top: 24rpx;
+  right: 24rpx;
 }
 
 

pages/list/six/index.js

@@ -1,6 +1,7 @@
 // pages/list/six/index.js
 let app = getApp()
 
+import { unix } from "dayjs"
 import commonApi from "../../../utils/https/common"
 import util from "../../../utils/util"
 Page({
@@ -15,7 +16,7 @@ Page({
     typeIndex:0,
     total:1,
     list:[],
-    keywords:""
+    keywords:"",
   },
 
   /**
@@ -143,6 +144,12 @@ Page({
     console.log(item)
     util.gotoDetail(item);
   },
+  goHotel () {
+      wx.navigateToMiniProgram({
+          appId : "wx0e6ed4f51db9d078",
+          page: "/pages/hotelsearch/search/index?ouid=kfptvxtool&allianceid=5820592&sid=155665063"
+      })
+  },
 
   /**
    * 生命周期函数--监听页面初次渲染完成

pages/list/six/index.wxml

@@ -28,10 +28,15 @@
     <image class="green-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon2.png" mode="widthFix"></image>
     <view>景点门票</view>
   </navigator>
-  <navigator url="../hotel/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
+  <!-- <navigator url="../hotel/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
     <image class="blue-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon3.png" mode="widthFix"></image>
     <view>酒店住宿</view>
-  </navigator>
+  </navigator> -->
+  <view class="new-icon" bind:tap="goHotel">
+    <image class="blue-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon3.png" mode="widthFix"></image>
+    <view>酒店住宿</view>
+  </view>
+    
   <!-- <navigator url="../movieticket/index?area_id={{areas[areaIndex].area_id}}" class="new-icon">
     <image class="purple-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon4.png" mode="widthFix"></image>
     <view>电影购票</view>
@@ -39,7 +44,7 @@
 </view>
 <view class="new-title">公共服务</view>
 <view class="new-icons">
-  <navigator  data-title="景区舒适度" url="/pages/pbService/sceneComfort/index" class="new-icon">
+  <navigator  data-title="景区舒适度" url="/pages/pbService/sceneComfort/index?area_code={{areas[areaIndex].area_key}}" class="new-icon">
     <image class="green-shadow" src="https://static.ticket.sz-trip.com/xcxImages/six/icon5.png" mode="widthFix"></image>
     <view>景区舒适度</view>
   </navigator>

pages/order/components/date/index.js

@@ -169,9 +169,10 @@ Component({
                       }
                   })
               }
-
+              leftIndex = (leftIndex-1)>=0?(leftIndex-1):0;
               this.setData({
-                  scrollLeft: 70*leftIndex
+                //   scrollLeft: 70*leftIndex
+                scrollLeft: "scroll-item-"+leftIndex
               })
               setTimeout(() => {
                   this.changeDate(seldDate)
@@ -211,13 +212,16 @@ Component({
     },
     changeDate: function (e) {
       let date = e.currentTarget ? e.currentTarget.dataset.date : e
+      let index = e.currentTarget.dataset.index;
       if (date.stock <= 0) return;
       if (date.stock == null) return;
       if (date.price == null) return;
+      index = (index-1)>=0?(index-1):0;
       this.setData({
         activeDate: date,
         moreFlag: true,
-        date_price:date.price
+        date_price:date.price,
+        scrollLeft: "scroll-item-"+index
       })
       this.triggerEvent("onChangeDate", this.data.activeDate)
       this.getTimeStock()
@@ -225,17 +229,20 @@ Component({
     // 修改日期
     onTapDay: function (e) {
       let threeDays = this.data.threeDays, flag = false;
-      threeDays.map(item => {
+      threeDays.map((item,i) => {
         if (item.date == e.detail.date) {
           flag = true
         }
       })
+      let index = this.data.datelist.findIndex(v=>v.date == e.detail.date)
       e.detail.short_date = e.detail.date.substr(5, 5);
       e.detail.date_price = this.data.activeDate.price;
+      index = (index-1)>=0?(index-1):0;
       this.setData({
         activeDate: e.detail,
         showMoreDateFlag: false,
-        moreFlag: flag
+        moreFlag: flag,
+        scrollLeft: "scroll-item-"+index
       })
       app.globalData.product.price = this.data.activeDate.price
       this.triggerEvent("onChangeDate", this.data.activeDate)

pages/order/components/date/index.wxml

@@ -28,9 +28,9 @@
       使用日期
     </view>
     <view class="dates-boxes">
-      <scroll-view scroll-x enable-flex scroll-left="{{scrollLeft}}"
+      <scroll-view scroll-x enable-flex scroll-into-view="{{scrollLeft}}" scroll-with-animation
         style="height: 133rpx;width: 580rpx;display: flex;overflow-x: scroll;flex-direction: row;">
-        <view bindtap="changeDate" data-date="{{item}}" class="date-item{{activeDate.date==item.date?' active':''}}{{(item.stock<=0 || item.stock==null || item.price==null)?' disable':''}}" wx:for-index="index" wx:for="{{monthList}}">
+        <view id="scroll-item-{{index}}" bindtap="changeDate" data-date="{{item}}" data-index="{{index}}" class="date-item{{activeDate.date==item.date?' active':''}}{{(item.stock<=0 || item.stock==null || item.price==null)?' disable':''}}" wx:for-index="index" wx:for="{{monthList}}">
             <!-- <view>{{tool.showAllSeldDate(item.date,index,today,tomorrow,afterTom)}}</view> -->
             <view>{{item.week}}</view>
             <view class="short-date">{{item.short_date}}</view>

pages/pbService/index.wxml

@@ -9,8 +9,10 @@
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb1.png" mode="widthFix"></image>
       <view>苏康码</view>
     </view> -->
-    <view class="pb-item" data-event="comfort_click" data-title="高峰预警" bindtap="gotoPath"
-    data-path="/pages/pbService/sceneComfort/index?title=高峰预警">
+    <!-- data-path="/pages/pbService/sceneComfort/index?title=高峰预警" -->
+    <view class="pb-item" data-event="comfort_click" data-title="高峰预警" bindtap="gotoUrl"
+   
+    data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html?userEncry=FQqP774V6H3PacOWYqJLykUBBywTAZEWMu9Nz9tzrOZUIf/Zto2OvXmirAi7/FSOkZg1uwNpcK0kdZgK0FjuzEZKYBjL/1RXp3XpQhxv9H91g9c737NfSxRcfYUHo2SGLX8kAlAiAbt72AoEfG++i+WTjbTo57sunVEzn/nF7n55StkcgfesDKjXOm+txOYbEc0tH32A5Mn">
       <image src="https://static.ticket.sz-trip.com/xcxImages/pbservice/pb4.png" mode="widthFix"></image>
       <view>高峰预警</view>
     </view>

pages/pbService/sceneComfort/index.js

@@ -53,7 +53,7 @@ Page({
     commonApi._post('pbservice/Comfort/getComfortAreaList').then(res=>{
       let areaObj = {}
       res.data.forEach(item=>{
-        item.area_code = item.area
+        item.area_code = item.area_code
         item.area_name = item.area
         areaObj[item.area_code] = item.area;
       })