合并代码

Common.wxss

@@ -165,6 +165,11 @@ image{
   padding: 0 26rpx;
   position: relative;
 }
+.commonF .FlTitleView .more{
+  position: absolute;
+  right: 30rpx;
+  margin-top:7rpx;
+}
 .commonF .FlTitleView .text{
   font-size:20rpx;font-weight:700;
 }

component/Search/search.js

@@ -78,7 +78,6 @@ Component({
       })
     },
     bindPickerChange: function(e) {
-      console.log('picker发送选择改变，携带值为', e.detail.value)
       this.setData({
         index: e.detail.value
       })

component/calendar/calendar.js

@@ -50,6 +50,9 @@ Component({
     },
     getYearMonthDay() {
       let that = this;
+      wx.showLoading({
+        title: '加载中222',
+      });
       let currentYear = that.data.currentDay.substring(0, 4); //当前年份
       let currentMonth = that.data.currentDay.substring(5, 7); //当前月份	
       that.setData({
@@ -134,6 +137,7 @@ Component({
             item.color=true;
         }
       })
+      wx.hideLoading()
       that.setData({
         daysData: Arr
       })

pages/GroupTour/ChDateNum/ChDateNum.js

@@ -7,7 +7,7 @@ Page({
    * 页面的初始数据
    */
   data: {
-    currentDay: "",
+    currentDay: util.YYMMDD(new Date()),
     priceData: [],
     numer: 1,
     GoodsView: false,
@@ -53,7 +53,7 @@ Page({
     price: 0,
     zaoniao: 0,
     sumSeat: 0,
-    totalPersion:0,
+    totalPersion: 0,
     adultPrice: 0,
     childrenPrice: 0,
     babyPrice: 0,
@@ -74,14 +74,18 @@ Page({
       msg.tcid = options.tcid;
       // msg.configId = options.idDes = decodeURIComponent("5aEwngdTBnM%3D%0A");
       // msg.tcid = options.tcid = "3458";
-      msg.teamType = options.teamType = 0;
-      that.data.teamType = options.teamType = 0;
+      if (options.teamType) {
+        msg.teamType = options.teamType;
+        that.data.teamType = options.teamType;
+      }
+
       cityId: that.data.cityId,
         that.setData({
-          msg: msg
+          msg: msg,
+          teamType: that.data.teamType
         })
       this.getData(that.data.msg);
-      this.getB2BSellByCustomerId();
+      
     }
 
   },
@@ -105,7 +109,7 @@ Page({
       })
       return;
     }
-    
+
     let youhuiMoney = 0
     trip.lineTeamDiscountList.forEach(x => {
       if (x.startNum <= sumSeat && sumSeat <= x.endNum) {
@@ -253,7 +257,7 @@ Page({
     let babyCount = chosenObj.yeCount; //婴儿
 
     let childrenCount = childrenNotPlaceholderCount + childrenPlaceholderCount;
-    
+
     let totalPersion = adultCount + babyCount + childrenCount;
 
     let znyh = parseFloat(currentPriceInfo.discountPrice); // 早鸟优惠
@@ -285,7 +289,7 @@ Page({
       adultPrice: adultPrice,
       childrenPrice: childrenPrice,
       babyPrice: babyPrice,
-      zf:zf,//杂费
+      zf: zf,//杂费
       zcf: zcf,
       bzcf: bzcf,
       qzPrice: qzPrice,
@@ -293,12 +297,13 @@ Page({
 
     })
   },
- 
+
   getB2BSellByCustomerId() {
     app.$api('b2b_get_GetCustomerSummary', {}).then(res => {
       this.setData({
         customer: res,
       })
+
     }).catch(err => {
 
     })
@@ -347,25 +352,30 @@ Page({
 
 
   },
-  
+
   getData(msg) {
+
     let that = this;
     app.$api('b2b_get_GetB2BTravelInfoV1', msg).then(res => {
+      that.getB2BSellByCustomerId();
       let data = res;
-      // console.log(data)
       that.setData({
         trip: data,
         priceList: data.priceList,
         FlightList: data.currentPriceInfo && data.currentPriceInfo.priceFlight ? data.currentPriceInfo.priceFlight : '',
       })
+
       this.getDateArr(that.data.priceList);
     }).catch(err => {
 
+      this.CreatCalendar();
+
     })
   },
 
   getDateArr(arr) {
     let that = this;
+
     var new_arr = {};
     for (var i = 0, len = arr.length; i < len; i++) {
       var Month_index = arr[i].startDate.lastIndexOf('-');
@@ -409,14 +419,14 @@ Page({
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
-  onReady: function() {
+  onReady: function () {
 
   },
 
   /**
    * 生命周期函数--监听页面显示
    */
-  onShow: function() {
+  onShow: function () {
 
   },
   CreatCalendar() {
@@ -426,35 +436,35 @@ Page({
   /**
    * 生命周期函数--监听页面隐藏
    */
-  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/GroupTour/FillOrder/FillOrder.js

@@ -37,7 +37,8 @@ Page({
       that.data.teamType = options.teamType;
       cityId: that.data.cityId,
         that.setData({
-          msg: msg
+          msg: msg,
+        teamType: that.data.teamType
         })
       this.getData(msg);
     }
@@ -125,7 +126,7 @@ Page({
       let data = res;
       if (res.resultCode == 1) {
         wx.navigateTo({
-          url: '/pages/GroupTour/Pay/Pay',
+          url: '/pages/member/orderCenter/orderCenter?index=1',
         })
       }
     }).catch(err => {

pages/GroupTour/GroupDetails/GroupDetails.js

-// pages/GroupTour/GroupDetails/GroupDetails.js
+
 let app = getApp();
 var WxParse = require('../../wxParse/wxParse.js');
 Page({
@@ -48,7 +48,6 @@ Page({
       that.setData({
         msg: msg
       })
-      console.log("msg", that.data.msg)
       this.getData();
     }
 
@@ -56,7 +55,7 @@ Page({
   getData() {
     let that = this;
     app.$api('b2b_get_GetB2BTravelInfoV1', that.data.msg).then(res => {
-      console.log(res);
+      
       let data = res;
       data.priceList.forEach(item => {
         item.date = item.startDate.split("-")[1] + "/" + item.startDate.split("-")[2];
@@ -100,7 +99,6 @@ Page({
         feature: data.feature.tripImageList,
         dayList: data.dayList,
       })
-      console.log("dayList", that.data.dayList)
       WxParse.wxParse('feeInclude', 'html', res.feature.feeInclude, that, 0);
       WxParse.wxParse('warmTip', 'html', res.feature.warmTip, that, 0);
       WxParse.wxParse('visaRemark', 'html', res.feature.warmTip, that, 0);
@@ -137,7 +135,6 @@ Page({
 
   },
   StartYd() {
-    console.log(this.data.msg);
     let msg = this.data.msg;
     wx.navigateTo({
       url: '/pages/GroupTour/ChDateNum/ChDateNum?idDes=' + encodeURIComponent(msg.configId) + "&tcid=" + msg.tcid + "&teamType=" + msg.teamType,

pages/GroupTour/GroupList/GroupList.js

@@ -60,11 +60,11 @@ Page({
       dates: dates
     })
   },
-  PXClick() {
-    this.setData({
-      StopResh: true,
-    })
-  },
+  // PXClick() {
+  //   this.setData({
+  //     StopResh: true,
+  //   })
+  // },
   ClosePXView(e) {
     if (e.target.dataset.target == "self") {
       this.setData({
@@ -215,7 +215,7 @@ Page({
   Godetail(e) {
     let item = e.currentTarget.dataset;
     wx.navigateTo({
-      url: '/pages/GroupTour/GroupDetails/GroupDetails?idDes=' + encodeURIComponent(item.id) + "&tcid=" + item.tcid,
+      url: '/pages/GroupTour/GroupDetails/GroupDetails?idDes=' + encodeURIComponent(item.id) + "&tcid=" + item.tcid + "&teamType=0",
     })
   },
   ScreenOpen() {

pages/GroupTour/GroupList/GroupList.wxml

-<view class='GroupList commonF' catchtouchmove="{{StopResh}}">
+<view class='GroupList commonF'>
   <view id="searchView">
  <search id="CityComp" bind:ChangeSite="ChangeSite"></search>
 </view>
@@ -64,6 +64,9 @@
       </view>
     </view>
   </view>
+  <view class="nodata">
+    <image style="width:190rpx;height:190rpx" src="/images/home/nodata.png"></image>
+  </view>
   <!-- 筛选多条件 -->
   <view bindtap='CloseScreen' data-target="self" class="screen" hidden="{{!ScreenStatus}}">
     <view>

pages/GroupTour/GroupList/GroupList.wxss

+
 .PxView .jView image {
   width: 16rpx;
   height: 8rpx;
   position: relative;
   top:-2rpx;
 }
+.nodata{
+  width: 100%;
+  height: 500rpx;
+  line-height: 500rpx;
+  text-align: center;
 
+}
 .PxView>view {
   display: inline-block;
   font-size: 28rpx;

pages/GroupTour/GroupTour.js

@@ -54,7 +54,7 @@ Page({
   Godetail(e){
     let item = e.currentTarget.dataset.item;
     wx.navigateTo({
-      url: '/pages/GroupTour/GroupDetails/GroupDetails?idDes=' + encodeURIComponent(item.idDes) + "&tcid=" + item.tcid,
+      url: '/pages/GroupTour/GroupDetails/GroupDetails?idDes=' + encodeURIComponent(item.idDes) + "&tcid=" + item.tcid + "&teamType=0",
     })
 
 
@@ -63,7 +63,7 @@ Page({
     let item = e.currentTarget.dataset.item;
     console.log(item)
     wx.navigateTo({
-      url: '/pages/GroupTour/GroupDetails/GroupDetails?idDes=' + encodeURIComponent(item.id) + "&tcid=" + item.tcid,
+      url: '/pages/GroupTour/GroupDetails/GroupDetails?idDes=' + encodeURIComponent(item.id) + "&tcid=" + item.tcid + "&teamType=0",
     })
   },
   Gourl(e) {

pages/GroupTour/GroupTour.wxml

@@ -76,7 +76,7 @@
             <text class="text" style="color:#61DCD4"> \ \ \</text>
             <text bindtap="Gourl" data-item="{{item}}" style="position: absolute;right:30rpx" class="f24 c88">查看更多</text>
           </view>
-          <view class="Gtour CommonList">
+          <view class="Gtour CommonList basefix">
             <view bindtap="GodetailList" data-item="{{line}}" wx:for-item="line" wx:for="{{item.LineList[0]}}" wx:key="index2">
               <view class="imgView">
                 <text class="country">日本</text>

pages/GroupTour/GroupTour.wxss

@@ -119,7 +119,7 @@
   padding:30rpx;
 }
 .group .CommonList>view{
-  display: inline-block;
+  float: left;
   width:330rpx;
   border-radius: 12px; 
   border: 1px solid #EDEDED;

pages/Home/home.js

@@ -6,6 +6,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    background: ["http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626103242285.png","http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190704061255480.jpg"],
     homeTravelSpecialSale:[],
     specialAirTicketItem:[],
     isLogin:0,
@@ -16,6 +17,10 @@ Page({
       cityId: app.state.cityId,
       siteName: app.state.siteName,
     },
+    gentuanList:[],
+    freeList:[],
+    scenList:[],
+    localList:[],
   },
 
   /**
@@ -23,13 +28,18 @@ Page({
    */
   onLoad: function (options) {
     // this.GetInitData();
-    this.GetCZTM();
-    this.GetAllTicket();
+    
     this.setData({
       isLogin: app.isLogin,
     })
     let City = this.selectComponent('#CityComp');
     City.getCityList();
+    this.GetGroup();
+    this.GetCZTM();
+    this.GetAllTicket();
+    this.getFree();
+    this.getScen();
+    this.getLocal()
   },
   ChangeSite(val){
     console.log(val.detail);
@@ -50,34 +60,94 @@ Page({
    */
   onShow: function () {
 
+  },
+  goGroup(e){
+    let item = e.currentTarget.dataset.item;
+    wx.navigateTo({
+      url: '/pages/GroupTour/GroupDetails/GroupDetails?idDes=' + encodeURIComponent(item.idDes) + "&tcid=" + item.tcid + "&teamType=0",
+    })
+
+  },
+  goMore(e){
+    let url=e.target.dataset.url;
+    wx.navigateTo({
+      url: url,
+    })
   },
   Scroll(e){
     this.setData({
       ScrollView: e.target.dataset.id,
       Scrollindex: e.target.dataset.index,
     })
-    console.log(this.data.ScrollView)
   },
-  // 跟团游
-  GetGroup() {
+  // 当地游
+  getLocal() {
     let Msg = {
-      airTicketType: 0,
+      fromOrigin: 1,
       pageIndex: 1,
-      pageSize: 2,
+      pageSize: 4,
     };
     let that = this;
-    app.$apiJavaNew('/api/b2b/home/getHomeSpecialAirTicketList', Msg).then(res => {
+    app.$apiJavaNew('/api/b2b/home/getHomeDayTripPrice', Msg).then(res => {
 
       that.setData({
-        specialAirTicketItem: res.pageData
+        localList: res.pageData
       })
+    }).catch(err => {
 
+    })
+  },
+  // 景点门票
+  getScen() {
+    let Msg = {
+      fromOrigin: 1,
+      pageIndex: 1,
+      pageSize: 4,
+    };
+    let that = this;
+    app.$apiJavaNew('/api/b2b/home/getHomeTicketCoupons', Msg).then(res => {
+
+      that.setData({
+        scenList: res.pageData
+      })
     }).catch(err => {
-      wx.showToast({
-        title: err.message,
-        icon: 'none',
-        duration: 1000
+
+    })
+  },
+  // 自由行
+  getFree() {
+    let Msg = {
+      fromOrigin: 1,
+      teamType: 1,
+      pageIndex: 1,
+      pageSize: 4,
+    };
+    let that = this;
+    app.$apiJavaNew('/api/b2b/home/getHomeTravelPrice', Msg).then(res => {
+
+      that.setData({
+        freeList: res.pageData
+      })
+    }).catch(err => {
+
+    })
+  },
+  // 跟团游
+  GetGroup() {
+    let Msg = {
+      fromOrigin:1,
+      teamType: 0,
+      pageIndex: 1,
+      pageSize: 4,
+    };
+    let that = this;
+    app.$apiJavaNew('/api/b2b/home/getHomeTravelPrice', Msg).then(res => {
+      
+      that.setData({
+        gentuanList: res.pageData
       })
+    }).catch(err => {
+      
     })
   },
   // 超值特卖
@@ -124,23 +194,7 @@ Page({
       })
     })
   },
-  GetInitData(){
-    let that=this;
-    app.$apiJavaNew('/api/b2b/home/getHomeInitData', {}).then(res => {
-      console.log("首页数据",res);
-      that.setData({
-        homeTravelSpecialSale: res.homeTravelSpecialSale,
-        specialAirTicketItem: res.specialAirTicketItem,
-      })
-      
-    }).catch(err => {
-      wx.showToast({
-        title: err.message,
-        icon: 'none',
-        duration: 1000
-      })
-    })
-  },
+  
 
   /**
    * 生命周期函数--监听页面隐藏

pages/Home/home.wxss

@@ -106,9 +106,17 @@
 .Home .CommonList{
   width: 100%;
   padding:30rpx;
+  
+}
+.Home .CommonList:after {
+    clear: both;
+    content: '.';
+    display: block;
+    height: 0;
+    overflow: hidden;
 }
 .Home .CommonList>view{
-  display: inline-block;
+  float: left;
   width:330rpx;
   border-radius: 12px; 
   border: 1px solid #EDEDED;
@@ -164,6 +172,10 @@
   border-radius:12rpx;
   position: relative;
 }
+.Home .CommonList .ScenimgView image{
+  border-radius:12rpx;
+
+}
 .Home .CommonList .ScenimgView .country{
   position: absolute;
   width:90rpx;

pages/freeTravel/PersonalTailor/PersonalTailor.js

+// pages/freeTravel/PersonalTailor/PersonalTailor.js
+const date = new Date()
+const years = []
+const months = []
+const days = []
+
+for (let i = 1990; i <= date.getFullYear(); i++) {
+  years.push(i)
+}
+
+for (let i = 1; i <= 12; i++) {
+  months.push(i)
+}
+
+for (let i = 1; i <= 31; i++) {
+  days.push(i)
+}
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    years: years,
+    year: date.getFullYear(),
+    months: months,
+    month: 2,
+    days: days,
+    day: 2,
+    value: [9999, 1, 1],
+    region: ['广东省', '广州市', '海珠区'],
+    customItem: '全部'
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+  bindChange: function (e) {
+    const val = e.detail.value
+    this.setData({
+      year: this.data.years[val[0]],
+      month: this.data.months[val[1]],
+      day: this.data.days[val[2]]
+    })
+  },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
\ No newline at end of file

pages/freeTravel/PersonalTailor/PersonalTailor.json

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

pages/freeTravel/PersonalTailor/PersonalTailor.wxml

+<view class="Personal commonF">
+  <view style="width:100%;height:200rpx">
+    <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-07/20190705050047885.png"></image>
+  </view>
+  <view class="InfoView">
+    <view class="title">个人定制</view>
+    <view class="writeView">
+      <view class="city">
+        <view class="site">
+
+        </view>
+        <view>-</view>
+        <view style="text-align:right" class="site">
+
+        </view>
+      </view>
+    </view>
+  </view>
+</view>
+<view class="CountrySelect">
+  <picker-view class="CountryPicker" indicator-style="height: 50px;" style="width: 100%; height: 300px;" value="{{value}}" bindchange="bindChange">
+  <view class="PickerBtn">
+  <view>取消</view>
+  <view>确定</view>
+  </view>
+    <picker-view-column>
+      <view wx:for="{{years}}" style="line-height: 50px">{{item}}年</view>
+    </picker-view-column>
+    <picker-view-column>
+      <view wx:for="{{months}}" style="line-height: 50px">{{item}}月</view>
+    </picker-view-column>
+    <picker-view-column>
+      <view wx:for="{{days}}" style="line-height: 50px">{{item}}日</view>
+    </picker-view-column>
+  </picker-view>
+</view>
\ No newline at end of file

pages/freeTravel/PersonalTailor/PersonalTailor.wxss

+.InfoView{
+  width:690rpx;
+  background:rgba(255,255,255,1);
+  box-shadow:0px 6rpx 10rpx 0px rgba(76,76,76,0.15);
+  border-radius:12rpx;
+  margin: 0 auto;
+}
+.InfoView .title{
+  width:100%;
+  height:90rpx;
+  line-height:90rpx;
+  border-bottom: 1px solid #E9E9E9;
+  text-align: center;
+  font-size: 28rpx;
+  font-weight: 600;
+}
+.writeView{
+  padding: 0 30rpx;
+  box-sizing: border-box;
+}
+.writeView .city{
+  font-size: 30rpx;
+  display: flex;
+  justify-content: space-between;
+  padding:30rpx 0;
+}
+.writeView .city .site{
+  width: 280rpx;
+  border-bottom: 1px solid #E9E9E9;
+
+}
+.CountrySelect{
+  position: fixed;
+  width: 100%;
+  height: 100%;
+  background: rgba(17,17,17,0.2);
+  top: 0;
+}
+.CountrySelect .CountryPicker{
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  background: #fff;
+  text-align: center;
+  font-size: 24rpx;
+}
+.CountrySelect .CountryPicker .PickerBtn{
+display: flex;
+padding: 30rpx;
+box-sizing: border-box;
+justify-content: space-between;
+border-bottom: 1px solid #f5f5f5;
+width: 
+}
\ No newline at end of file

pages/freeTravel/free.js

@@ -32,7 +32,11 @@ Page({
     this.HotCrash();
     this.CustomDesigner();
   },
-
+  goMore(){
+    wx.navigateTo({
+      url: '/pages/freeTravel/freeList/freeList',
+    })
+  },
   Treatment(){
     let that=this;
     app.$api('b2b_get_GetB2BFreeRecommendPageList', that.data.commonmsg).then(res => {
@@ -58,7 +62,6 @@ Page({
       that.setData({
         HotCrashList: HotCrashList
       })
-      console.log("111", HotCrashList)
 
     }).catch(err => { })
   },
@@ -73,7 +76,6 @@ Page({
         CustomDesignerList: res.pageData
       })
       
-      console.log("CustomDesignerList", that.data.CustomDesignerList)
     }).catch(err => {
       wx.showToast({
         title: err.message,

pages/freeTravel/free.wxml

@@ -92,7 +92,7 @@
           </view>
         </view>
         <view style="width:408rpx;height:122rpx;margin:30rpx auto">
-          <image src="../../images/free/more.png"></image>
+          <image bindtap="goMore" src="../../images/free/more.png"></image>
 
         </view>
       </view>
@@ -121,10 +121,6 @@
         </view>
         
       </view>
-      <view style="width:408rpx;height:122rpx;margin:30rpx auto">
-        <image src="../../images/free/more.png"></image>
-
-      </view>
 
 
     </view>

pages/freeTravel/freeList/freeList.js

@@ -13,36 +13,6 @@ Page({
       siteName: app.state.siteName,
     },
     dates: [],
-    datecount: [
-      {
-        id: 1,
-        name: "1天"
-      }, {
-        id: 2,
-        name: "2天"
-      }, {
-        id: 3,
-        name: "3天"
-      }, {
-        id: 4,
-        name: "4天"
-      }, {
-        id: 5,
-        name: "5天"
-      }, {
-        id: 6,
-        name: "6天"
-      }, {
-        id: 7,
-        name: "7-8天"
-      }, {
-        id: 9,
-        name: "9-10天"
-      }, {
-        id: 10,
-        name: "10天以上"
-      },
-    ],
     ScreenStatus: false,
     listmsg: {
       minTripDay: -1,
@@ -63,8 +33,9 @@ Page({
       companyId: app.state.companyId,
       priceOrderByField: 0,
       searchKey: '',
-      orderByDate:0,
+      orderByDate:2,
       orderByPrice:0,
+      orderBySales:0,
 
     },
     datalist:[],
@@ -109,31 +80,43 @@ Page({
     })
 
   },
+  getCity(e){
+    let that = this;
+    let id = e.currentTarget.dataset.city;
+    that.data.listmsg.startCityId = id;
+    that.setData({
+      listmsg: that.data.listmsg
+    })
+  },
+  getDay(e){
+    let that = this;
+    let day = e.currentTarget.dataset.day;
+    that.data.listmsg.dayNum=day;
+    that.setData({
+      listmsg: that.data.listmsg
+    })
+  },
   GetMonth(e){
     let that = this;
     let month = e.target.dataset.month;
-    console.log("month", month);
     let num = new Date(month.year, month.id, 0);
-    console.log(num.getDate());
     that.data.listmsg.startDate = month.year + "-" + month.month+"-"+"01";
     that.data.listmsg.endDate = month.year + "-" + month.month + "-" + num.getDate();
     that.setData({
       listmsg: that.data.listmsg
     })
-    console.log("that.data.listmsg",that.data.listmsg)
   },
   // 获取线路
   loadRecoItems() {
 
     let that = this;
     app.$api('b2b_get_GetFreeSearchItem', { companyId:that.data.site.companyId}).then(res => {
-      console.log(res);
+      
       that.setData({
         lineTeam:res.lineTeam,
         startCity: res.startCity,
         tripDay: res.tripDay
       })
-      console.log("startCity", this.data.startCity);
     }).catch(err => { })
   },
   // 最近3个月
@@ -158,19 +141,23 @@ Page({
     })
   },
   bindDateChange(e) {
-    console.log('picker发送选择改变，携带值为', e.detail.value)
+    let type = e.target.dataset.type;
     let listmsg = this.data.listmsg;
-    listmsg.endDate = e.detail.value;
+    if (type = "start") {
+      listmsg.startDate = e.detail.value;
+    }else{
+      listmsg.endDate = e.detail.value;
+    }
     this.setData({
       listmsg: listmsg
     })
   },
   ChangeSite(val) {
-    console.log(val.detail);
     this.setData({
       site: val.detail
     })
-    this.onLoad();
+    this.loadRecoItems();
+    this.GetList();
   },
   ScreenOpen() {
     this.setData({
@@ -178,6 +165,7 @@ Page({
     })
   },
   CloseScreen(e) {
+
     if (e.target.dataset.target == "self") {
       this.setData({
         ScreenStatus: false,
@@ -206,9 +194,12 @@ Page({
   GetList() {
 
     let that = this;
+    that.setData({
+      ScreenStatus: false,
+    })
     const datalist = that.data.datalist;
     app.$api('b2b_get_GetB2BFreePageList', that.data.listmsg).then(res => {
-      if (res.pageData.length == 0) {
+      if (res.pageData.length < 10) {
         that.setData({
           noData: true
         })
@@ -232,7 +223,6 @@ Page({
   },
   PriceTag(e) {
     let that = this;
-    console.log(e.target.dataset.tag);
     let listmsg = that.data.listmsg;
     let tag = e.target.dataset.tag;
     let index = e.target.dataset.index;
@@ -279,6 +269,7 @@ Page({
     }
     this.data.listmsg.orderByDate= orderindex == 1 ? (ordertype == 0 ? 2 : 1) : 0;
     this.data.listmsg.orderByPrice = orderindex == 2 ? (ordertype == 0 ? 2 : 1) : 0;
+    this.data.listmsg.orderBySales = orderindex == 3 ? (ordertype == 0 ? 2 : 1) : 0;
     this.setData({
       orderindex: orderindex,
       ordertype: ordertype,
@@ -337,7 +328,6 @@ Page({
     this.setData({
       listmsg: listmsg
     })
-    console.log("listmsg", that.data.listmsg)
     this.GetList();
   },
 

pages/freeTravel/freeList/freeList.wxml

 <view class='GroupList commonF' catchtouchmove="{{StopResh}}">
   <view id="searchView">
- <search id="CityComp" bind:ChangeSite="ChangeSite"></search>
-</view>
+    <search id="CityComp" bind:ChangeSite="ChangeSite"></search>
+  </view>
   <view class="ListView">
     <view class="PxView">
       <view class="jView" data-type="{{0}}" bindtap='changeOrderType'>
@@ -19,7 +19,14 @@
         <image wx:if="{{listmsg.orderByPrice==0}}" src="/images/group/bx.png"></image>
         <image wx:if="{{listmsg.orderByPrice==1}}" src="/images/group/rx.png"></image>
         <image wx:if="{{listmsg.orderByPrice==2}}" src="/images/group/rs.png"></image>
-        
+
+      </view>
+      <view class="jView" data-type="{{3}}" bindtap='changeOrderType'>
+        销量
+        <image wx:if="{{listmsg.orderBySales==0}}" src="/images/group/bx.png"></image>
+        <image wx:if="{{listmsg.orderBySales==1}}" src="/images/group/rx.png"></image>
+        <image wx:if="{{listmsg.orderBySales==2}}" src="/images/group/rs.png"></image>
+
       </view>
       <view bindtap='ScreenOpen' class="SView">
         筛选
@@ -67,8 +74,8 @@
       <view>销量从高到低</view>
     </view>
   </view>
-  <!-- 筛选多条件 hidden="{{!ScreenStatus}}" -->
-  <view bindtap='CloseScreen' data-target="self" class="screen" >
+  <!-- 筛选多条件  -->
+  <view bindtap='CloseScreen' hidden="{{!ScreenStatus}}" data-target="self" class="screen">
     <view>
       <view class="title">线路</view>
       <view class="xl">
@@ -77,13 +84,13 @@
       </view>
       <view class="title">出发日期</view>
       <view class="DatePicker">
-        <picker class="pcikerView" mode="date" value="{{listmsg.startDate}}" >
+        <picker class="pcikerView" mode="date" bindchange="bindDateChange" data-type="start" value="{{listmsg.startDate}}">
           <view class="picker">
             {{listmsg.startDate}}
           </view>
         </picker>
         <text style="margin:0 15rpx"> - </text>
-        <picker class="pcikerView" mode="date" value="{{listmsg.endDate}}"  bindchange="bindDateChange" >
+        <picker class="pcikerView" mode="date" data-type="end" value="{{listmsg.endDate}}" bindchange="bindDateChange">
           <view class="picker">
             {{listmsg.endDate}}
           </view>
@@ -93,23 +100,18 @@
         <text bindtap="GetMonth" data-month="{{item}}" wx:for="{{dates}}" wx:key="index">{{item.name}}</text>
       </view>
       <view class="title">出发城市</view>
-      <view class='MonthList' style="margin-top:25rpx">
-        <text>不限</text>
-        <text wx:key="index" wx:for="{{startCity}}">{{item.startCityName}}</text>
+      <view class='MonthList' style="margin-top:25rpx;">
+        <text class="{{listmsg.startCityId==0?'active':''}}" bindtap="getCity" data-city="{{0}}">不限</text>
+        <text class="{{listmsg.startCityId==item.id?'active':''}}" bindtap="getCity" data-city="{{item.id}}" wx:key="index" wx:for="{{startCity}}">{{item.startCityName}}</text>
       </view>
       <view class="title">行程天数</view>
       <view class='MonthList' style="margin-top:25rpx">
-        <text wx:for="{{tripDay}}" wx:key="index">{{item.name}}</text>
+        <text class="{{listmsg.dayNum==0?'active':''}}" bindtap="getCity" data-city="{{0}}">不限</text>
+        <text class="{{listmsg.dayNum==item.id?'active':''}}" bindtap="getDay" data-day="{{item.id}}" wx:for="{{tripDay}}" wx:key="index">{{item.name}}</text>
       </view>
-      <!-- <view class="title">价格区间</view>
-      <view class="PriceView">
-        <input placeholder="最低价" style="text-align:center"  />
-        <text style="padding:0 15rpx">-</text>
-        <input placeholder="最高价" style="text-align:center" />
-      </view> -->
       <view class="btnView">
-        <view>重置</view>
-        <view style="background:#EE4454;color:#fff;border:none">确定</view>
+        <view bindtap="CloseScreen" data-target="self">取消</view>
+        <view bindtap="GetList" style="background:#EE4454;color:#fff;border:none">确定</view>
       </view>
     </view>
   </view>

pages/freeTravel/freeList/freeList.wxss

@@ -13,7 +13,7 @@
   display: inline-block;
   font-size: 28rpx;
   color: #111;
-  width: 25%;
+  width: 20%;
   text-align: center;
   height: 90rpx;
   line-height: 90rpx;
@@ -96,11 +96,12 @@
 .screen {
   position: fixed;
   width: 100%;
-  height: 100%;
+  min-height: 100%;
   top: 0;
   left: 0;
   z-index: 5000;
   background: rgba(17, 17, 17, 0.5);
+  overflow: scroll;
 }
 
 .screen>view {
@@ -131,30 +132,32 @@
   margin-right: 30rpx;
 }
 .screen .picker{
-  width:100%;
-  height:54rpx;
-  line-height:54rpx;
-  background:rgba(242,242,242,1);
-  border-radius:27rpx;
-  display: inline-block;
-  font-size: 22rpx;
+  width: 296rpx;
+  height: 54rpx;
+  background: rgba(242,242,242,1);
+  border-radius: 27rpx;
   text-align: center;
+  font-size: 25rpx;
+  line-height: 54rpx;
+  margin-bottom: 20rpx;
+
 }
 .screen .DatePicker{
-  /* display: flex; */
+  display: flex;
   margin-top:15rpx;
 }
 .screen .pcikerView{
   display: inline-block;
-  width: 280rpx;
+  
   
 }
 .MonthList{
   display: flex;
-  justify-content: space-between;
+  justify-content: flex-start;
   flex-wrap: wrap;
 }
 .MonthList text{
+  margin-right: 20rpx;
   display: inline-block;
   width:190rpx;
   height:54rpx;
@@ -167,6 +170,10 @@
   margin-bottom:25rpx;
   
 }
+.MonthList .active{
+  background: #EE4454;
+  color: #fff;
+}
 .PriceView {
   display: flex;
   margin-top:15rpx;