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

修改

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