Skip to content

F
FlashMan
Commit 4eda8c83 authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huaguohao/flashman

parents 024c2dc2 391157bc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1136 additions and 410 deletions
Common.wxss
View file @ 4eda8c83
...@@ -2,6 +2,11 @@ ...@@ -2,6 +2,11 @@
color:#000000; color:#000000;
background: #fff; background: #fff;
} }
::-webkit-scrollbar {
width: 0;
height: 0;
color: transparent;
}
.commonF .f12{ .commonF .f12{
font-size: 12rpx; font-size: 12rpx;
} }
......
app.js
View file @ 4eda8c83
//app.js //app.js
let md5 = require('utils/md5.js') let md5 = require('utils/md5.js')
App({ App({
// 小程序初始化时 // 小程序初始化时
onLaunch: function(options) {}, onLaunch: function(options) {
},
// 小程序显示 // 小程序显示
onShow: function(options) {}, onShow: function(options) {},
// 小程序隐藏 // 小程序隐藏
...@@ -11,6 +14,7 @@ App({ ...@@ -11,6 +14,7 @@ App({
onError: function(msg) {}, onError: function(msg) {},
// 用户token // 用户token
token: '', token: '',
isLogin: wx.getStorageSync('admin') ? 1 :0,
// 全局状态 // 全局状态
state: { state: {
admin: { admin: {
...@@ -29,7 +33,13 @@ App({ ...@@ -29,7 +33,13 @@ App({
customerName: wx.getStorageSync('admin') ? wx.getStorageSync('admin').customerName : '', customerName: wx.getStorageSync('admin') ? wx.getStorageSync('admin').customerName : '',
id: wx.getStorageSync('admin') ? wx.getStorageSync('admin').id : '' 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 :'成都站' siteName: wx.getStorageSync('site') ? wx.getStorageSync('site').siteName :'成都站'
}, },
// 请求接口 // 请求接口
...@@ -41,9 +51,9 @@ App({ ...@@ -41,9 +51,9 @@ App({
let timestamp = (new Date()).valueOf() let timestamp = (new Date()).valueOf()
let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '') let sign = md5('cmd=' + url + '&' + 'msg=' + encodeURIComponent(data).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + getApp().state.admin.token + '&' + 'key=' + '')
wx.request({ 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: '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', // url: ' http://test.viitto.com/api/common/post',
method: 'POST', method: 'POST',
...@@ -80,6 +90,7 @@ App({ ...@@ -80,6 +90,7 @@ App({
let groupId=2; let groupId=2;
let token = this.state.admin.token; let token = this.state.admin.token;
let secretKey = this.state.admin.secretKey; let secretKey = this.state.admin.secretKey;
let data={};
var promise = new Promise((resolve, reject) => { var promise = new Promise((resolve, reject) => {
wx.showLoading({ wx.showLoading({
title: '加载中', title: '加载中',
...@@ -87,8 +98,9 @@ App({ ...@@ -87,8 +98,9 @@ App({
let timestamp = (new Date()).valueOf() let timestamp = (new Date()).valueOf()
let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey) let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey)
wx.request({ wx.request({
// url: 'https://efficient.oytour.com/'+ url, //线上 url: 'https://reborn.oytour.com/api/common/post'+ 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', method: 'POST',
data: { data: {
...@@ -106,6 +118,12 @@ App({ ...@@ -106,6 +118,12 @@ App({
// wx.reLaunch({ // wx.reLaunch({
// url: '/pages/login/login' // url: '/pages/login/login'
// }) // })
// wx.showToast({
// title: res.data.message,
// icon: 'none',
// duration: 1000
// })
// reject(res.data)
} else { } else {
wx.showToast({ wx.showToast({
title: res.data.message, title: res.data.message,
...@@ -162,6 +180,7 @@ App({ ...@@ -162,6 +180,7 @@ App({
}) })
return promise; return promise;
}, },
globalData: { globalData: {
userInfo: null, userInfo: null,
awardsConfig: {}, awardsConfig: {},
......
app.json
View file @ 4eda8c83
{ {
"pages": [ "pages": [
"pages/freeTravel/freeList/freeList",
"pages/GroupTour/GroupTour",
"pages/local/localhome",
"pages/freeTravel/free",
"pages/Home/home", "pages/Home/home",
"pages/login/login", "pages/login/login",
"pages/GroupTour/Pay/Pay", "pages/GroupTour/Pay/Pay",
...@@ -8,7 +12,6 @@ ...@@ -8,7 +12,6 @@
"pages/GroupTour/GroupDetails/GroupDetails", "pages/GroupTour/GroupDetails/GroupDetails",
"pages/GroupTour/GroupList/GroupList", "pages/GroupTour/GroupList/GroupList",
"pages/product/product", "pages/product/product",
"pages/GroupTour/GroupTour",
"pages/member/member", "pages/member/member",
"pages/member/memberCenter/memberCenter", "pages/member/memberCenter/memberCenter",
"pages/member/memberInfo/memberInfo", "pages/member/memberInfo/memberInfo",
...@@ -20,9 +23,7 @@ ...@@ -20,9 +23,7 @@
"pages/Voucher/rating/rating", "pages/Voucher/rating/rating",
"pages/Voucher/VoucherDetails/VoucherDetails", "pages/Voucher/VoucherDetails/VoucherDetails",
"pages/Voucher/write/write", "pages/Voucher/write/write",
"pages/freeTravel/free",
"pages/Ticket/Ticket", "pages/Ticket/Ticket",
"pages/local/localhome",
"pages/login/smsLogin/smsLogin", "pages/login/smsLogin/smsLogin",
"pages/login/revisePwd/revisePwd", "pages/login/revisePwd/revisePwd",
"pages/product/SametradeZW/prizelist/prizelist", "pages/product/SametradeZW/prizelist/prizelist",
...@@ -33,12 +34,12 @@ ...@@ -33,12 +34,12 @@
"pages/product/productSite/productSite", "pages/product/productSite/productSite",
"pages/product/productOrder/productOrder", "pages/product/productOrder/productOrder",
"pages/mine/mine", "pages/mine/mine",
"pages/login/activate/activate", "pages/login/activate/activate",
"pages/product/SametradeZW/SametradeZW", "pages/product/SametradeZW/SametradeZW",
"pages/product/SametradeZW/Applicationnotes/Applicationnotes", "pages/product/SametradeZW/Applicationnotes/Applicationnotes",
"pages/product/SametradeZW/Successview/Successview", "pages/product/SametradeZW/Successview/Successview",
"component/amount/amount" "component/amount/amount"
], ],
"window": { "window": {
"backgroundTextStyle": "light", "backgroundTextStyle": "light",
......
component/Search/search.js
View file @ 4eda8c83
// component/Search/search.js // component/Search/search.js
let app = getApp();
Component({ Component({
/** /**
* 组件的属性列表 * 组件的属性列表
...@@ -12,37 +13,74 @@ Component({ ...@@ -12,37 +13,74 @@ Component({
*/ */
data: { data: {
array: ['美国', '中国', '巴西', '日本'], array: ['美国', '中国', '巴西', '日本'],
InputFous:false, InputFous: false,
CitySite:false, CitySite: false,
cityList: [],
site:{
companyId: app.state.companyId,
cityId: app.state.cityId,
siteName: app.state.siteName,
},
}, },
/** /**
* 组件的方法列表 * 组件的方法列表
*/ */
methods: { methods: {
CloseCity(e){ getCityList() {
console.log(e.target.dataset.target) app.$api('b2b_get_site', {}).then(res => {
if (e.target.dataset.target=="self"){ 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({ this.setData({
CitySite: false, CitySite: false,
}) })
} }
}, },
ChangeSite(){ ChangeSite() {
this.setData({ this.setData({
CitySite: true, CitySite: true,
}) })
}, },
bindPickerChange: function (e) { bindPickerChange: function(e) {
console.log('picker发送选择改变，携带值为', e.detail.value) console.log('picker发送选择改变，携带值为', e.detail.value)
this.setData({ this.setData({
index: e.detail.value index: e.detail.value
}) })
}, },
ListenInput(){ ListenInput() {
this.setData({ this.setData({
InputFous:true, InputFous: true,
}) })
}, },
} }
}) })
\ No newline at end of file
component/Search/search.wxml
View file @ 4eda8c83
<view class="newsite" catchtouchmove="{{CitySite}}"> <view class="newsite" catchtouchmove="{{CitySite}}">
<view class='cityView' hidden="{{InputFous}}"> <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> <image src="../../images/home/location.png"></image>
成都</view> {{site.siteName}}</view>
<view style="color:#CCCCCC">|</view> <view style="color:#CCCCCC">|</view>
<view class="head3" style="width:500rpx"> <view class="head3" style="width:500rpx">
<image src="../../images/home/search.png"></image> <image src="../../images/home/search.png"></image>
<input bindtap="ListenInput" style="width:100%" placeholder="搜索目的地/交通/景点/酒店"/> <input style="width:100%" placeholder="搜索目的地/交通/景点/酒店"/>
</view> </view>
<!-- bindtap="ListenInput" -->
</view> </view>
<view bindtap="CloseCity" data-target="self" class="cityChange" hidden="{{!CitySite}}"> <view bindtap="CloseCity" data-target="self" class="cityChange" hidden="{{!CitySite}}">
<view class="CityView"> <view class="CityView">
<view class="CityItem">成都站</view> <view catchtap='SetCity' data-msg="{{item}}" class="CityItem" wx:for="{{cityList}}" wx:key="index">{{item.siteName}}</view>
<view class="CityItem">成都站</view>
<view class="CityItem">南京站</view>
</view> </view>
</view> </view>
......
component/Search/search.wxss
View file @ 4eda8c83
...@@ -97,12 +97,13 @@ ...@@ -97,12 +97,13 @@
margin-right:30rpx; margin-right:30rpx;
} }
.cityChange{ .cityChange{
height: 100%;
background:rgba(17,17,17,0.5); background:rgba(17,17,17,0.5);
position: fixed; position: fixed;
top: 60rpx; top: 75rpx;
width: 100%; width: 100%;
z-index: 100; z-index: 100;
height:calc( 100% - 75rpx);
} }
.CityView{ .CityView{
background: #fff; background: #fff;
......
images/free/t1.png
View replaced file @ 024c2dc2 View file @ 4eda8c83
images/free/t1.png

11.9 KB | W: | H:

images/free/t1.png

18.2 KB | W: | H:

images/free/t1.png
images/free/t1.png
images/free/t1.png
images/free/t1.png
  • 2-up
  • Swipe
  • Onion skin
images/free/t2.png
View replaced file @ 024c2dc2 View file @ 4eda8c83
images/free/t2.png

18.2 KB | W: | H:

images/free/t2.png

11.8 KB | W: | H:

images/free/t2.png
images/free/t2.png
images/free/t2.png
images/free/t2.png
  • 2-up
  • Swipe
  • Onion skin
pages/GroupTour/GroupTour.js
View file @ 4eda8c83
// pages/GroupTour/GroupTour.js // pages/GroupTour/GroupTour.js
let app = getApp();
Page({ Page({
/** /**
...@@ -7,25 +8,25 @@ Page({ ...@@ -7,25 +8,25 @@ Page({
data: { data: {
background: [ background: [
{ {
title:1, title: 1,
list:[ list: [
{ {
name: '南压线', name: '南压线',
id:1, id: 1,
}, },
{ {
name: '中南办', name: '中南办',
id: 1, id: 1,
}, },
{ {
name: '中东办', name: '中东办',
id: 1, id: 1,
}, },
{ {
name: '韩国线', name: '韩国线',
id: 1, id: 1,
} }
], ],
}, },
{ {
title: 1, title: 1,
...@@ -56,16 +57,41 @@ Page({ ...@@ -56,16 +57,41 @@ Page({
interval: 2000, interval: 2000,
duration: 500, duration: 500,
previousMargin: 0, previousMargin: 0,
nextMargin: 0 nextMargin: 0,
companyId: app.state.companyId,
cityId: app.state.cityId,
tiaoshui:[],
isLogin: app.isLogin,
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { 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
View file @ 4eda8c83
...@@ -27,26 +27,17 @@ ...@@ -27,26 +27,17 @@
<view class="tsView"> <view class="tsView">
<view class="f30" style="margin-top:10rpx;padding-left:30rpx">跳水特价</view> <view class="f30" style="margin-top:10rpx;padding-left:30rpx">跳水特价</view>
<view class="inlineBlock"> <view class="inlineBlock">
<view class="ViewItem"> <view class="ViewItem" wx:for="{{tiaoshui}}" wx-if="{{index<4}}" wx:key="index">
<image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image> <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="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="itemDes"> <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"> <view class="space">
<text class="f22" style="color:#fff">5月13日</text> <text class="f22" style="color:#fff">{{item.startDate}}</text>
<text class="f28 cee">￥1200</text> <text class="f28 cee">￥{{isLogin!==1 ? item.b2CPrice : item.b2BPrice}}</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<!-- 印象精选 --> <!-- 印象精选 -->
......
pages/Home/home.js
View file @ 4eda8c83
...@@ -8,16 +8,36 @@ Page({ ...@@ -8,16 +8,36 @@ Page({
data: { data: {
homeTravelSpecialSale:[], homeTravelSpecialSale:[],
specialAirTicketItem:[], specialAirTicketItem:[],
isLogin:0,
ScrollView: '',
Scrollindex:0,
site: {
companyId: app.state.companyId,
cityId: app.state.cityId,
siteName: app.state.siteName,
},
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
onLoad: function (options) { onLoad: function (options) {
this.GetInitData(); // this.GetInitData();
this.GetCZTM();
this.GetAllTicket(); 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({ ...@@ -31,6 +51,58 @@ Page({
onShow: function () { 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() { GetAllTicket() {
let Msg = { let Msg = {
airTicketType: 0, airTicketType: 0,
...@@ -39,7 +111,7 @@ Page({ ...@@ -39,7 +111,7 @@ Page({
}; };
let that = this; let that = this;
app.$apiJavaNew('/api/b2b/home/getHomeSpecialAirTicketList', Msg).then(res => { app.$apiJavaNew('/api/b2b/home/getHomeSpecialAirTicketList', Msg).then(res => {
console.log("特价机票", res);
that.setData({ that.setData({
specialAirTicketItem: res.pageData specialAirTicketItem: res.pageData
}) })
......
pages/Home/home.wxml
View file @ 4eda8c83
This diff is collapsed.
pages/Home/home.wxss
View file @ 4eda8c83
...@@ -74,6 +74,17 @@ ...@@ -74,6 +74,17 @@
box-sizing: border-box; box-sizing: border-box;
box-shadow: 0 0 8px #F7F7F7; 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{ .Home .tjTicket .listRight .icon>view{
display: inline-block; display: inline-block;
} }
......
pages/freeTravel/free.js
View file @ 4eda8c83
// pages/freeTravel/free.js // pages/freeTravel/free.js
let app = getApp();
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { 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) { 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
View file @ 4eda8c83
...@@ -42,34 +42,18 @@ ...@@ -42,34 +42,18 @@
<text class="cont_bottom">Hot Areas In The Season</text> <text class="cont_bottom">Hot Areas In The Season</text>
</view> </view>
<view class="HotView"> <view class="HotView">
<view class="hotItem"> <view class="hotItem" wx:for="{{TreatmentList}}" wx:key="index">
<view class="hotImg"> <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 class="price">
<view>RMB</view> <view>RMB</view>
<view>4889起</view> <view>{{item.b2BPrice}}起</view>
</view> </view>
</view> </view>
<view style="padding:0 25rpx;text-align:center"> <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 class="text text3 f20">
四季变化明显，樱花季节，富士山，银座，新宿，池袋东护城河对岸矗立着一幢标志性建筑 飞檐重阁白墙黑 {{item.title}}
</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">
四季变化明显，
</view> </view>
<view class="purchase f22">立即购买</view> <view class="purchase f22">立即购买</view>
</view> </view>
...@@ -81,26 +65,26 @@ ...@@ -81,26 +65,26 @@
<text class="cont_bottom">Hot Crash Free Rides</text> <text class="cont_bottom">Hot Crash Free Rides</text>
</view> </view>
<view style="padding:0 30rpx;"> <view style="padding:0 30rpx;">
<view class="CrashView"> <view class="CrashView" wx:for="{{HotCrashList}}" wx:key="index">
<view class="CrashImg"> <view class="CrashImg">
<image style="z-index:1" src="../../images/free/t1.png"></image> <image style="z-index:1" src="{{'../../images/free/t'+index+'.png'}}"></image>
<image style="z-index:0" src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image> <image style="z-index:0" src="{{item.imgCover[0].Url}}"></image>
</view> </view>
<view class="f32 bold"> <view class="f32 bold">
东京-大阪-富士山 {{item.lineName}}
<text class="comp">2人成行</text> <text class="comp">{{item.totalPosition}}人成行</text>
</view> </view>
<view class="f22" style="color:#666666;padding:20rpx 0"> <view class="f22" style="color:#666666;padding:20rpx 0">
初游推荐，樱花季漫游东京，赠人气药妆三款礼遇任您选，代订富士山/镰仓一日游初游推荐，樱花季漫游东京，赠人气药妆 三款礼遇任您选，代订富士山/镰仓一日游 {{item.title}}
</view> </view>
<view> <view>
<view class="f20" style="color:#FF6633;display:inline-block">￥ <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>
<view style="display:inline-block;float:right"> <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> <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> </view>
<view class="liqg"> <view class="liqg">
...@@ -118,54 +102,24 @@ ...@@ -118,54 +102,24 @@
<text class="cont_bottom">Professional Trip Maker</text> <text class="cont_bottom">Professional Trip Maker</text>
</view> </view>
<view class="Person"> <view class="Person">
<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 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="personDes"> <view class="personDes">
<view class="bg"> <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">精通 <view class="des_item bold f30">精通
<text class="bold">欧洲线</text> <text class="bold">{{item.masterLine}}</text>
</view> </view>
</view> </view>
<view class="personImg"> <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> </view>
</view> </view>
<view style="width:408rpx;height:122rpx;margin:30rpx auto"> <view style="width:408rpx;height:122rpx;margin:30rpx auto">
<image src="../../images/free/more.png"></image> <image src="../../images/free/more.png"></image>
......
pages/freeTravel/free.wxss
View file @ 4eda8c83
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
.HotView{ .HotView{
padding: 0 30rpx; padding: 0 30rpx;
margin: 30rpx 0; margin: 30rpx 0;
min-height: 50rpx;
} }
.HotView .hotItem{ .HotView .hotItem{
width:330rpx; width:330rpx;
...@@ -175,6 +176,7 @@ ...@@ -175,6 +176,7 @@
bottom: -125rpx; bottom: -125rpx;
left: -50rpx; left: -50rpx;
border: 4rpx solid #eeeeee; border: 4rpx solid #eeeeee;
background:#fff;
} }
.Person .Person_item .personImg image{ .Person .Person_item .personImg image{
......
pages/freeTravel/freeList/freeList.js 0 → 100644
View file @ 4eda8c83
// pages/freeTravel/freeList/freeList.js
let app=getApp();
Page({
/**
* 页面的初始数据
*/
data: {
isLogin: app.isLogin,
site: {
companyId: app.state.companyId,
cityId: app.state.cityId,
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,
maxTripDay: -1,
pageIndex: 1,
pageSize: 10,
lineId: 0,
lineTeamId: 0,
dayNum: -1,
monthdate: [],
priceTag: [],
startCityId: 0,
cityId: app.state.cityId,
startDate: '',
endDate: '',
minPrice: '',
maxPrice: '',
companyId: app.state.companyId,
priceOrderByField: 0,
searchKey: '',
},
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
let City = this.selectComponent('#CityComp');
City.getCityList();
this.getThemeTag();
},
ChangeSite(val) {
console.log(val.detail);
this.setData({
site: val.detail
})
this.onLoad();
},
ScreenOpen() {
this.setData({
ScreenStatus: true,
})
},
CloseScreen(e) {
if (e.target.dataset.target == "self") {
this.setData({
ScreenStatus: false,
})
}
},
// 获取主题标签
getThemeTag() {
let tagmsg={
name: 'theme',
code: 1,
}
let that = this;
app.$api('travel_get_GetTravelPriceTag', tagmsg).then(res => {
console.log(res);
let ThemeTagList = res;
ThemeTagList.forEach(item => {
item.show = 0;
})
that.setData({
ThemeTagList: ThemeTagList
})
}).catch(err => { })
},
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;
let priceTag = that.data.listmsg.priceTag;
let ThemeTagList = that.data.ThemeTagList;
priceTag=[];
that.setData({
listmsg: listmsg
})
ThemeTagList.forEach(item => {
item.SNO = 0;
})
if (index != 0) {
priceTag.push(tag.ID);
that.data.listmsg.priceTag = priceTag;
priceTag.forEach(tag => {
ThemeTagList.forEach(item => {
if (tag == item.ID) {
item.SNO = -1;
}
})
})
that.setData({
ThemeTagList: ThemeTagList,
listmsg: listmsg
})
console.log("listmsg", listmsg);
}
this.GetList();
},
GetList(){
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/freeTravel/freeList/freeList.json 0 → 100644
View file @ 4eda8c83
{
"navigationBarTitleText": "首页",
"usingComponents": {
"search": "/component/Search/search"
}
}
\ No newline at end of file
pages/freeTravel/freeList/freeList.wxml 0 → 100644
View file @ 4eda8c83
<view class='GroupList commonF' catchtouchmove="{{StopResh}}">
<search id="CityComp" bind:ChangeSite="ChangeSite"></search>
<view class="ListView">
<view class="PxView">
<view class="jView" bindtap='PXClick'>
综合排序
<!-- <image src="/images/group/bx.png"></image> -->
</view>
<view class="jView">
时间
<image src="/images/group/bx.png"></image>
</view>
<view class="jView">
价格
<image src="/images/group/bx.png"></image>
</view>
<view bindtap='ScreenOpen' class="SView">
筛选
<image src="/images/group/s.png"></image>
</view>
</view>
<scroll-view scroll-x class="scroll-header">
<view bindtap='PriceTag' data-index="{{0}}" data-tag="{{item}}" class="ScrollActive scroll-view-item">不限</view>
<view bindtap='PriceTag' data-index="{{1}}" data-tag="{{item}}" wx:key="index" wx:for="{{ThemeTagList}}" class="ScrollActive scroll-view-item">{{item.Content}}</view>
</scroll-view>
<!-- 列表数据 -->
<view class="ListItem">
<view class="imgView">
<image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
</view>
<view class="ItemRight" style="width:460rpx;padding-left:15rpx">
<view class="text2 f26">日本本州~精品假期~免费升级：2晚东京 市中心*东京曼迪酒店+1晚特色机票
</view>
<view class="f22" style="color:#888888;padding:15rpx 0">
<image style="width:18rpx;height:22rpx" src="/images/group/adress.png"></image>
出发地：成都
<image style="width:22rpx;height:22rpx" src="/images/group/tuan.png"></image>
最近团期：2019-08-90
</view>
<view class="f20" style="color:#5597FF">
精品添加
</view>
<view class="f22" style="color:#888888;padding-top:15rpx">
<image style="width:22rpx;height:22rpx" src="/images/group/p.png"></image>
<text>余位：充足</text>
<text class="cee f40" style="float:right;position:relative;top:-20rpx">￥1900</text>
</view>
</view>
</view>
</view>
<!-- 筛选条件 -->
<view bindtap='ClosePXView' data-target="self" class="Condition" hidden="{{!StopResh}}">
<view style="padding:0 30rpx">
<view>综合排序</view>
<view>价格从低到高</view>
<view>价格从低到高</view>
<view>销量从高到低</view>
</view>
</view>
<!-- 筛选多条件 -->
<view bindtap='CloseScreen' data-target="self" class="screen" hidden="{{!ScreenStatus}}">
<view>
<view class="title">系列</view>
<view class="xl">
<text>本州 147升级版</text>
<text>希尔顿假期系列</text>
<text>希尔顿假期系列</text>
<text>小王子x列</text>
</view>
<view class="title">出发日期</view>
<view class="DatePicker">
<picker class="pcikerView" mode="date" value="{{date}}" start="2015-09-01" end="2017-09-01" bindchange="bindDateChange">
<view class="picker">
</view>
</picker>
<text style="margin:0 15rpx"> - </text>
<picker class="pcikerView" mode="date" value="{{date}}" start="2015-09-01" end="2017-09-01" bindchange="bindDateChange">
<view class="picker">
</view>
</picker>
</view>
<view class='MonthList'>
<text wx:for="{{dates}}" wx:key="index">{{item.name}}</text>
</view>
<view class="title">出发城市</view>
<view class='MonthList' style="margin-top:25rpx">
<text>成都</text>
<text>成都</text>
<text>成都</text>
<text>成都</text>
<text>成都</text>
<text>成都</text>
</view>
<view class="title">行程天数</view>
<view class='MonthList' style="margin-top:25rpx">
<text wx:for="{{datecount}}" wx:key="index">{{item.name}}</text>
</view>
<view class="title">价格区间</view>
<view class="PriceView">
<input placeholder="2000" placeholder-style="text-align:center" />
<text style="padding:0 15rpx">-</text>
<input placeholder="最高价" placeholder-style="text-align:center" />
</view>
<view class="btnView">
<view>重置</view>
<view style="background:#EE4454;color:#fff;border:none">确定</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
pages/freeTravel/freeList/freeList.wxss 0 → 100644
View file @ 4eda8c83
.PxView .jView image {
width: 16rpx;
height: 8rpx;
}
.PxView>view {
display: inline-block;
font-size: 28rpx;
color: #111;
width: 25%;
text-align: center;
height: 90rpx;
line-height: 90rpx;
}
.PxView .SView image {
width: 22rpx;
height: 22rpx;
}
.scroll-header {
display: flex;
white-space: nowrap;
padding-bottom: 30rpx;
border-bottom: 1rpx solid #e9e9e9;
height: 120rpx;
}
.scroll-header view {
height: 54rpx;
line-height: 54rpx;
display: inline-block;
margin-left: 30rpx;
font-size: 24rpx;
color: #111;
background: #f2f2f2;
padding: 0 30rpx;
border-radius: 27rpx;
}
.scroll-header .ScrollActive {
color: #ee4454;
}
.ListItem {
padding: 30rpx 30rpx 15rpx 30rpx;
border-bottom: 1rpx solid #e9e9e9;
}
.ListView {
border-top: 1rpx solid #e9e9e9;
width: 100%;
padding-bottom: 20rpx;
margin-top: 20rpx;
}
.ListItem .imgView {
width: 210rpx;
height: 210rpx;
border-radius: 6rpx;
}
.ListItem>view {
display: inline-block;
}
/* 综合排序 */
.Condition {
font-size: 26rpx;
position: fixed;
width: 100%;
background: rgba(17, 17, 17, 0.5);
top: 190rpx;
height: calc(100% - 190rpx);
border-top: 1rpx solid #e9e9e9;
}
.Condition>view {
background: #fff;
}
.Condition>view view {
padding: 15rpx 0;
}
/* 筛选多条件 */
.screen {
position: fixed;
width: 100%;
height: 100%;
top: 0;
left: 0;
z-index: 5000;
background: rgba(17, 17, 17, 0.5);
}
.screen>view {
width: 690rpx;
min-height: 100%;
background: rgba(255, 255, 255, 1);
border-radius: 12rpx 0px 0px 12rpx;
position: absolute;
right: 0;
padding: 30rpx;
color: rgba(17, 17, 17, 1);
}
.screen>view .title {
font-size: 28rpx;
font-weight: bold;
}
.screen>view .xl text{
height: 54rpx;
display: inline-block;
line-height: 54rpx;
background: rgba(242, 242, 242, 1);
border-radius: 27rpx;
padding: 0 20rpx;
font-size:22rpx;
margin-bottom: 30rpx;
margin-right: 30rpx;
}
.screen .picker{
width:296rpx;
height:54rpx;
background:rgba(242,242,242,1);
border-radius:27rpx;
display: inline-block;
}
.screen .DatePicker{
display: flex;
margin-top:15rpx;
}
.screen .pcikerView{
display: inline-block;
}
.MonthList{
display: flex;
justify-content: space-between;
flex-wrap: wrap;
}
.MonthList text{
display: inline-block;
width:190rpx;
height:54rpx;
line-height:54rpx;
background:rgba(242,242,242,1);
border-radius:27rpx;
font-size: 22rpx;
text-align: center;
color:#333333;
margin-bottom:25rpx;
}
.PriceView {
display: flex;
margin-top:15rpx;
}
.PriceView input{
width:296rpx;
height:54rpx;
line-height:54rpx;
background:rgba(242,242,242,1);
border-radius:27rpx;
display: inline-block;
font-size: 22rpx;
}
.btnView{
margin-top:20rpx;
display: flex;
justify-content: space-between;
}
.btnView>view{
width:300rpx;
height:60rpx;
line-height:60rpx;
background:rgba(255,255,255,1);
border:1px solid rgba(204, 204, 204, 1);
border-radius:30rpx;
text-align: center;
font-size: 24rpx;
display: inline-block;
}
pages/local/localhome.js
View file @ 4eda8c83
// pages/local/localHome/localhome.js // pages/local/localHome/localhome.js
let app=getApp();
Page({ Page({
/** /**
* 页面的初始数据 * 页面的初始数据
*/ */
data: { data: {
lineList:[],
lineIndex:0,
lineTeamList:[],
toView:'oneday',
site: {
companyId: app.state.companyId,
cityId: app.state.cityId,
siteName: app.state.siteName,
},
}, },
/** /**
* 生命周期函数--监听页面加载 * 生命周期函数--监听页面加载
*/ */
Scrolltap(e) {
let color = e.target.dataset.index;
this.setData({
toView: color
})
},
onLoad: function (options) { 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 file @ 4eda8c83
<view class="localhome commonF"> <view class="localhome commonF">
<search></search> <search id="CityComp" bind:ChangeSite="ChangeSite"></search>
<view style="width:100%;height:300rpx;margin-top:36rpx"> <view style="width:100%;height:300rpx;margin-top:36rpx">
<image src='http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626095424470.png'></image> <image src='http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626095424470.png'></image>
</view> </view>
...@@ -31,17 +31,10 @@ ...@@ -31,17 +31,10 @@
</view> </view>
<view class="ChooseBan" style="margin-top:40rpx"> <view class="ChooseBan" style="margin-top:40rpx">
<view class="chooseTitle f22"> <view class="chooseTitle f22">
<text class="active">日本</text> <text class="active" wx:if="{{index<3}}" wx:key="index" wx:for="{{lineList}}">{{item.lineShortName}}</text>
<text>印尼</text>
<text>日本</text>
</view> </view>
<view class="chooseDiv f28" style="height:210rpx;"> <view class="chooseDiv f28" style="height:210rpx;">
<text>名古屋一日游</text> <text wx:if="{{index<5}}" wx:key="index" wx:for="{{lineTeamList}}">{{item.ltName}}</text>
<text>东京一日游</text>
<text>名古屋一日游</text>
<text>名古屋一日游</text>
<text>东京一日游</text>
<text>名古屋一日游</text>
</view> </view>
</view> </view>
<!-- 为你推荐 --> <!-- 为你推荐 -->
...@@ -49,89 +42,98 @@ ...@@ -49,89 +42,98 @@
<view style="padding-left:30rpx"> <view style="padding-left:30rpx">
<text class="bold" style="font-size:30rpx;color:#000000">为你推荐</text> <text class="bold" style="font-size:30rpx;color:#000000">为你推荐</text>
</view> </view>
<view class="likeView">
<text class="activeText">境外一日游</text>
<text>景点门票</text>
<text>当地美食</text>
</view>
<view class="FlTitleView"> <view class="section">
<text class="text" style="color:#61DCD4"> \ \ \ </text> <view class="likeView">
<text style="font-size:30rpx;color:#000000;font-weight:600;margin:0 12rpx"> 境外一日游 </text> <text class="activeText" data-index="oneday" bindtap="Scrolltap">境外一日游</text>
<text class="text" style="color:#61DCD4"> \ \ \</text> <text data-index="ticket" bindtap="Scrolltap">景点门票</text>
</view> <text data-index="food" bindtap="Scrolltap">当地美食</text>
<!-- 境外一日游 -->
<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> <scroll-view scroll-y style="height: 500rpx;" scroll-into-view="{{toView}}">
<view id="oneday" class="scroll-view-item bc_green">
<view class="FlTitleView"> <view class="FlTitleView">
<text class="text" style="color:#FD7F56"> \ \ \ </text> <text class="text" style="color:#61DCD4"> \ \ \ </text>
<text style="font-size:30rpx;color:#000000;font-weight:600;margin:0 12rpx"> 游玩门票 </text> <text style="font-size:30rpx;color:#000000;font-weight:600;margin:0 12rpx"> 境外一日游 </text>
<text class="text" style="color:#FD7F56"> \ \ \</text> <text class="text" style="color:#61DCD4"> \ \ \</text>
</view> </view>
<!-- 游玩门票 --> <!-- 境外一日游 -->
<view class="ticket"> <view class="oneday">
<view class="ticketItem"> <view class="onedayItem">
<view class="ImgView" style="height:247rpx;"> <view class="ImgView" style="height:247rpx;">
<image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image> <image src="http://imgfile.oytour.com/New/Upload/Cloud/2019-06/20190626102629935.png"></image>
<view class="ticketView" style="padding:0 20rpx"> <text class="country">日本</text>
<text style="padding-top:25rpx" class="bold f28">日本名古屋周边一日游\n</text> </view>
<text style="text-align:right" class="f22 price">￥1999起</text> <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> </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> </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 style="padding:0 20rpx"> <view id="food" class="scroll-view-item bc_yellow">
<text class="bold f28">日本名古屋周边一日游</text> <view class="FlTitleView">
<text>\n</text> <text class="text" style="color:#F9C900"> \ \ \ </text>
<text class="f22 price">￥1999起</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>
</view> </scroll-view>
</view> </view>
</view> </view>
</view> </view>
\ No newline at end of file
pages/local/localhome.wxss
View file @ 4eda8c83
...@@ -47,6 +47,7 @@ ...@@ -47,6 +47,7 @@
color: #EE4454; color: #EE4454;
} }
.chooseTitle text{ .chooseTitle text{
display: inline-block; display: inline-block;
margin: 0 50rpx; margin: 0 50rpx;
...@@ -54,6 +55,7 @@ ...@@ -54,6 +55,7 @@
.chooseDiv{ .chooseDiv{
padding: 20rpx 50rpx; padding: 20rpx 50rpx;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden;
} }
.chooseDiv text{ .chooseDiv text{
display: inline-block; display: inline-block;
......
utils/util.js
View file @ 4eda8c83
...@@ -22,6 +22,7 @@ const formatNumber = n => { ...@@ -22,6 +22,7 @@ const formatNumber = n => {
return n[1] ? n : '0' + n return n[1] ? n : '0' + n
} }
module.exports = { module.exports = {
formatTime: formatTime, formatTime: formatTime,
CompareDate: CompareDate, CompareDate: CompareDate,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment