Skip to content

T
TripFriend
Commit 983176f8 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

update

parent d9d442f7
Hide whitespace changes
Inline Side-by-side
Showing with 435 additions and 44 deletions
app.json
View file @ 983176f8
......@@ -12,7 +12,9 @@
"components/emoji/emoji",
"components/inputclear/inputclear",
"components/inputmodal/inputmodal",
"pages/index/tripDay/tripDay"
"pages/index/tripDay/tripDay",
"pages/index/sceneDetail/sceneDetail",
"pages/index/hotelDetails/hotelDetails"
],
"window": {
"backgroundTextStyle": "light",
......
app.wxss
View file @ 983176f8
......@@ -8,15 +8,27 @@
padding: 200rpx 0;
box-sizing: border-box;
}
.f42{
font-size: 42rpx;
}
.f40{
font-size: 40rpx;
}
.f30{
font-size: 30rpx;
}
.f20{
font-size: 20rpx;
}
.f24{
font-size: 24rpx;
}
.f26{
font-size: 26rpx;
}
.f28{
font-size: 28rpx;
}
.f22{
font-size: 22rpx;
}
......
pages/index/hotelDetails/hotelDetails.js 0 → 100644
View file @ 983176f8
// pages/index/hotelDetails/hotelDetails.js
const app = getApp()
Page({
/**
* 页面的初始数据
*/
data: {
msg:{
Id:'2499',
Type:4,
GuestId:'37284'
},
dataInfo:{},
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log("options",options)
if (options.GuestId){
let msg = this.data.msg;
msg.GuestId = options.GuestId;
msg.Id = options.Id;
this.setData({
msg: msg
})
}
this.getData();
},
getData(){
let msg = this.data.msg;
app.$api('b2b_get_GetMXYToDayTourInfo', msg).then(res => {
console.log("sfdasf",res)
this.setData({
dataInfo:res
})
}).catch(err => { })
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/index/hotelDetails/hotelDetails.json 0 → 100644
View file @ 983176f8
{
"usingComponents": {},
"navigationBarTitleText": "详情",
"navigationStyle": "default"
}
\ No newline at end of file
pages/index/hotelDetails/hotelDetails.wxml 0 → 100644
View file @ 983176f8
<view class="sceneDetail">
<view class="item" style="padding: 0 30rpx;box-sizing: border-box;">
<!-- <view class="index f30 bold">景点一</view> -->
<view style="position:relative" class="f42 bold">{{dataInfo.Name}}
<view class="dkBtn">
<text>打卡</text>
</view>
</view>
<view class="dakaView">
<view>
<image style="width:40rpx;height:40rpx" src="../../../images/index/adress.png"></image>
<text style="position:relative;top:-6rpx;margin-left:10rpx" class="f26">{{dataInfo.Address}}</text>
</view>
</view>
<view wx:for="{{dataInfo.ImageList}}" wx:key="index" style="margin:20rpx 0 20rpx 0">
<image wx:if="item" style="width:100%" src="{{item}}"></image>
<image wx:else style="width:100%" src="../../../images/index/default.png"></image>
</view>
<view style="padding-bottom: 20rpx;" class="f28">
{{dataInfo.Descriptions}}
</view>
</view>
<!-- <view class="funView">
<image style="width:26rpx;height:26rpx" src="../../../images/index/jh.png"></image>
展开
</view> -->
</view>
\ No newline at end of file
pages/index/hotelDetails/hotelDetails.wxss 0 → 100644
View file @ 983176f8
.sceneDetail{
width: 100%;
background: #FAFAFA;
}
.sceneDetail .item{
background: #fff;
margin-bottom: 20rpx;
}
.sceneDetail:last-child .item{
margin-bottom: 0;
}
.dakaView{
display: flex;
justify-content: space-between;
margin-top: 35rpx;
align-items: center;
}
.dakaView>view{
display: inline-block;
}
.dkBtn{
position: absolute;
right: 0;
top: 0;
}
.dkBtn text{
display: inline-block;
width:128rpx;
height:50rpx;
line-height:50rpx;
background:rgba(255,255,255,1);
border:2rpx solid rgba(255, 49, 102, 1);
border-radius:25rpx;
text-align: center;
color:#FF3166;
font-size: 24rpx;
}
.funView{
border-top: 1px solid #E2E2E2;
height:90rpx;
line-height:90rpx;
text-align: center;
font-size: 30rpx;
}
\ No newline at end of file
pages/index/index.js
View file @ 983176f8
......@@ -21,7 +21,7 @@ Page({
ConfigId:0,
TCID:'',
// Date: util.YYMMDD(new Date()),
Date: '2019-11 - 02',
Date: '2019-11-03',
},
todayList:[],
......@@ -75,10 +75,26 @@ Page({
}
that.getData();
},
goDetail(e){
let that = this;
let userInfo = (wx.getStorageSync('userInfo'))
if (!userInfo){
util.showToast('text', '请先核对身份！', { duration: 3000 })
return;
}
let info = e.currentTarget.dataset.item;
let Id = info.Id;
let GuestId = userInfo.GuestId;
if (info.Type==4){
wx.navigateTo({
url: '/pages/index/hotelDetails/hotelDetails?GuestId=' + GuestId + '&Id=' + Id
})
}
},
tripDay(e){
let that=this;
let info = e.currentTarget.dataset.item;
console.log("info",info)
wx.navigateTo({
url: '/pages/index/tripDay/tripDay?ConfigId=' + that.data.configId + "&TCID=" + that.data.tcid + "&DayNum=" + info.DayNum
})
......
pages/index/index.wxml
View file @ 983176f8
......@@ -143,7 +143,7 @@
<!-- 今日游玩 -->
<view class="toDayView">
<view style="font-size:30rpx;font-weight:700;padding-left:30rpx">今日游玩</view>
<view wx:for="{{todayList}}" wx:key="index" class="ListItem">
<view bindtap="goDetail" data-item="{{item}}" wx:for="{{todayList}}" wx:key="index" class="ListItem">
<view class="imgLeft">
<image wx:if="{{item.ImgCover && item.ImgCover!=''}}" src="{{item.ImgCover}}"></image>
<image wx:else src="../../images/index/default1.png"></image>
......@@ -221,7 +221,7 @@
<view catchtap="noThing" data-self="no" class="contentView1">
<image class="photo" src="../../images/index/air.png"></image>
<view class="Content" style="padding-top:85rpx">
<view wx:for="{{dataInfo.FlightList}}" wx:key="index">
<view style="margin-bottom:20rpx" wx:for="{{dataInfo.FlightList}}" wx:key="index">
<view class="title">
<text>{{item.FlightDate}}</text>
</view>
......
pages/index/index.wxss
View file @ 983176f8
......@@ -331,7 +331,7 @@
}
.AirTc .contentView1{
text-align: left;
padding: 0 30rpx;
box-sizing: border-box;
background:rgba(255,255,255,1);
border-radius:20rpx;
......@@ -347,8 +347,11 @@
z-index: 100000;
}
.AirTc .contentView1 .Content{
height:574rpx;
height:650rpx;
overflow: scroll;
padding: 0 30rpx;
width: 100%;
box-sizing: border-box;
}
.AirTc .contentView1 .title{
margin-bottom: 15rpx;
......
pages/index/sceneDetail/sceneDetail.js 0 → 100644
View file @ 983176f8
// pages/index/sceneDetail/sceneDetail.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
console.log("options", options)
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
pages/index/sceneDetail/sceneDetail.json 0 → 100644
View file @ 983176f8
{
"usingComponents": {},
"navigationBarTitleText": "详情",
"navigationStyle": "default"
}
\ No newline at end of file
pages/index/sceneDetail/sceneDetail.wxml 0 → 100644
View file @ 983176f8
<view class="sceneDetail">
<view class="item" style="padding: 0 30rpx;box-sizing: border-box;">
<view class="index f30 bold">景点一</view>
<view class="f42 bold">六本木之丘森大樓52F TokyoCityVie w展望台（夜景）
</view>
<view class="dakaView">
<view>
<image style="width:40rpx;height:40rpx" src="../../../images/index/adress.png"></image>
<text style="position:relative;top:-6rpx;margin-left:10rpx" class="f26">日本.东京</text>
</view>
<view class="dkBtn">
<text>打卡</text>
</view>
</view>
<view style="margin:40rpx 0 30rpx 0">
<image style="width:100%" src="../../../images/index/default.png"></image>
</view>
<view style="padding-bottom: 20rpx;" class="f28">
我发现其实我没有单篇文章好好的写过六本木之丘，森大楼顶端的展望台(Tokyo City View) 这个景点。来分夜景和日景介绍一番吧。从2004年到现在，我应该已经上去不下五次了。本篇照的比较好的六张是网友尼克的大作啦，很感谢他。照片出自 [尼克的东京自助摄影旅行;东京铁塔与六本木之丘夜景] 。如果要我推荐东京只去一个景点，比方说跟团有一天可以自由行动，我就会推荐这里。
</view>
</view>
<view class="item" style="padding: 0 30rpx;box-sizing: border-box;">
<view class="index f30 bold">景点一</view>
<view class="f42 bold">六本木之丘森大樓52F TokyoCityVie w展望台（夜景）
</view>
<view class="dakaView">
<view>
<image style="width:40rpx;height:40rpx" src="../../../images/index/adress.png"></image>
<text style="position:relative;top:-6rpx;margin-left:10rpx" class="f26">日本.东京</text>
</view>
<view class="dkBtn">
<text>打卡</text>
</view>
</view>
<view style="margin:40rpx 0 30rpx 0">
<image style="width:100%" src="../../../images/index/default.png"></image>
</view>
<view style="padding-bottom: 20rpx;" class="f28">
我发现其实我没有单篇文章好好的写过六本木之丘，森大楼顶端的展望台(Tokyo City View) 这个景点。来分夜景和日景介绍一番吧。从2004年到现在，我应该已经上去不下五次了。本篇照的比较好的六张是网友尼克的大作啦，很感谢他。照片出自 [尼克的东京自助摄影旅行;东京铁塔与六本木之丘夜景] 。如果要我推荐东京只去一个景点，比方说跟团有一天可以自由行动，我就会推荐这里。
</view>
</view>
<view class="funView">
<image style="width:26rpx;height:26rpx" src="../../../images/index/jh.png"></image>
展开
</view>
</view>
\ No newline at end of file
pages/index/sceneDetail/sceneDetail.wxss 0 → 100644
View file @ 983176f8
.sceneDetail{
width: 100%;
background: #FAFAFA;
}
.sceneDetail .item{
background: #fff;
margin-bottom: 20rpx;
}
.sceneDetail:last-child .item{
margin-bottom: 0;
}
.dakaView{
display: flex;
justify-content: space-between;
margin-top: 35rpx;
align-items: center;
}
.dakaView>view{
display: inline-block;
}
.dkBtn text{
display: inline-block;
width:128rpx;
height:50rpx;
line-height:50rpx;
background:rgba(255,255,255,1);
border:2rpx solid rgba(255, 49, 102, 1);
border-radius:25rpx;
text-align: center;
color:#FF3166;
font-size: 24rpx;
}
.funView{
border-top: 1px solid #E2E2E2;
height:90rpx;
line-height:90rpx;
text-align: center;
font-size: 30rpx;
}
\ No newline at end of file
pages/index/tripDay/tripDay.js
View file @ 983176f8
......@@ -8,10 +8,11 @@ Page({
data: {
msg:{
ConfigId:'4265',
DayNum:'1',
DayNum:'2',
TCID:'7003',
},
dataInfo:{},
dayInfo:{},
},
/**
......@@ -34,10 +35,36 @@ Page({
getData(){
let msg=this.data.msg
app.$api('b2b_get_GetMXYTravelJourneyInfo', msg ).then(res => {
let dayInfo={
titleList:[],
scenList:[],
warnList:[],
mealList:[],
hotelList:[],
};
res.dayArray.forEach(item=>{
if (item.Type && item.Type==7){
dayInfo.titleList.push(item);
}
if (item.Type && item.Type == 2) {
dayInfo.scenList.push(item);
}
if (item.Type && item.Type == 6) {
dayInfo.warnList.push(item);
}
if (item.Type && item.Type == 4) {
dayInfo.mealList.push(item);
}
if (item.Type && item.Type == 3) {
dayInfo.hotelList.push(item);
}
})
this.setData({
dataInfo:res
dataInfo:res,
dayInfo: dayInfo
})
console.log("dataInfo", this.data.dataInfo)
console.log("dayInfo", dayInfo)
}).catch(err => { })
},
/**
......
pages/index/tripDay/tripDay.wxml
View file @ 983176f8
<view class="tripDay">
<view class="title">
<text class="f32">第{{dataInfo.dayNum}}天</text>
<!-- <text class="f22">2020-03-11</text> -->
<text class="f22">{{dataInfo.nowDate}}</text>
</view>
<view wx:for="{{dataInfo.dayArray}}" wx:key="index" class="content">
<view wx:if="{{item.Type==1}}" class="common head f24">
<text class="circle"></text>
<view class="bold">交通</view>
<view style="margin-top:12rpx" wx:if="{{item.childItem.SubTraffic}}">
<view wx:for="{{item.childItem.SubTraffic}}" wx:for-item="trac" wx:key="index">
<text>{{trac.StartCityName}}</text>
<text style="margin:0 15rpx">至</text>
<text>{{trac.ArrivalCityName}}</text>
</view>
</view>
</view>
<view wx:if="{{item.Type==7}}" class="common head f24">
<view class="content">
<view wx:for="{{dayInfo.titleList}}" wx:key="index" class="common head f24">
<text class="circle"></text>
<view class="bold">{{item.childItem.Title}}</view>
</view>
<view wx:if="{{item.Type==2}}" class="common head f24">
<view wx:for="{{dayInfo.scenList}}" wx:key="index" class="common head f24">
<text class="circle"></text>
<view>
<text class="f22 c99">景点</text>
......@@ -35,36 +25,41 @@
{{item.childItem.Description}}
</view>
</view>
<view wx:if="{{item.Type==3}}" class="common head f24">
<text class="circle"></text>
<view>
<text class="f22 c99">住宿</text>
<text style="margin:0 6rpx 0 30rpx" class="f26 bold">{{item.childItem.NewHotelName}}</text>
</view>
<view wx:for="{{item.childItem.ImaArray}}" wx:key="index" wx:for-item="img" class="img">
<image wx:if="{{img.Url && img.Url!=''}}" src="{{img.Url}}"></image>
<image wx:else src="../../../images/index/default.png"></image>
</view>
<view style="margin-top:15rpx">
{{item.childItem.HotelNewDescriptionText}}
</view>
</view>
<view wx:if="{{item.Type==6}}" class="common head f24">
<!-- <text class="circle"></text> -->
<view wx:for="{{dayInfo.warnList}}" wx:key="index" class="common head f24">
<view class="bold" style="color:#FF3166">温馨提示</view>
<view style="margin-top:15rpx">
<rich-text nodes="{{item.childItem.Description}}"></rich-text>
</view>
</view>
<view wx:if="{{item.Type==4}}" class="common head f24">
<view wx:if="{{dayInfo.mealList.length}}" class="common head f24">
<text class="circle"></text>
<view>
<text class="f22 c99">餐饮</text>
<text style="margin:0 6rpx 0 30rpx" class="f26 bold">
{{item.childItem.DinnerName}}
</text>
<view wx:for="{{dayInfo.mealList}}" wx:key="index" style="margin:10rpx 0 0 0rpx" class="f26">
<text wx:if="{{item.childItem.UseDinnerType=='1'}}">早餐：{{item.childItem.DinnerName}}</text>
<text wx:if="{{item.childItem.UseDinnerType=='2'}}">午餐：{{item.childItem.DinnerName}}</text>
<text wx:if="{{item.childItem.UseDinnerType=='3'}}">晚餐：{{item.childItem.DinnerName}}</text>
</view>
</view>
</view>
<view wx:for="{{dayInfo.hotelList}}" wx:key="index" class="common head f24">
<text class="circle"></text>
<view>
<text class="f22 c99">酒店</text>
<text style="margin:0 6rpx 0 30rpx" class="f26 bold">{{item.childItem.NewHotelName}}</text>
</view>
<!-- <view wx:for="{{item.childItem.ImaArray}}" wx:key="index" wx:for-item="img" class="img">
<image wx:if="{{img.Url && img.Url!=''}}" src="{{img.Url}}"></image>
<image wx:else src="../../../images/index/default.png"></image>
</view>
<view style="margin-top:15rpx">
{{item.childItem.HotelNewDescriptionText}}
</view> -->
</view>
</view>
......
project.config.json
View file @ 983176f8
......@@ -88,6 +88,20 @@
"id": -1,
"name": "行程概览",
"pathName": "pages/index/tripDay/tripDay",
"query": "",
"scene": null
},
{
"id": -1,
"name": "景点详情",
"pathName": "pages/index/sceneDetail/sceneDetail",
"query": "",
"scene": null
},
{
"id": -1,
"name": "酒店详情",
"pathName": "pages/index/hotelDetails/hotelDetails",
"scene": null
}
]
......
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