Commit 855f4bbd authored by 18224442217's avatar 18224442217

no message

parent af1a82ef
...@@ -145,7 +145,6 @@ ...@@ -145,7 +145,6 @@
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)
} }
// x.NewFlightList[0].frequency = y.frequency
}) })
}) })
if (this.msg.pageIndex === 1) { if (this.msg.pageIndex === 1) {
......
...@@ -306,13 +306,13 @@ ...@@ -306,13 +306,13 @@
let obj = {} let obj = {}
obj = { 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 ':''}`,
Days: 1, Days: 0,
...z ...z
} }
if(index){ if(index){
obj = { obj = {
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: 1, Days: 0,
...z ...z
} }
} }
...@@ -343,16 +343,15 @@ ...@@ -343,16 +343,15 @@
NewFlightDates2 = FlightDates2.slice(0,FlightDates2.length-1) NewFlightDates2 = FlightDates2.slice(0,FlightDates2.length-1)
Days2 = new Set(NewFlightDates2) Days2 = new Set(NewFlightDates2)
} }
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: FlightList.length-1, frequency: FlightList.length-1,
Days: Array.from(Days).length>1?Array.from(Days).length:1, Days: Array.from(Days).length-1>1?Array.from(Days).length-1:0,
...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>1?Array.from(Days2).length-1:0,
frequency: FlightList2.length-1, frequency: FlightList2.length-1,
...y.FlightList[y.FlightList.length-1] ...y.FlightList[y.FlightList.length-1]
} }
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<text class="fz36 fontBold">{{childs.Arrival_time}} </text> <text class="fz36 fontBold">{{childs.Arrival_time}} </text>
<text class="fz22 MT5 width100 ellipsis1">{{childs.aName}}</text> <text class="fz22 MT5 width100 ellipsis1">{{childs.aName}}</text>
</view> </view>
<view class="FlightDirection-time absolute colorFF5858 fz20 nowrap"> <view class="FlightDirection-time absolute colorFF5858 fz20 nowrap" v-if="childs.Days">
<text>+</text> <text>+</text>
<text class="ML5">{{childs.Days}}</text> <text class="ML5">{{childs.Days}}</text>
<text class="ML5"></text> <text class="ML5"></text>
......
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