Skip to content

F
FlashMan
Commit 391157bc authored by huangyuanyuan's avatar huangyuanyuan
Browse files
Options

update

parent a052f84b
Hide whitespace changes
Inline Side-by-side
Showing with 520 additions and 7 deletions
app.js
View file @ 391157bc
......@@ -98,9 +98,9 @@ App({
let timestamp = (new Date()).valueOf()
let sign = md5('msg=' + encodeURIComponent(JSON.stringify(msg)).toLowerCase() + '&' + 'timestamp=' + timestamp + '&' + 'token=' + token + '&' + 'key=' + secretKey)
wx.request({
// url: 'https://efficient.oytour.com/'+ url, //线上
url: 'https://reborn.oytour.com/api/common/post'+ url, //线上
// url: 'http://47.96.12.235:9001/' + url, //测试
url: 'http://192.168.2.215:9000/'+ url,
// url: 'http://192.168.2.215:9000/'+ url,
method: 'POST',
data: {
......
app.json
View file @ 391157bc
{
"pages": [
"pages/freeTravel/freeList/freeList",
"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",
......@@ -21,9 +21,7 @@
"pages/Voucher/rating/rating",
"pages/Voucher/VoucherDetails/VoucherDetails",
"pages/Voucher/write/write",
"pages/Ticket/Ticket",
"pages/login/smsLogin/smsLogin",
"pages/login/revisePwd/revisePwd",
"pages/product/SametradeZW/prizelist/prizelist",
......@@ -34,12 +32,12 @@
"pages/product/productSite/productSite",
"pages/product/productOrder/productOrder",
"pages/mine/mine",
"pages/login/activate/activate",
"pages/product/SametradeZW/SametradeZW",
"pages/product/SametradeZW/Applicationnotes/Applicationnotes",
"pages/product/SametradeZW/Successview/Successview",
"component/amount/amount"
],
"window": {
"backgroundTextStyle": "light",
......
component/Search/search.wxml
View file @ 391157bc
......@@ -7,8 +7,9 @@
<view style="color:#CCCCCC">|</view>
<view class="head3" style="width:500rpx">
<image src="../../images/home/search.png"></image>
<input bindtap="ListenInput" style="width:100%" placeholder="搜索目的地/交通/景点/酒店"/>
<input style="width:100%" placeholder="搜索目的地/交通/景点/酒店"/>
</view>
<!-- bindtap="ListenInput" -->
</view>
<view bindtap="CloseCity" data-target="self" class="cityChange" hidden="{{!CitySite}}">
<view class="CityView">
......
pages/freeTravel/freeList/freeList.js 0 → 100644
View file @ 391157bc
// 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 @ 391157bc
{
"navigationBarTitleText": "首页",
"usingComponents": {
"search": "/component/Search/search"
}
}
\ No newline at end of file
pages/freeTravel/freeList/freeList.wxml 0 → 100644
View file @ 391157bc
<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 @ 391157bc
.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 @ 391157bc
......@@ -10,6 +10,11 @@ Page({
lineIndex:0,
lineTeamList:[],
toView:'oneday',
site: {
companyId: app.state.companyId,
cityId: app.state.cityId,
siteName: app.state.siteName,
},
},
/**
......
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