Skip to content

J
jz_Travel
Commit a53b03dc authored by 18224442217's avatar 18224442217
Browse files
Options

no message

parent b337277c
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 24 deletions
pages/airTicket/TicketOrderDetails.vue
View file @ a53b03dc
...@@ -407,18 +407,25 @@ ...@@ -407,18 +407,25 @@
x.time = '' x.time = ''
x.week = '' x.week = ''
x.duration = '' x.duration = ''
x.frequency = 0
x.show = true x.show = true
}); });
} }
arr(res.data.FlightList) arr(res.data.FlightList)
this.DetailsList = res.data.FlightList this.DetailsList = res.data.FlightList
this.DetailsList = res.data.FlightList
let FlightListZ =this.DetailsList.filter(z=>{
return z.FlightSubType!=3
})
let FlightListZ2 = this.DetailsList.filter(z=>{
return z.FlightSubType==3
})
this.DetailsList.forEach(y=>{ this.DetailsList.forEach(y=>{
let date = y.FlightDate.split('-') let date = y.FlightDate.split('-')
y.time = `${date[1]}-${date[2]}` y.time = `${date[1]}-${date[2]}`
y.week = getDateWeek(y.FlightDate) y.week = getDateWeek(y.FlightDate)
y.duration = `${y.DepartureTime.Days>0?y.DepartureTime.Days+'d ':''}${y.DepartureTime.Hours>0?y.DepartureTime.Hours+'h ':''}${y.DepartureTime.Minutes>0?y.DepartureTime.Minutes+'m ':''}` y.duration = `${y.DepartureTime.Days>0?y.DepartureTime.Days+'d ':''}${y.DepartureTime.Hours>0?y.DepartureTime.Hours+'h ':''}${y.DepartureTime.Minutes>0?y.DepartureTime.Minutes+'m ':''}`
y.frequency = this.DetailsList.length-2>1?this.DetailsList.length-2:0
}) })
let FlightList = [] let FlightList = []
let NewFlightList = [] let NewFlightList = []
...@@ -447,6 +454,7 @@ ...@@ -447,6 +454,7 @@
let obj = { let obj = {
FlightList: FlightList, FlightList: FlightList,
NewFlightList: NewFlightList, NewFlightList: NewFlightList,
frequency: FlightListZ.length-1,
...this.DetailsList[0] ...this.DetailsList[0]
} }
this.NewDetailsList.push(obj) this.NewDetailsList.push(obj)
...@@ -456,6 +464,7 @@ ...@@ -456,6 +464,7 @@
let obj = { let obj = {
FlightList: FlightList2, FlightList: FlightList2,
NewFlightList: NewFlightList2, NewFlightList: NewFlightList2,
frequency: FlightListZ2.length-1,
...this.DetailsList[this.DetailsList.length-1] ...this.DetailsList[this.DetailsList.length-1]
} }
this.NewDetailsList.push(obj) this.NewDetailsList.push(obj)
......
pages/airTicket/TicketOrderList.vue
View file @ a53b03dc
...@@ -110,7 +110,6 @@ ...@@ -110,7 +110,6 @@
x.week = '' x.week = ''
x.duration = '' x.duration = ''
x.frequency = 0 x.frequency = 0
x.frequencyA = 0
x.different = 0 //是否异地 x.different = 0 //是否异地
x.NewFlightList = [] x.NewFlightList = []
x.loading = false x.loading = false
...@@ -121,7 +120,6 @@ ...@@ -121,7 +120,6 @@
arr(x.flightList) arr(x.flightList)
}) })
res.data.pageData.forEach(x=>{ res.data.pageData.forEach(x=>{
if(x.flightList.length>2){ if(x.flightList.length>2){
x.different = 1 x.different = 1
} }
...@@ -132,26 +130,18 @@ ...@@ -132,26 +130,18 @@
let FlightList2 = x.flightList.filter(z=>{ let FlightList2 = x.flightList.filter(z=>{
return z.flightSubType==3 return z.flightSubType==3
}) })
x.frequency = FlightList.length-1
x.frequencyA = FlightList2.length-1
x.flightList.forEach((y,index)=>{
if(y.flightSubType!=3&&x.flightList.length>2){ x.flightList.forEach((y,index)=>{
x.frequency+=1
}
if(y.flightSubType==3){
x.frequencyA+=1
}
let date = y.flightDate.split('-') let date = y.flightDate.split('-')
y.time = `${date[1]}-${date[2]}` y.time = `${date[1]}-${date[2]}`
y.week = getDateWeek(y.flightDate) y.week = getDateWeek(y.flightDate)
if(index==0){ if(index==0){
y.frequency = x.frequency y.frequency = FlightList.length-1
y.duration = `${x.departureTime.days>0?x.departureTime.days+'d ':''}${x.departureTime.hours>0?x.departureTime.hours+'h ':''}${x.departureTime.minutes>0?x.departureTime.minutes+'m ':''}` y.duration = `${x.departureTime.days>0?x.departureTime.days+'d ':''}${x.departureTime.hours>0?x.departureTime.hours+'h ':''}${x.departureTime.minutes>0?x.departureTime.minutes+'m ':''}`
x.NewFlightList.push(y) x.NewFlightList.push(y)
} }
if(x.flightList.length-1==index){ if(x.flightList.length-1==index){
y.frequency = x.frequencyA y.frequency = FlightList2.length-1
y.duration = `${x.arrivalTime.days>0?x.arrivalTime.days+'d ':''}${x.arrivalTime.hours>0?x.arrivalTime.hours+'h ':''}${x.arrivalTime.minutes>0?x.arrivalTime.minutes+'m ':''}` y.duration = `${x.arrivalTime.days>0?x.arrivalTime.days+'d ':''}${x.arrivalTime.hours>0?x.arrivalTime.hours+'h ':''}${x.arrivalTime.minutes>0?x.arrivalTime.minutes+'m ':''}`
x.NewFlightList.push(y) x.NewFlightList.push(y)
} }
...@@ -164,6 +154,7 @@ ...@@ -164,6 +154,7 @@
this.dataList = this.dataList.concat(res.data.pageData); this.dataList = this.dataList.concat(res.data.pageData);
} }
this.pageCount = res.data.pageCount; this.pageCount = res.data.pageCount;
if(this.pageCount==1) this.status = "nomore";
} }
uni.hideLoading() uni.hideLoading()
} }
......
pages/airTicket/airTicketDetails.vue
View file @ a53b03dc
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<text>已选： <text>已选：
<!-- {{orderMsg.GuestNum}} <text class="fz22">人</text> --> <!-- {{orderMsg.GuestNum}} <text class="fz22">人</text> -->
</text> </text>
<text class="ML30" v-if="orderMsg.ManNum>0">{{orderMsg.ManNum}} <text class="fz22">成人</text></text> <text v-if="orderMsg.ManNum>0">{{orderMsg.ManNum}} <text class="fz22">成人</text></text>
<text class="ML30" v-if="orderMsg.BabyNum>0">{{orderMsg.BabyNum}} <text class="fz22">婴儿</text></text> <text class="ML30" v-if="orderMsg.BabyNum>0">{{orderMsg.BabyNum}} <text class="fz22">婴儿</text></text>
<text class="ML30" v-if="orderMsg.ChirdNum>0">{{orderMsg.ChirdNum}} <text class="fz22">儿童</text></text> <text class="ML30" v-if="orderMsg.ChirdNum>0">{{orderMsg.ChirdNum}} <text class="fz22">儿童</text></text>
</view> </view>
...@@ -455,16 +455,29 @@ ...@@ -455,16 +455,29 @@
} }
arr(res.data.FlightList) arr(res.data.FlightList)
this.DetailsList = res.data.FlightList this.DetailsList = res.data.FlightList
let FlightListZ =this.DetailsList.filter(z=>{
return z.FlightSubType!=3
})
let FlightListZ2 = this.DetailsList.filter(z=>{
return z.FlightSubType==3
})
this.DetailsList.forEach((y,index)=>{ this.DetailsList.forEach((y,index)=>{
let date = y.FlightDate.split('-') let date = y.FlightDate.split('-')
y.time = `${date[1]}-${date[2]}` y.time = `${date[1]}-${date[2]}`
y.week = getDateWeek(y.FlightDate) y.week = getDateWeek(y.FlightDate)
if(index){ if(index){
y.frequency = FlightListZ2.length-1
y.duration = `${y.ArrivalTime.Days>0?y.ArrivalTime.Days+'d ':''}${y.ArrivalTime.Hours>0?y.ArrivalTime.Hours+'h ':''}${y.ArrivalTime.Minutes>0?y.ArrivalTime.Minutes+'m ':''}` y.duration = `${y.ArrivalTime.Days>0?y.ArrivalTime.Days+'d ':''}${y.ArrivalTime.Hours>0?y.ArrivalTime.Hours+'h ':''}${y.ArrivalTime.Minutes>0?y.ArrivalTime.Minutes+'m ':''}`
}else{ }else{
y.frequency = FlightListZ.length-1
y.duration = `${y.DepartureTime.Days>0?y.DepartureTime.Days+'d ':''}${y.DepartureTime.Hours>0?y.DepartureTime.Hours+'h ':''}${y.DepartureTime.Minutes>0?y.DepartureTime.Minutes+'m ':''}` y.duration = `${y.DepartureTime.Days>0?y.DepartureTime.Days+'d ':''}${y.DepartureTime.Hours>0?y.DepartureTime.Hours+'h ':''}${y.DepartureTime.Minutes>0?y.DepartureTime.Minutes+'m ':''}`
} }
}) })
let FlightList = [] let FlightList = []
let NewFlightList = [] let NewFlightList = []
let FlightList2 = [] let FlightList2 = []
......
pages/airTicket/airTicketList.vue
View file @ a53b03dc
...@@ -344,18 +344,16 @@ ...@@ -344,18 +344,16 @@
Days2 = new Set(NewFlightDates2) Days2 = new Set(NewFlightDates2)
} }
y.frequency = FlightList.length-1
y.frequencyA = FlightList2.length-1
let obj = { let obj = {
duration:`${y.DepartureTime.Days>0?y.DepartureTime.Days+'d ':''}${y.DepartureTime.Hours>0?y.DepartureTime.Hours+'h ':''}${y.DepartureTime.Minutes>0?y.DepartureTime.Minutes+'m ':''}`, duration:`${y.DepartureTime.Days>0?y.DepartureTime.Days+'d ':''}${y.DepartureTime.Hours>0?y.DepartureTime.Hours+'h ':''}${y.DepartureTime.Minutes>0?y.DepartureTime.Minutes+'m ':''}`,
frequency: y.frequency, frequency: FlightList.length-1,
Days: Array.from(Days).length>1?Array.from(Days).length:1, Days: Array.from(Days).length>1?Array.from(Days).length:1,
...y.FlightList[0] ...y.FlightList[0]
} }
let obj2 = { let obj2 = {
duration:`${y.ArrivalTime.Days>0?y.ArrivalTime.Days+'d ':''}${y.ArrivalTime.Hours>0?y.ArrivalTime.Hours+'h ':''}${y.ArrivalTime.Minutes>0?y.ArrivalTime.Minutes+'m ':''}`, duration:`${y.ArrivalTime.Days>0?y.ArrivalTime.Days+'d ':''}${y.ArrivalTime.Hours>0?y.ArrivalTime.Hours+'h ':''}${y.ArrivalTime.Minutes>0?y.ArrivalTime.Minutes+'m ':''}`,
Days: Array.from(Days2).length>1?Array.from(Days2).length:1, Days: Array.from(Days2).length>1?Array.from(Days2).length:1,
frequency: y.frequencyA, frequency: FlightList2.length-1,
...y.FlightList[y.FlightList.length-1] ...y.FlightList[y.FlightList.length-1]
} }
y.NewFlightList.push(obj) y.NewFlightList.push(obj)
......
pages/airTicket/components/TicketOrderDetails.vue
View file @ a53b03dc
...@@ -52,9 +52,9 @@ ...@@ -52,9 +52,9 @@
</view> </view>
</view> </view>
<view class="flexG relative"> <view class="flexG relative">
<view v-if="index!=0" class="airTicketDetailsCard-ZhuanNum bgE1C278 fz18 colorFFF absolute"> <view v-if="items.frequency&&index!=0" class="airTicketDetailsCard-ZhuanNum bgE1C278 fz18 colorFFF absolute">
转 转
<template v-if="items.FlightList.length-1>1">+{{items.FlightList.length-1}}</template> <template v-if="items.frequency>1">+{{items.frequency}}</template>
</view> </view>
<view class="airTicketDetailsCard-title row-aic-n absolute" v-if="index==0"> <view class="airTicketDetailsCard-title row-aic-n absolute" v-if="index==0">
<img class="inlineblock flexS" mode="widthFix" style="width: 20rpx;height: 17rpx;" <img class="inlineblock flexS" mode="widthFix" style="width: 20rpx;height: 17rpx;"
......
pages/airTicket/components/airTicketDetails.vue
View file @ a53b03dc
...@@ -50,9 +50,9 @@ ...@@ -50,9 +50,9 @@
</view> </view>
</view> </view>
<view class="column flexG relative"> <view class="column flexG relative">
<view v-if="index!=0" class="airTicketDetailsCard-ZhuanNum bgE1C278 fz18 colorFFF absolute"> <view v-if="items.frequency&&index!=0" class="airTicketDetailsCard-ZhuanNum bgE1C278 fz18 colorFFF absolute">
转 转
<template v-if="items.FlightList.length-1>1">+{{items.FlightList.length-1}}</template> <template v-if="items.frequency>1">+{{items.frequency}}</template>
</view> </view>
<view class="airTicketDetailsCard-title row-aic-n absolute" v-if="index==0"> <view class="airTicketDetailsCard-title row-aic-n absolute" v-if="index==0">
<img class="inlineblock flexS" mode="widthFix" style="width: 20rpx;height: 17rpx;" <img class="inlineblock flexS" mode="widthFix" style="width: 20rpx;height: 17rpx;"
......
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