Commit 9a735de5 authored by 黄媛媛's avatar 黄媛媛

11

parent 8aec6819
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
"pages/video/index", "pages/video/index",
"components/emoji/emoji", "components/emoji/emoji",
"components/inputclear/inputclear", "components/inputclear/inputclear",
"components/inputmodal/inputmodal" "components/inputmodal/inputmodal",
"pages/index/tripDay/tripDay"
], ],
"window": { "window": {
"backgroundTextStyle": "light", "backgroundTextStyle": "light",
......
...@@ -26,6 +26,9 @@ ...@@ -26,6 +26,9 @@
.c99{ .c99{
color:#999999; color:#999999;
} }
.c66{
color:#666666;
}
.text1 { .text1 {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
...@@ -41,3 +44,12 @@ ...@@ -41,3 +44,12 @@
-webkit-line-clamp: 2; -webkit-line-clamp: 2;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
} }
.center{
text-align: center;
}
.left{
text-align: left;
}
.right{
text-align: right;
}
\ No newline at end of file
...@@ -27,6 +27,7 @@ Page({ ...@@ -27,6 +27,7 @@ Page({
todayList:[], todayList:[],
contactState:true, contactState:true,
contactInfo:{}, contactInfo:{},
airState:false,
}, },
//事件处理函数 //事件处理函数
bindViewTap: function() { bindViewTap: function() {
...@@ -72,6 +73,12 @@ Page({ ...@@ -72,6 +73,12 @@ Page({
} }
that.getData(); that.getData();
}, },
makePhone(e){
let phone = e.currentTarget.dataset.item.MobilePhone;
wx.makePhoneCall({
phoneNumber: phone,
})
},
closeState(e){ closeState(e){
this.setData({ this.setData({
contactState:true, contactState:true,
...@@ -139,6 +146,7 @@ Page({ ...@@ -139,6 +146,7 @@ Page({
dataInfo:res, dataInfo:res,
todayMsg: todayMsg todayMsg: todayMsg
}) })
console.log("dataInfo", this.data.dataInfo.FlightList)
this.getToday(); this.getToday();
}).catch(err => { }) }).catch(err => { })
}, },
......
...@@ -48,10 +48,10 @@ ...@@ -48,10 +48,10 @@
</scroll-view> </scroll-view>
</view> </view>
<view class="timeView"> <view class="timeView">
<view style="font-size:30rpx;font-weight:700">重要时间</view> <view style="font-size:30rpx;font-weight:700;padding-left:30rpx">重要时间</view>
<swiper class="swiper-box" style="height:240rpx" indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}"> <swiper class="swiper-box" style="height:240rpx" indicator-dots="{{indicatorDots}}" autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}">
<block> <block>
<swiper-item> <swiper-item style="padding: 0 30rpx;box-sizing: border-box;">
<view class="item"> <view class="item">
<view class="itemView"> <view class="itemView">
<image style="width:44rpx;height:44rpx" src="../../images/index/time.png"></image> <image style="width:44rpx;height:44rpx" src="../../images/index/time.png"></image>
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
</swiper-item> </swiper-item>
</block> </block>
<block> <block>
<swiper-item> <swiper-item style="padding: 0 30rpx;box-sizing: border-box;">
<view class="item"> <view class="item">
<!-- <view class="itemView"> <!-- <view class="itemView">
<image style="width:44rpx;height:44rpx" src="../../images/index/time.png"></image> <image style="width:44rpx;height:44rpx" src="../../images/index/time.png"></image>
...@@ -147,6 +147,8 @@ ...@@ -147,6 +147,8 @@
<view class="imgLeft"> <view class="imgLeft">
<image wx:if="{{item.ImgCover && item.ImgCover!=''}}" src="{{item.ImgCover}}"></image> <image wx:if="{{item.ImgCover && item.ImgCover!=''}}" src="{{item.ImgCover}}"></image>
<image wx:else src="../../images/index/default1.png"></image> <image wx:else src="../../images/index/default1.png"></image>
<image class="img1" src="{{item.ImgCover}}"></image>
<image class="img2" src="{{item.ImgCover}}"></image>
</view> </view>
<view class="right"> <view class="right">
<view style="margin-top:10rpx" class="text2 c11 f30">{{item.Name}}</view> <view style="margin-top:10rpx" class="text2 c11 f30">{{item.Name}}</view>
...@@ -206,7 +208,7 @@ ...@@ -206,7 +208,7 @@
<view style="margin:30rpx 0 30rpx 0" class="f32 bold">30</view> <view style="margin:30rpx 0 30rpx 0" class="f32 bold">30</view>
<view wx:if="{{contactInfo.type==3}}" class="f22">报名数量</view> <view wx:if="{{contactInfo.type==3}}" class="f22">报名数量</view>
<view wx:else class="f22">带团次数</view> <view wx:else class="f22">带团次数</view>
<view class="lxView"> <view bindtap="makePhone" data-item="{{contactInfo}}" class="lxView">
<image style="width:30rpx;height:30rpx;position: relative;top:4rpx" src="../../images/index/lx.png"></image> <image style="width:30rpx;height:30rpx;position: relative;top:4rpx" src="../../images/index/lx.png"></image>
联系他 联系他
</view> </view>
...@@ -214,3 +216,27 @@ ...@@ -214,3 +216,27 @@
</view> </view>
</view> </view>
<!-- 航班详情 -->
<view catchtap="closeState" data-self="self" hidden="{{airState}}" class="ContactTc AirTc">
<view catchtap="noThing" data-self="no" class="contentView">
<image class="photo" src="../../images/index/air.png"></image>
<view style="padding-top:85rpx">
<view class="title"><text>去程</text></view>
<view class="fightitem">
<view style="width:120rpx" class="time f32 right">00:35</view>
<view style="width:240rpx;position:relative;top:15rpx" class="hr f22 c66 center">韩亚航空 OZ324(OK)</view>
<view style="width:120rpx" class="time f32 left">00:35</view>
</view>
<view class="fightitem">
<view style="width:120rpx" class="time f24 right ">00:35</view>
<view style="width:240rpx" class="hr f22 c66">
<image style="width:100%;height:8rpx" src="../../images/index/hr.png"></image>
</view>
<view style="width:120rpx" class="time f24 left">00:35</view>
</view>
</view>
</view>
</view>
\ No newline at end of file
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
height: 24rpx; height: 24rpx;
} }
.timeView{ .timeView{
padding: 0 30rpx;
box-sizing: border-box; box-sizing: border-box;
} }
.timeView .item .itemView{ .timeView .item .itemView{
...@@ -213,12 +213,35 @@ ...@@ -213,12 +213,35 @@
border-radius:20rpx; border-radius:20rpx;
} }
.toDayView .ListItem .imgLeft image{ .toDayView .ListItem .imgLeft image{
width: 100%; width:200rpx;
height: 100%; height:260rpx;
z-index: 3;
border-radius:20rpx;
}
.toDayView .ListItem .imgLeft .img1{
position: absolute;
width: 200rpx;
height: 220rpx;
left: 40rpx;
opacity: 0.6;
top: 20rpx;
z-index:-1;
border-radius:20rpx;
}
.toDayView .ListItem .imgLeft .img2{
position: absolute;
width: 200rpx;
height: 180rpx;
left: 66rpx;
opacity: 0.6;
top: 40rpx;
z-index:-2;
border-radius:20rpx;
display: inline-block;
} }
.toDayView .ListItem .right{ .toDayView .ListItem .right{
width: 100%; width: 100%;
padding-left: 230rpx; padding-left: 290rpx;
box-sizing: border-box; box-sizing: border-box;
} }
.toDayView .daka{ .toDayView .daka{
...@@ -304,4 +327,29 @@ ...@@ -304,4 +327,29 @@
margin-left: 15rpx; margin-left: 15rpx;
} }
.AirTc .contentView{
text-align: left;
padding: 0 30rpx;
box-sizing: border-box;
}
.AirTc .contentView .title{
margin-bottom: 15rpx;
}
.AirTc .contentView .title text{
padding: 8rpx 20rpx;
background:rgba(255,49,102,0.3);
border-radius:26rpx;
font-size: 22rpx;
}
.AirTc .contentView .fightitem{
display: flex;
justify-content: space-around;
}
.AirTc .contentView .fightitem>view{
display: inline-block;
}
.AirTc .contentView .fightitem .hr{
padding: 0 10rpx;
box-sizing: border-box;
}
// pages/index/tripDay/tripDay.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
}
})
\ No newline at end of file
{
"usingComponents": {}
}
\ No newline at end of file
<!--pages/index/tripDay/tripDay.wxml-->
<text>pages/index/tripDay/tripDay.wxml</text>
/* pages/index/tripDay/tripDay.wxss */
\ No newline at end of file
...@@ -83,6 +83,12 @@ ...@@ -83,6 +83,12 @@
"pathName": "pages/webview/webview", "pathName": "pages/webview/webview",
"query": "", "query": "",
"scene": null "scene": null
},
{
"id": -1,
"name": "行程概览",
"pathName": "pages/index/tripDay/tripDay",
"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