update

Common.wxss

@@ -188,4 +188,38 @@ image{
   text-align: center;
   font-size: 24rpx;
   color: #999;
+}
+.num_wrap{
+  width: 220rpx;
+  vertical-align: middle;
+  display: inline-flex!important;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-end;
+}
+.num_wrap .btn{
+  width: 40rpx;
+  height:40rpx;
+  line-height: 30rpx;
+  text-align: center;
+  border-radius: 50%;
+  padding: 0;
+  margin:0;
+  font-size: 36rpx;
+  border: 1px solid #EE4454;
+  color: #EE4454;
+  
+}
+
+.btn::after{
+  border: none;
+}
+.num_wrap .input{
+  width: 90rpx;
+  height: 60rpx;
+  color: #333;
+  font-size: 24rpx;
+  text-align: center;
+  border: none;
+  margin: 0 2rpx;
 }
\ No newline at end of file

app.js

@@ -123,9 +123,9 @@ App({
       let timestamp = (new Date()).valueOf()
       let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey)
       wx.request({
-        url: 'https://efficient.oytour.com/' + url, //线上
+        // url: 'https://efficient.oytour.com/' + url, //线上
         // url: 'http://47.96.12.235:9001/' + url,       //测试 
-        // url: 'http://192.168.2.215:9000/'+ url,
+        url: 'http://192.168.2.215:9000/'+ url,
 
         method: 'POST',
         data: {
@@ -176,8 +176,8 @@ App({
       let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey)
       wx.request({
         // url: 'https://efficient.oytour.com/'+ url, //线上
-        url: 'http://47.96.12.235:9001/' + url,       //测试 
-        // url: 'http://192.168.2.215:9000/'+ url,
+        // url: 'http://47.96.12.235:9001/' + url,       //测试 
+        url: 'http://192.168.2.215:9000/'+ url,
 
         method: 'POST',
         data: {

app.json

@@ -50,7 +50,10 @@
     "pages/product/SametradeZW/Successview/Successview",
     "component/amount/amount",
     "pages/activity/activity",
-    "pages/local/TicketOrder/TicketOrder"
+    "pages/local/TicketOrder/TicketOrder",
+    "pages/local/LocalFoodDetails/LocalFoodDetails",
+    "pages/local/FoodOrder/FoodOrder",
+    "pages/Pay/Pay"
   ],
   "window": {
     "backgroundTextStyle": "light",

component/calendar/calendar.js

@@ -35,7 +35,7 @@ Component({
     selectDate(e){
       let item = e.currentTarget.dataset.item;
       let index = e.currentTarget.dataset.index;
-      
+      // console.log(item);
       if (item.price == 0 || item.price == "" || !item.color){
         return;
       }
@@ -52,6 +52,10 @@ Component({
         msg.ticketId = item.ticketId;
         msg.price = item.price;
       }
+      if(item.priceId){
+        msg.priceId=item.priceId;
+        msg.price = item.price;
+      }
       this.triggerEvent('childrenEvent', msg);
     },
     getYearMonthDay() {
@@ -109,6 +113,9 @@ Component({
           dayDict.priceId = price.priceId;
           dayDict.ticketId = price.ticketId;
         }
+        if (price.priceId){
+          dayDict.priceId=price.priceId;
+        }
         if (dayIndex < strDate && strMonth == currentMonth) {
           dayDict.price = '';
         }
@@ -149,7 +156,6 @@ Component({
             item.color=true;
         }
       })
-      wx.hideLoading()
       that.setData({
         daysData: Arr
       })

component/chooseCity/chooseCity.js

@@ -24,7 +24,7 @@ Component({
       name:"",
       id:"",
     },
-    index:[],
+    index:[0,0,0],
   },
 
   /**
@@ -52,12 +52,11 @@ Component({
           provinceList: res,
           cityList: [],
         })
+        let index = that.data.index[1]; 
         if (res.length > 0) {
-          let proInfo = that.data.provinceList[0];
+          let proInfo = that.data.provinceList[index];
           that.getCity(proInfo)
         } else {
-          
-          let index = that.data.index[0]; 
           that.data.selectInfo.name = that.data.countryList[index].Name;
           that.data.selectInfo.id = that.data.countryList[index].ID;
         }
@@ -80,8 +79,8 @@ Component({
           that.data.selectInfo.id = that.data.provinceList[index].ID;
           
         }else{
-          that.data.selectInfo.name = that.data.cityList[0].Name;
-          that.data.selectInfo.id = that.data.cityList[0].ID;
+          that.data.selectInfo.name = that.data.cityList[index].Name;
+          that.data.selectInfo.id = that.data.cityList[index].ID;
         }
         that.setData({
           selectInfo: that.data.selectInfo
@@ -93,18 +92,28 @@ Component({
     changeCountry(e) {
       let that = this;
       const val = e.detail.value
-      console.log(val);
-      this.setData({
-        index:val,
-        countryID: this.data.countryList[val[0]]
-      })
-      that.getProvince(that.data.countryID);
+      let arrbefore=that.data.index;
+      if (arrbefore[0] == val[0] && arrbefore[1] == val[1] && arrbefore[2] != val[2]){
+        let index = val[2];
+        that.data.selectInfo.name = that.data.cityList[index].Name;
+        that.data.selectInfo.id = that.data.cityList[index].ID;
+        this.setData({
+          index: val,
+          selectInfo: that.data.selectInfo
+        })
+      }else{
+        this.setData({
+          index: val,
+          countryID: this.data.countryList[val[0]]
+        })
+        that.getProvince(that.data.countryID);
+      }
+      
 
     },
     closeCountry(e) {
       let country = e.target.dataset.self;
       if (country == "country") {
-        console.log("11")
         this.triggerEvent('closeCountryView', " ")
       }
 

pages/GroupTour/GroupDetails/GroupDetails.js

@@ -38,6 +38,7 @@ Page({
       cityId: app.state.cityId,
     }
     if (options) {
+      console.log("options", options)
       msg.configId = decodeURIComponent(options.idDes);
       msg.tcid = options.tcid;
       // msg.configId = options.idDes = decodeURIComponent("5aEwngdTBnM%3D%0A");

pages/Home/home.js

@@ -27,7 +27,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    // this.GetInitData();
     
     this.setData({
       isLogin: app.isLogin,
@@ -61,13 +60,26 @@ Page({
   onShow: function () {
 
   },
-  goGroup(e){
+  login(){
+    wx.navigateTo({
+      url: '/pages/login/login',
+    })
+  },
+  goTicket(e) {
     let item = e.currentTarget.dataset.item;
     wx.navigateTo({
-      url: '/pages/GroupTour/GroupDetails/GroupDetails?idDes=' + encodeURIComponent(item.idDes) + "&tcid=" + item.tcid + "&teamType=0",
+      url: '/pages/local/TicketDetails/TicketDetails?idDes=' + encodeURIComponent(item.idDes),
     })
+  },
 
+  goGroup(e){
+    let item = e.currentTarget.dataset.item;
+    let teamType = e.currentTarget.dataset.teamtype;
+    wx.navigateTo({
+      url: '/pages/GroupTour/GroupDetails/GroupDetails?idDes=' + encodeURIComponent(item.idDes) + "&tcid=" + item.tcid + "&teamType=" + teamType,
+    })
   },
+
   goMore(e){
     let url=e.target.dataset.url;
     wx.navigateTo({

pages/Home/home.wxml

 <!--pages/Home/home.wxml-->
-<view class="Home commonF">
+<view wx:if="{{isLogin!=0}}" class="Home commonF">
   <view id="searchView">
     <search id="CityComp" bind:ChangeSite="ChangeSite"></search>
   </view>
@@ -64,14 +64,14 @@
         <text bindtap="goMore" data-url="/pages/GroupTour/GroupList/GroupList" style="font-size:24rpx;color:#888888;float:right;margin-top:15rpx">查看更多</text>
       </view>
       <view class="cztm cztm1">
-        <view bindtap="goGroup" data-item="{{item}}" class="cztmList1" wx:for="{{homeTravelSpecialSale}}" wx:key="{{index}}" wx:if="{{index==0}}">
+        <view bindtap="goGroup" data-teamType="{{0}}" data-item="{{item}}" class="cztmList1" wx:for="{{homeTravelSpecialSale}}" wx:key="{{index}}" wx:if="{{index==0}}">
           <image src="{{item.imgCover[0].url}}"></image>
           <view class="boxshadow">
             <view class="text1" style="font-size:30rpx;padding-top:29rpx">{{item.title}}</view>
             <view style="font-size:22rpx">{{item.dayNum}}日{{item.nightNum}}晚</view>
           </view>
         </view>
-        <view bindtap="goGroup" data-item="{{item}}" class="cztmList" wx:for="{{homeTravelSpecialSale}}" wx:key="{{index}}" wx:if="{{index==1}}">
+        <view bindtap="goGroup" data-teamType="{{0}}" data-item="{{item}}" class="cztmList" wx:for="{{homeTravelSpecialSale}}" wx:key="{{index}}" wx:if="{{index==1}}">
           <image src="{{item.imgCover[0].url}}"></image>
           <view class="boxshadow">
             <view class="text1" style="font-size:30rpx;padding-top:29rpx">{{item.title}}</view>
@@ -81,7 +81,7 @@
 
       </view>
       <view class="cztm cztm2">
-        <view bindtap="goGroup" data-item="{{item}}" class="cztmList" wx:for="{{homeTravelSpecialSale}}" wx:key="{{index}}" wx:if="{{index>1 && index<5}}">
+        <view bindtap="goGroup" data-teamType="{{0}}" data-item="{{item}}" class="cztmList" wx:for="{{homeTravelSpecialSale}}" wx:key="{{index}}" wx:if="{{index>1 && index<5}}">
           <image src="{{item.imgCover[0].url}}"></image>
           <view class="boxshadow">
             <view class="text1" style="font-size:30rpx;padding-top:29rpx">{{item.title}}</view>
@@ -143,7 +143,7 @@
       <text bindtap="goMore" data-url="/pages/GroupTour/GroupList/GroupList" class="more f24 c88"> 查看更多</text>
     </view>
     <view class="Gtour CommonList">
-      <view bindtap="goGroup" data-item="{{item}}" wx:for="{{gentuanList}}" wx:key="index">
+      <view bindtap="goGroup" data-item="{{item}}" data-teamType="{{0}}" wx:for="{{gentuanList}}" wx:key="index">
         <view class="imgView">
           <!-- <text class="country">日本</text> -->
           <image wx:if="{{item.imgCover[0]}}" src="{{item.imgCover[0].url}}"></image>
@@ -161,10 +161,10 @@
         <text class="text" style="color:#FD7F56"> \ \ \ </text>
         <text style="font-size:30rpx;color:#000000;font-weight:600;margin:0 12rpx"> 自由行          </text>
         <text class="text" style="color:#FD7F56"> \ \ \</text>
-        <text class="more f24 c88"> 查看更多</text>
+        <text bindtap="goMore" data-url="/pages/freeTravel/freeList/freeList" class="more f24 c88"> 查看更多</text>
       </view>
       <view class="Gtour CommonList">
-        <view wx:for="{{freeList}}" wx:key="index">
+        <view bindtap="goGroup" data-item="{{item}}" data-teamType="{{1}}" wx:for="{{freeList}}" wx:key="index">
           <view class="imgView">
             <!-- <text class="country">日本</text> -->
             <image wx:if="{{item.imgCover[0]}}" src="{{item.imgCover[0].url}}"></image>
@@ -183,10 +183,10 @@
       <text class="text" style="color:#6AA8F9"> \ \ \ </text>
       <text style="font-size:30rpx;color:#000000;font-weight:600;margin:0 12rpx"> 景点门票</text>
       <text class="text" style="color:#6AA8F9"> \ \ \</text>
-      <text class="more f24 c88"> 查看更多</text>
+      <text bindtap="goMore" data-url="/pages/local/localTrip/localTrip?isShowType=3" class="more f24 c88"> 查看更多</text>
     </view>
     <view class="Scen CommonList">
-      <view wx:for="{{scenList}}" wx:key="index">
+      <view bindtap="goTicket" data-item="{{item}}" wx:for="{{scenList}}" wx:key="index">
         <view class="ScenimgView">
           <!-- <text class="country">日本</text> -->
           <image wx:if="{{item.coverImgs[0]}}" src="{{item.coverImgs[0]}}"></image>
@@ -206,10 +206,10 @@
       <text class="text" style="color:#F36C9B"> \ \ \ </text>
       <text style="font-size:30rpx;color:#000000;font-weight:600;margin:0 12rpx"> 当地游</text>
       <text class="text" style="color:#F36C9B"> \ \ \</text>
-      <text class="more f24 c88"> 查看更多</text>
+      <text class="more f24 c88" bindtap="goMore" data-url="/pages/local/localTrip/localTrip"> 查看更多</text>
     </view>
     <view class="Local CommonList">
-      <view wx:for="{{localList}}" wx:key="index">
+      <view bindtap="goGroup" data-item="{{item}}" data-teamType="{{2}}" wx:for="{{localList}}" wx:key="index">
         <view class="LocalimgView">
           <image wx:if="{{item.imgCover[0]}}" src="{{item.imgCover[0].url}}"></image>
           <view class='title'>{{item.ltName}}</view>
@@ -220,4 +220,12 @@
     </view>
   </scroll-view>
 
+</view>
+<!-- 未登录 -->
+<view class="loginOut" wx:if="{{isLogin==0}}">
+  <view class="imgView">
+    <image style="width:438rpx;height:215rpx" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190710035131045.png"></image>
+    <view style="font-size:28rpx">您还没有登录，请登录后查看</view>
+    <view bindtap="login" class="loginBtn">去登录</view>
+  </view>
 </view>
\ No newline at end of file

pages/Home/home.wxss

 /* pages/Home/home.wxss */
-.Home{
+
+.loginOut {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  top: 0;
   background: #fff;
+  z-index: 3000;
+}
+.imgView{
+  text-align: center;
+  width: 500rpx;
+  height: 600rpx;
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  margin: auto;
 }
-.Home_hover{
+.loginOut .loginBtn {
+  display: inline-block;
+  margin-top:24rpx;
+  width: 127rpx;
+  height: 58rpx;
+  background: rgba(238, 68, 84, 1);
+  border-radius: 4rpx;
+  font-size: 24rpx;
+  color: #fff;
+  text-align: center;
+  line-height: 58rpx;
+}
+
+.Home {
+  background: #fff;
+}
+
+.Home_hover {
   background: transparent;
 }
-.Home .tab1{
+
+.Home .tab1 {
   height: 300rpx;
   margin: 36rpx 0;
 }
-.Home .tab1 image{
+
+.Home .tab1 image {
   width: 100%;
   height: 100%;
 }
-.Home .tablist{
+
+.Home .tablist {
   display: flex;
   justify-content: space-around;
 }
-.Home .tablist>view{
+
+.Home .tablist>view {
   width: 18%;
   text-align: center;
   font-size: 22rpx;
-  color: #000000;
+  color: #000;
 }
-.Home .tablist image{
+
+.Home .tablist image {
   width: 96rpx;
   height: 63rpx;
 }
-.Home .tab2{
+
+.Home .tab2 {
   height: 220rpx;
   margin: 36rpx 0;
 }
-.Home .tab2 image,navigator{
+
+.Home .tab2 image, navigator {
   width: 100%;
   height: 100%;
 }
-.Home .CommonMargin{
+
+.Home .CommonMargin {
   margin: 0 26rpx;
   box-sizing: border-box;
 }
 
-.Home .tjTicket{
+.Home .tjTicket {
   display: inline-block;
-  margin-left:24rpx;
+  margin-left: 24rpx;
 }
-.Home .tjTicket view{
+
+.Home .tjTicket view {
   text-align: center;
 }
-.Home .tjTicket .listLeft{
-  color:#ffffff;
+
+.Home .tjTicket .listLeft {
+  color: #fff;
   font-size: 22rpx;
-  width:110rpx;
+  width: 110rpx;
   display: inline-flex;
   align-items: center;
-  justify-content: center; 
-  height:144rpx;
-  background:linear-gradient(0deg,rgba(255,189,30,1),rgba(255,213,103,1));
+  justify-content: center;
+  height: 144rpx;
+  background: linear-gradient(0deg, rgba(255, 189, 30, 1), rgba(255, 213, 103, 1));
   border-radius: 8rpx;
-  
 }
-.Home .tjTicket .listRight{
-  width:220rpx;
-  height:144rpx;
+
+.Home .tjTicket .listRight {
+  width: 220rpx;
+  height: 144rpx;
   font-size: 22rpx;
-  color:#668EFF;
+  color: #668eff;
   display: inline-flex;
   flex-direction: column;
-  position:relative;
-  top:-19rpx;
+  position: relative;
+  top: -19rpx;
   border-radius: 8rpx;
-  border:1rpx solid #F7F7F7;
+  border: 1rpx solid #f7f7f7;
   padding: 0 10rpx;
   box-sizing: border-box;
-  box-shadow: 0 0 8px #F7F7F7;
+  box-shadow: 0 0 8px #f7f7f7;
 }
-.Home .tjTicket .listRight .hidden{
+
+.Home .tjTicket .listRight .hidden {
   width: 60rpx;
   overflow: hidden;
   text-overflow: ellipsis;
   height: 50rpx;
   line-height: 50rpx;
-  
 }
-.Home .tjTicket .listRight .icon{
+
+.Home .tjTicket .listRight .icon {
   height: 90rpx;
 }
-.Home .tjTicket .listRight .icon>view{
+
+.Home .tjTicket .listRight .icon>view {
   display: inline-block;
 }
-.Home .likeView{
-  height:90rpx;
-  line-height:90rpx;
+
+.Home .likeView {
+  height: 90rpx;
+  line-height: 90rpx;
   font-size: 24rpx;
-  
 }
-.Home .likeView text{
-  width:175rpx;
+
+.Home .likeView text {
+  width: 175rpx;
   display: inline-block;
   text-align: center;
 }
-.Home .likeView .activeText{
-  color: #EE4454;
+
+.Home .likeView .activeText {
+  color: #ee4454;
 }
 
-.Home .CommonList{
+.Home .CommonList {
   width: 100%;
-  padding:30rpx;
-  
+  padding: 30rpx;
 }
+
 .Home .CommonList:after {
-    clear: both;
-    content: '.';
-    display: block;
-    height: 0;
-    overflow: hidden;
+  clear: both;
+  content: '.';
+  display: block;
+  height: 0;
+  overflow: hidden;
 }
-.Home .CommonList>view{
+
+.Home .CommonList>view {
   float: left;
-  width:330rpx;
-  border-radius: 12px; 
-  border: 1px solid #EDEDED;
-  padding-bottom:16rpx;
+  width: 330rpx;
+  border-radius: 12px;
+  border: 1px solid #ededed;
+  padding-bottom: 16rpx;
   margin-bottom: 30rpx;
 }
-.Home .CommonList>view:nth-child(even){
+
+.Home .CommonList>view:nth-child(even) {
   margin-left: 30rpx;
 }
-.Home .CommonList>view .pad{
+
+.Home .CommonList>view .pad {
   padding: 0 20rpx;
   box-sizing: border-box;
-  
 }
-.Home .CommonList .imgView{
-  width:100%;
-  height:247rpx;
+
+.Home .CommonList .imgView {
+  width: 100%;
+  height: 247rpx;
   position: relative;
 }
-.Home .CommonList .imgView .country{
+
+.Home .CommonList .imgView .country {
   position: absolute;
-  width:90rpx;
-  height:40rpx;
-  background:rgba(249,201,0,1);
-  border-radius:12rpx 0px 12rpx 0px;
+  width: 90rpx;
+  height: 40rpx;
+  background: rgba(249, 201, 0, 1);
+  border-radius: 12rpx 0px 12rpx 0px;
   font-size: 22rpx;
   text-align: center;
   color: #fff;
 }
-.Home .CommonList image{
+
+.Home .CommonList image {
   width: 100%;
   height: 100%;
 }
-.Home .CommonList .title{
-  font-size:28rpx;
+
+.Home .CommonList .title {
+  font-size: 28rpx;
   font-weight: 600;
 }
-.Home .CommonList .pad .xl{
-  font-size:22rpx;
-  color: #888888;
-  float: left;  
-  
+
+.Home .CommonList .pad .xl {
+  font-size: 22rpx;
+  color: #888;
+  float: left;
 }
-.Home .CommonList .pad .price{
-  font-size:22rpx;
-  color: #EE4454;
+
+.Home .CommonList .pad .price {
+  font-size: 22rpx;
+  color: #ee4454;
   font-weight: 600;
-  float: right;  
+  float: right;
 }
-.Home .CommonList .ScenimgView{
-  width:100%;
-  height:452rpx;
-  border-radius:12rpx;
+
+.Home .CommonList .ScenimgView {
+  width: 100%;
+  height: 452rpx;
+  border-radius: 12rpx;
   position: relative;
 }
-.Home .CommonList .ScenimgView image{
-  border-radius:12rpx;
 
+.Home .CommonList .ScenimgView image {
+  border-radius: 12rpx;
 }
-.Home .CommonList .ScenimgView .country{
+
+.Home .CommonList .ScenimgView .country {
   position: absolute;
-  width:90rpx;
-  height:40rpx;
-  background:rgba(249,201,0,1);
-  border-radius:12rpx 0px 12rpx 0px;
+  width: 90rpx;
+  height: 40rpx;
+  background: rgba(249, 201, 0, 1);
+  border-radius: 12rpx 0px 12rpx 0px;
   font-size: 22rpx;
   text-align: center;
   color: #fff;
 }
-.Home .CommonList .ScenimgView .DesView{
+
+.Home .CommonList .ScenimgView .DesView {
   position: absolute;
   bottom: 0;
-  width:100%;
-  height:114rpx;
-  background:rgba(17,17,17,0.4);
-  border-radius:0 0px 12rpx 12rpx;
+  width: 100%;
+  height: 114rpx;
+  background: rgba(17, 17, 17, 0.4);
+  border-radius: 0 0px 12rpx 12rpx;
   display: flex;
   flex-direction: column;
   justify-content: center;
 }
-.Home .CommonList .ScenimgView .DesView{
+
+.Home .CommonList .ScenimgView .DesView {
   color: #fff;
 }
-.Home .CommonList .padScen{
+
+.Home .CommonList .padScen {
   padding: 0 20rpx;
 }
-.Home .CommonList .padScen .xl{
-  font-size:22rpx;
+
+.Home .CommonList .padScen .xl {
+  font-size: 22rpx;
   color: #fff;
-  float: left;  
-  
+  float: left;
 }
-.Home .CommonList .padScen .price{
-  font-size:22rpx;
-  color: #EE4454;
+
+.Home .CommonList .padScen .price {
+  font-size: 22rpx;
+  color: #ee4454;
   font-weight: 600;
-  float: right;  
+  float: right;
 }
-.Home .Scen>view{
+
+.Home .Scen>view {
   padding: 0;
 }
-.Home .Local>view{
+
+.Home .Local>view {
   border: none;
 }
-.Home .CommonList .LocalimgView{
-  width:100%;
-  height:247rpx;
-  border-radius:12px;
+
+.Home .CommonList .LocalimgView {
+  width: 100%;
+  height: 247rpx;
+  border-radius: 12px;
   position: relative;
 }
-.Home .CommonList .LocalimgView .price{
+
+.Home .CommonList .LocalimgView .price {
   position: absolute;
   bottom: 30rpx;
   right: 20rpx;
-  color: #EE4454;
+  color: #ee4454;
   font-size: 22rpx;
 }
-.Home .CommonList .LocalimgView .title{
-   position: absolute;
+
+.Home .CommonList .LocalimgView .title {
+  position: absolute;
   top: 26rpx;
   left: 15rpx;
-}
+}
\ No newline at end of file

pages/Pay/Pay.js

+// pages/Pay/Pay.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

pages/Pay/Pay.json

+{
+  "usingComponents": {}
+}
\ No newline at end of file

pages/Pay/Pay.wxml

+<view class="FillOrder commonF">
+  <view class="OrderDes">
+    <!-- <view class="title f36">
+      希尔顿假期系列6日5晚跟团游
+    </view> -->
+    <view class="body">
+      <view class="f26">订单号：</view>
+      <view class="c66 f26">
+        1213245
+      </view>
+    </view>
+    <view class="money">
+      <text class="f20 c99">应付总额：</text>
+      <text class="cee">￥</text>
+      <text class="f46 cee">9980</text>
+    </view>
+
+  </view>
+  <view class="Gray30"></view>
+  <view class='payType'>
+    <view class="active">
+      <image style="width:30rpx;height:30rpx" src="/images/group/wx.png"></image>
+      微信支付
+    </view>
+    <view>
+      <image style="width:30rpx;height:30rpx" src="/images/group/zfb.png"></image>
+      支付宝支付
+    </view>
+  </view>
+  
+</view>
\ No newline at end of file

pages/Pay/Pay.wxss

+.FillOrder {
+  padding: 30rpx 0 0 0;
+}
+
+.FillOrder .OrderDes {
+  margin: 30rpx;
+  width: calc(100% - 60rpx);
+  /* height: 230rpx; */
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 6rpx 10rpx 0px rgba(76, 76, 76, 0.15);
+  border-radius: 12rpx;
+}
+
+.FillOrder .OrderDes .title {
+  width: 100%;
+  height: 90rpx;
+  line-height: 90rpx;
+  background: rgba(244, 244, 244, 1);
+  padding: 0 30rpx;
+  border-radius: 12rpx 12rpx 0px 0px;
+}
+.FillOrder .OrderDes .body{
+  border-bottom:1px solid #E9E9E9;
+}
+.FillOrder .OrderDes .body>view {
+  padding: 15rpx 0 10rpx 30rpx;
+}
+.FillOrder .OrderDes .money{
+  height: 90rpx;
+  line-height: 90rpx;
+  padding-left: 30rpx;
+}
+
+.PayView{
+  width:100%;
+  height:100rpx;
+  line-height:100rpx;
+  border-top:1px solid #E9E9E9; 
+  display: flex;
+  align-items: center;
+  background: #fff;
+  z-index: 100;
+  position: fixed;
+  bottom: 0;
+
+}
+.PayView>view{
+  display: inline-flex;
+  justify-content: center;
+  height: 100%;
+  align-items: center;
+}
+
+.payType .active{
+  background:rgba(204,204,204,1)!important;
+}
+.payType>view{
+  padding-left: 30rpx;
+  font-size: 30rpx;
+  display: flex;
+  align-items: center;
+  height: 90rpx;
+}
+.payType>view image{
+  margin-right: 15rpx;
+}
\ No newline at end of file

pages/SearchPage/SearchPage.js

@@ -32,6 +32,7 @@ Page({
       typeHidden: true,
     })
   },
+  // 搜索
   searchInput(data){
     let value = this.data.searchKey;
     
@@ -49,6 +50,21 @@ Page({
         url: '/pages/GroupTour/GroupList/GroupList?searchKey=' + this.data.searchKey,
       })
     }
+    if (this.data.type == "oneday") {
+      wx.navigateTo({
+        url: '/pages/local/localTrip/localTrip?isShowType=1&searchKey=' + this.data.searchKey,
+      })
+    }
+    if (this.data.type == "ticket") {
+      wx.navigateTo({
+        url: '/pages/local/localTrip/localTrip?isShowType=2&searchKey=' + this.data.searchKey,
+      })
+    }
+    if (this.data.type == "food") {
+      wx.navigateTo({
+        url: '/pages/local/localTrip/localTrip?isShowType=3&searchKey=' + this.data.searchKey,
+      })
+    }
   },
   inputValue(e){
     let value = e.detail.value;
@@ -59,6 +75,7 @@ Page({
   goUrl(e){
     let data=e.target.dataset.type;
     let chineseValue = e.target.dataset.value;
+    console.log("chineseValue",chineseValue)
     this.setData({
       chineseValue: chineseValue,
       typeHidden:false,

pages/SearchPage/SearchPage.wxml

@@ -8,6 +8,9 @@
     <input bindinput="inputValue" data-self="self" value="{{value}}" style="width:520rpx;display:inline-block" placeholder="搜索目的地/交通/景点/酒店" />
     <view class="TypeList" hidden="{{!typeHidden}}">
       <view bindtap="goUrl" data-type="gentuan" data-value="跟团游">跟团游</view>
+      <view bindtap="goUrl" data-type="oneday" data-value="一日游">一日游</view>
+      <view bindtap="goUrl" data-type="ticket" data-value="门票">门票</view>
+      <view bindtap="goUrl" data-type="food" data-value="美食">美食</view>
     </view>
   </view>
   <text bindtap="searchInput" class='Seach'>搜索</text>

pages/Ticket/Ticket.js

 // pages/Ticket/Ticket.js
+let app = getApp();
+var util = require('../../utils/util.js')
 Page({
 
   /**
@@ -9,19 +11,45 @@ Page({
       id: 0,
       name: '头等舱'
     }, {
-        id: 1,
-        name: '商务舱'
+      id: 1,
+      name: '商务舱'
     }, {
-        id: 2,
-        name: '经济舱'
+      id: 2,
+      name: '经济舱'
     }],
-    index:0,//初始化数据
+    index: 0,//初始化数据
     items: [
       { name: '0', value: '携带儿童' },
       { name: '1', value: '携带婴儿', checked: 'true' }
-    ]
+    ],
+    dataList: [],
+    isLogin: app.isLogin,
+    msg: {
+      pageIndex: 1,
+      pageSize: 10,
+      id: 0,
+      qFlightDateStart: util.YYMMDD(new Date()),
+      qFlightDateEnd: "",
+      flight_number: "",
+      airLineID: 0,
+      ticketType: 2,
+      lineId: 0,
+      isPayOrder: 0,
+      departure_city: 0,
+      departure_cityname: "",
+      arrival_city: 0,
+      arrival_cityname: "",
+      freightSpace: 0,
+      airTicketScatterNum: 0,
+      cr: 0,
+      child: 0,
+      ye: 0,
+      lr: 0
+    },
+    countryHidden:false,
+    type:'',
   },
-  bindPickerChange: function(e) {
+  bindPickerChange: function (e) {
     console.log('picker发送选择改变，携带值为', e.detail.value)
     this.setData({
       index: e.detail.value
@@ -30,56 +58,108 @@ Page({
   /**
    * 生命周期函数--监听页面加载
    */
-  onLoad: function(options) {
+  onLoad: function (options) {
+    this.getJXTH();
+    let chooseCity = this.selectComponent('#chooseCity');
+    chooseCity.getCountry();
+  },
+  getCity(e) {
+    let that = this;
+    that.setData({
+      countryHidden: true
+    })
+    let type = e.target.dataset.type;
+    that.setData({
+      type: type
+    })
+  },
+  selectCity(val) {
+    let that = this;
+    let vastr = val.detail;
+    if (that.data.type == "start") {
+      that.data.msg.departure_city = vastr.id;
+      that.data.msg.departureName = vastr.name;
+
+    } else {
+      that.data.msg.arrival_city = vastr.id;
+      that.data.msg.arrivalName = vastr.name;
+    }
+    that.setData({
+      msg: that.data.msg
+    })
+  },
+  closeCountryView() {
+    this.setData({
+      countryHidden: false,
+    })
+  },
+  bindDateChange(e){
+    this.data.msg.qFlightDateStart= e.detail.value
+    this.setData({
+      msg:this.data.msg
+    })
+  },
+  getJXTH() {
+    let msg = {
+      isDiscounts: 1,
+      pageIndex: 1,
+      pageSize: 4
+    };
+    app.$apiJavaNew('/api/dmc/airticket/getB2BAirticketList', msg).then(res => {
+      this.setData({
+        dataList: res.pageData
+      })
+    }).catch(err => {
 
+    })
   },
 
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function() {
+  onReady: function () {
 
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function() {
+  onShow: function () {
 
   },
 
   /**
    * 生命周期函数--监听页面隐藏
    */
-  onHide: function() {
+  onHide: function () {
 
   },
 
   /**
    * 生命周期函数--监听页面卸载
    */
-  onUnload: function() {
+  onUnload: function () {
 
   },
 
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */
-  onPullDownRefresh: function() {
+  onPullDownRefresh: function () {
 
   },
 
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function() {
+  onReachBottom: function () {
 
   },
 
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function() {
+  onShareAppMessage: function () {
 
   }
 })
\ No newline at end of file

pages/Ticket/Ticket.json

 {
   "navigationBarTitleText": "机票",
   "usingComponents": {
-    "search": "/component/Search/search"
+    "search": "/component/Search/search",
+    "chooseCity": "/component/chooseCity/chooseCity"
   }
 }
\ No newline at end of file

pages/Ticket/Ticket.wxml

 <view class="commonF Ticket">
   <view id="searchView">
- <search id="CityComp" bind:ChangeSite="ChangeSite"></search>
-</view>
+    <search id="CityComp" bind:ChangeSite="ChangeSite"></search>
+  </view>
   <view style="width:100%;height:300rpx;margin-top:36rpx;position: relative;z-index:0">
     <image style="position: relative;z-index:0" src='http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626103539899.png'></image>
   </view>
   <view class="Choose">
     <view class="Title flex">
-      <view class="Active">单程</view>
-      <view>往返</view>
+      <view class="{{msg.ticketType==1?'Active':''}}">单程</view>
+      <view class="{{msg.ticketType==2?'Active':''}}">往返</view>
     </view>
     <view class="city flexb">
-      <view>成都</view>
+      <view style="width:200rpx" bindtap="getCity" data-type="start">出发:{{msg.departureName}}</view>
       <view style="width:53rpx;height:53rpx">
         <image src='/images/ticket/r1.png'></image>
       </view>
-      <view>巴西</view>
+      <view style="width:200rpx" bindtap="getCity" data-type="end">目的:{{msg.arrivalName}}</view>
     </view>
     <view class="date" style="font-size:40rpx;padding-bottom:20rpx;border-bottom:1rpx solid #E9E9E9">
-      6月21日
+      <picker mode="date" value="{{date}}" bindchange="bindDateChange">
+        <view class="picker">
+          {{msg.qFlightDateStart}}
+        </view>
+      </picker>
+
     </view>
     <view class="SecView">
       <view class="section">
@@ -45,14 +50,14 @@
     </view>
     <view class="cztm cztm1">
       <view class="cztmList1">
-        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
+        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190710042106139.png"></image>
         <view class="boxshadow">
           <view style="font-size:30rpx;padding-top:29rpx">科伦坡</view>
           <view style="font-size:22rpx">COlOMBO</view>
         </view>
       </view>
       <view class="cztmList">
-        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
+        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190710042149046.png"></image>
         <view class="boxshadow">
           <view style="font-size:30rpx;padding-top:29rpx">首尔</view>
           <view style="font-size:22rpx">Seoul</view>
@@ -62,21 +67,21 @@
     </view>
     <view class="cztm cztm2">
       <view class="cztmList">
-        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
+        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190710042122788.png"></image>
         <view class="boxshadow">
           <view style="font-size:30rpx;padding-top:29rpx">东京</view>
           <view style="font-size:22rpx">Tokyo</view>
         </view>
       </view>
       <view class="cztmList">
-        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
+        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190710042148963.png"></image>
         <view class="boxshadow">
           <view style="font-size:30rpx;padding-top:29rpx">巴厘岛</view>
           <view style="font-size:22rpx">BALI</view>
         </view>
       </view>
       <view class="cztmList">
-        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
+        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190710042149091.png"></image>
         <view class="boxshadow">
           <view style="font-size:30rpx;padding-top:29rpx">香港</view>
           <view style="font-size:22rpx">HONGKONG</view>
@@ -92,36 +97,24 @@
     <text class="f24" style="color:#888888;position:absolute;right:15rpx"> 查看更多          </text>
   </view>
   <view class='JXView'>
-    <view class="JxItem">
-      <view class="imgView">
-        <image src='http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626103539899.png'></image>
-      </view>
-      <view class="JxItemDes">
-        <view class="bold f30">北京-北京</view>
-        <view class="f24" style="padding:8rpx 0">
-          <image style="width:24rpx;height:24rpx;border-radius:50%" src='http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626103539899.png'></image>
-          <text>泰国亚航</text>
-          <text>FD563</text>
-        </view>
-        <view class="f22" style="color:#666666">出发时间：2019-05-60</view>
-      </view>
-      <text class="price">￥1500</text>
-    </view>
-    <view class="JxItem">
+    <view wx:for="{{dataList}}" wx:key="index" class="JxItem">
       <view class="imgView">
-        <image src='http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626103539899.png'></image>
+        <image src='{{item.airlineUrl}}'></image>
       </view>
       <view class="JxItemDes">
-        <view class="bold f30">北京-北京</view>
+        <view class="bold f30">{{item.flightList[0].departureName}} - {{item.flightList[item.flightList.length-1].arrivalCityName}}</view>
         <view class="f24" style="padding:8rpx 0">
-          <image style="width:24rpx;height:24rpx;border-radius:50%" src='http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626103539899.png'></image>
-          <text>泰国亚航</text>
-          <text>FD563</text>
+          <image style="width:24rpx;height:24rpx;border-radius:50%" src='{{item.airlineUrl}}'></image>
+          <text>{{item.airlineName}}</text>
         </view>
-        <view class="f22" style="color:#666666">出发时间：2019-05-60</view>
+        <view class="f22" style="color:#666666">出发时间：{{item.goFlightTime}}</view>
       </view>
-      <text class="price">￥1500</text>
+      <text class="price">￥{{isLogin!=1 ? item.scatterB2CPrice : item.scatterB2BPrice}}</text>
     </view>
-  </view>
 
+  </view>
+<!-- 国家城市选择 -->
+<view hidden="{{!countryHidden}}">
+  <chooseCity bind:selectCity="selectCity" bind:closeCountryView="closeCountryView" data-type="{{type}}" id="chooseCity"></chooseCity>
+</view>
 </view>
\ No newline at end of file

pages/Ticket/Ticket.wxss

@@ -9,8 +9,8 @@
   border-radius:12rpx;
   position: relative;
   top: -45rpx;
-  z-index: 200;
   background: #fff;
+  z-index: 1,
 }
 .Choose .Title{
   border-bottom: 1rpx solid #E9E9E9;
@@ -38,8 +38,8 @@
 }
 .Choose .city{
   padding:20rpx;
-  font-size: 40rpx;
-  font-weight: 700;
+  font-size: 30rpx;
+  font-weight: 600;
   margin: 20rpx 0;
 }
 .Choose .date{

pages/freeTravel/PersonalTailor/PersonalTailor.js

@@ -68,6 +68,11 @@ Page({
     let chooseCity = this.selectComponent('#chooseCity');
     chooseCity.getCountry();
   },
+  goOrder(){
+    wx.navigateTo({
+      url: '/pages/member/orderCenter/orderCenter?index=2',
+    })
+  },
   submitMsg() {
     let that = this;
     let msg = that.data.msg;

pages/freeTravel/PersonalTailor/PersonalTailor.wxml

@@ -21,7 +21,8 @@
         <view class="Date">
           <picker mode="date" data-str="start" value="{{date}}" bindchange="bindDateChange">
             <view class="picker">
-              <input value="{{msg.startDate}}" placeholder="请选择出行时间"></input>
+            {{msg.startDate}}
+              <!-- <input value="" placeholder="请选择出行时间"></input> -->
             </view>
           </picker>
         </view>
@@ -43,7 +44,7 @@
       </view>
       <view>
         <text class="c88 f30">预估人均预算</text>
-        <input bindinput="budgetInput" placeholder-class="bugetInput" style="display:inline-block;width:400rpx;padding-left:30rpx;font-size: 24rpx;" placeholder="请输入0-99999之间的数字"></input>
+        <input bindinput="budgetInput" type="number" placeholder-class="bugetInput" style="display:inline-block;width:400rpx;padding-left:30rpx;font-size: 24rpx;" placeholder="请输入0-99999之间的数字"></input>
       </view>
       <view>
         <text class="f30 c88">需要提供什么</text>
@@ -148,11 +149,11 @@
     <view style="text-align:center;position:relative;top:-50rpx">
       <image style="width:100rpx;height:100rpx;" src="/images/free/gou.png"></image>
     </view>
-    <view class="f30">您的订单已经成功提交！</view>
+    <view class="f30" style="text-align:center">您的订单已经成功提交！</view>
     <view class="f24 c66">
       <view style="padding:20rpx 0">我们正在为您分配定制师</view>
       <view>定制师接单后将<text style="color:#EE4454">明天</text>联系您</view>
     </view>
-    <view class="f30 cee" style="text-align:center;margin-top:30rpx">查看订单</view>
+    <view bindtap="goOrder" class="f30 cee" style="text-align:center;margin-top:30rpx">查看订单</view>
   </view>
 </view>
\ No newline at end of file

pages/freeTravel/free.js

@@ -32,9 +32,14 @@ Page({
     this.HotCrash();
     this.CustomDesigner();
   },
-  goMore(){
+  goUrl(){
+
+  },
+  goMore(e){
+    console.log(e)
+    let url=e.target.dataset.url;
     wx.navigateTo({
-      url: '/pages/freeTravel/freeList/freeList',
+      url: url,
     })
   },
   Treatment(){

pages/freeTravel/free.wxml

@@ -34,7 +34,7 @@
       </view>
 
     </view>
-    <view class="ljdz">立即定制</view>
+    <view bindtap="goMore" data-url="/pages/freeTravel/PersonalTailor/PersonalTailor" class="ljdz">立即定制</view>
     <view>
       <!-- 当季精选特惠 -->
       <view class="djjx">
@@ -92,7 +92,7 @@
           </view>
         </view>
         <view style="width:408rpx;height:122rpx;margin:30rpx auto">
-          <image bindtap="goMore" src="../../images/free/more.png"></image>
+          <image bindtap="goMore" data-url="/pages/freeTravel/freeList/freeList" src="../../images/free/more.png"></image>
 
         </view>
       </view>

pages/freeTravel/freeList/freeList.js

@@ -72,6 +72,12 @@ Page({
     this.loadDates();
     this.GetList();
   },
+  goGroup(e) {
+    let item = e.currentTarget.dataset.item;
+    wx.navigateTo({
+      url: '/pages/GroupTour/GroupDetails/GroupDetails?idDes=' + encodeURIComponent(item.id) + "&tcid=" + item.tcid + "&teamType=1",
+    })
+  },
   ChangeLine(e){
     let that = this;
     that.data.listmsg.lineTeamId = e.target.dataset.id;

pages/freeTravel/freeList/freeList.wxml

@@ -40,7 +40,7 @@
 
     </scroll-view>
     <!-- 列表数据 -->
-    <view class="ListItem" wx:for="{{datalist}}" wx:key="index">
+    <view bindtap="goGroup" data-item="{{item}}" class="ListItem" wx:for="{{datalist}}" wx:key="index">
       <view class="imgView">
         <image wx:if="{{item.imgCover.length}}" src="{{item.imgCover[0].Url}}"></image>
       </view>

pages/local/FoodOrder/FoodOrder.js

+// pages/GroupTour/ChDateNum/ChDateNum.js
+let app = getApp();
+var util = require('../../../utils/util.js')
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    currentDay: util.YYMMDD(new Date()),
+    priceData: [],
+    numer: 1,
+    monthList: [],
+    activeTab: 0,
+    isLogin: app.isLogin,
+
+    idDes: "",
+    timeStr: {},
+    tomonth: util.YYMM(new Date()),
+    selectIndex: -1,
+    msg:{},
+    dateMsg:{},
+    singelPrice:0,
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    let that = this;
+    let msg = wx.getStorageSync('Foodmsg')
+    msg.preferPrice=0;
+    let dateMsg = wx.getStorageSync('FooddateMsg')
+    that.setData({
+      msg: msg,
+      dateMsg: dateMsg,
+    })
+    console.log("111", that.data.msg)
+    console.log("222", that.data.dateMsg)
+
+    that.getPrice();
+
+  },
+
+// 获取价格
+getPrice(){
+  let that=this;
+  let tomonth = that.data.tomonth;
+  let year = tomonth.substr(0, 4)
+  let month = tomonth.substr(5, 2)
+  let currentMonthDays = util.getDays(year, month);
+  let dateMsg=that.data.dateMsg;
+  dateMsg.startDate = `${tomonth}-01`;
+  dateMsg.endDate = `${tomonth}-${currentMonthDays}`;
+  app.$apiJavaNew('/api/b2b/food/getFoodMealPriceList', dateMsg).then(res => {
+    console.log(res);
+    let data=[];
+    res.forEach(item=>{
+      let msg={};
+      msg.dateStr = item.date;
+      msg.startDate = item.date;
+      msg.priceId=item.id;
+      msg.b2CPrice = item.b2bPrice;
+      msg.b2BPrice = item.b2bPrice;
+      data.push(msg)
+    })
+    
+    this.setData({
+      priceData: data
+    })
+    this.CreatCalendar();
+
+  }).catch(err => { })
+},
+  // 改变月份
+  changeMonth(e) {
+    let num = e.currentTarget.dataset.month;
+    let tomonth = util.changeMonth(this.data.tomonth, num);
+    let today = util.YYMM(new Date());
+    if (!util.CompareDate(tomonth, today)){
+      wx.showToast({
+        title: "不能选择过去的日期！",
+        icon: 'none',
+        duration: 1000
+      })
+      return;
+    }
+    this.setData({
+      tomonth: tomonth,
+      currentDay: tomonth
+    })
+    this.getPrice()
+  },
+  childrenEvent(e) {
+    let that = this;
+    let val = e.detail;
+    console.log(val);
+    that.data.msg.priceId = val.priceId;
+    that.data.singelPrice = val.price;
+    that.setData({
+      selectIndex: val.selectIndex,
+      msg: that.data.msg,
+      singelPrice: that.data.singelPrice
+    })
+    this.calcMoney();
+  },
+
+  StartYd() {
+    let that = this;
+    let msg = that.data.msg;
+    if (msg.preferPrice ==0) {
+      wx.showToast({
+        title: "请选择使用日期",
+        icon: 'none',
+        duration: 1000
+      })
+      return;
+    }
+    app.$apiJavaData('/api/b2b/food/setFoodOrder', msg).then(res => {
+      console.log(res);
+      if (res.resultCode == 1) {
+        wx.navigateTo({
+          url: '/pages/member/orderCenter/orderCenter?index=3',
+        })
+      } else {
+        wx.showToast({
+          title: res.message,
+          icon: 'none',
+          duration: 1000
+        })
+      }
+
+    }).catch(err => { })
+  },
+ 
+  calcMoney() {
+    let that = this;
+    let msg = that.data.msg;
+    msg.preferPrice = that.data.singelPrice * (msg.adultNum + msg.childNum);
+    that.setData({
+      msg: msg
+    })
+  },
+
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+  CreatCalendar() {
+    this.calendar = this.selectComponent('#calendar');
+    this.calendar.getYearMonthDay();
+  },
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

pages/local/FoodOrder/FoodOrder.json

+{
+  "navigationBarTitleText": "订单填写",
+  "usingComponents": {
+    "calendar": "/component/calendar/calendar"
+  }
+}
\ No newline at end of file

pages/local/FoodOrder/FoodOrder.wxml

+<view class="DateNum commonF">
+  <view style="padding-left:15rpx">
+    <text class="f30 bold">使用日期</text>
+  </view>
+   <view style="padding:15rpx 0;text-align:center;border-bottom:1px solid #e5e5e5">
+    <image bindtap="changeMonth" data-month="{{-1}}" style="width:14rpx;height:27rpx" src="/images/group/before.png"></image>
+      <text class="f30" style="margin:0 50rpx">{{tomonth}}</text>
+    <image bindtap="changeMonth" data-month="{{1}}" style="width:14rpx;height:27rpx" src="/images/group/chakn.png"></image>
+  </view> 
+  <!-- 日历 -->
+  <view style="padding-bottom:10rpx">
+    <calendar bind:childrenEvent="childrenEvent" selectIndex="{{selectIndex}}" isLogin="{{isLogin}}" currentDay="{{currentDay}}" priceData="{{priceData}}" id="calendar"></calendar>
+  </view>
+  <view class="Gray30"></view>
+
+  <view class="{{GoodsView?'payFixed PayView':'PayView'}}">
+    <view style="width:400rpx;">
+      <text class="f20">总价:￥</text>
+      <text class="f46 cee">{{msg.preferPrice}}</text>
+      <!-- <text bindtap='OpenGoodsView' style="padding-left:10rpx" class="f22 c55">明细</text> -->
+      <!-- <image bindtap='OpenGoodsView' style="width:18rpx;height:8rpx" src="/images/group/mx1.png"></image> -->
+
+    </view>
+    <view style="width:100rpx;border-left:1px solid #E9E9E9;">
+      <image style="width:45rpx;height:45rpx" src="/images/group/pay.png"></image>
+    </view>
+    <view bindtap='StartYd' class="startPay">确认订单</view>
+  </view>
+
+</view>
\ No newline at end of file

pages/local/FoodOrder/FoodOrder.wxss

+.DateNum .scroll-header {
+  display: flex;
+  white-space: nowrap;
+  background: #e5efff;
+  /* height: 95rpx; */
+}
+
+.DateNum .scroll-header .scroll-view-item {
+  display: inline-flex;
+  font-size: 24rpx;
+  color: #111;
+  width: 166rpx;
+  height: 82rpx;
+  align-items: center;
+  flex-direction: column;
+  position: relative;
+}
+
+.DateNum .scroll-header .ScrollActive {
+  color: #5597ff;
+  border-bottom: 1rpx solid #5597ff;
+}
+
+.PayView{
+  position: fixed;
+  bottom: 0;
+  width:100%;
+  height:100rpx;
+  line-height:100rpx;
+  border-top:1px solid #E9E9E9; 
+  display: flex;
+  align-items: center;
+  background: #fff;
+  z-index: 100;
+
+}
+.PayView>view{
+  display: inline-flex;
+  justify-content: center;
+  height: 100%;
+  align-items: center;
+}
+.startPay{
+  width:250rpx;
+  background:rgba(238,68,84,1);
+  color: #fff;
+  font-size: 30rpx;
+}
+.GoodsView{
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: calc(100% - 100rpx);
+  background:rgba(0,0,0,0.5); 
+  z-index: 100;
+  text-align: center;
+}
+.GoodsView .GoodsDes{
+  background: #fff;
+  border-radius:12rpx 12rpx 0px 0px;
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  
+}
+.GoodsView .flexbe{
+  padding:15rpx 30rpx;
+  display: flex;
+  justify-content: space-between;
+
+}
+.payFixed{
+  position: fixed;
+  bottom: 0;
+  /* width:100%; */
+}
+.concatView>view{
+  border-bottom: 1px solid #e9e9e9;
+  height: 90rpx;
+  line-height: 90rpx;
+  padding: 0 30rpx;
+}
+.concatView>view:last-child{
+  border: none;
+}
+.concatView .concatItem .left{
+  width: 150rpx;
+  float: left;
+  font-size: 28rpx;
+  height: 100%;
+}
+.concatView .concatItem .right{
+  width: 500rpx;
+  float: left;
+  font-size: 24rpx;
+  height: 100%;
+}
+.concatView .concatItem .right input{
+  height: 100%;
+  line-height: 90rpx;
+}
+/* 加减 */
+.num_wrap{
+  width: 220rpx;
+  vertical-align: middle;
+  display: inline-flex!important;
+  flex-direction: row;
+  align-items: center;
+  justify-content: flex-end;
+}
+.num_wrap .btn{
+  width: 40rpx;
+  height:40rpx;
+  line-height: 30rpx;
+  text-align: center;
+  border-radius: 50%;
+  padding: 0;
+  margin:0;
+  font-size: 36rpx;
+  border: 1px solid #EE4454;
+  color: #EE4454;
+  
+}
+
+.btn::after{
+  border: none;
+}
+.num_wrap .input{
+  width: 90rpx;
+  height: 60rpx;
+  color: #333;
+  font-size: 24rpx;
+  text-align: center;
+  border: none;
+  margin: 0 2rpx;
+}
\ No newline at end of file

pages/local/LocalFood/LocalFood.js

@@ -9,6 +9,9 @@ Component({
     pageIndex: {
       type: 'number'
     },
+    searchKey: {
+      type: 'String'
+    }
   },
 
   /**
@@ -44,6 +47,12 @@ Component({
    * 组件的方法列表
    */
   methods: {
+    goUrl(e) {
+      let item = e.currentTarget.dataset.item;
+      wx.navigateTo({
+        url: '/pages/local/LocalFoodDetails/LocalFoodDetails?idDes=' + encodeURIComponent(item.idDes)+"&id="+item.id,
+      })
+    },
     zhpx() {
       this.data.msg.orderByPrice = 0;
       this.data.msg.orderBySales = 0;
@@ -74,7 +83,11 @@ Component({
       this.getList();
     },
     getList() {
+      this.data.msg.searchKey = this.data.searchKey;
       this.data.msg.pageIndex = this.properties.pageIndex;
+      this.setData({
+        msg: this.data.msg
+      })
       let dataList = this.data.dataList;
       app.$apiJavaNew('/api/b2b/food/getFoodList', this.data.msg).then(res => {
         console.log("美食", res);

pages/local/LocalFood/LocalFood.wxml

@@ -30,7 +30,7 @@
     </view>
 
     <!-- 列表数据 -->
-    <view wx:for="{{dataList}}" wx:key="index" class="ListItem commonF">
+    <view bindtap="goUrl" data-item="{{item}}" wx:for="{{dataList}}" wx:key="index" class="ListItem commonF">
       <view class="imgView">
         <image wx:if="{{item.coverImgs[0]}}" src="{{item.coverImgs[0]}}"></image>
       </view>

pages/local/LocalFoodDetails/LocalFoodDetails.js

+let app = getApp();
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    indicatorDots: false,
+    autoplay: false,
+    interval: 5000,
+    duration: 1000,
+    idDes: '',
+    data: {},
+    tcState:false,
+    msg:{
+      adultNum: 0,
+      childNum:0,
+      diningId: 0,
+      mealId: 0,
+      priceId: 0,
+    },
+    dateMsg:{
+      idDes:'',
+    },
+    tcActive:-1,
+    mealName:'',
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    let that = this;
+    console.log(options);
+    if (options.idDes) {
+      that.data.msg.diningId = options.id;
+      that.setData({
+        idDes: decodeURIComponent(options.idDes),
+        msg:that.data.msg
+      })
+    }
+    that.data.msg.diningId = 1640;
+    that.setData({
+      idDes: decodeURIComponent("6jijCeixL9w%3D%0A"),
+      msg: that.data.msg
+      
+    })
+    that.getData();
+
+  },
+  yD(){
+    let that=this;
+    let msg=that.data.msg;
+    if (msg.adultNum + msg.childNum<1){
+      wx.showToast({
+        title: "至少选择一人",
+        icon: 'none',
+        duration: 1000
+      })
+      return;
+    }
+    if (msg.mealId==0){
+      wx.showToast({
+        title: "请选择套餐",
+        icon: 'none',
+        duration: 1000
+      })
+      return;
+    }
+    wx.setStorage({
+      key: "Foodmsg",
+      data: that.data.msg,
+    })
+    wx.setStorage({
+      key: "FooddateMsg",
+      data: that.data.dateMsg,
+    })
+    wx.navigateTo({
+      url: '/pages/local/FoodOrder/FoodOrder',
+    })
+
+  },
+  getMeal(e){
+    let item = e.currentTarget.dataset.item;
+    let index = e.currentTarget.dataset.index;
+    this.data.dateMsg.idDes=item.idDes;
+    this.data.msg.mealId=item.id;
+    this.data.tcActive = index;
+    this.setData({
+      dateMsg: this.data.dateMsg,
+      msg: this.data.msg,
+      tcActive: this.data.tcActive,
+      mealName: item.mealName
+    })
+  },
+  subtract(e) {
+    let type = e.target.dataset.type;
+    if(type=="cr"){
+      let adultNum = this.data.msg.adultNum;
+      adultNum > 0 ? adultNum-- : 0;
+      this.data.msg.adultNum = adultNum
+    }else{
+      let childNum = this.data.msg.childNum;
+      childNum > 0 ? childNum-- : 0;
+      this.data.msg.childNum = childNum
+    }
+    
+    this.setData({
+      msg: this.data.msg
+    })
+  },
+  add(e) {
+    let type = e.target.dataset.type;
+    if (type == "cr") {
+      let adultNum = this.data.msg.adultNum;
+      adultNum = ++adultNum;
+      this.data.msg.adultNum = adultNum
+    }else{
+      let childNum = this.data.msg.childNum;
+      childNum = ++childNum;
+      this.data.msg.childNum = childNum
+    }
+
+    
+    this.setData({
+      msg: this.data.msg
+    })
+  },
+  inputPurchase(e) {
+    let type = e.target.dataset.type;
+    let val = e.detail.value;
+    if (type == "cr") {
+      this.data.msg.adultNum = val;
+    }else{
+      this.data.msg.childNum = val;
+    }
+    
+    
+    this.setData({
+      msg: this.data.msg
+    })
+  },
+  goUrl(e) {
+    let item = e.currentTarget.dataset.item;
+    wx.navigateTo({
+      url: '/pages/local/TicketOrder/TicketOrder?idDes=' + encodeURIComponent(item.idDes),
+    })
+  },
+  openTcView(){
+    this.setData({
+      tcState:true,
+    })
+  },
+  closeTcView(e) {
+    let val = e.target.dataset.self;
+    if(val=="self"){
+      this.setData({
+        tcState: false,
+      })
+    }
+    
+  },
+  getData() {
+    app.$apiJavaNew('/api/b2b/food/getFoodInfo', { idDes: this.data.idDes }).then(res => {
+      console.log("res",res);
+      this.setData({
+        data: res
+      })
+
+
+    }).catch(err => { })
+  },
+
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

pages/local/LocalFoodDetails/LocalFoodDetails.json

+{
+  "usingComponents": {}
+}
\ No newline at end of file

pages/local/LocalFoodDetails/LocalFoodDetails.wxml

+<view class="ticketDes commonF">
+  <view class="swiper">
+    <swiper indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}">
+      <block wx:for="{{data.coverImgs}}" wx:key="index">
+        <swiper-item>
+          <image src="{{item}}" class="slide-image" width="355" height="150" />
+        </swiper-item>
+      </block>
+    </swiper>
+  </view>
+  <view class="ban_view">
+    <view class="price" style="margin-top:20rpx">
+      
+      <text wx:if="{{data.dieLine}}" style="margin-left:20rpx" class="c88 f22">提前预定天数：{{data.dieLine}}</text>
+    </view>
+    <view class="bold f32">
+      {{data.name}}
+    </view>
+    <view class="xqView" style="border-bottom:1px solid #E9E9E9">
+      <view class="left">
+        <image style="width:20rpx;height:20rpx;margin-right:6rpx" src="/images/group/tuan.png"></image>
+        <text>开放时间：{{data.openingHours}}</text>
+      </view>
+      <view class="right">
+        <image style="width:14rpx;height:26rpx" src="/images/group/chakn.png"></image>
+      </view>
+    </view>
+    <view class="xqView">
+      <view class="left">
+        <image style="width:16rpx;height:20rpx;margin-right:6rpx" src="/images/group/adress.png"></image>
+        <text>{{data.address}}</text>
+      </view>
+      <view class="right">
+        <image style="width:14rpx;height:26rpx" src="/images/group/chakn.png"></image>
+      </view>
+    </view>
+  </view>
+  <view class="Gray30"></view>
+  <view class="ban_view ticketInfo">
+    <view bindtap="openTcView" class="xqView">
+      <view class="left">
+        <text class="f24 c88">选择套餐</text>
+        <text class="f26" style="margin-left:15rpx">{{mealName}}</text>
+      </view>
+      <view class="right">
+        <image style="width:14rpx;height:26rpx" src="/images/group/chakn.png"></image>
+      </view>
+    </view>
+
+  </view>
+  <view class="Gray30"></view>
+  <view class="details" style="padding-bottom:30rpx">
+    <view style="padding:20rpx 0;">
+      <image style="width:24rpx;height:26rpx;margin-right:6rpx" src="/images/local/ydxz.png"></image>
+      <text class="f26">预定须知</text>
+    </view>
+    <view class="deItem">
+      <view class="f22 cee">预定说明</view>
+      <view>{{data.bookingInfo}}</view>
+    </view>
+    <view class="deItem">
+      <view class="f22 cee">特色</view>
+      <view>{{data.feature}}</view>
+    </view>
+
+  </view>
+
+  <!--  -->
+  <view class="bottomView">
+   <view class="left">
+      <!-- <text class="f22 cee">￥</text>
+      <text class="f46 bold cee">{{data.minPrice}}</text>
+      <text class="f46 bold cee" wx:if="{{data.minPrice!=data.maxPrice}}">~{{data.maxPrice}}</text> -->
+    </view>
+    <view bindtap="yD" class="right">
+      <text style="f30" style="color:#fff ">立即预定</text>
+    </view>
+  </view>
+  <!-- 套餐 -->
+  <view class="tcView" bindtap="closeTcView" data-self="self" hidden="{{!tcState}}">
+    <view class="content">
+    <image bindtap="closeTcView" data-self="self" class="close" style="width:30rpx;height:30rpx" src="/images/group/close.png"></image>
+      <view class="bold f30" style="text-align:center">选择套餐</view>
+      <view class="tcList">
+        <view class="{{tcActive==index?'active tcItem':'tcItem'}}" bindtap="getMeal" data-index="{{index}}" data-item="{{item}}" wx:key="index" wx:for="{{data.diningMealList}}" >{{item.mealName}}</view>
+
+      </view>
+      <view class="personItem">
+        <view>成人</view>
+        <view class="num_wrap">
+          <button class='btn' data-type="cr" catchtap='subtract' disabled='{{msg.adultNum<=0}}'>-</button>
+          <input class="input" data-type="cr" type='number' value='{{msg.adultNum}}' bindinput='inputPurchase'></input>
+          <button class='btn' data-type="cr" catchtap='add'>+</button>
+        </view>
+
+      </view>
+      <view class="personItem">
+        <view>儿童</view>
+        <view class="num_wrap">
+          <button class='btn' data-type="et" catchtap='subtract' disabled='{{msg.childNum<=0}}'>-</button>
+          <input class="input" data-type="et" type='number' value='{{msg.childNum}}' bindinput='inputPurchase'></input>
+          <button class='btn' data-type="et" catchtap='add'>+</button>
+        </view>
+
+      </view>
+      <view bindtap="closeTcView" data-self="self" class="Querybtn">确定</view>
+    </view>
+  </view>
+</view>
\ No newline at end of file

pages/local/LocalFoodDetails/LocalFoodDetails.wxss

+.swiper {
+  width: 100%;
+  height: 540rpx;
+}
+
+.swiper swiper {
+  height: 100%;
+  width: 100%;
+}
+
+.ban_view {
+  padding: 0 30rpx;
+  background: #fff;
+}
+
+.ban_view .price {
+  display: flex;
+  align-items: center;
+}
+
+.ban_view .xqView {
+  display: flex;
+  justify-content: space-between;
+  font-size: 24rpx;
+  padding: 30rpx 0;
+}
+
+.ban_view .xqView .left {
+  width: 526rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.ban_view .xqView .right {
+  width: 70rpx;
+  text-align: right;
+}
+
+.ticketInfo .ticketItem {
+  display: flex;
+  justify-content: space-between;
+  padding: 0 30rpx;
+  height: 150rpx;
+  border-bottom: 1px solid #e9e9e9;
+}
+
+.ticketInfo .ticketItem:last-child {
+  border: none;
+}
+
+.ticketInfo .ticketItem>view {
+  display: inline-flex;
+  flex-direction: column;
+  justify-content: center;
+}
+
+.ticketInfo .ticketItem .left {
+  width: 600rpx;
+  font-size: 22rpx;
+}
+
+.ticketInfo .ticketItem .right {
+  width: 130rpx;
+}
+
+.ticketInfo .ticketItem .right>view {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.ticketInfo .ticketItem .right .Ydbtn {
+  display: inline-block;
+  width: 120rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  background: rgba(238, 68, 84, 1);
+  border-radius: 3rpx;
+  text-align: center;
+  font-size: 22rpx;
+  color: #fff;
+  position: relative;
+  top: -10rpx;
+}
+
+.details {
+  padding: 0 30rpx;
+}
+
+.deItem {
+  font-size: 22rpx;
+}
+
+.deItem>view:first-child {
+  padding: 20rpx 0;
+}
+
+.bottomView {
+  border-top: 1px solid #e9e9e9;
+  height: 100rpx;
+  text-align: center;
+}
+
+.bottomView>view {
+  float: left;
+  line-height: 100rpx;
+  height: 100%;
+}
+
+.bottomView .left {
+  width: 410rpx;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.bottomView .right {
+  width: 341rpx;
+  background: rgba(238, 68, 84, 1);
+  font-size: 30rpx;
+}
+
+.tcView {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.5);
+}
+
+.tcView .content {
+  width: 100%;
+  background: rgba(255, 255, 255, 1);
+  border-radius: 12rpx 12rpx 0px 0px;
+  position: absolute;
+  bottom: 0;
+  padding: 30rpx;
+  box-sizing: border-box;
+}
+
+.tcList .active {
+  background: rgba(255, 223, 226, 1)!important;
+  border: 1px solid rgba(238, 68, 84, 1)!important;
+  color: #ee4454;
+}
+
+.tcItem {
+  width: 330rpx;
+  height: 54rpx;
+  line-height: 54rpx;
+  background: rgba(242, 242, 242, 1);
+  border-radius: 27rpx;
+  display: inline-block;
+  margin: 30rpx 30rpx 0 0;
+  font-size: 22rpx;
+  text-align: center;
+}
+
+.tcItem:nth-child(even) {
+  margin-right: 0;
+}
+
+.personItem {
+  width: 100%;
+  height: 90rpx;
+  border-top: 1px solid #f4f4f4;
+  display: flex;
+  justify-content: space-between;
+  padding: 0 30rpx;
+  align-items: center;
+  position: relative;
+}
+
+.personItem>view {
+  display: inline-block;
+  font-size: 24rpx;
+}
+
+.personItem>view text {
+  position: absolute;
+  left: 200rpx;
+  top: 25rpx;
+}
+
+.Querybtn {
+  width: 660rpx;
+  height: 74rpx;
+  line-height: 74rpx;
+  background: rgba(238, 68, 84, 1);
+  border-radius: 12rpx;
+  margin: 30rpx auto;
+  text-align: center;
+  font-size: 30rpx;
+  color: #fff;
+}
+
+.tcView .content .close {
+  position: absolute;
+  right: 30rpx;
+}

pages/local/TicketList/TicketList.js

@@ -9,6 +9,9 @@ Component({
     pageIndex: {
       type: 'number'
     },
+    searchKey: {
+      type: 'String'
+    }
   },
 
   /**
@@ -81,7 +84,11 @@ Component({
       this.getList();
     },
     getList() {
+      this.data.msg.searchKey = this.data.searchKey;
       this.data.msg.pageIndex = this.properties.pageIndex;
+      this.setData({
+        msg: this.data.msg
+      })
       let dataList = this.data.dataList;
       app.$apiJavaNew('/api/b2b/scenic/getScenicTicketList', this.data.msg).then(res => {
         console.log("sfsd",res);

pages/local/TicketOrder/TicketOrder.js

@@ -89,6 +89,15 @@ Page({
   changeMonth(e) {
     let num = e.currentTarget.dataset.month;
     let tomonth = util.changeMonth(this.data.tomonth, num)
+    let today = util.YYMM(new Date());
+    if (!util.CompareDate(tomonth, today)) {
+      wx.showToast({
+        title: "不能选择过去的日期！",
+        icon: 'none',
+        duration: 1000
+      })
+      return;
+    }
     this.setData({
       tomonth: tomonth
     })

pages/local/localTrip/localTrip.js

@@ -13,7 +13,7 @@ Page({
       siteName: app.state.siteName,
     },
     dates: [],
-    isShowType:3,
+    isShowType:1,
    
     datecount: [
       {
@@ -47,15 +47,53 @@ Page({
     ],
     onedaypageIndex:1,
     noData:false,
+    search:{
+      searchKey1: "",
+      searchKey2: "",
+      searchKey3: "",
+    },
+    lineMsg:{
+      lineId:0,
+      lineTeamId:0,
+    },
+    
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    console.log("options", options)
     let City = this.selectComponent('#CityComp');
     City.getCityList();
+    if (options.isShowType){
+      this.data.isShowType = options.isShowType;
+      this.setData({
+        isShowType: this.data.isShowType
+      })
+    }
+    if (options.searchKey){
+      if (options.isShowType==1){
+        this.data.search.searchKey1 = options.searchKey;
+      }
+      if (options.isShowType == 2) {
+        this.data.search.searchKey2 = options.searchKey;
+      }
+      if (options.isShowType == 3) {
+        this.data.search.searchKey3 = options.searchKey;
+      }
+      this.setData({
+        search: this.data.search
+      })
+      
+    }
+    if (options.lineId){
+      this.data.lineMsg.lineId = options.lineId;
+      this.data.lineMsg.lineTeamId = options.ltId;
+      this.setData({
+        lineMsg: this.data.lineMsg
+      })
+    }
     let isShowType = this.data.isShowType;
     if (isShowType==1){
       this.oneDayShow();

pages/local/localTrip/localTrip.wxml

@@ -19,9 +19,9 @@
 
   </view>
   <view>
-    <oneday wx:if="{{isShowType==1}}" bind:oneDayInfo="oneDayInfo" pageIndex="{{onedaypageIndex}}" id="oneday"></oneday>
-    <ticket wx:if="{{isShowType==2}}" bind:oneDayInfo="oneDayInfo" pageIndex="{{onedaypageIndex}}" id="ticket"></ticket>
-    <localfood wx:if="{{isShowType==3}}" bind:oneDayInfo="oneDayInfo" pageIndex="{{onedaypageIndex}}" id="localfood"></localfood>
+    <oneday wx:if="{{isShowType==1}}" bind:oneDayInfo="oneDayInfo" lineTeamId="{{lineMsg.lineTeamId}}" lineId="{{lineMsg.lineId}}" searchKey="{{search.searchKey1}}" pageIndex="{{onedaypageIndex}}" id="oneday"></oneday>
+    <ticket wx:if="{{isShowType==2}}" bind:oneDayInfo="oneDayInfo" searchKey="{{search.searchKey2}}" pageIndex="{{onedaypageIndex}}" id="ticket"></ticket>
+    <localfood wx:if="{{isShowType==3}}" bind:oneDayInfo="oneDayInfo" searchKey="{{search.searchKey3}}" pageIndex="{{onedaypageIndex}}" id="localfood"></localfood>
     
     
   </view>

pages/local/localhome.js

@@ -20,6 +20,7 @@ Page({
     isLogin: app.isLogin,
     ticketList:[],
     foodList:[],
+    lineId:0,
   },
 
   /**
@@ -34,6 +35,41 @@ Page({
     this.getTicket();
     this.getFood();
   },
+  goFood(e) {
+    let item = e.currentTarget.dataset.item;
+    wx.navigateTo({
+      url: '/pages/local/LocalFoodDetails/LocalFoodDetails?idDes=' + encodeURIComponent(item.idDes) + "&id=" + item.id,
+    })
+  },
+  goTicket(e) {
+    let item = e.currentTarget.dataset.item;
+    wx.navigateTo({
+      url: '/pages/local/TicketDetails/TicketDetails?idDes=' + encodeURIComponent(item.idDes),
+    })
+  },
+  goGroup(e) {
+    let item = e.currentTarget.dataset.item;
+    wx.navigateTo({
+      url: '/pages/GroupTour/GroupDetails/GroupDetails?idDes=' + encodeURIComponent(item.idDes) + "&tcid=" + item.tcid + "&teamType=2",
+    })
+  },
+  goOnedayList(e){
+    let item = e.currentTarget.dataset.item;
+    wx.navigateTo({
+      url: '/pages/local/localTrip/localTrip?isShowType=1&lineId=' + this.data.lineId + "&ltId=" + item.ltId,
+    })
+
+  },
+  getlineTeam(e) {
+    console.log(e);
+    let item = e.currentTarget.dataset.item;
+    let index = e.currentTarget.dataset.index;
+    this.setData({
+      lineActive: index,
+      lineTeamList: item.lineTeamList,
+      lineId: item.lineId
+    })
+  },
   // 当地美食
   getFood() {
     let msg = {
@@ -89,15 +125,7 @@ Page({
 
     }).catch(err => {})
   },
-  getlineTeam(e){
-    console.log(e);
-    let item = e.currentTarget.dataset.item;
-    let index = e.currentTarget.dataset.index;
-    this.setData({
-      lineActive:index,
-      lineTeamList: item.lineTeamList
-    })
-  },
+ 
   GetLine() {
     let that = this;
     app.$apiJavaNew('/api/b2b/dayTrip/getLineItem', {}).then(res => {

pages/local/localhome.wxml

@@ -36,12 +36,12 @@
       <text bindtap="getlineTeam" data-item="{{item}}" data-index="{{index}}" class="{{lineActive==index?'active':''}}" wx:if="{{index<3}}" wx:key="index" wx:for="{{lineList}}">{{item.lineShortName}}</text>
     </view>
     <view class="chooseDiv f28" style="height:210rpx;">
-      <text wx:if="{{index<5}}" wx:key="index" wx:for="{{lineTeamList}}">{{item.ltName}}</text>
+      <text bindtap="goOnedayList" data-item="{{item}}" wx:if="{{index<5}}" wx:key="index" wx:for="{{lineTeamList}}">{{item.ltName}}</text>
     </view>
   </view>
   <!-- 为你推荐 -->
   <view style="margin-top:40rpx">
-    <view style="padding-left:30rpx">
+    <view style="padding-left:30rpx;margin-bottom:20rpx">
       <text class="bold" style="font-size:30rpx;color:#000000">为你推荐</text>
     </view>
 
@@ -59,8 +59,8 @@
             <text class="text" style="color:#61DCD4"> \ \ \</text>
           </view>
           <!-- 境外一日游 -->
-          <view class="oneday">
-            <view wx:for="{{abroadList}}" wx:key="index" class="onedayItem">
+          <view class="oneday basefix">
+            <view bindtap="goGroup" data-item="{{item}}" wx:for="{{abroadList}}" wx:key="index" class="onedayItem">
               <view class="ImgView" style="height:247rpx;">
                 <image wx-if="{{item.imgCover[0]}}" src="{{item.imgCover[0].url}}"></image>
                 <text class="country">{{item.lineShortName}}</text>
@@ -80,8 +80,8 @@
             <text class="text" style="color:#FD7F56"> \ \ \</text>
           </view>
           <!-- 游玩门票 -->
-          <view class="ticket">
-            <view wx:for="{{ticketList}}" wx:key="index" class="ticketItem">
+          <view class="ticket basefix">
+            <view bindtap="goTicket" data-item="{{item}}" wx:for="{{ticketList}}" wx:key="index" class="ticketItem">
               <view class="ImgView" style="height:247rpx;">
                 <image wx:if="item.coverImgs[0]" src="{{item.coverImgs[0]}}"></image>
                 <view class="ticketView" style="padding:0 20rpx">
@@ -100,8 +100,8 @@
             <text class="text" style="color:#F9C900"> \ \ \</text>
           </view>
           <!-- 当地美食 -->
-          <view class="oneday">
-            <view  wx:for="{{foodList}}" wx:key="index"  class="onedayItem">
+          <view class="oneday basefix">
+            <view bindtap="goFood" data-item="{{item}}" wx:for="{{foodList}}" wx:key="index"  class="onedayItem">
               <view class="ImgView" style="height:247rpx;">
                 <image wx:if="{{item.coverImgs[0]}}" src="{{item.coverImgs[0]}}"></image>
               </view>

pages/local/localhome.wxss

@@ -86,7 +86,7 @@
   box-sizing: border-box;
 }
 .oneday .onedayItem{
-  display: inline-block;
+  float: left;
   width: 330rpx;
   height: 360rpx;
   border-radius:12rpx;

pages/local/oneday/oneday.js

@@ -9,6 +9,15 @@ Component({
     pageIndex:{
       type:'number'
     },
+    searchKey:{
+      type: 'String'
+    },
+    lineTeamId: {
+      type: 'Number'
+    },
+    lineId: {
+      type: 'Number'
+    }
   },
 
   /**
@@ -51,6 +60,12 @@ Component({
    * 组件的方法列表
    */
   methods: {
+    goGroup(e){
+      let item = e.currentTarget.dataset.item;
+      wx.navigateTo({
+        url: '/pages/GroupTour/GroupDetails/GroupDetails?idDes=' + encodeURIComponent(item.idDes) + "&tcid=" + item.tcid + "&teamType=2",
+      })
+    },
     zhpx(){
       this.data.msg.orderByPrice = 0;
       this.data.msg.orderBySales = 0;
@@ -81,7 +96,13 @@ Component({
       this.getList();
     },
     getList(){
+      this.data.msg.searchKey = this.data.searchKey;
       this.data.msg.pageIndex = this.properties.pageIndex;
+      this.data.msg.lineTeamId = this.data.lineTeamId;
+      this.data.msg.lineId = this.properties.lineId;
+      this.setData({
+        msg: this.data.msg
+      })
       let dataList = this.data.dataList;
       app.$apiJavaNew('/api/b2b/dayTrip/getDayTripProductList', this.data.msg).then(res => {
         

pages/local/oneday/oneday.wxml

@@ -30,7 +30,7 @@
     </view>
 
     <!-- 列表数据 -->
-    <view wx:for="{{dataList}}" wx:key="index" class="ListItem commonF">
+    <view bindtap="goGroup" data-item="{{item}}" wx:for="{{dataList}}" wx:key="index" class="ListItem commonF">
       <view class="imgView">
         <image wx:if="{{item.imgCover[0]}}" src="{{item.imgCover[0].url}}"></image>
       </view>

project.config.json

@@ -39,7 +39,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 13,
+			"current": 20,
 			"list": [
 				{
 					"id": 2,
@@ -138,6 +138,54 @@
 					"pathName": "pages/Home/home",
 					"query": "",
 					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "美食详情",
+					"pathName": "pages/local/LocalFoodDetails/LocalFoodDetails",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "美食订单填写",
+					"pathName": "pages/local/FoodOrder/FoodOrder",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "搜索",
+					"pathName": "pages/SearchPage/SearchPage",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "当地游首页",
+					"pathName": "pages/local/localhome",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "自由行首页",
+					"pathName": "pages/freeTravel/free",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "支付",
+					"pathName": "pages/Pay/Pay",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": -1,
+					"name": "机票",
+					"pathName": "pages/Ticket/Ticket",
+					"scene": null
 				}
 			]
 		}