Skip to content

J
jz_Travel
Commit 9d41d1be authored by 罗超's avatar 罗超
Browse files
Options

修改样式

parent 08659106
Show whitespace changes
Inline Side-by-side
Showing with 78 additions and 46 deletions
asset/css/flex.css
View file @ 9d41d1be
...@@ -173,10 +173,7 @@ ...@@ -173,10 +173,7 @@
left: 0; left: 0;
right: 0; right: 0;
overflow: hidden; overflow: hidden;
-webkit-border-radius: 50rpx 50rpx 0px 0px; border-radius: 20rpx;
-moz-border-radius: 50rpx 50rpx 0px 0px;
-ms-border-radius: 50rpx 50rpx 0px 0px;
-o-border-radius: 50rpx 50rpx 0px 0px;
} }
.relative{ .relative{
position: relative; position: relative;
......
pages.json
View file @ 9d41d1be
...@@ -719,10 +719,9 @@ ...@@ -719,10 +719,9 @@
"navigationBarTitleText": "订单列表" "navigationBarTitleText": "订单列表"
}, },
{ {
"path": "TicketOrderDetails", //机票订单详情 "path": "TicketOrderDetails",
"navigationBarTitleText": "订单详情",
"style": { "style": {
"navigationStyle": "custom" "navigationBarTitleText": "机票订单详情"
} }
}, },
{ {
......
pages/airTicket/TicketOrderDetails.vue
View file @ 9d41d1be
<template> <template>
<view class="TicketOrderDetailsBg height100vh"> <view class="TicketOrderDetailsBg height100vh column">
<scroll-view <scroll-view scroll-y="true" style="box-sizing: border-box;height: 1px;" class="col">
scroll-y="true" <view class="TicketOrderDetailsC overflow" v-if="orderData&&orderData.model">
style="height: 100%; flex: 1; box-sizing: border-box"
@scroll="scroll"
>
<NavigationHeader :title="title" :titleStyle="titleStyle"></NavigationHeader>
<!-- :style="{top:topheight+'px'}" -->
<view class="TicketOrderDetailsC overflow PT123 PB260" v-if="orderData&&orderData.model">
<view class="PX53"> <view class="PX53">
<view class="row-sb-n MT20"> <view class="row-sb-n MT20">
<view class="flexS row-aic-n"> <view class="flexS row-aic-n">
...@@ -64,7 +58,7 @@ ...@@ -64,7 +58,7 @@
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<view class="airTicketDetailsFooter fixedFooter bgFFF fixed z-index2"> <view style="border-radius: 20rpx 20rpx 0 0;" class="airTicketDetailsFooter bgFFF">
<view class="TicketOrderDetailsFooter row-sbs-n" <view class="TicketOrderDetailsFooter row-sbs-n"
v-if="dataModel.OrderState==1||dataModel.OrderState==2||dataModel.OrderState==3"> v-if="dataModel.OrderState==1||dataModel.OrderState==2||dataModel.OrderState==3">
<view v-if="dataModel.OrderState==1||dataModel.OrderState==2||dataModel.OrderState==3" <view v-if="dataModel.OrderState==1||dataModel.OrderState==2||dataModel.OrderState==3"
...@@ -73,12 +67,12 @@ ...@@ -73,12 +67,12 @@
@click="cancelOrder(dataModel)"> @click="cancelOrder(dataModel)">
<text class="fz32">取消订单</text> <text class="fz32">取消订单</text>
</view> </view>
<view v-if="dataModel.OrderState==1||dataModel.OrderState==2" <!-- <view v-if="dataModel.OrderState==1||dataModel.OrderState==2"
class="airTicketDetailsFooter-order row-ajc-w fontBold MR50" class="airTicketDetailsFooter-order row-ajc-w fontBold MR50"
:class="[loading?'bgF5':'bgDEBF7B']" :class="[loading?'bgF5':'bgDEBF7B']"
@click="queren(orderMsg.ID)"> @click="queren(orderMsg.ID)">
<text class="fz32">立即支付</text> <text class="fz32">立即支付</text>
</view> </view> -->
</view> </view>
<view class="TicketOrderDetailsFooter row-ajc-n" v-if="dataModel.OrderState==5||dataModel.OrderState==4"> <view class="TicketOrderDetailsFooter row-ajc-n" v-if="dataModel.OrderState==5||dataModel.OrderState==4">
<view <view
...@@ -139,12 +133,12 @@ ...@@ -139,12 +133,12 @@
class="fz32 relative TicketOrderListCard-PrQx MR20" class="fz32 relative TicketOrderListCard-PrQx MR20"
:class="[loading?'color9999A5':'colorDEBF7B']" :class="[loading?'color9999A5':'colorDEBF7B']"
@click="cancelOrder(dataModel)">取 消</view> @click="cancelOrder(dataModel)">取 消</view>
<view v-if="dataModel.OrderState==1||dataModel.OrderState==2" <!-- <view v-if="dataModel.OrderState==1||dataModel.OrderState==2"
class="airTicketDetailsFooter-order PXY2463 row-ajc-w fontBold" class="airTicketDetailsFooter-order PXY2463 row-ajc-w fontBold"
:class="[loading?'bgF5':'bgDEBF7B']" :class="[loading?'bgF5':'bgDEBF7B']"
@click="queren(orderMsg.ID)"> @click="queren(orderMsg.ID)">
<text class="fz32">立即支付</text> <text class="fz32">立即支付</text>
</view> </view> -->
<view v-if="dataModel.OrderState==5||dataModel.OrderState==4" <view v-if="dataModel.OrderState==5||dataModel.OrderState==4"
class="airTicketDetailsFooter-order PXY2463 row-ajc-w fontBold bgDEBF7B borderDEBF7B" class="airTicketDetailsFooter-order PXY2463 row-ajc-w fontBold bgDEBF7B borderDEBF7B"
@click="goUndOrder(dataModel.TCID)"> @click="goUndOrder(dataModel.TCID)">
...@@ -195,6 +189,10 @@ ...@@ -195,6 +189,10 @@
} }
}, },
onLoad(options){ onLoad(options){
uni.setNavigationBarColor({
backgroundColor: '#ECDFC4',
frontColor:'#000000'
})
this.orderMsg.ID = options.orderId this.orderMsg.ID = options.orderId
this.getOrderDetails() this.getOrderDetails()
let that = this; let that = this;
...@@ -216,7 +214,7 @@ ...@@ -216,7 +214,7 @@
methods: { methods: {
goUndOrder(TCID){ goUndOrder(TCID){
uni.navigateTo({ uni.navigateTo({
url: `/pages/airTicket/airTicketDetails?TCID=${TCID}&Price=${this.dataModel.Unit_Price}` url: '/pages/airTicket/airIndex'
}); });
}, },
TicketDetails(){ TicketDetails(){
...@@ -564,17 +562,7 @@ ...@@ -564,17 +562,7 @@
}); });
}, },
}); });
}, }
scroll(e) {
this.boxOption = Math.floor((e.detail.scrollTop - 50) / 1.5);
this.titleStyle.opacity =
e.detail.scrollTop - 100 < 0
? 0
: Math.floor(e.detail.scrollTop - 100) / 100 > 1
? 1
: 1;//Math.floor(e.detail.scrollTop - 100) / 10
this.$forceUpdate();
},
} }
} }
</script> </script>
...@@ -602,7 +590,9 @@ ...@@ -602,7 +590,9 @@
margin-bottom: 0; margin-bottom: 0;
} }
.TicketOrderDetailsFooter{ .TicketOrderDetailsFooter{
padding: 38rpx 0 67rpx 0; padding: 20rpx 0;
padding-bottom: calc(10rpx + constant(safe-area-inset-bottom));
padding-bottom: calc(10rpx + env(safe-area-inset-bottom));
} }
.TicketOrderDetailsGet-box{ .TicketOrderDetailsGet-box{
margin: 46rpx 53rpx 51rpx 53rpx; margin: 46rpx 53rpx 51rpx 53rpx;
......
pages/airTicket/airIndex.vue
View file @ 9d41d1be
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<u-empty mode="data"></u-empty> <u-empty mode="data"></u-empty>
</view> </view>
<view v-else> <view v-else>
<view class="row items-center q-mb-md" v-for="(x,i) in lowData" :key="i"> <view class="row items-center q-mb-md" @click="openFlightHandle(x,0)" v-for="(x,i) in lowData" :key="i">
<image style="width: 160rpx;height: 186rpx;border-radius: 14rpx;" :src="`https://pic.c-ctrip.com/flight/fuzzy/${x.ArrivalCityCode}/640.jpg`" mode="aspectFill"></image> <image style="width: 160rpx;height: 186rpx;border-radius: 14rpx;" :src="`https://pic.c-ctrip.com/flight/fuzzy/${x.ArrivalCityCode}/640.jpg`" mode="aspectFill"></image>
<view class="city-list-item col"> <view class="city-list-item col">
<view class="row"> <view class="row">
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<image style="width: 30rpx;" :src="`https://static.tripcdn.com/packages/flight/airline-logo/latest/airline/48/${x.Flight.AlCode}.png`" mode="widthFix"></image> <image style="width: 30rpx;" :src="`https://static.tripcdn.com/packages/flight/airline-logo/latest/airline/48/${x.Flight.AlCode}.png`" mode="widthFix"></image>
<view class="info-text q-ml-sm"> <view class="info-text q-ml-sm">
<text>{{ x.Flight.AirLineName }}</text> <text>{{ x.Flight.AirLineName }}</text>
<text class="q-ml-md">{{x.Flight.FlightDate.split('-').splice(0,1).join('-')}} {{x.Flight.WeekDayStr}}</text> <text class="q-ml-md">{{x.Flight.FlightDate.split('-').splice(1,2).join('-')}} {{x.Flight.WeekDayStr}}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<text style="color:#FF3166;font-size: 22rpx;">¥</text> <text style="color:#FF3166;font-size: 22rpx;">¥</text>
<text style="font-size: 32rpx;font-weight: bold;color:#FF3166;">{{x.Flight.B2BPrice}}</text> <text style="font-size: 32rpx;font-weight: bold;color:#FF3166;">{{x.Flight.B2BPrice}}</text>
</view> </view>
<view class="more-date">更多日期</view> <view class="more-date" @click="openFlightHandle(x,1)">更多日期</view>
</view> </view>
</view> </view>
</view> </view>
...@@ -195,6 +195,43 @@ ...@@ -195,6 +195,43 @@
}) })
} }
}, },
openFlightHandle(x,t){
const d=[
{
type:0,
ID:x.DepartureCity,
Name:x.DepartureName
},
{
type:1,
ID:x.ArrivalCityId,
Name:x.ArrivalCityName
}
]
const dr={
type:0,
startDate:'',
fuzzy:{
fuzzyType:-2,
fuzzyTypeName:'未来三个月',
weeks:[],
dayRangStatus:false,
dayRange:[4,10]
},
formatStartDate:'未来三个月'
}
uni.setStorageSync('scf',{
cities:d,
dateRange: dr
})
let url = '/pages/airTicket/ticketList/ticketList'
if(t==0){
url+=`?dv=${encodeURIComponent(x.Flight.FlightDate)}`
}
uni.navigateTo({
url
})
},
async getContainerWidth() { async getContainerWidth() {
const width = await this.getDomWidthAsync(".toolsContainer"); const width = await this.getDomWidthAsync(".toolsContainer");
this.containerWidth = width-18; this.containerWidth = width-18;
...@@ -219,6 +256,10 @@ ...@@ -219,6 +256,10 @@
},(e)=>{ },(e)=>{
this.loadingLow = false this.loadingLow = false
}) })
uni.setStorageSync('scf',{
cities:this.chosenResult,
dateRange: this.dateRangeValue
})
}, },
formatLowData(d){ formatLowData(d){
d.forEach((x)=>{ d.forEach((x)=>{
......
pages/airTicket/components/TicketOrderList.vue
View file @ 9d41d1be
...@@ -39,9 +39,10 @@ ...@@ -39,9 +39,10 @@
</view> </view>
</view> </view>
<view :style="{'height':!childs.frequency&&!childs.duration?'79rpx':''}"> <view :style="{'height':!childs.frequency&&!childs.duration?'79rpx':''}">
<text class="fz19 textCenter width100 ellipsis1 relative relativeFT8"> <!-- <text class="fz19 textCenter width100 ellipsis1 relative relativeFT8">
{{childs.departureName}} {{childs.arrivalCityName}} {{childs.departureName}} {{childs.arrivalCityName}}
</text> </text> -->
<text style="color: transparent;">&nbsp;1</text>
</view> </view>
</view> </view>
<view class="FlightDirection-line absolute row-aic-n"> <view class="FlightDirection-line absolute row-aic-n">
...@@ -322,8 +323,8 @@ ...@@ -322,8 +323,8 @@
@import url("@/asset/css/flex.css"); @import url("@/asset/css/flex.css");
@import url("../style.css"); @import url("../style.css");
.TicketOrderListCard{ .TicketOrderListCard{
border-radius: 50rpx; border-radius: 18rpx;
padding: 27rpx 39rpx 34rpx 50rpx; padding: 26rpx 36rpx;
margin-bottom: 40rpx; margin-bottom: 40rpx;
} }
.TicketOrderListCard-wf{ .TicketOrderListCard-wf{
......
pages/airTicket/ticketList/ticketList.vue
View file @ 9d41d1be
...@@ -69,7 +69,9 @@ ...@@ -69,7 +69,9 @@
</view> </view>
<view class="line">&nbsp;</view> <view class="line">&nbsp;</view>
<view class="t-cities" v-if="x.GoFlightList.length>1"> <view class="t-cities" v-if="x.GoFlightList.length>1">
<text v-for="(c,ci) in x.GoFlightList" :key="ci">{{ci==0?c.ArrivalCityName:c.DepartureName}} </text> <template v-for="(c,ci) in x.BackFlightList">
<text :key="ci" v-if="ci>0" style="margin-right: 6rpx;">{{c.DepartureName}}</text>
</template>
</view> </view>
</view> </view>
<view class="flight-time"> <view class="flight-time">
...@@ -85,7 +87,7 @@ ...@@ -85,7 +87,7 @@
<view class="login-box"> <view class="login-box">
<image :src="`https://static.tripcdn.com/packages/flight/airline-logo/latest/airline/48/${a.AlCode}.png`" mode="widthFix"></image> <image :src="`https://static.tripcdn.com/packages/flight/airline-logo/latest/airline/48/${a.AlCode}.png`" mode="widthFix"></image>
</view> </view>
<text class="login-text">{{a.AlName}}{{a.Flight_number}} </text> <text class="login-text">{{a.Flight_number}} </text>
</view> </view>
</view> </view>
</view> </view>
...@@ -105,7 +107,9 @@ ...@@ -105,7 +107,9 @@
</view> </view>
<view class="line">&nbsp;</view> <view class="line">&nbsp;</view>
<view class="t-cities" v-if="x.BackFlightList.length>1"> <view class="t-cities" v-if="x.BackFlightList.length>1">
<text v-for="(c,ci) in x.BackFlightList" :key="ci">{{ci==0?c.ArrivalCityName:c.DepartureName}} </text> <template v-for="(c,ci) in x.BackFlightList">
<text v-if="ci>0" :key="ci" style="margin-right: 6rpx;">{{c.DepartureName}}</text>
</template>
</view> </view>
</view> </view>
<view class="flight-time"> <view class="flight-time">
...@@ -121,7 +125,7 @@ ...@@ -121,7 +125,7 @@
<view class="login-box"> <view class="login-box">
<image :src="`https://static.tripcdn.com/packages/flight/airline-logo/latest/airline/48/${a.AlCode}.png`" mode="widthFix"></image> <image :src="`https://static.tripcdn.com/packages/flight/airline-logo/latest/airline/48/${a.AlCode}.png`" mode="widthFix"></image>
</view> </view>
<text class="login-text">{{a.AlName}}{{a.Flight_number}} </text> <text class="login-text">{{a.Flight_number}} </text>
</view> </view>
</view> </view>
</view> </view>
......
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