Commit 5f1d4919 authored by 罗超's avatar 罗超

修改

parent 03f3b4a6
...@@ -98,6 +98,7 @@ export default { ...@@ -98,6 +98,7 @@ export default {
} }
}, },
formatTraffic() { formatTraffic() {
if(this.trip.trafficList && this.trip.trafficList.length>0 && this.trip.trafficList[0].subTraffic && this.trip.trafficList[0].subTraffic.length>0){
let z = this.trip.trafficList[0].subTraffic[0] let z = this.trip.trafficList[0].subTraffic[0]
if (z&&z.arrivalType&&z.arrivalType == 1) { if (z&&z.arrivalType&&z.arrivalType == 1) {
this.traffic = '飛機往返'; this.traffic = '飛機往返';
...@@ -108,6 +109,8 @@ export default { ...@@ -108,6 +109,8 @@ export default {
} else { } else {
this.traffic = '高鐵往返'; this.traffic = '高鐵往返';
} }
}
}, },
formatHotel(){ formatHotel(){
let h = [] let h = []
......
...@@ -109,6 +109,7 @@ export default { ...@@ -109,6 +109,7 @@ export default {
} }
}, },
formatTraffice(tras) { formatTraffice(tras) {
console.log(tras)
let txt = "從" + tras.length>0&&tras[0].startCityName; let txt = "從" + tras.length>0&&tras[0].startCityName;
tras.forEach((z, i) => { tras.forEach((z, i) => {
if (i > 0) { if (i > 0) {
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
}}</span> }}</span>
</q-timeline-entry> </q-timeline-entry>
<template v-for="(y, yi) in x.dayArray"> <template v-for="(y, yi) in x.dayArray">
{{ y.title }}
<q-timeline-entry <q-timeline-entry
:title="y.title" :title="y.title"
:subtitle="y.subtitle" :subtitle="y.subtitle"
...@@ -38,6 +39,7 @@ ...@@ -38,6 +39,7 @@
<div <div
class="row items-center rounded-borders" class="row items-center rounded-borders"
style="overflow: hidden" style="overflow: hidden"
v-if="y.childItem.playTimeHour > 0 || y.childItem.playTimeMinutes > 0"
> >
<div <div
class="bg-dark text-white" class="bg-dark text-white"
...@@ -233,6 +235,7 @@ ...@@ -233,6 +235,7 @@
text-color="grey-2" text-color="grey-2"
dense dense
label="或同級別酒店" label="或同級別酒店"
v-else
> >
<q-tooltip class="bg-dark" <q-tooltip class="bg-dark"
>我們會儘量保證入住行程所示酒店,不排除突發的意外情況造成無法入住,我們將會為您安排同級別的酒店,請您放心選購</q-tooltip >我們會儘量保證入住行程所示酒店,不排除突發的意外情況造成無法入住,我們將會為您安排同級別的酒店,請您放心選購</q-tooltip
...@@ -352,10 +355,10 @@ export default { ...@@ -352,10 +355,10 @@ export default {
} }
}, },
formatTraffice(tras) { formatTraffice(tras) {
let txt = "從" + tras.length>0&&tras[0].startCityName; let txt = "從" + (tras.length>0?tras[0].startCityName:'');
tras.forEach((z, i) => { tras.forEach((z, i) => {
if (i > 0) { if (i > 0 && txt!='') {
txt = ";再"; txt += ";再";
} }
if (z.arrivalType == 1) { if (z.arrivalType == 1) {
txt += "搭乘航班"; txt += "搭乘航班";
......
...@@ -388,7 +388,7 @@ ...@@ -388,7 +388,7 @@
<div <div
class="col q-ml-xl position-relative" class="col q-ml-xl position-relative"
v-if=" v-if="
dayList.length > 3 && (!(dataList.priceList && dataList.priceList[0].teamType==2)&&!(dataList.currentPrice && dataList.currentPrice.teamType==2)) &&
currentHeight > days[0].top - 60 && currentHeight > days[0].top - 60 &&
currentHeight < navs[2].top && currentHeight < navs[2].top &&
$q.platform.is.desktop $q.platform.is.desktop
...@@ -446,12 +446,13 @@ ...@@ -446,12 +446,13 @@
</div> </div>
<div class="q-pb-xl"> <div class="q-pb-xl">
<smaple <smaple
v-if="dataList"
:trip="dataList" :trip="dataList"
:class="{ :class="{
'q-px-md': $q.screen.width < 1220 && $q.platform.is.desktop, 'q-px-md': $q.screen.width < 1220 && $q.platform.is.desktop,
}" }"
></smaple> ></smaple>
<template v-if="dataList.dayList.length <= 3"> <template v-if="(dataList.priceList && dataList.priceList[0].teamType==2)||(dataList.currentPrice && dataList.currentPrice.teamType==2)">
<trip :trip="dataList" @change="changeTripShowHandler"></trip> <trip :trip="dataList" @change="changeTripShowHandler"></trip>
</template> </template>
<template v-else> <template v-else>
......
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