update

Common.wxss

@@ -2,6 +2,11 @@
   color:#000000;
   background: #fff;
 }
+::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+  color: transparent;
+}
 .commonF .f12{
     font-size: 12rpx;
 }

app.js

 //app.js
 let md5 = require('utils/md5.js')
+
 App({
   // 小程序初始化时
-  onLaunch: function(options) {},
+  onLaunch: function(options) {
+    
+  },
   // 小程序显示
   onShow: function(options) {},
   // 小程序隐藏
@@ -11,6 +14,7 @@ App({
   onError: function(msg) {},
   // 用户token
   token: '',
+  isLogin: wx.getStorageSync('admin') ? 1 :0,
   // 全局状态
   state: {
     admin: {
@@ -29,7 +33,13 @@ App({
       customerName: wx.getStorageSync('admin') ? wx.getStorageSync('admin').customerName : '',
       id: wx.getStorageSync('admin') ? wx.getStorageSync('admin').id : ''
     },
-    companyId: wx.getStorageSync('site') ? wx.getStorageSync('site').companyId:0,
+    site:{
+      companyId: wx.getStorageSync('site') ? wx.getStorageSync('site').companyId : 0,
+      cityId: wx.getStorageSync('site') ? wx.getStorageSync('site').cityId : 262,
+      siteName: wx.getStorageSync('site') ? wx.getStorageSync('site').siteName : '成都站'
+    },
+    companyId: wx.getStorageSync('site') ? wx.getStorageSync('site').companyId : 0,
+    cityId: wx.getStorageSync('site') ? wx.getStorageSync('site').cityId:262,
     siteName: wx.getStorageSync('site') ? wx.getStorageSync('site').siteName :'成都站'
   },
   // 请求接口
@@ -41,9 +51,9 @@ App({
       let timestamp = (new Date()).valueOf()
       let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '')
       wx.request({
-        // url: 'http://192.168.2.214:8082/api/Common/Post',
+        url: 'http://192.168.2.214:8082/api/Common/Post',
         // url: 'http://192.168.2.65:8025/api/Common/Post', //春姐
-        url: 'https://reborn.oytour.com/api/common/post',  //线上
+        // url: 'https://reborn.oytour.com/api/common/post',  //线上
         // url: ' http://test.viitto.com/api/common/post',
        
         method: 'POST',
@@ -80,6 +90,7 @@ App({
     let groupId=2;
     let token = this.state.admin.token;
     let secretKey = this.state.admin.secretKey;
+    let data={};
     var promise = new Promise((resolve, reject) => {
       wx.showLoading({
         title: '加载中',
@@ -88,7 +99,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://47.96.12.235:9001/' + url,       //测试 
+        url: 'http://192.168.2.215:9000/'+ url,
 
         method: 'POST',
         data: {
@@ -106,6 +118,12 @@ App({
             // wx.reLaunch({
             //   url: '/pages/login/login'
             // })
+            // wx.showToast({
+            //   title: res.data.message,
+            //   icon: 'none',
+            //   duration: 1000
+            // })
+            // reject(res.data)
           } else {
             wx.showToast({
               title: res.data.message,
@@ -162,6 +180,7 @@ App({
     })
     return promise;
   },
+ 
   globalData: {
     userInfo: null,
     awardsConfig: {},

app.json

 {
   "pages": [
+    "pages/GroupTour/GroupTour",
+    "pages/local/localhome",
+    "pages/freeTravel/free",
     "pages/Home/home",
     "pages/login/login",
+    
     "pages/GroupTour/Pay/Pay",
     "pages/GroupTour/FillOrder/FillOrder",
     "pages/GroupTour/ChDateNum/ChDateNum",
     "pages/GroupTour/GroupDetails/GroupDetails",
     "pages/GroupTour/GroupList/GroupList",
     "pages/product/product",
-    "pages/GroupTour/GroupTour",
     "pages/member/member",
     "pages/member/memberCenter/memberCenter",
     "pages/member/memberInfo/memberInfo",
@@ -18,9 +21,9 @@
     "pages/Voucher/rating/rating",
     "pages/Voucher/VoucherDetails/VoucherDetails",
     "pages/Voucher/write/write",
-    "pages/freeTravel/free",
+    
     "pages/Ticket/Ticket",
-    "pages/local/localhome",
+    
     "pages/login/smsLogin/smsLogin",
     "pages/login/revisePwd/revisePwd",
     "pages/product/SametradeZW/prizelist/prizelist",

component/Search/search.js

 // component/Search/search.js
+let app = getApp();
 Component({
   /**
    * 组件的属性列表
@@ -12,37 +13,74 @@ Component({
    */
   data: {
     array: ['美国', '中国', '巴西', '日本'],
-    InputFous:false,
-    CitySite:false,
+    InputFous: false,
+    CitySite: false,
+    cityList: [],
+    site:{
+      companyId: app.state.companyId,
+      cityId: app.state.cityId,
+      siteName: app.state.siteName,
+    },
+    
+
   },
 
   /**
    * 组件的方法列表
    */
   methods: {
-    CloseCity(e){
-      console.log(e.target.dataset.target)
-      if (e.target.dataset.target=="self"){
+    getCityList() {
+      app.$api('b2b_get_site', {}).then(res => {
+        this.setData({
+          cityList: res
+        })
+      }).catch(err => {})
+    },
+    SetCity(e) {
+      let that=this;
+      let site = {
+        cityId: e.target.dataset.msg.cityId,
+        companyId: e.target.dataset.msg.companyId,
+        siteName: e.target.dataset.msg.siteName,
+      }
+      that.setData({
+        site: site,
+        CitySite:false,
+      })
+      this.triggerEvent('ChangeSite', that.data.site)
+      wx.setStorage({
+        key: "site",
+        data: site,
+        success: function() {
+          
+        },
+        fail: function() {
+          
+        }
+      })
+    },
+    CloseCity(e) {
+      if (e.target.dataset.target == "self") {
         this.setData({
           CitySite: false,
         })
       }
     },
-    ChangeSite(){
+    ChangeSite() {
       this.setData({
         CitySite: true,
       })
     },
-    bindPickerChange: function (e) {
+    bindPickerChange: function(e) {
       console.log('picker发送选择改变，携带值为', e.detail.value)
       this.setData({
         index: e.detail.value
       })
     },
-    ListenInput(){
+    ListenInput() {
       this.setData({
-        InputFous:true,
+        InputFous: true,
       })
     },
   }
-})
+})
\ No newline at end of file

component/Search/search.wxml

 <view class="newsite" catchtouchmove="{{CitySite}}">
 
   <view class='cityView' hidden="{{InputFous}}">
-    <view bindtap='ChangeSite' class="head1" style="width:100rpx">
+    <view bindtap='ChangeSite' class="head1" style="width:150rpx">
       <image src="../../images/home/location.png"></image>
-      成都</view>
+      {{site.siteName}}</view>
     <view style="color:#CCCCCC">|</view>
     <view class="head3" style="width:500rpx">
       <image src="../../images/home/search.png"></image>
@@ -12,9 +12,7 @@
   </view>
   <view bindtap="CloseCity" data-target="self" class="cityChange" hidden="{{!CitySite}}">
     <view class="CityView">
-      <view class="CityItem">成都站</view>
-      <view class="CityItem">成都站</view>
-      <view class="CityItem">南京站</view>
+      <view catchtap='SetCity' data-msg="{{item}}" class="CityItem" wx:for="{{cityList}}" wx:key="index">{{item.siteName}}</view>
     </view>
   </view>
 

component/Search/search.wxss

@@ -97,12 +97,13 @@
   margin-right:30rpx;
 }
 .cityChange{
-  height: 100%;
+  
   background:rgba(17,17,17,0.5);
   position: fixed;
-  top: 60rpx;
+  top: 75rpx;
   width: 100%;
   z-index: 100;
+  height:calc( 100% - 75rpx);
 }
 .CityView{
   background: #fff;

pages/GroupTour/GroupTour.js

 // pages/GroupTour/GroupTour.js
+let app = getApp();
 Page({
 
   /**
@@ -7,25 +8,25 @@ Page({
   data: {
     background: [
       {
-      title:1,
-      list:[
-        {
-          name: '南压线',
-          id:1,
-        },
-        {
-          name: '中南办',
-          id: 1,
-        },
-        {
-          name: '中东办',
-          id: 1,
-        },
-        {
-          name: '韩国线',
-          id: 1,
-        }
-      ],
+        title: 1,
+        list: [
+          {
+            name: '南压线',
+            id: 1,
+          },
+          {
+            name: '中南办',
+            id: 1,
+          },
+          {
+            name: '中东办',
+            id: 1,
+          },
+          {
+            name: '韩国线',
+            id: 1,
+          }
+        ],
       },
       {
         title: 1,
@@ -56,16 +57,41 @@ Page({
     interval: 2000,
     duration: 500,
     previousMargin: 0,
-    nextMargin: 0
+    nextMargin: 0,
+    companyId: app.state.companyId,
+    cityId: app.state.cityId,
+    tiaoshui:[],
+    isLogin: app.isLogin,
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    this.loadTiaoshui();
+  },
+  loadTiaoshui() {
+    let that=this;
+    let msg = {
+      pageIndex: 1,
+      pageSize: 12,
+      groupRecommendType: 1,
+      companyId: that.data.companyId,
+      cityId: that.data.cityId
+    }
+    app.$apiJavaNew('/api/b2b/group/getHomeRecommendPrice', msg).then(res => {
+      that.setData({
+        tiaoshui: res.pageData
+      })
+
+    }).catch(err => {
+      wx.showToast({
+        title: err.message,
+        icon: 'none',
+        duration: 1000
+      })
+    })
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/GroupTour/GroupTour.wxml

@@ -27,26 +27,17 @@
   <view class="tsView">
     <view class="f30" style="margin-top:10rpx;padding-left:30rpx">跳水特价</view>
     <view class="inlineBlock">
-      <view class="ViewItem">
-        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
-        <view class="itemDes">
-          <view class="f28" style="color:#fff;padding-top:20rpx">日本东京大阪</view>
-          <view class="space">
-            <text class="f22" style="color:#fff">5月13日</text>
-            <text class="f28 cee">￥1200</text>
-          </view>
-        </view>
-      </view>
-      <view class="ViewItem">
-        <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
+      <view class="ViewItem" wx:for="{{tiaoshui}}" wx-if="{{index<4}}" wx:key="index">
+        <image wx-if="{{item.imgCover.length}}" src="{{item.imgCover[0].url}}"></image>
         <view class="itemDes">
-          <view class="f28" style="color:#fff;padding-top:20rpx">日本东京大阪</view>
+          <view class="f28 text1" style="color:#fff;padding-top:20rpx">{{item.title}}</view>
           <view class="space">
-            <text class="f22" style="color:#fff">5月13日</text>
-            <text class="f28 cee">￥1200</text>
+            <text class="f22" style="color:#fff">{{item.startDate}}</text>
+            <text class="f28 cee">￥{{isLogin!==1 ? item.b2CPrice : item.b2BPrice}}</text>
           </view>
         </view>
       </view>
+      
     </view>
   </view>
   <!-- 印象精选 -->

pages/Home/home.js

@@ -8,16 +8,36 @@ Page({
   data: {
     homeTravelSpecialSale:[],
     specialAirTicketItem:[],
+    isLogin:0,
+    ScrollView: '',
+    Scrollindex:0,
+    site: {
+      companyId: app.state.companyId,
+      cityId: app.state.cityId,
+      siteName: app.state.siteName,
+    },
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.GetInitData();
+    // this.GetInitData();
+    this.GetCZTM();
     this.GetAllTicket();
+    this.setData({
+      isLogin: app.isLogin,
+    })
+    let City = this.selectComponent('#CityComp');
+    City.getCityList();
+  },
+  ChangeSite(val){
+    console.log(val.detail);
+    this.setData({
+      site: val.detail
+    })
+    this.onLoad();
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */
@@ -31,6 +51,58 @@ Page({
   onShow: function () {
 
   },
+  Scroll(e){
+    this.setData({
+      ScrollView: e.target.dataset.id,
+      Scrollindex: e.target.dataset.index,
+    })
+    console.log(this.data.ScrollView)
+  },
+  // 跟团游
+  GetGroup() {
+    let Msg = {
+      airTicketType: 0,
+      pageIndex: 1,
+      pageSize: 2,
+    };
+    let that = this;
+    app.$apiJavaNew('/api/b2b/home/getHomeSpecialAirTicketList', Msg).then(res => {
+
+      that.setData({
+        specialAirTicketItem: res.pageData
+      })
+
+    }).catch(err => {
+      wx.showToast({
+        title: err.message,
+        icon: 'none',
+        duration: 1000
+      })
+    })
+  },
+  // 超值特卖
+  GetCZTM() {
+    let that=this;
+    let Msg = {
+      companyId: that.data.site.companyId,
+      cityId: that.data.site.cityId,
+      pageIndex: 1,
+      pageSize: 5,
+    };
+    app.$apiJavaNew('/api/b2b/home/getHomeTravelSpecialSale', Msg).then(res => {
+      that.setData({
+        homeTravelSpecialSale: res.pageData
+      })
+
+    }).catch(err => {
+      wx.showToast({
+        title: err.message,
+        icon: 'none',
+        duration: 1000
+      })
+    })
+  },
+  // 特价机票
   GetAllTicket() {
     let Msg = {
       airTicketType: 0,
@@ -39,7 +111,7 @@ Page({
     };
     let that = this;
     app.$apiJavaNew('/api/b2b/home/getHomeSpecialAirTicketList', Msg).then(res => {
-      console.log("特价机票", res);
+      
       that.setData({
         specialAirTicketItem: res.pageData
       })

pages/Home/home.wxss

@@ -74,6 +74,17 @@
   box-sizing: border-box;
   box-shadow: 0 0 8px #F7F7F7;
 }
+.Home .tjTicket .listRight .hidden{
+  width: 60rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  height: 50rpx;
+  line-height: 50rpx;
+  
+}
+.Home .tjTicket .listRight .icon{
+  height: 90rpx;
+}
 .Home .tjTicket .listRight .icon>view{
   display: inline-block;
 }

pages/freeTravel/free.js

 // pages/freeTravel/free.js
+let app = getApp();
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    commonmsg: {
+      companyId: app.state.companyId,
+      freeRecommendType: 1,
+      pageIndex: 1,
+      pageSize: 4,
+    },
+    commonmsg2: {
+      companyId: app.state.companyId,
+      freeRecommendType: 2,
+      pageIndex: 1,
+      pageSize: 3,
+    },
+    isLogin: app.isLogin,
+    TreatmentList:[],
+    HotCrashList:[],
+    CustomDesignerList:[],
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-
+    this.Treatment();
+    this.HotCrash();
+    this.CustomDesigner();
   },
 
+  Treatment(){
+    let that=this;
+    app.$api('b2b_get_GetB2BFreeRecommendPageList', that.data.commonmsg).then(res => {
+     
+      let TreatmentList = res.data.data.pageData;
+      TreatmentList.forEach(item => {
+        item.imgCover = JSON.parse(item.imgCover)
+      })
+      that.setData({
+        TreatmentList: TreatmentList
+      })
+      
+    }).catch(err => { })
+  },
+  HotCrash() {
+    let that = this;
+    app.$api('b2b_get_GetB2BFreeRecommendPageList', that.data.commonmsg2).then(res => {
+      
+      let HotCrashList = res.data.data.pageData;
+      HotCrashList.forEach(item => {
+        item.imgCover = JSON.parse(item.imgCover)
+      })
+      that.setData({
+        HotCrashList: HotCrashList
+      })
+      console.log("111", HotCrashList)
+
+    }).catch(err => { })
+  },
+  CustomDesigner() {
+    let that = this;
+    app.$apiJavaNew('/api/b2b/free/getTripCustomList', {}).then(res => { 
+      let CustomDesignerList = res.pageData;
+      CustomDesignerList.forEach(item=>{
+        item.emBirthday = that.Year(item.emBirthday);
+      })
+      that.setData({
+        CustomDesignerList: res.pageData
+      })
+      
+      console.log("CustomDesignerList", that.data.CustomDesignerList)
+    }).catch(err => {
+      wx.showToast({
+        title: err.message,
+        icon: 'none',
+        duration: 1000
+      })
+    })
+  },
+  Year(val){
+    let str = "";
+    if (val) {
+      str = val.substr(2, 1) + "0后"
+    }
+    return str;
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/freeTravel/free.wxml

@@ -42,34 +42,18 @@
         <text class="cont_bottom">Hot Areas In The Season</text>
       </view>
       <view class="HotView">
-        <view class="hotItem">
+        <view class="hotItem" wx:for="{{TreatmentList}}" wx:key="index">
           <view class="hotImg">
-            <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
+            <image src="{{item.imgCover[0].Url}}"></image>
             <view class="price">
               <view>RMB</view>
-              <view>4889起</view>
+              <view>{{item.b2BPrice}}起</view>
             </view>
           </view>
           <view style="padding:0 25rpx;text-align:center">
-            <view class="title bold f26">东京-大阪自由行</view>
+            <view class="title bold f26">{{item.lineName}}</view>
             <view class="text text3 f20">
-              四季变化明显，樱花季节，富士山，银座，新宿，池袋东护城河对岸矗立着一幢标志性建筑 飞檐重阁白墙黑
-            </view>
-            <view class="purchase f22">立即购买</view>
-          </view>
-        </view>
-        <view class="hotItem">
-          <view class="hotImg">
-            <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
-            <view class="price">
-              <view>RMB</view>
-              <view>4889起</view>
-            </view>
-          </view>
-          <view style="padding:0 25rpx;text-align:center">
-            <view class="title bold f26">东京-大阪自由行</view>
-            <view class="text text3 f20">
-              四季变化明显，
+              {{item.title}}
             </view>
             <view class="purchase f22">立即购买</view>
           </view>
@@ -81,26 +65,26 @@
         <text class="cont_bottom">Hot Crash Free Rides</text>
       </view>
       <view style="padding:0 30rpx;">
-        <view class="CrashView">
+        <view class="CrashView" wx:for="{{HotCrashList}}" wx:key="index">
           <view class="CrashImg">
-            <image style="z-index:1" src="../../images/free/t1.png"></image>
-            <image style="z-index:0" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
+            <image style="z-index:1" src="{{'../../images/free/t'+index+'.png'}}"></image>
+            <image style="z-index:0" src="{{item.imgCover[0].Url}}"></image>
 
           </view>
           <view class="f32 bold">
-            东京-大阪-富士山
-            <text class="comp">2人成行</text>
+            {{item.lineName}}
+            <text class="comp">{{item.totalPosition}}人成行</text>
           </view>
           <view class="f22" style="color:#666666;padding:20rpx 0">
-            初游推荐，樱花季漫游东京，赠人气药妆三款礼遇任您选，代订富士山/镰仓一日游初游推荐，樱花季漫游东京，赠人气药妆 三款礼遇任您选，代订富士山/镰仓一日游
+            {{item.title}}
           </view>
           <view>
             <view class="f20" style="color:#FF6633;display:inline-block">￥
-              <text class="f40">4888</text> 起
+              <text class="f40">{{(isLogin!=1 ? item.b2CPrice : item.b2BPrice)}}</text> 起
             </view>
             <view style="display:inline-block;float:right">
               <image style="display:inline-block;width:14rpx;height:22rpx;margin:0 10rpx" src="../../images/home/location.png"></image>
-              <text class="f22">成都出发</text>
+              <text class="f22">{{item.startCityName}}出发</text>
             </view>
           </view>
           <view class="liqg">
@@ -118,54 +102,24 @@
         <text class="cont_bottom">Professional Trip Maker</text>
       </view>
       <view class="Person">
-        <view class="Person_item">
-          <view class="personDes">
-            <view class="bg">
-              <view class="des_item f24" style="padding-top:121rpx;">张帅/90后</view>
-              <view class="des_item bold f30">精通
-                <text class="bold">欧洲线</text>
-              </view>
-            </view>
-
-            <view class="personImg">
-              <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626095806143.png"></image>
-
-            </view>
-          </view>
-
-        </view>
-        <view class="Person_item">
-          <view class="personDes">
-            <view class="bg">
-              <view class="des_item f24" style="padding-top:121rpx;">张帅/90后</view>
-              <view class="des_item bold f30">精通
-                <text class="bold">欧洲线</text>
-              </view>
-            </view>
-
-            <view class="personImg">
-              <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626095806143.png"></image>
-
-            </view>
-          </view>
-
-        </view>
-        <view class="Person_item">
+        <view class="Person_item" wx:if="{{index<4}}" wx:for="{{CustomDesignerList}}" wx:key="index">
           <view class="personDes">
             <view class="bg">
-              <view class="des_item f24" style="padding-top:121rpx;">张帅/90后</view>
+              <view class="des_item f24" style="padding-top:121rpx;">{{item.name}}
+              <text wx:if="{{item.emBirthday!=''}}">/{{item.emBirthday}}</text></view>
               <view class="des_item bold f30">精通
-                <text class="bold">欧洲线</text>
+                <text class="bold">{{item.masterLine}}</text>
               </view>
             </view>
 
             <view class="personImg">
-              <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626095806143.png"></image>
+              <image src="{{item.emPhoto}}"></image>
 
             </view>
           </view>
 
         </view>
+        
       </view>
       <view style="width:408rpx;height:122rpx;margin:30rpx auto">
         <image src="../../images/free/more.png"></image>

pages/freeTravel/free.wxss

@@ -72,6 +72,7 @@
 .HotView{
   padding: 0 30rpx;
   margin: 30rpx 0;
+  min-height: 50rpx;
 }
 .HotView .hotItem{
   width:330rpx;
@@ -175,6 +176,7 @@
   bottom: -125rpx;
   left: -50rpx;
   border: 4rpx solid #eeeeee;
+  background:#fff;
 
 }
 .Person .Person_item .personImg image{

pages/local/localhome.js

 // pages/local/localHome/localhome.js
+let app=getApp();
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
-
+    lineList:[],
+    lineIndex:0,
+    lineTeamList:[],
+    toView:'oneday',
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
+  Scrolltap(e) {
+    let color = e.target.dataset.index;
+    this.setData({
+      toView: color
+    })
+    },
   onLoad: function (options) {
-
+    let City = this.selectComponent('#CityComp');
+    City.getCityList();
+    this.GetLine();
+  },
+  ChangeSite(val) {
+    this.setData({
+      site: val.detail
+    })
+    this.onLoad();
+  },
+  GetLine() {
+    let that = this;
+    app.$apiJavaNew('/api/b2b/dayTrip/getLineItem', {}).then(res => {
+      let lineList=res;
+      
+      if (lineList.length>0){
+        let arr = lineList[0].lineTeamList;
+        that.setData({
+          lineTeamList: arr
+        })
+      }
+      that.setData({
+        lineList: lineList
+      })
+      console.log("lineTeamList", this.data.lineTeamList);
+
+
+    }).catch(err => {
+      wx.showToast({
+        title: err.message,
+        icon: 'none',
+        duration: 1000
+      })
+    })
   },
-
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/local/localhome.wxml

 <view class="localhome commonF">
-  <search></search>
+  <search id="CityComp" bind:ChangeSite="ChangeSite"></search>
   <view style="width:100%;height:300rpx;margin-top:36rpx">
     <image src='http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626095424470.png'></image>
   </view>
@@ -31,17 +31,10 @@
   </view>
   <view class="ChooseBan" style="margin-top:40rpx">
     <view class="chooseTitle f22">
-      <text class="active">日本</text>
-      <text>印尼</text>
-      <text>日本</text>
+      <text class="active" wx:if="{{index<3}}" wx:key="index" wx:for="{{lineList}}">{{item.lineShortName}}</text>
     </view>
     <view class="chooseDiv f28" style="height:210rpx;">
-      <text>名古屋一日游</text>
-      <text>东京一日游</text>
-      <text>名古屋一日游</text>
-      <text>名古屋一日游</text>
-      <text>东京一日游</text>
-      <text>名古屋一日游</text>
+      <text wx:if="{{index<5}}" wx:key="index" wx:for="{{lineTeamList}}">{{item.ltName}}</text>
     </view>
   </view>
   <!-- 为你推荐 -->
@@ -49,89 +42,98 @@
     <view style="padding-left:30rpx">
       <text class="bold" style="font-size:30rpx;color:#000000">为你推荐</text>
     </view>
-    <view class="likeView">
-      <text class="activeText">境外一日游</text>
-      <text>景点门票</text>
-      <text>当地美食</text>
-    </view>
 
-    <view class="FlTitleView">
-      <text class="text" style="color:#61DCD4"> \ \ \ </text>
-      <text style="font-size:30rpx;color:#000000;font-weight:600;margin:0 12rpx"> 境外一日游          </text>
-      <text class="text" style="color:#61DCD4"> \ \ \</text>
-    </view>
-    <!-- 境外一日游 -->
-    <view class="oneday">
-      <view class="onedayItem">
-        <view class="ImgView" style="height:247rpx;">
-          <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
-          <text class="country">日本</text>
-        </view>
-        <view style="padding:0 20rpx">
-          <text class="bold f28">日本名古屋周边一日游</text>
-          <text>\n</text>
-          <text class="f22 price">￥1999起</text>
-        </view>
-      </view>
-      <view class="onedayItem">
-        <view class="ImgView" style="height:247rpx;">
-          <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
-          <text class="country">日本</text>
-        </view>
-        <view style="padding:0 20rpx">
-          <text class="bold f28">日本名古屋周边一日游</text>
-          <text>\n</text>
-          <text class="f22 price">￥1999起</text>
-        </view>
+    <view class="section">
+      <view class="likeView">
+        <text class="activeText" data-index="oneday" bindtap="Scrolltap">境外一日游</text>
+        <text data-index="ticket" bindtap="Scrolltap">景点门票</text>
+        <text data-index="food" bindtap="Scrolltap">当地美食</text>
       </view>
-    </view>
-
-    <view class="FlTitleView">
-      <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>
-    </view>
-    <!-- 游玩门票 -->
-    <view class="ticket">
-      <view class="ticketItem">
-        <view class="ImgView" style="height:247rpx;">
-          <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
-          <view class="ticketView" style="padding:0 20rpx">
-            <text style="padding-top:25rpx" class="bold f28">日本名古屋周边一日游\n</text>
-            <text style="text-align:right" class="f22 price">￥1999起</text>
+      <scroll-view scroll-y style="height: 500rpx;" scroll-into-view="{{toView}}">
+        <view id="oneday" class="scroll-view-item bc_green">
+          <view class="FlTitleView">
+            <text class="text" style="color:#61DCD4"> \ \ \ </text>
+            <text style="font-size:30rpx;color:#000000;font-weight:600;margin:0 12rpx"> 境外一日游          </text>
+            <text class="text" style="color:#61DCD4"> \ \ \</text>
+          </view>
+          <!-- 境外一日游 -->
+          <view class="oneday">
+            <view class="onedayItem">
+              <view class="ImgView" style="height:247rpx;">
+                <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
+                <text class="country">日本</text>
+              </view>
+              <view style="padding:0 20rpx">
+                <text class="bold f28">日本名古屋周边一日游</text>
+                <text>\n</text>
+                <text class="f22 price">￥1999起</text>
+              </view>
+            </view>
+            <view class="onedayItem">
+              <view class="ImgView" style="height:247rpx;">
+                <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
+                <text class="country">日本</text>
+              </view>
+              <view style="padding:0 20rpx">
+                <text class="bold f28">日本名古屋周边一日游</text>
+                <text>\n</text>
+                <text class="f22 price">￥1999起</text>
+              </view>
+            </view>
           </view>
         </view>
+        <view id="ticket" class="scroll-view-item bc_red">
+          <view class="FlTitleView">
+            <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>
+          </view>
+          <!-- 游玩门票 -->
+          <view class="ticket">
+            <view class="ticketItem">
+              <view class="ImgView" style="height:247rpx;">
+                <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
+                <view class="ticketView" style="padding:0 20rpx">
+                  <text style="padding-top:25rpx" class="bold f28">日本名古屋周边一日游\n</text>
+                  <text style="text-align:right" class="f22 price">￥1999起</text>
+                </view>
+              </view>
 
-      </view>
-    </view>
-
-    <view class="FlTitleView">
-      <text class="text" style="color:#F9C900"> \ \ \ </text>
-      <text style="font-size:30rpx;color:#000000;font-weight:600;margin:0 12rpx"> 当地美食          </text>
-      <text class="text" style="color:#F9C900"> \ \ \</text>
-    </view>
-    <!-- 当地美食 -->
-    <view class="oneday">
-      <view class="onedayItem">
-        <view class="ImgView" style="height:247rpx;">
-          <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
-        </view>
-        <view style="padding:0 20rpx">
-          <text class="bold f28">日本名古屋周边一日游</text>
-          <text>\n</text>
-          <text class="f22 price">￥1999起</text>
-        </view>
-      </view>
-      <view class="onedayItem">
-        <view class="ImgView" style="height:247rpx;">
-          <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
+            </view>
+          </view>
         </view>
-        <view style="padding:0 20rpx">
-          <text class="bold f28">日本名古屋周边一日游</text>
-          <text>\n</text>
-          <text class="f22 price">￥1999起</text>
+        <view id="food" class="scroll-view-item bc_yellow">
+          <view class="FlTitleView">
+            <text class="text" style="color:#F9C900"> \ \ \ </text>
+            <text style="font-size:30rpx;color:#000000;font-weight:600;margin:0 12rpx"> 当地美食          </text>
+            <text class="text" style="color:#F9C900"> \ \ \</text>
+          </view>
+          <!-- 当地美食 -->
+          <view class="oneday">
+            <view class="onedayItem">
+              <view class="ImgView" style="height:247rpx;">
+                <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
+              </view>
+              <view style="padding:0 20rpx">
+                <text class="bold f28">日本名古屋周边一日游</text>
+                <text>\n</text>
+                <text class="f22 price">￥1999起</text>
+              </view>
+            </view>
+            <view class="onedayItem">
+              <view class="ImgView" style="height:247rpx;">
+                <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
+              </view>
+              <view style="padding:0 20rpx">
+                <text class="bold f28">日本名古屋周边一日游</text>
+                <text>\n</text>
+                <text class="f22 price">￥1999起</text>
+              </view>
+            </view>
+          </view>
         </view>
-      </view>
+      </scroll-view>
     </view>
   </view>
+
 </view>
\ No newline at end of file

pages/local/localhome.wxss

@@ -47,6 +47,7 @@
   color: #EE4454;
 
 }
+
 .chooseTitle text{
   display: inline-block;
   margin: 0 50rpx;
@@ -54,6 +55,7 @@
 .chooseDiv{
   padding: 20rpx 50rpx;
   box-sizing: border-box;
+  overflow: hidden;
 }
 .chooseDiv text{
   display: inline-block;

utils/util.js

@@ -22,6 +22,7 @@ const formatNumber = n => {
   return n[1] ? n : '0' + n
 }
 
+
 module.exports = {
   formatTime: formatTime,
   CompareDate: CompareDate,