Skip to content

M
million
Commit 44b17912 authored by 沈良进's avatar 沈良进
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/viitto/million

parents 85e88c5d f405b1ec
Expand all Show whitespace changes
Inline Side-by-side
Showing with 2064 additions and 968 deletions
package.json
View file @ 44b17912
...@@ -14,12 +14,13 @@ ...@@ -14,12 +14,13 @@
"build:pwa": "quasar build -m pwa" "build:pwa": "quasar build -m pwa"
}, },
"dependencies": { "dependencies": {
"@quasar/extras": "^1.0.0", "@quasar/extras": "^1.15.10",
"axios": "^0.18.1", "axios": "^0.18.1",
"babel-plugin-transform-remove-console": "^6.9.4",
"js-md5": "^0.7.3", "js-md5": "^0.7.3",
"qrcode.vue": "^1.7.0", "qrcode.vue": "^1.7.0",
"qrcodejs2": "^0.0.2", "qrcodejs2": "^0.0.2",
"quasar": "^1.0.0", "quasar": "^1.22.5",
"v-viewer": "^1.6.4", "v-viewer": "^1.6.4",
"vue-concise-slider": "^4.2.5", "vue-concise-slider": "^4.2.5",
"vue-core-video-player": "^0.2.0", "vue-core-video-player": "^0.2.0",
......
quasar.conf.js
View file @ 44b17912
...@@ -162,7 +162,8 @@ module.exports = function( /* ctx */ ) { ...@@ -162,7 +162,8 @@ module.exports = function( /* ctx */ ) {
'QResponsive', 'QResponsive',
'QTooltip', 'QTooltip',
'QBadge', 'QBadge',
'QParallax' 'QParallax',
'QField',
], ],
directives: [ directives: [
......
src/assets/trip/block/index.css
View file @ 44b17912
...@@ -74,7 +74,6 @@ ...@@ -74,7 +74,6 @@
z-index: 2; z-index: 2;
} }
.trip-block .block-item .item .playInfo{ .trip-block .block-item .item .playInfo{
margin-top: 5px;
margin-left: -5px; margin-left: -5px;
height: 25px; height: 25px;
} }
...@@ -126,9 +125,10 @@ ...@@ -126,9 +125,10 @@
/* box-sizing: border-box; */ /* box-sizing: border-box; */
} }
.trip-block .block-item .item.big .right .details{ .trip-block .block-item .item.big .right .details{
height: 260px;
display: block; display: block;
margin-top: 15px; margin-top: 15px;
font-size: 16px; /* font-size: 16px; */
line-height: 1.5em; line-height: 1.5em;
text-align: justify; text-align: justify;
color: #444; color: #444;
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
height: 100%; height: 100%;
} }
.trip-block .block-item .item .down{ .trip-block .block-item .item .down{
/* height: 150px; */ height: 260px;
overflow: hidden; overflow: hidden;
} }
.trip-block .block-item .item.hor-box{ .trip-block .block-item .item.hor-box{
......
src/components/navs/subscriber.vue
View file @ 44b17912
...@@ -28,12 +28,18 @@ height: 56px; ...@@ -28,12 +28,18 @@ height: 56px;
margin: 0 auto; margin: 0 auto;
position: relative; position: relative;
} }
.email-box.mobile {
width: 100%;
}
.input { .input {
width: 630px; width: 630px;
height: 56px; height: 56px;
background-color: #fff; background-color: #fff;
border-radius: 28px; border-radius: 28px;
} }
.input.mobile {
width: 100%;
}
.btn { .btn {
position: absolute; position: absolute;
right: 5px; right: 5px;
...@@ -46,15 +52,15 @@ border-radius: 23px; ...@@ -46,15 +52,15 @@ border-radius: 23px;
</style>> </style>>
<template> <template>
<div class="fill"> <div class="fill">
<div class="box"> <div class="box" :class="{'q-px-md': $q.platform.is.mobile}">
<div class="title"> <div class="title">
輸入電子郵箱接收訂閱信息 輸入電子郵箱接收訂閱信息
</div> </div>
<div class="desc"> <div class="desc">
最高可省60%，只有订阅用户才能享受到隐藏优惠，点击“订阅”，即表示你同意我们的《訂閱條款》 最高可省60%，只有订阅用户才能享受到隐藏优惠，点击“订阅”，即表示你同意我们的《訂閱條款》
</div> </div>
<div class="email-box"> <div class="email-box" :class="{'mobile':$q.platform.is.mobile}">
<q-input class="input" rounded outlined placeholder="請輸入您在使用的電子郵件"></q-input><q-btn class="btn" label="提交"></q-btn> <q-input class="input" :class="{'mobile':$q.platform.is.mobile}" rounded outlined placeholder="請輸入您在使用的電子郵件"></q-input><q-btn class="btn" label="提交"></q-btn>
</div> </div>
</div> </div>
</div> </div>
......
src/components/trip/block/allDay.vue 0 → 100644
View file @ 44b17912
<template>
<div class="block-item">
<!-- transition-prev="scale"
transition-next="scale" -->
<q-carousel v-model="slide"
transition-prev="slide-right"
transition-next="slide-left"
swipeable animated
control-color="white" infinite arrows height="100%"
class="my-bg-grey text-black shadow-1 no-shadow"
control-type="regular"
:arrows="day.details.length>0?false:false"
control-text-color="primary"
thumbnails
infinite
>
<template v-for="(x, i) in day.details">
<q-carousel-slide :name="i" class="column no-wrap">
<div class="bg-white row">
<template
v-if="x.fileType && x.fileType == '.mp4'">
<video
ref="myVideo"
width="100%"
height="246px"
:src="x.videoPath"
controls="controls"
></video>
</template>
<template v-else>
<q-img
v-if="x.img"
:src="x.img"
:ratio="12 / 4"
style="width: 100%"
>
<template v-slot:error>
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
</div>
</template>
</q-img>
<q-img
v-else
src="../../../assets/img/nll.jpg"
:ratio="12 / 4"
fit="cover"
height="100%"
></q-img>
</template>
</div>
<div class="one-block q-px-md q-py-lg">
<div class="item big row">
<div class="row no-wrap">
<div class="right col">
<div class="details">
<div
v-if="x.title != ''"
class="text-h6 text-bold q-pb-sm"
v-html="x.title"
style="cursor: pointer"
></div>
<div
class="playInfo"
v-if="
x.playTimeHour || x.playTimeMinutes
"
>
<span
class="playInfo-item"
v-if="x.ticketName != ''"
>
</span>
<span
class="playInfo-item"
v-if="
x.playTimeHour ||
x.playTimeMinutes
"
>
<i class="iconfont icon-shijian1"></i>
约
<span v-if="x.playTimeHour"
>{{ x.playTimeHour }}小时
</span>
<span v-if="x.playTimeMinutes"
>{{ x.playTimeMinutes }}分钟</span
>
</span>
</div>
<span v-html="x.content"></span>
</div>
</div>
</div>
</div>
</div>
</q-carousel-slide>
</template>
</q-carousel>
</div>
</template>
<script>
export default {
props: {
day: {},
isDirect: {},
},
data() {
return {
slide: 0,
lorem: ''
}
},
mounted() {},
methods: {
getHotelSuffix() {
let suffix = "";
if (this.day.jiu2.length > 1) {
if (this.isDirect === 1) {
suffix = "或同級";
}
} else {
if (
this.day.jiu2.length == 1 &&
this.day.jiu2[0].name != "温馨的家" &&
this.day.jiu2[0].name != "机场附近酒店"
) {
if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】";
} else {
if (this.isDirect === 1) {
suffix = "或同級";
}
}
}
}
return suffix;
},
goUrl(url) {
if (url != null && url.length > 0) {
window.open(url, "_blank");
}
},
},
};
</script>
<style scoped>
.q-carousel__slide{
padding: 0 !important;
}
.q-img__image{
border-style: none !important;
}
</style>
\ No newline at end of file
src/components/trip/block/fiveday.vue
View file @ 44b17912
This diff is collapsed.
src/components/trip/block/fourday.vue
View file @ 44b17912
This diff is collapsed.
src/components/trip/block/index.vue
View file @ 44b17912
...@@ -3,7 +3,9 @@ ...@@ -3,7 +3,9 @@
</style> </style>
<template> <template>
<div class="trip-box"> <div class="trip-box">
<div class="trip-block" v-for="(item,i) in trips" :key="i">
<div :class="{'trip-block':$q.platform.is.desktop,'q-pb-lg':$q.platform.is.mobile,'q-pt-lg':$q.platform.is.mobile&&i==0}" v-for="(item,i) in trips" :key="i">
<template v-if="$q.platform.is.desktop">
<div class="trip-title" :id="`days_${i}`"> <div class="trip-title" :id="`days_${i}`">
<div> <div>
<p class="day">第<span v-if='item.dayNum<10'>0</span>{{item.dayNum}}天</p> <p class="day">第<span v-if='item.dayNum<10'>0</span>{{item.dayNum}}天</p>
...@@ -16,7 +18,15 @@ ...@@ -16,7 +18,15 @@
<threeday v-if="item.details && item.details.length==3" :day='item' :isDirect="isDirect"></threeday> <threeday v-if="item.details && item.details.length==3" :day='item' :isDirect="isDirect"></threeday>
<fourday v-if="item.details && item.details.length==4" :day='item' :isDirect="isDirect"></fourday> <fourday v-if="item.details && item.details.length==4" :day='item' :isDirect="isDirect"></fourday>
<fiveday v-if="item.details && item.details.length>=5" :day='item' :isDirect="isDirect"></fiveday> <fiveday v-if="item.details && item.details.length>=5" :day='item' :isDirect="isDirect"></fiveday>
</template>
<template v-else>
<div :id="`days_${i}`">
<allDay :day='item' :isDirect="isDirect"></allDay>
</div>
</template>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
...@@ -25,9 +35,11 @@ ...@@ -25,9 +35,11 @@
import threeday from './threeday' import threeday from './threeday'
import fourday from './fourday' import fourday from './fourday'
import fiveday from './fiveday' import fiveday from './fiveday'
import allDay from './allDay'
export default { export default {
props: ['tripList', 'isDirect', 'clickDate','days','currentHeightDay'], props: ['tripList', 'isDirect', 'clickDate','days','currentHeightDay'],
components: { components: {
allDay,
oneday, oneday,
twoday, twoday,
threeday, threeday,
...@@ -45,7 +57,7 @@ ...@@ -45,7 +57,7 @@
this.daysClass.forEach((x,i)=>{ this.daysClass.forEach((x,i)=>{
var object=document.getElementById(`days_${i}`); var object=document.getElementById(`days_${i}`);
x.top = object.getBoundingClientRect().top - 100 x.top = object.getBoundingClientRect().top+100
}) })
} catch (error) { } catch (error) {
console.log('----异常') console.log('----异常')
......
src/components/trip/block/oneday.vue
View file @ 44b17912
...@@ -2,114 +2,174 @@ ...@@ -2,114 +2,174 @@
<div class="block-item"> <div class="block-item">
<div class="one-block"> <div class="one-block">
<div class="item big row"> <div class="item big row">
<div class="row no-wrap" :class="{'col-8':day.details.length>1,'col':day.details.length==1}"> <div
class="row no-wrap"
:class="{
'col-8': day.details.length > 1,
col: day.details.length == 1,
}"
>
<div class="col-7"> <div class="col-7">
<template v-if="day.details[0].fileType&&day.details[0].fileType=='.mp4'"> <template
<video ref="myVideo" width="100%" height="100%" :src="day.details[0].videoPath" controls="controls"> v-if="
</video> day.details[0].fileType && day.details[0].fileType == '.mp4'
"
>
<video
ref="myVideo"
width="100%"
height="100%"
:src="day.details[0].videoPath"
controls="controls"
></video>
</template> </template>
<template v-else> <template v-else>
<q-img v-if="day.details[0].img" :src='day.details[0].img' :ratio="12/4" fit="cover" height="100%"> <q-img
v-if="day.details[0].img"
:src="day.details[0].img"
:ratio="12 / 4"
fit="cover"
height="100%"
>
<template v-slot:error> <template v-slot:error>
<div class="absolute-full flex flex-center bg-blue-1 text-dark"> <div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败 图片加载失败
</div> </div>
</template> </template>
</q-img> </q-img>
<q-img v-else src='../../../assets/img/nll.jpg' :ratio="12/4" fit="cover" height="100%"></q-img> <q-img
v-else
src="../../../assets/img/nll.jpg"
:ratio="12 / 4"
fit="cover"
height="100%"
></q-img>
</template> </template>
</div> </div>
<div class="right col" style="border: 1px solid #ccc;border-left: 0;"> <div class="right col" style="border: 1px solid #ccc; border-left: 0">
<div class="details"> <div class="details">
<div v-if="day.details[0].title!=''" class="text-h6 text-bold" v-html="day.details[0].title" @click.stop="goUrl(day.details[0].url)" <div
style="cursor: pointer;"></div> v-if="day.details[0].title != ''"
<div class="playInfo"> class="text-h6 text-bold q-pb-sm"
<span class="playInfo-item" v-if='day.details[0].ticketName!=""'> v-html="day.details[0].title"
@click.stop="goUrl(day.details[0].url)"
style="cursor: pointer"
></div>
<div
class="playInfo"
v-if="
day.details[0].playTimeHour || day.details[0].playTimeMinutes
"
>
<span
class="playInfo-item"
v-if="day.details[0].ticketName != ''"
>
</span> </span>
<span class="playInfo-item" v-if='day.details[0].playTimeHour || day.details[0].playTimeMinutes'> <span
class="playInfo-item"
v-if="
day.details[0].playTimeHour ||
day.details[0].playTimeMinutes
"
>
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
约 约
<span v-if="day.details[0].playTimeHour">{{day.details[0].playTimeHour}}小时 </span> <span v-if="day.details[0].playTimeHour"
<span v-if="day.details[0].playTimeMinutes">{{day.details[0].playTimeMinutes}}分钟</span> >{{ day.details[0].playTimeHour }}小时
</span>
<span v-if="day.details[0].playTimeMinutes"
>{{ day.details[0].playTimeMinutes }}分钟</span
>
</span> </span>
</div> </div>
<span v-html="day.details[0].content"></span> <span v-html="day.details[0].content"></span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="item flex q-mt-sm q-pa-lg" v-if='day.tips.length>0'> <div class="item flex q-mt-sm q-pa-lg" v-if="day.tips.length > 0">
<h4>温馨提示</h4> <h4>温馨提示</h4>
<div class="remark"> <div class="remark">
<span v-for="(t,k) in day.tips" :key="k" v-html="t.content"></span> <span v-for="(t, k) in day.tips" :key="k" v-html="t.content"></span>
</div> </div>
</div> </div>
<div class="restaurant row justify-between wrap"> <div
class="restaurant"
:class="{
'row justify-between wrap': $q.platform.is.desktop,
column: $q.platform.is.mobile,
}"
>
<div class="restaurant-item"> <div class="restaurant-item">
<div class="key"> <div class="key">
<img src='../../../assets/img/daily_breakfast.png' /> <img src="../../../assets/img/daily_breakfast.png" />
</div> </div>
<div class="val">{{day.can.breakfirst}}</div> <div class="val">{{ day.can.breakfirst }}</div>
</div> </div>
<div class="restaurant-item q-pl-sm"> <div class="restaurant-item">
<div class="key"> <div class="key">
<img src='../../../assets/img/daily_lunch.png' /> <img src="../../../assets/img/daily_lunch.png" />
</div> </div>
<div class="val">{{day.can.lanuch}}</div> <div class="val">{{ day.can.lanuch }}</div>
</div> </div>
<div class="restaurant-item q-pl-sm"> <div class="restaurant-item">
<div class="key"> <div class="key">
<img src='../../../assets/img/daily_dinner.png' /> <img src="../../../assets/img/daily_dinner.png" />
</div> </div>
<div class="val">{{day.can.dinner}}</div> <div class="val">{{ day.can.dinner }}</div>
</div> </div>
</div> </div>
<div class="restaurant"> <div class="restaurant">
<div class="restaurant-item col-24 row">
<div class="restaurant-item col-24">
<div class="key"> <div class="key">
<img src='../../../assets/img/daily_hotel-1.png' /> <img src="../../../assets/img/daily_hotel-1.png" />
</div> </div>
<div class="val" v-if='day.jiu2.length>0'> <div class="val" v-if="day.jiu2.length > 0">
<span v-for="(t,k) in day.jiu2" @click.stop="goUrl(t.url)" style="cursor: pointer" :key="k"> <span
{{k==day.jiu2.length-1?t.name:t.name+' / '}} v-for="(t, k) in day.jiu2"
@click.stop="goUrl(t.url)"
style="cursor: pointer"
:key="k"
>
{{ k == day.jiu2.length - 1 ? t.name : t.name + " / " }}
</span> </span>
{{getHotelSuffix()}} {{ getHotelSuffix() }}
</div> </div>
<div class="val" v-else>本日无酒店安排</div> <div class="val" v-else>本日无酒店安排</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props:{ props: {
day:{}, day: {},
isDirect:{} isDirect: {},
},
mounted() {
console.log(this.day,'----')
}, },
methods:{ mounted() {},
getHotelSuffix(){ methods: {
getHotelSuffix() {
let suffix = ""; let suffix = "";
if (this.day.jiu2.length > 1) { if (this.day.jiu2.length > 1) {
if (this.isDirect === 1) { if (this.isDirect === 1) {
suffix = "或同級" suffix = "或同級";
} }
} else { } else {
if (this.day.jiu2.length == 1 && this.day.jiu2[0].name != '温馨的家' && this.day.jiu2[0].name != if (
'机场附近酒店') { this.day.jiu2.length == 1 &&
this.day.jiu2[0].name != "温馨的家" &&
this.day.jiu2[0].name != "机场附近酒店"
) {
if (this.day.jiu2[0].status == 1) { if (this.day.jiu2[0].status == 1) {
suffix = "【保证入住】" suffix = "【保证入住】";
} else { } else {
if (this.isDirect === 1) { if (this.isDirect === 1) {
suffix = "或同級" suffix = "或同級";
} }
} }
} }
...@@ -117,10 +177,10 @@ export default { ...@@ -117,10 +177,10 @@ export default {
return suffix; return suffix;
}, },
goUrl(url) { goUrl(url) {
if(url!=null&&url.length>0){ if (url != null && url.length > 0) {
window.open(url, "_blank"); window.open(url, "_blank");
} }
} },
} },
} };
</script> </script>
src/components/trip/block/threeday.vue
View file @ 44b17912
This diff is collapsed.
src/components/trip/block/twoday.vue
View file @ 44b17912
This diff is collapsed.
src/components/trip/orderPreview.vue
View file @ 44b17912
...@@ -12,14 +12,21 @@ ...@@ -12,14 +12,21 @@
</div> </div>
<div class="text-grey-6 f12 q-my-md">選擇數量</div> <div class="text-grey-6 f12 q-my-md">選擇數量</div>
<div class="row items-end"> <div class="row items-end">
<div class="col"> <div class="col" :class="{'column':$q.platform.is.mobile}">
<div>
<span class="text-subtitle2 text-weight-bold">成人</span> <span class="text-subtitle2 text-weight-bold">成人</span>
<span class="text-grey-6 f12 q-ml-sm">(12-99歲)</span> <span class="text-grey-6 f12 q-ml-sm">(12-99歲)</span>
</div> </div>
<div class="row items-end"> <div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px"> <span class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ moneyFormat(p.originalB2CPrice, 0) }} /每人 CNY {{ moneyFormat(p.originalB2CPrice, 0) }} /每人
</span> </span>
</div>
</div>
<div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ moneyFormat(p.originalB2CPrice, 0) }} /每人
</span>
<q-input <q-input
style="width: 150px" style="width: 150px"
@input="changePeople" @input="changePeople"
...@@ -59,15 +66,23 @@ ...@@ -59,15 +66,23 @@
</div> </div>
</div> </div>
<div class="row items-end q-mt-md" v-if="p.isSupportChildren == 1"> <div class="row items-end q-mt-md" v-if="p.isSupportChildren == 1">
<div class="col"> <div class="col" :class="{'column':$q.platform.is.mobile}">
<div>
<span class="text-subtitle2 text-weight-bold">儿童</span> <span class="text-subtitle2 text-weight-bold">儿童</span>
<span class="text-grey-6 f12 q-ml-sm">(2-11歲,不占床)</span> <span class="text-grey-6 f12 q-ml-sm">(2-11歲,不占床)</span>
</div> </div>
<div class="row items-end"> <div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px"> <span class="text-grey-7 product-price" style="font-size: 13px">
CNY CNY
{{ moneyFormat(p.originalB2CPrice - p.childNoNeedPrice, 0) }} /每人 {{ moneyFormat(p.originalB2CPrice - p.childNoNeedPrice, 0) }} /每人
</span> </span>
</div>
</div>
<div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY
{{ moneyFormat(p.originalB2CPrice - p.childNoNeedPrice, 0) }} /每人
</span>
<q-input <q-input
style="width: 150px" style="width: 150px"
@input="changePeople" @input="changePeople"
...@@ -108,12 +123,19 @@ ...@@ -108,12 +123,19 @@
</div> </div>
<div class="row items-end q-mt-md" v-if="p.isSupportChildren == 1"> <div class="row items-end q-mt-md" v-if="p.isSupportChildren == 1">
<div class="col"> <div class="col" :class="{'column':$q.platform.is.mobile}">
<div>
<span class="text-subtitle2 text-weight-bold">婴儿</span> <span class="text-subtitle2 text-weight-bold">婴儿</span>
<span class="text-grey-6 f12 q-ml-sm">(2歲以下)</span> <span class="text-grey-6 f12 q-ml-sm">(2歲以下)</span>
</div> </div>
<div v-if="$q.platform.is.mobile">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ moneyFormat(p.babyPrice, 0) }} /每人
</span>
</div>
</div>
<div class="row items-end"> <div class="row items-end">
<span class="text-grey-7 product-price" style="font-size: 13px"> <span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ moneyFormat(p.babyPrice, 0) }} /每人 CNY {{ moneyFormat(p.babyPrice, 0) }} /每人
</span> </span>
<q-input <q-input
...@@ -164,14 +186,21 @@ ...@@ -164,14 +186,21 @@
> >
<div class="text-grey-6 f12">單房服務</div> <div class="text-grey-6 f12">單房服務</div>
<div class="row items-end"> <div class="row items-end">
<div class="col"> <div class="col" :class="{'column':$q.platform.is.mobile}">
<div>
<span class="text-subtitle2 text-weight-bold">單房服務</span> <span class="text-subtitle2 text-weight-bold">單房服務</span>
<span class="text-grey-6 f12 q-ml-sm">(獨立單間住宿)</span> <span class="text-grey-6 f12 q-ml-sm">(獨立單間住宿)</span>
</div> </div>
<div class="row items-end"> <div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px"> <span class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ moneyFormat(p.singleRoomPrice, 0) }} /每人 CNY {{ moneyFormat(p.singleRoomPrice, 0) }} /每人
</span> </span>
</div>
</div>
<div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ moneyFormat(p.singleRoomPrice, 0) }} /每人
</span>
<q-input <q-input
style="width: 150px" style="width: 150px"
@input="changePeople" @input="changePeople"
...@@ -226,7 +255,7 @@ ...@@ -226,7 +255,7 @@
<span class="text-h6 text-primary product-price">CNY {{ moneyFormat(sumPrice,0) }}</span> <span class="text-h6 text-primary product-price">CNY {{ moneyFormat(sumPrice,0) }}</span>
</div> </div>
<div class="q-mt-md text-right"> <div class="q-mt-md text-right">
<span class="q-mr-lg f12 text-negative" v-if="!p.startDate" >請選擇左側的出行日期</span> <span class="q-mr-lg f12 text-negative" v-if="!p.startDate" >{{$q.platform.is.mobile?'請選擇上面的出行日期':'請選擇左側的出行日期'}} </span>
<q-btn color="primary" label="立即訂購" unelevated class="q-px-lg" :disable="sumPrice==0"/> <q-btn color="primary" label="立即訂購" unelevated class="q-px-lg" :disable="sumPrice==0"/>
</div> </div>
</div> </div>
......
src/components/trip/smaple.vue
View file @ 44b17912
...@@ -2,40 +2,49 @@ ...@@ -2,40 +2,49 @@
<div class="q-mt-md"> <div class="q-mt-md">
<div class="text-subtitle2 text-weight-bold">產品概要</div> <div class="text-subtitle2 text-weight-bold">產品概要</div>
<div class="row q-pt-md q-col-gutter-md"> <div class="row q-pt-md q-col-gutter-md">
<div class="row items-center q-pt-mb col-6" v-if="traffic!=''"> <div class="row items-center q-pt-mb"
<div class="col-3 q-mr-md">往返交通：</div> :class="{'col-6':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}" v-if="traffic!=''">
<div class="q-mr-md col-3">往返交通：</div>
<div class="col text-grey-6">{{ traffic }}</div> <div class="col text-grey-6">{{ traffic }}</div>
</div> </div>
<div class="row items-center q-pt-mb col-6" v-if="hotel!=''"> <div class="row items-center q-pt-mb"
<div class="col-3 q-mr-md">酒店住宿：</div> :class="{'col-6':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}" v-if="hotel!=''">
<div class="q-mr-md col-3">酒店住宿：</div>
<div class="col text-grey-6">{{ hotel }}</div> <div class="col text-grey-6">{{ hotel }}</div>
</div> </div>
<div class="row items-center q-pt-mb col-6"> <div class="row items-center q-pt-mb"
<div class="col-3 q-mr-md">購物：</div> :class="{'col-6':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}">
<div class="q-mr-md col-3">購物：</div>
<div class="col text-grey-6">{{ trip.shopList.length>0?`${trip.shopList.length}個購物點`:'無購物行程' }}</div> <div class="col text-grey-6">{{ trip.shopList.length>0?`${trip.shopList.length}個購物點`:'無購物行程' }}</div>
</div> </div>
<div class="row items-center q-pt-mb col-6" v-if="team!=''"> <div class="row items-center q-pt-mb"
<div class="col-3 q-mr-md">團隊人數：</div> :class="{'col-6':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}" v-if="team!=''">
<div class="q-mr-md col-3">團隊人數：</div>
<div class="col text-grey-6">{{ team }}</div> <div class="col text-grey-6">{{ team }}</div>
</div> </div>
<div class="row items-center q-pt-mb col-6"> <div class="row items-center q-pt-mb"
<div class="col-3 q-mr-md">景點：</div> :class="{'col-6':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}" >
<div class="q-mr-md col-3">景點：</div>
<div class="col text-grey-6">{{ trip.scenicList.length }}個景點或場館</div> <div class="col text-grey-6">{{ trip.scenicList.length }}個景點或場館</div>
</div> </div>
<div class="row items-center q-pt-mb col-6"> <div class="row items-center q-pt-mb"
<div class="col-3 q-mr-md">自費項目：</div> :class="{'col-6':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}" >
<div class="q-mr-md col-3">自費項目：</div>
<div class="col text-grey-6">{{ trip.selfpayingList.length>0?`${trip.selfpayingList.length}個自費項目`:'無自費項目' }}</div> <div class="col text-grey-6">{{ trip.selfpayingList.length>0?`${trip.selfpayingList.length}個自費項目`:'無自費項目' }}</div>
</div> </div>
<div class="row items-center q-pt-mb col-6" v-if="trip.freedomList.length>0"> <div class="row items-center q-pt-mb"
<div class="col-3 q-mr-md">自由活動：</div> :class="{'col-6':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}" v-if="trip.freedomList.length>0">
<div class="q-mr-md col-3">自由活動：</div>
<div class="col text-grey-6">{{ trip.freedomList.length}} 次自由活動</div> <div class="col text-grey-6">{{ trip.freedomList.length}} 次自由活動</div>
</div> </div>
<div class="row items-center q-pt-mb col-6"> <div class="row items-center q-pt-mb"
<div class="col-3 q-mr-md">餐食：</div> :class="{'col-6':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}" >
<div class="q-mr-md col-3">餐食：</div>
<div class="col text-grey-6">{{ dinner }}</div> <div class="col text-grey-6">{{ dinner }}</div>
</div> </div>
<div class="row items-center q-pt-mb col-6"> <div class="row items-center q-pt-mb"
<div class="col-3 q-mr-md">服務用語</div> :class="{'col-6':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}" >
<div class="q-mr-md col-3">服務用語</div>
<div class="col text-grey-6">普通話/日本語</div> <div class="col text-grey-6">普通話/日本語</div>
</div> </div>
</div> </div>
......
src/components/trip/trip.vue
View file @ 44b17912
<template> <template>
<div class="q-mt-lg"> <div class="q-mt-lg" :class="{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}">
<div class="text-subtitle1 text-weight-bold row items-center"> <div class="text-subtitle1 text-weight-bold row items-center">
<span class="col">每日行程</span> <span class="col">每日行程</span>
<span class=""> <span class="">
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<q-tab name="image" @click="changeHandler" icon="iconfont iconimage" class="no-padding q-mr-lg" label="圖文模式" /> <q-tab name="image" @click="changeHandler" icon="iconfont iconimage" class="no-padding q-mr-lg" label="圖文模式" />
<q-tab name="dates" @click="changeHandler" icon="iconfont iconrili" class="no-padding q-mr-lg" label="日曆模式" /> <q-tab name="dates" @click="changeHandler" icon="iconfont iconrili" class="no-padding q-mr-lg" label="日曆模式" />
</q-tabs> </q-tabs>
<list :days="trip.dayList" v-if="displayType=='image'"></list> <list :days="trip.dayList" v-if="displayType=='image'"></list>
<calendar :days="trip.dayList" v-if="displayType=='dates'"></calendar> <calendar :days="trip.dayList" v-if="displayType=='dates'"></calendar>
</div> </div>
......
src/pages/detailsNew.vue
View file @ 44b17912
This diff is collapsed.
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