Skip to content

B
bigwood
Commit 00fab9f6 authored by youjie's avatar youjie
Browse files
Options

no message

parent f1e36eb9
Hide whitespace changes
Inline Side-by-side
Showing with 227 additions and 162 deletions
src/components/trip/block/allDay.vue
View file @ 00fab9f6
......@@ -34,7 +34,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
{{$t('v103.details.style.nodata')}}
</div>
</template>
</q-img>
......@@ -77,12 +77,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
约
{{$t('v103.details.style.d1')}}
<span v-if="x.playTimeHour"
>{{ x.playTimeHour }}小时
>{{ x.playTimeHour }}{{$t('v103.details.style.d2')}}
</span>
<span v-if="x.playTimeMinutes"
>{{ x.playTimeMinutes }}分钟</span
>{{ x.playTimeMinutes }}{{$t('v103.details.style.d3')}}</span
>
</span>
</div>
......@@ -134,12 +134,9 @@
setup(props) {
const $router = useRouter()
const { t } = useI18n()
const carousel = ref(null)
const $q = useQuasar()
let {ctx:that, proxy} = getCurrentInstance()
const data= reactive({
slide: 0,
autoplay: 0,
showImagePriview:false,
currentImage:'',
images:[],
......@@ -156,23 +153,24 @@
data.currentImage = url
data.showImagePriview = true
},
getHotelSuffix() {
let suffix = "";
if (props.day.jiu2.length > 1) {
if (props.isDirect === 1) {
suffix = "或同級";
suffix = t('v103.details.style.d6');
}
} else {
if (
props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != "温馨的家" &&
props.day.jiu2[0].name != "机场附近酒店"
props.day.jiu2[0].name != t('v103.details.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8')
) {
if (props.day.jiu2[0].status == 1) {
suffix = "【保证入住】";
suffix = t('v103.details.style.d9');
} else {
if (props.isDirect === 1) {
suffix = "或同級";
suffix = t('v103.details.style.d10');
}
}
}
......@@ -188,7 +186,6 @@
return {
...toRefs(data),
...methods,
carousel,
}
}
})
......
src/components/trip/block/fiveday.vue
View file @ 00fab9f6
......@@ -32,7 +32,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
{{$t('v103.details.style.nodata')}}
</div>
</template>
</q-img>
......@@ -75,12 +75,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
约
{{$t('v103.details.style.d1')}}
<span v-if="day.details[0].playTimeHour"
>{{ day.details[0].playTimeHour }}小时
>{{ day.details[0].playTimeHour }}{{$t('v103.details.style.d2')}}
</span>
<span v-if="day.details[0].playTimeMinutes"
>{{ day.details[0].playTimeMinutes }}分钟</span
>{{ day.details[0].playTimeMinutes }}{{$t('v103.details.style.d3')}}</span
>
</span>
</div>
......@@ -119,7 +119,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
{{$t('v103.details.style.nodata')}}
</div>
</template>
</q-img>
......@@ -162,12 +162,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
约
{{$t('v103.details.style.d1')}}
<span v-if="day.details[1].playTimeHour"
>{{ day.details[1].playTimeHour }}小时
>{{ day.details[1].playTimeHour }}{{$t('v103.details.style.d2')}}
</span>
<span v-if="day.details[1].playTimeMinutes"
>{{ day.details[1].playTimeMinutes }}分钟</span
>{{ day.details[1].playTimeMinutes }}{{$t('v103.details.style.d3')}}</span
>
</span>
</div>
......@@ -207,7 +207,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
{{$t('v103.details.style.nodata')}}
</div>
</template>
</q-img>
......@@ -252,12 +252,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
约
{{$t('v103.details.style.d1')}}
<span v-if="day.details[2].playTimeHour"
>{{ day.details[2].playTimeHour }}小时
>{{ day.details[2].playTimeHour }}{{$t('v103.details.style.d2')}}
</span>
<span v-if="day.details[2].playTimeMinutes"
>{{ day.details[2].playTimeMinutes }}分钟
>{{ day.details[2].playTimeMinutes }}{{$t('v103.details.style.d3')}}
</span>
</span>
</div>
......@@ -292,7 +292,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
{{$t('v103.details.style.nodata')}}
</div>
</template>
</q-img>
......@@ -337,12 +337,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
约
{{$t('v103.details.style.d1')}}
<span v-if="day.details[3].playTimeHour"
>{{ day.details[3].playTimeHour }}小时
>{{ day.details[3].playTimeHour }}{{$t('v103.details.style.d2')}}
</span>
<span v-if="day.details[3].playTimeMinutes"
>{{ day.details[3].playTimeMinutes }}分钟
>{{ day.details[3].playTimeMinutes }}{{$t('v103.details.style.d3')}}
</span>
</span>
</div>
......@@ -378,7 +378,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
{{$t('v103.details.style.nodata')}}
</div>
</template>
</q-img>
......@@ -418,12 +418,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
约
{{$t('v103.details.style.d1')}}
<span v-if="day.details[4].playTimeHour"
>{{ day.details[4].playTimeHour }}小时
>{{ day.details[4].playTimeHour }}{{$t('v103.details.style.d2')}}
</span>
<span v-if="day.details[4].playTimeMinutes"
>{{ day.details[4].playTimeMinutes }}分钟
>{{ day.details[4].playTimeMinutes }}{{$t('v103.details.style.d3')}}
</span>
</span>
</div>
......@@ -434,7 +434,7 @@
</div>
<div class="item flex q-mt-sm q-pa-lg" v-if="day.tips.length > 0">
<h4>温馨提示</h4>
<h4>{{$t('v103.details.style.d4')}}</h4>
<div class="remark">
<span v-for="(t, k) in day.tips" :key="k" v-html="t.content"></span>
</div>
......@@ -481,7 +481,7 @@
</span>
{{ getHotelSuffix() }}
</div>
<div class="val" v-else>本日无酒店安排</div>
<div class="val" v-else>{{$t('v103.details.style.d5')}}</div>
</div>
</div>
</div>
......@@ -525,23 +525,24 @@ export default defineComponent({
data.currentImage = url
data.showImagePriview = true
},
getHotelSuffix() {
let suffix = "";
if (props.day.jiu2.length > 1) {
if (props.isDirect === 1) {
suffix = "或同級";
suffix = t('v103.details.style.d6');
}
} else {
if (
props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != "温馨的家" &&
props.day.jiu2[0].name != "机场附近酒店"
props.day.jiu2[0].name != t('v103.details.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8')
) {
if (props.day.jiu2[0].status == 1) {
suffix = "【保证入住】";
suffix = t('v103.details.style.d9');
} else {
if (props.isDirect === 1) {
suffix = "或同級";
suffix = t('v103.details.style.d10');
}
}
}
......
src/components/trip/block/fourday.vue
View file @ 00fab9f6
......@@ -32,7 +32,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
{{$t('v103.details.style.nodata')}}
</div>
</template>
</q-img>
......@@ -78,12 +78,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
约
{{$t('v103.details.style.d1')}}
<span v-if="day.details[0].playTimeHour"
>{{ day.details[0].playTimeHour }}小时
>{{ day.details[0].playTimeHour }}{{$t('v103.details.style.d2')}}
</span>
<span v-if="day.details[0].playTimeMinutes"
>{{ day.details[0].playTimeMinutes }}分钟</span
>{{ day.details[0].playTimeMinutes }}{{$t('v103.details.style.d3')}}</span
>
</span>
</div>
......@@ -126,7 +126,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
{{$t('v103.details.style.nodata')}}
</div>
</template>
</q-img>
......@@ -167,12 +167,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
约
{{$t('v103.details.style.d1')}}
<span v-if="day.details[1].playTimeHour"
>{{ day.details[1].playTimeHour }}小时
>{{ day.details[1].playTimeHour }}{{$t('v103.details.style.d2')}}
</span>
<span v-if="day.details[1].playTimeMinutes"
>{{ day.details[1].playTimeMinutes }}分钟
>{{ day.details[1].playTimeMinutes }}{{$t('v103.details.style.d3')}}
</span>
</span>
</div>
......@@ -206,7 +206,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
{{$t('v103.details.style.nodata')}}
</div>
</template>
</q-img>
......@@ -247,12 +247,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
约
{{$t('v103.details.style.d1')}}
<span v-if="day.details[2].playTimeHour"
>{{ day.details[2].playTimeHour }}小时
>{{ day.details[2].playTimeHour }}{{$t('v103.details.style.d2')}}
</span>
<span v-if="day.details[2].playTimeMinutes"
>{{ day.details[2].playTimeMinutes }}分钟
>{{ day.details[2].playTimeMinutes }}{{$t('v103.details.style.d3')}}
</span>
</span>
</div>
......@@ -288,7 +288,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
{{$t('v103.details.style.nodata')}}
</div>
</template>
</q-img>
......@@ -329,12 +329,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
约
{{$t('v103.details.style.d1')}}
<span v-if="day.details[3].playTimeHour"
>{{ day.details[3].playTimeHour }}小时
>{{ day.details[3].playTimeHour }}{{$t('v103.details.style.d2')}}
</span>
<span v-if="day.details[3].playTimeMinutes"
>{{ day.details[3].playTimeMinutes }}分钟
>{{ day.details[3].playTimeMinutes }}{{$t('v103.details.style.d3')}}
</span>
</span>
</div>
......@@ -346,7 +346,7 @@
</div>
<div class="item flex q-mt-sm q-pa-lg" v-if="day.tips.length > 0">
<h4>温馨提示</h4>
<h4>{{$t('v103.details.style.d4')}}</h4>
<div class="remark">
<span v-for="(t, k) in day.tips" :key="k" v-html="t.content"></span>
</div>
......@@ -393,7 +393,7 @@
</span>
{{ getHotelSuffix() }}
</div>
<div class="val" v-else>本日无酒店安排</div>
<div class="val" v-else>{{$t('v103.details.style.d5')}}</div>
</div>
</div>
</div>
......@@ -437,23 +437,24 @@ export default defineComponent({
data.currentImage = url
data.showImagePriview = true
},
getHotelSuffix() {
let suffix = "";
if (props.day.jiu2.length > 1) {
if (props.isDirect === 1) {
suffix = "或同級";
suffix = t('v103.details.style.d6');
}
} else {
if (
props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != "温馨的家" &&
props.day.jiu2[0].name != "机场附近酒店"
props.day.jiu2[0].name != t('v103.details.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8')
) {
if (props.day.jiu2[0].status == 1) {
suffix = "【保证入住】";
suffix = t('v103.details.style.d9');
} else {
if (props.isDirect === 1) {
suffix = "或同級";
suffix = t('v103.details.style.d10');
}
}
}
......
src/components/trip/block/oneday.vue
View file @ 00fab9f6
......@@ -38,7 +38,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
{{$t('v103.details.style.nodata')}}
</div>
</template>
</q-img>
......@@ -79,12 +79,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
约
{{$t('v103.details.style.d1')}}
<span v-if="day.details[0].playTimeHour"
>{{ day.details[0].playTimeHour }}小时
>{{ day.details[0].playTimeHour }}{{$t('v103.details.style.d2')}}
</span>
<span v-if="day.details[0].playTimeMinutes"
>{{ day.details[0].playTimeMinutes }}分钟</span
>{{ day.details[0].playTimeMinutes }}{{$t('v103.details.style.d3')}}</span
>
</span>
</div>
......@@ -95,7 +95,7 @@
</div>
<div class="item flex q-mt-sm q-pa-lg" v-if="day.tips.length > 0">
<h4>温馨提示</h4>
<h4>{{$t('v103.details.style.d4')}}</h4>
<div class="remark">
<span v-for="(t, k) in day.tips" :key="k" v-html="t.content"></span>
</div>
......@@ -142,7 +142,7 @@
</span>
{{ getHotelSuffix() }}
</div>
<div class="val" v-else>本日无酒店安排</div>
<div class="val" v-else>{{$t('v103.details.style.d5')}}</div>
</div>
</div>
</div>
......@@ -191,19 +191,19 @@ export default defineComponent({
let suffix = "";
if (props.day.jiu2.length > 1) {
if (props.isDirect === 1) {
suffix = "或同級";
suffix = t('v103.details.style.d6');
}
} else {
if (
props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != "温馨的家" &&
props.day.jiu2[0].name != "机场附近酒店"
props.day.jiu2[0].name != t('v103.details.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8')
) {
if (props.day.jiu2[0].status == 1) {
suffix = "【保证入住】";
suffix = t('v103.details.style.d9');
} else {
if (props.isDirect === 1) {
suffix = "或同級";
suffix = t('v103.details.style.d10');
}
}
}
......
src/components/trip/block/threeday.vue
View file @ 00fab9f6
......@@ -32,7 +32,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
{{$t('v103.details.style.nodata')}}
</div>
</template>
</q-img>
......@@ -80,12 +80,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
约
{{$t('v103.details.style.d1')}}
<span v-if="day.details[0].playTimeHour"
>{{ day.details[0].playTimeHour }}小时
>{{ day.details[0].playTimeHour }}{{$t('v103.details.style.d2')}}
</span>
<span v-if="day.details[0].playTimeMinutes"
>{{ day.details[0].playTimeMinutes }}分钟
>{{ day.details[0].playTimeMinutes }}{{$t('v103.details.style.d3')}}
</span>
</span>
</div>
......@@ -125,12 +125,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
约
{{$t('v103.details.style.d1')}}
<span v-if="day.details[1].playTimeHour"
>{{ day.details[1].playTimeHour }}小时
>{{ day.details[1].playTimeHour }}{{$t('v103.details.style.d2')}}
</span>
<span v-if="day.details[1].playTimeMinutes"
>{{ day.details[1].playTimeMinutes }}分钟
>{{ day.details[1].playTimeMinutes }}{{$t('v103.details.style.d3')}}
</span>
</span>
</div>
......@@ -163,7 +163,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
{{$t('v103.details.style.nodata')}}
</div>
</template>
</q-img>
......@@ -205,7 +205,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
{{$t('v103.details.style.nodata')}}
</div>
</template>
</q-img>
......@@ -248,12 +248,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
约
{{$t('v103.details.style.d1')}}
<span v-if="day.details[2].playTimeHour"
>{{ day.details[0].playTimeHour }}小时
>{{ day.details[0].playTimeHour }}{{$t('v103.details.style.d2')}}
</span>
<span v-if="day.details[2].playTimeMinutes"
>{{ day.details[0].playTimeMinutes }}分钟
>{{ day.details[0].playTimeMinutes }}{{$t('v103.details.style.d3')}}
</span>
</span>
</div>
......@@ -265,7 +265,7 @@
</div>
<div class="item flex q-mt-sm q-pa-lg" v-if="day.tips.length > 0">
<h4>温馨提示</h4>
<h4>{{$t('v103.details.style.d4')}}</h4>
<div class="remark">
<span v-for="(t, k) in day.tips" :key="k" v-html="t.content"></span>
</div>
......@@ -312,7 +312,7 @@
</span>
{{ getHotelSuffix() }}
</div>
<div class="val" v-else>本日无酒店安排</div>
<div class="val" v-else>{{$t('v103.details.style.d5')}}</div>
</div>
</div>
</div>
......@@ -361,19 +361,19 @@ export default defineComponent({
let suffix = "";
if (props.day.jiu2.length > 1) {
if (props.isDirect === 1) {
suffix = "或同級";
suffix = t('v103.details.style.d6');
}
} else {
if (
props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != "温馨的家" &&
props.day.jiu2[0].name != "机场附近酒店"
props.day.jiu2[0].name != t('v103.details.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8')
) {
if (props.day.jiu2[0].status == 1) {
suffix = "【保证入住】";
suffix = t('v103.details.style.d9');
} else {
if (props.isDirect === 1) {
suffix = "或同級";
suffix = t('v103.details.style.d10');
}
}
}
......
src/components/trip/block/twoday.vue
View file @ 00fab9f6
......@@ -43,7 +43,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
{{$t('v103.details.style.nodata')}}
</div>
</template>
</q-img>
......@@ -82,12 +82,12 @@
v-if="item.playTimeHour || item.playTimeMinutes"
>
<i class="iconfont icon-shijian1"></i>
约
{{$t('v103.details.style.d1')}}
<span v-if="item.playTimeHour"
>{{ item.playTimeHour }}小时
>{{ item.playTimeHour }}{{$t('v103.details.style.d2')}}
</span>
<span v-if="item.playTimeMinutes"
>{{ item.playTimeMinutes }}分钟
>{{ item.playTimeMinutes }}{{$t('v103.details.style.d3')}}
</span>
</span>
</div>
......@@ -124,12 +124,12 @@
v-if="item.playTimeHour || item.playTimeMinutes"
>
<i class="iconfont icon-shijian1"></i>
约
{{$t('v103.details.style.d1')}}
<span v-if="item.playTimeHour"
>{{ item.playTimeHour }}小时
>{{ item.playTimeHour }}{{$t('v103.details.style.d2')}}
</span>
<span v-if="item.playTimeMinutes"
>{{ item.playTimeMinutes }}分钟
>{{ item.playTimeMinutes }}{{$t('v103.details.style.d3')}}
</span>
</span>
</div>
......@@ -158,7 +158,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
图片加载失败
{{$t('v103.details.style.nodata')}}
</div>
</template>
</q-img>
......@@ -176,7 +176,7 @@
</div>
<div class="item flex q-mt-sm q-pa-lg" v-if="day.tips.length > 0">
<h4>温馨提示</h4>
<h4>{{$t('v103.details.style.d4')}}</h4>
<div class="remark">
<span v-for="(t, k) in day.tips" :key="k" v-html="t.content"></span>
</div>
......@@ -223,7 +223,7 @@
</span>
{{ getHotelSuffix() }}
</div>
<div class="val" v-else>本日无酒店安排</div>
<div class="val" v-else>{{$t('v103.details.style.d5')}}</div>
</div>
</div>
</div>
......@@ -264,7 +264,6 @@ export default defineComponent({
})
const methods = {
showImageHandler(url: string) {
console.log(url,'------')
data.currentImage = url
data.showImagePriview = true
},
......@@ -273,19 +272,19 @@ export default defineComponent({
let suffix = "";
if (props.day.jiu2.length > 1) {
if (props.isDirect === 1) {
suffix = "或同級";
suffix = t('v103.details.style.d6');
}
} else {
if (
props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != "温馨的家" &&
props.day.jiu2[0].name != "机场附近酒店"
props.day.jiu2[0].name != t('v103.details.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8')
) {
if (props.day.jiu2[0].status == 1) {
suffix = "【保证入住】";
suffix = t('v103.details.style.d9');
} else {
if (props.isDirect === 1) {
suffix = "或同級";
suffix = t('v103.details.style.d10');
}
}
}
......
src/components/trip/style3.vue
View file @ 00fab9f6
......@@ -2721,7 +2721,7 @@
</label>
<label class="style3_detail">{{getHotelSuffix(item)}}</label>
</div>
<div class="val" v-else>本日无酒店安排</div>
<div class="val" v-else>{{$t('v103.details.style.d5')}}</div>
</div>
</div>
</div>
......
src/components/trip/style5.vue
View file @ 00fab9f6
......@@ -127,7 +127,7 @@
</div>
</div>
<div class="expense">
<div class="left">温馨提示</div>
<div class="left">{{$t('v103.details.style.d4')}}</div>
<div class="right">
<div v-html="htmlData5"></div>
</div>
......
src/components/trip/style6.vue
View file @ 00fab9f6
......@@ -243,7 +243,7 @@
</label>
{{getHotelSuffix(item)}}
</div>
<div class="style6_val" v-else>本日无酒店安排</div>
<div class="style6_val" v-else>{{$t('v103.details.style.d5')}}</div>
</div>
</div>
<div class="detail-right">
......
src/components/trip/tripView/calendar.vue
View file @ 00fab9f6
......@@ -2,17 +2,17 @@
<q-table :rows="days" :columns="cols" flat class="q-mt-md" hide-pagination>
<template v-slot:body-cell-day="props">
<q-td :props="props">
<div class="text-h6">第 {{ props.row.dayNum }} 天</div>
<div class="text-h6">{{$t('v103.details.calendarhtml.d1')}} {{ props.row.dayNum }} {{$t('v103.details.calendarhtml.d11')}}</div>
<div class="f12 text-grey-8">{{ props.row.title }}</div>
</q-td>
</template>
<template v-slot:body-cell-dinner="props">
<q-td :props="props">
<div class="f12 text-grey-8">早餐：</div>
<div class="f12 text-grey-8">{{$t('v103.details.calendarhtml.d2')}}：</div>
<div class="f12 text-grey-8">{{ props.row.breakfast }}</div>
<div class="f12 text-grey-8 q-mt-sm">午餐：</div>
<div class="f12 text-grey-8 q-mt-sm">{{$t('v103.details.calendarhtml.d3')}}：</div>
<div class="f12 text-grey-8">{{ props.row.lanuch }}</div>
<div class="f12 text-grey-8 q-mt-sm">晚餐：</div>
<div class="f12 text-grey-8 q-mt-sm">{{$t('v103.details.calendarhtml.d4')}}：</div>
<div class="f12 text-grey-8">{{ props.row.dinner }}</div>
</q-td>
</template>
......@@ -28,7 +28,7 @@
<q-td :props="props">
<div v-for="(x,i) in props.row.hotel" :key="i" class="row items-center" >
<q-chip class="bg-transparent" text-color="blue" dense :label="x.n" />
<span class="q-ml-sm">{{ x.t==0?'保證入住':'或同級別酒店' }}</span>
<span class="q-ml-sm">{{ x.t==0?$t('v103.details.calendarhtml.d5'):$t('v103.details.calendarhtml.d6') }}</span>
</div>
<div class="q-mt-sm" v-if="props.row.tips">{{ props.row.tips }}</div>
</q-td>
......@@ -52,10 +52,10 @@ export default defineComponent({
const data= reactive({
cols: [
{ name: "day", label: "行程", align: "left",style:'vertical-align:top;' },
{ name: "dinner", label: "用餐", align: "left",style:'vertical-align:top;' },
{ name: "acitvity", label: "景点/场馆&活动", align: "left",style:'vertical-align:top;' },
{ name: "hotel", label: "酒店", align: "left",style:'vertical-align:top;' },
{ name: "day", label: t('v103.details.calendartitle.d1'), align: "left",style:'vertical-align:top;' },
{ name: "dinner", label: t('v103.details.calendartitle.d2'), align: "left",style:'vertical-align:top;' },
{ name: "acitvity", label: t('v103.details.calendartitle.d3'), align: "left",style:'vertical-align:top;' },
{ name: "hotel", label: t('v103.details.calendartitle.d4'), align: "left",style:'vertical-align:top;' },
],
days: props.days,
d: props.days
......@@ -69,9 +69,9 @@ export default defineComponent({
formatDay() {
if (data.d.length > 0) {
data.d.forEach((x) => {
x.breakfast='不含餐'
x.lanuch='不含餐'
x.dinner='不含餐'
x.breakfast=t('v103.details.day.d1')
x.lanuch=t('v103.details.day.d1')
x.dinner=t('v103.details.day.d1')
x.activity=[]
x.hotel=[]
x.tips=''
......@@ -87,13 +87,13 @@ export default defineComponent({
y.title = methods.formatTraffice(y.childItem.subTraffic);
y.icon = "iconfont iconjiaotong";
} else if (y.type == 4) {
if(y.childItem.dinnerName.indexOf('自理')==-1 && y.childItem.dinnerName.indexOf('请选择')==-1){
if(y.childItem.dinnerName.indexOf(t('v103.details.day.d2'))==-1 && y.childItem.dinnerName.indexOf(t('v103.details.day.d3'))==-1){
if(y.childItem.useDinnerType=='1'){
x.breakfast =x.breakfast=='不含餐'?y.childItem.dinnerName:x.breakfast+'，'+y.childItem.dinnerName
x.breakfast =x.breakfast==t('v103.details.day.d1')?y.childItem.dinnerName:x.breakfast+'，'+y.childItem.dinnerName
} else if(y.childItem.useDinnerType=='2'){
x.lanuch =x.lanuch=='不含餐'?y.childItem.dinnerName:x.lanuch+'，'+y.childItem.dinnerName
x.lanuch =x.lanuch==t('v103.details.day.d1')?y.childItem.dinnerName:x.lanuch+'，'+y.childItem.dinnerName
} else if(y.childItem.useDinnerType=='3'){
x.dinner =x.dinner=='不含餐'?y.childItem.dinnerName:x.dinner+'，'+y.childItem.dinnerName
x.dinner =x.dinner==t('v103.details.day.d1')?y.childItem.dinnerName:x.dinner+'，'+y.childItem.dinnerName
}
}
} else if (y.type == 2) {
......@@ -104,7 +104,7 @@ export default defineComponent({
} else if (y.type == 5) {
x.activity.push({
t:2,
n:'自由活動'
n:t('v103.details.day.d4')
})
} else if (y.type == 3) {
x.hotel.push({n:y.childItem.hotelName,t:y.childItem.IsSameLevel})
......@@ -116,21 +116,21 @@ export default defineComponent({
}
},
formatTraffice(tras) {
let txt = "從" + tras[0].startCityName;
let txt = t('v103.details.traffice.d1') + tras[0].startCityName;
tras.forEach((z, i) => {
if (i > 0) {
txt = "；再";
txt = t('v103.details.traffice.d2');
}
if (z.arrivalType == 1) {
txt += "搭乘航班";
txt += t('v103.details.traffice.d3');
} else if (z.arrivalType == 2) {
txt += "乘坐豪華巴士";
txt += t('v103.details.traffice.d4');
} else if (z.arrivalType == 3) {
txt += "乘坐豪華郵輪";
txt += t('v103.details.traffice.d5');
} else {
txt += "乘坐高鐵";
txt += t('v103.details.traffice.d6');
}
txt += " 到達" + z.arrivalCityName;
txt += ` ${t('v103.details.traffice.d7')}` + z.arrivalCityName;
});
return txt;
},
......
src/components/trip/tripView/list.vue
View file @ 00fab9f6
......@@ -4,7 +4,7 @@
<q-timeline color="secondary" layout="dense">
<q-timeline-entry heading class="small-heading">
<span class="text-subtitle1 text-grey-9 text-weight-bold"
>第 {{ x.dayNum }} 天</span
>{{$t('v103.details.calendarhtml.d1')}} {{ x.dayNum }} {{$t('v103.details.calendarhtml.d11')}}</span
>
<span class="text-subtitle1 text-grey-9 text-weight-bold q-ml-lg">{{
x.title
......@@ -24,7 +24,7 @@
></div>
</q-timeline-entry>
<q-timeline-entry
subtitle="景點/場館"
:subtitle="$t('v103.details.list.d1')"
icon="iconfont iconjingdian"
color="info"
:key="yi"
......@@ -33,7 +33,7 @@
<template v-slot:title>
<div class="row">
<span class="q-mr-md">{{
`遊玩${y.childItem.couponsName}`
`${$t('v103.details.list.d2')}${y.childItem.couponsName}`
}}</span>
<div
class="row items-center rounded-borders"
......@@ -43,17 +43,17 @@
class="bg-dark text-white"
style="padding: 0 4px; font-size: 12px"
>
推薦遊玩
{{$t('v103.details.list.d3')}}
</div>
<div
class="text-dark"
style="padding: 0 4px; font-size: 12px; background: #f0bd86"
>
<span v-if="y.childItem.playTimeHour > 0"
>{{ y.childItem.playTimeHour }} 小時</span
>{{ y.childItem.playTimeHour }} {{$t('v103.details.list.d4')}}</span
>
<span v-if="y.childItem.playTimeMinutes > 0">
{{ y.childItem.playTimeMinutes }} 分鐘</span
{{ y.childItem.playTimeMinutes }} {{$t('v103.details.list.d5')}}</span
>
</div>
</div>
......@@ -141,8 +141,8 @@
</div>
</q-timeline-entry>
<q-timeline-entry
title="自由活動"
subtitle="放鬆休息，細細品味身邊的風景"
:title="$t('v103.details.day.d4')"
:subtitle="$t('v103.details.list.d6')"
icon="iconfont iconhuodong"
:key="yi"
color="grey"
......@@ -184,7 +184,7 @@
</div>
</q-timeline-entry>
<q-timeline-entry
subtitle="住宿"
:subtitle="$t('v103.details.list.d7')"
icon="iconfont iconjiudian"
color="dark"
:key="yi"
......@@ -193,7 +193,7 @@
<template v-slot:title>
<div class="row items-center">
<span class="q-mr-md">
<span>入住</span>
<span>{{$t('v103.details.list.d8')}}</span>
<span class="q-ml-sm">
{{ y.childItem.hotelName }}
<q-badge transparent align="middle" color="orange">
......@@ -208,7 +208,7 @@
square
text-color="grey-2"
dense
label="含早餐"
:label="$t('v103.details.day.d5')"
v-if="y.childItem.useDinnerType.indexOf('1') != -1"
/>
<q-chip
......@@ -216,7 +216,7 @@
square
text-color="grey-2"
dense
label="含晚餐"
:label="$t('v103.details.day.d6')"
v-if="y.childItem.useDinnerType.indexOf('3') != -1"
/>
<q-chip
......@@ -224,7 +224,7 @@
square
text-color="grey-2"
dense
label="保證入住"
:label="$t('v103.details.day.d7')"
v-if="y.childItem.isSameLevel == 0"
/>
<q-chip
......@@ -232,10 +232,10 @@
square
text-color="grey-2"
dense
label="或同級別酒店"
:label="$t('v103.details.day.d8')"
>
<q-tooltip class="bg-dark"
>我們會儘量保證入住行程所示酒店，不排除突發的意外情況造成無法入住，我們將會為您安排同級別的酒店，請您放心選購</q-tooltip
>{{$t('v103.details.list.d9')}}</q-tooltip
>
</q-chip>
</div>
......@@ -277,8 +277,8 @@
</div>
</q-timeline-entry>
<q-timeline-entry
title="溫馨提示"
subtitle="感謝您的耐心閱讀，"
:title="$t('v103.details.list.d10')"
:subtitle="$t('v103.details.list.d11')"
icon="iconfont icontishi"
:key="yi"
color="warning"
......@@ -356,7 +356,7 @@ export default defineComponent({
y.title = methods.formatTraffice(y.childItem.subTraffic);
y.icon = "iconfont iconjiaotong";
} else if (y.type == 4) {
let t = ["早餐", "午餐", "晚餐"];
let t = [t('v103.details.calendarhtml.d2'), t('v103.details.calendarhtml.d3'), t('v103.details.calendarhtml.d4')];
y.childItem.dinnerTypeName =
t[parseInt(y.childItem.useDinnerType) - 1];
}
......@@ -365,21 +365,21 @@ export default defineComponent({
}
},
formatTraffice(tras) {
let txt = "從" + tras[0].startCityName;
let txt = t('v103.details.traffice.d1') + tras[0].startCityName;
tras.forEach((z, i) => {
if (i > 0) {
txt = "；再";
txt = t('v103.details.traffice.d2');
}
if (z.arrivalType == 1) {
txt += "搭乘航班";
txt += t('v103.details.traffice.d3');
} else if (z.arrivalType == 2) {
txt += "乘坐豪華巴士";
txt += t('v103.details.traffice.d4');
} else if (z.arrivalType == 3) {
txt += "乘坐豪華郵輪";
txt += t('v103.details.traffice.d5');
} else {
txt += "乘坐高鐵";
txt += t('v103.details.traffice.d6');
}
txt += " 到達" + z.arrivalCityName;
txt += ` ${t('v103.details.traffice.d7')}` + z.arrivalCityName;
});
return txt;
},
......
src/i18n/zh-TW/index.ts
View file @ 00fab9f6
......@@ -1150,7 +1150,74 @@ export default {
},
daily: '每日行程',
graphicmode: '圖文模式',
calendarmode: '日曆模式'
calendarmode: '日曆模式',
calendarhtml:{
d1: '第',
d11: '天',
d2: '早餐',
d3: '午餐',
d4: '晚餐',
d5: '保證入住',
d6: '或同級別酒店',
},
calendartitle:{
d1: '行程',
d2: '用餐',
d3: '景点/场馆&活动',
d4: '酒店',
},
day:{
d1: '不含餐',
d2: '自理',
d3: '请选择',
d4: '自由活動',
d5: '含早餐',
d6: '含晚餐',
d7: '保證入住',
d8: '或同級別酒店'
},
traffice:{
d1: '從',
d2: '；再',
d3: '搭乘航班',
d4: '乘坐豪華巴士',
d5: '乘坐豪華郵輪',
d6: '乘坐高鐵',
d7: '到達',
},
list:{
d1: '景點/場館',
d2: '遊玩',
d3: '推薦遊玩',
d4: '小時',
d5: '分鐘',
d6: '放鬆休息，細細品味身邊的風景',
d7: '住宿',
d8: '入住',
d9: '我們會儘量保證入住行程所示酒店，不排除突發的意外情況造成無法入住，我們將會為您安排同級別的酒店，請您放心選購',
d10: '溫馨提示',
d11: '感謝您的耐心閱讀，',
d12: '',
d13: '',
},
style:{
nodata: '图片加载失败',
d1: '约',
d2: '小时',
d3: '分钟',
d4: '温馨提示',
d5: '本日无酒店安排',
d6: '或同級',
d7: '温馨的家',
d8: '机场附近酒店',
d9: '【保证入住】',
d10: '或同級',
d11: '',
d12: '',
d13: '',
d14: '',
d15: '',
}
}
}
//#endregion
......
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