Skip to content

B
bigwood
Commit 461e7b2b authored by youjie's avatar youjie
Browse files
Options

行程订单优化

parent 187da1ee
Hide whitespace changes
Inline Side-by-side
Showing with 280 additions and 247 deletions
src/components/trip/block/allDay.vue
View file @ 461e7b2b
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<div <div
class="absolute-full flex flex-center bg-blue-1 text-dark" class="absolute-full flex flex-center bg-blue-1 text-dark"
> >
{{$t('v103.details.style.nodata')}} {{$t('v103.scheduledTripDetails.style.nodata')}}
</div> </div>
</template> </template>
</q-img> </q-img>
...@@ -77,12 +77,12 @@ ...@@ -77,12 +77,12 @@
" "
> >
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}} {{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="x.playTimeHour" <span v-if="x.playTimeHour"
>{{ x.playTimeHour }}{{$t('v103.details.style.d2')}} >{{ x.playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span> </span>
<span v-if="x.playTimeMinutes" <span v-if="x.playTimeMinutes"
>{{ x.playTimeMinutes }}{{$t('v103.details.style.d3')}}</span >{{ x.playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}</span
> >
</span> </span>
</div> </div>
...@@ -158,19 +158,19 @@ ...@@ -158,19 +158,19 @@
let suffix = ""; let suffix = "";
if (props.day.jiu2.length > 1) { if (props.day.jiu2.length > 1) {
if (props.isDirect === 1) { if (props.isDirect === 1) {
suffix = t('v103.details.style.d6'); suffix = t('v103.scheduledTripDetails.style.d6');
} }
} else { } else {
if ( if (
props.day.jiu2.length == 1 && props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != t('v103.details.style.d7') && props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8') props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d8')
) { ) {
if (props.day.jiu2[0].status == 1) { if (props.day.jiu2[0].status == 1) {
suffix = t('v103.details.style.d9'); suffix = t('v103.scheduledTripDetails.style.d9');
} else { } else {
if (props.isDirect === 1) { if (props.isDirect === 1) {
suffix = t('v103.details.style.d10'); suffix = t('v103.scheduledTripDetails.style.d10');
} }
} }
} }
......
src/components/trip/block/fiveday.vue
View file @ 461e7b2b
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<div <div
class="absolute-full flex flex-center bg-blue-1 text-dark" class="absolute-full flex flex-center bg-blue-1 text-dark"
> >
{{$t('v103.details.style.nodata')}} {{$t('v103.scheduledTripDetails.style.nodata')}}
</div> </div>
</template> </template>
</q-img> </q-img>
...@@ -75,12 +75,12 @@ ...@@ -75,12 +75,12 @@
" "
> >
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}} {{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="day.details[0].playTimeHour" <span v-if="day.details[0].playTimeHour"
>{{ day.details[0].playTimeHour }}{{$t('v103.details.style.d2')}} >{{ day.details[0].playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span> </span>
<span v-if="day.details[0].playTimeMinutes" <span v-if="day.details[0].playTimeMinutes"
>{{ day.details[0].playTimeMinutes }}{{$t('v103.details.style.d3')}}</span >{{ day.details[0].playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}</span
> >
</span> </span>
</div> </div>
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<div <div
class="absolute-full flex flex-center bg-blue-1 text-dark" class="absolute-full flex flex-center bg-blue-1 text-dark"
> >
{{$t('v103.details.style.nodata')}} {{$t('v103.scheduledTripDetails.style.nodata')}}
</div> </div>
</template> </template>
</q-img> </q-img>
...@@ -162,12 +162,12 @@ ...@@ -162,12 +162,12 @@
" "
> >
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}} {{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="day.details[1].playTimeHour" <span v-if="day.details[1].playTimeHour"
>{{ day.details[1].playTimeHour }}{{$t('v103.details.style.d2')}} >{{ day.details[1].playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span> </span>
<span v-if="day.details[1].playTimeMinutes" <span v-if="day.details[1].playTimeMinutes"
>{{ day.details[1].playTimeMinutes }}{{$t('v103.details.style.d3')}}</span >{{ day.details[1].playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}</span
> >
</span> </span>
</div> </div>
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
<div <div
class="absolute-full flex flex-center bg-blue-1 text-dark" class="absolute-full flex flex-center bg-blue-1 text-dark"
> >
{{$t('v103.details.style.nodata')}} {{$t('v103.scheduledTripDetails.style.nodata')}}
</div> </div>
</template> </template>
</q-img> </q-img>
...@@ -252,12 +252,12 @@ ...@@ -252,12 +252,12 @@
" "
> >
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}} {{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="day.details[2].playTimeHour" <span v-if="day.details[2].playTimeHour"
>{{ day.details[2].playTimeHour }}{{$t('v103.details.style.d2')}} >{{ day.details[2].playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span> </span>
<span v-if="day.details[2].playTimeMinutes" <span v-if="day.details[2].playTimeMinutes"
>{{ day.details[2].playTimeMinutes }}{{$t('v103.details.style.d3')}} >{{ day.details[2].playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}
</span> </span>
</span> </span>
</div> </div>
...@@ -292,7 +292,7 @@ ...@@ -292,7 +292,7 @@
<div <div
class="absolute-full flex flex-center bg-blue-1 text-dark" class="absolute-full flex flex-center bg-blue-1 text-dark"
> >
{{$t('v103.details.style.nodata')}} {{$t('v103.scheduledTripDetails.style.nodata')}}
</div> </div>
</template> </template>
</q-img> </q-img>
...@@ -337,12 +337,12 @@ ...@@ -337,12 +337,12 @@
" "
> >
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}} {{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="day.details[3].playTimeHour" <span v-if="day.details[3].playTimeHour"
>{{ day.details[3].playTimeHour }}{{$t('v103.details.style.d2')}} >{{ day.details[3].playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span> </span>
<span v-if="day.details[3].playTimeMinutes" <span v-if="day.details[3].playTimeMinutes"
>{{ day.details[3].playTimeMinutes }}{{$t('v103.details.style.d3')}} >{{ day.details[3].playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}
</span> </span>
</span> </span>
</div> </div>
...@@ -378,7 +378,7 @@ ...@@ -378,7 +378,7 @@
<div <div
class="absolute-full flex flex-center bg-blue-1 text-dark" class="absolute-full flex flex-center bg-blue-1 text-dark"
> >
{{$t('v103.details.style.nodata')}} {{$t('v103.scheduledTripDetails.style.nodata')}}
</div> </div>
</template> </template>
</q-img> </q-img>
...@@ -418,12 +418,12 @@ ...@@ -418,12 +418,12 @@
" "
> >
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}} {{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="day.details[4].playTimeHour" <span v-if="day.details[4].playTimeHour"
>{{ day.details[4].playTimeHour }}{{$t('v103.details.style.d2')}} >{{ day.details[4].playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span> </span>
<span v-if="day.details[4].playTimeMinutes" <span v-if="day.details[4].playTimeMinutes"
>{{ day.details[4].playTimeMinutes }}{{$t('v103.details.style.d3')}} >{{ day.details[4].playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}
</span> </span>
</span> </span>
</div> </div>
...@@ -434,7 +434,7 @@ ...@@ -434,7 +434,7 @@
</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>{{$t('v103.details.style.d4')}}</h4> <h4>{{$t('v103.scheduledTripDetails.style.d4')}}</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>
...@@ -481,7 +481,7 @@ ...@@ -481,7 +481,7 @@
</span> </span>
{{ getHotelSuffix() }} {{ getHotelSuffix() }}
</div> </div>
<div class="val" v-else>{{$t('v103.details.style.d5')}}</div> <div class="val" v-else>{{$t('v103.scheduledTripDetails.style.d5')}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -530,19 +530,19 @@ export default defineComponent({ ...@@ -530,19 +530,19 @@ export default defineComponent({
let suffix = ""; let suffix = "";
if (props.day.jiu2.length > 1) { if (props.day.jiu2.length > 1) {
if (props.isDirect === 1) { if (props.isDirect === 1) {
suffix = t('v103.details.style.d6'); suffix = t('v103.scheduledTripDetails.style.d6');
} }
} else { } else {
if ( if (
props.day.jiu2.length == 1 && props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != t('v103.details.style.d7') && props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8') props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d8')
) { ) {
if (props.day.jiu2[0].status == 1) { if (props.day.jiu2[0].status == 1) {
suffix = t('v103.details.style.d9'); suffix = t('v103.scheduledTripDetails.style.d9');
} else { } else {
if (props.isDirect === 1) { if (props.isDirect === 1) {
suffix = t('v103.details.style.d10'); suffix = t('v103.scheduledTripDetails.style.d10');
} }
} }
} }
......
src/components/trip/block/fourday.vue
View file @ 461e7b2b
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<div <div
class="absolute-full flex flex-center bg-blue-1 text-dark" class="absolute-full flex flex-center bg-blue-1 text-dark"
> >
{{$t('v103.details.style.nodata')}} {{$t('v103.scheduledTripDetails.style.nodata')}}
</div> </div>
</template> </template>
</q-img> </q-img>
...@@ -78,12 +78,12 @@ ...@@ -78,12 +78,12 @@
" "
> >
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}} {{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="day.details[0].playTimeHour" <span v-if="day.details[0].playTimeHour"
>{{ day.details[0].playTimeHour }}{{$t('v103.details.style.d2')}} >{{ day.details[0].playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span> </span>
<span v-if="day.details[0].playTimeMinutes" <span v-if="day.details[0].playTimeMinutes"
>{{ day.details[0].playTimeMinutes }}{{$t('v103.details.style.d3')}}</span >{{ day.details[0].playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}</span
> >
</span> </span>
</div> </div>
...@@ -126,7 +126,7 @@ ...@@ -126,7 +126,7 @@
<div <div
class="absolute-full flex flex-center bg-blue-1 text-dark" class="absolute-full flex flex-center bg-blue-1 text-dark"
> >
{{$t('v103.details.style.nodata')}} {{$t('v103.scheduledTripDetails.style.nodata')}}
</div> </div>
</template> </template>
</q-img> </q-img>
...@@ -167,12 +167,12 @@ ...@@ -167,12 +167,12 @@
" "
> >
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}} {{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="day.details[1].playTimeHour" <span v-if="day.details[1].playTimeHour"
>{{ day.details[1].playTimeHour }}{{$t('v103.details.style.d2')}} >{{ day.details[1].playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span> </span>
<span v-if="day.details[1].playTimeMinutes" <span v-if="day.details[1].playTimeMinutes"
>{{ day.details[1].playTimeMinutes }}{{$t('v103.details.style.d3')}} >{{ day.details[1].playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}
</span> </span>
</span> </span>
</div> </div>
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
<div <div
class="absolute-full flex flex-center bg-blue-1 text-dark" class="absolute-full flex flex-center bg-blue-1 text-dark"
> >
{{$t('v103.details.style.nodata')}} {{$t('v103.scheduledTripDetails.style.nodata')}}
</div> </div>
</template> </template>
</q-img> </q-img>
...@@ -247,12 +247,12 @@ ...@@ -247,12 +247,12 @@
" "
> >
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}} {{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="day.details[2].playTimeHour" <span v-if="day.details[2].playTimeHour"
>{{ day.details[2].playTimeHour }}{{$t('v103.details.style.d2')}} >{{ day.details[2].playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span> </span>
<span v-if="day.details[2].playTimeMinutes" <span v-if="day.details[2].playTimeMinutes"
>{{ day.details[2].playTimeMinutes }}{{$t('v103.details.style.d3')}} >{{ day.details[2].playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}
</span> </span>
</span> </span>
</div> </div>
...@@ -288,7 +288,7 @@ ...@@ -288,7 +288,7 @@
<div <div
class="absolute-full flex flex-center bg-blue-1 text-dark" class="absolute-full flex flex-center bg-blue-1 text-dark"
> >
{{$t('v103.details.style.nodata')}} {{$t('v103.scheduledTripDetails.style.nodata')}}
</div> </div>
</template> </template>
</q-img> </q-img>
...@@ -329,12 +329,12 @@ ...@@ -329,12 +329,12 @@
" "
> >
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}} {{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="day.details[3].playTimeHour" <span v-if="day.details[3].playTimeHour"
>{{ day.details[3].playTimeHour }}{{$t('v103.details.style.d2')}} >{{ day.details[3].playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span> </span>
<span v-if="day.details[3].playTimeMinutes" <span v-if="day.details[3].playTimeMinutes"
>{{ day.details[3].playTimeMinutes }}{{$t('v103.details.style.d3')}} >{{ day.details[3].playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}
</span> </span>
</span> </span>
</div> </div>
...@@ -346,7 +346,7 @@ ...@@ -346,7 +346,7 @@
</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>{{$t('v103.details.style.d4')}}</h4> <h4>{{$t('v103.scheduledTripDetails.style.d4')}}</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>
...@@ -393,7 +393,7 @@ ...@@ -393,7 +393,7 @@
</span> </span>
{{ getHotelSuffix() }} {{ getHotelSuffix() }}
</div> </div>
<div class="val" v-else>{{$t('v103.details.style.d5')}}</div> <div class="val" v-else>{{$t('v103.scheduledTripDetails.style.d5')}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -442,19 +442,19 @@ export default defineComponent({ ...@@ -442,19 +442,19 @@ export default defineComponent({
let suffix = ""; let suffix = "";
if (props.day.jiu2.length > 1) { if (props.day.jiu2.length > 1) {
if (props.isDirect === 1) { if (props.isDirect === 1) {
suffix = t('v103.details.style.d6'); suffix = t('v103.scheduledTripDetails.style.d6');
} }
} else { } else {
if ( if (
props.day.jiu2.length == 1 && props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != t('v103.details.style.d7') && props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8') props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d8')
) { ) {
if (props.day.jiu2[0].status == 1) { if (props.day.jiu2[0].status == 1) {
suffix = t('v103.details.style.d9'); suffix = t('v103.scheduledTripDetails.style.d9');
} else { } else {
if (props.isDirect === 1) { if (props.isDirect === 1) {
suffix = t('v103.details.style.d10'); suffix = t('v103.scheduledTripDetails.style.d10');
} }
} }
} }
......
src/components/trip/block/oneday.vue
View file @ 461e7b2b
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<div <div
class="absolute-full flex flex-center bg-blue-1 text-dark" class="absolute-full flex flex-center bg-blue-1 text-dark"
> >
{{$t('v103.details.style.nodata')}} {{$t('v103.scheduledTripDetails.style.nodata')}}
</div> </div>
</template> </template>
</q-img> </q-img>
...@@ -79,12 +79,12 @@ ...@@ -79,12 +79,12 @@
" "
> >
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}} {{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="day.details[0].playTimeHour" <span v-if="day.details[0].playTimeHour"
>{{ day.details[0].playTimeHour }}{{$t('v103.details.style.d2')}} >{{ day.details[0].playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span> </span>
<span v-if="day.details[0].playTimeMinutes" <span v-if="day.details[0].playTimeMinutes"
>{{ day.details[0].playTimeMinutes }}{{$t('v103.details.style.d3')}}</span >{{ day.details[0].playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}</span
> >
</span> </span>
</div> </div>
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
</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>{{$t('v103.details.style.d4')}}</h4> <h4>{{$t('v103.scheduledTripDetails.style.d4')}}</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>
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
</span> </span>
{{ getHotelSuffix() }} {{ getHotelSuffix() }}
</div> </div>
<div class="val" v-else>{{$t('v103.details.style.d5')}}</div> <div class="val" v-else>{{$t('v103.scheduledTripDetails.style.d5')}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -191,19 +191,19 @@ export default defineComponent({ ...@@ -191,19 +191,19 @@ export default defineComponent({
let suffix = ""; let suffix = "";
if (props.day.jiu2.length > 1) { if (props.day.jiu2.length > 1) {
if (props.isDirect === 1) { if (props.isDirect === 1) {
suffix = t('v103.details.style.d6'); suffix = t('v103.scheduledTripDetails.style.d6');
} }
} else { } else {
if ( if (
props.day.jiu2.length == 1 && props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != t('v103.details.style.d7') && props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8') props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d8')
) { ) {
if (props.day.jiu2[0].status == 1) { if (props.day.jiu2[0].status == 1) {
suffix = t('v103.details.style.d9'); suffix = t('v103.scheduledTripDetails.style.d9');
} else { } else {
if (props.isDirect === 1) { if (props.isDirect === 1) {
suffix = t('v103.details.style.d10'); suffix = t('v103.scheduledTripDetails.style.d10');
} }
} }
} }
......
src/components/trip/block/threeday.vue
View file @ 461e7b2b
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<div <div
class="absolute-full flex flex-center bg-blue-1 text-dark" class="absolute-full flex flex-center bg-blue-1 text-dark"
> >
{{$t('v103.details.style.nodata')}} {{$t('v103.scheduledTripDetails.style.nodata')}}
</div> </div>
</template> </template>
</q-img> </q-img>
...@@ -80,12 +80,12 @@ ...@@ -80,12 +80,12 @@
" "
> >
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}} {{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="day.details[0].playTimeHour" <span v-if="day.details[0].playTimeHour"
>{{ day.details[0].playTimeHour }}{{$t('v103.details.style.d2')}} >{{ day.details[0].playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span> </span>
<span v-if="day.details[0].playTimeMinutes" <span v-if="day.details[0].playTimeMinutes"
>{{ day.details[0].playTimeMinutes }}{{$t('v103.details.style.d3')}} >{{ day.details[0].playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}
</span> </span>
</span> </span>
</div> </div>
...@@ -125,12 +125,12 @@ ...@@ -125,12 +125,12 @@
" "
> >
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}} {{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="day.details[1].playTimeHour" <span v-if="day.details[1].playTimeHour"
>{{ day.details[1].playTimeHour }}{{$t('v103.details.style.d2')}} >{{ day.details[1].playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span> </span>
<span v-if="day.details[1].playTimeMinutes" <span v-if="day.details[1].playTimeMinutes"
>{{ day.details[1].playTimeMinutes }}{{$t('v103.details.style.d3')}} >{{ day.details[1].playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}
</span> </span>
</span> </span>
</div> </div>
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
<div <div
class="absolute-full flex flex-center bg-blue-1 text-dark" class="absolute-full flex flex-center bg-blue-1 text-dark"
> >
{{$t('v103.details.style.nodata')}} {{$t('v103.scheduledTripDetails.style.nodata')}}
</div> </div>
</template> </template>
</q-img> </q-img>
...@@ -205,7 +205,7 @@ ...@@ -205,7 +205,7 @@
<div <div
class="absolute-full flex flex-center bg-blue-1 text-dark" class="absolute-full flex flex-center bg-blue-1 text-dark"
> >
{{$t('v103.details.style.nodata')}} {{$t('v103.scheduledTripDetails.style.nodata')}}
</div> </div>
</template> </template>
</q-img> </q-img>
...@@ -248,12 +248,12 @@ ...@@ -248,12 +248,12 @@
" "
> >
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}} {{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="day.details[2].playTimeHour" <span v-if="day.details[2].playTimeHour"
>{{ day.details[0].playTimeHour }}{{$t('v103.details.style.d2')}} >{{ day.details[0].playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span> </span>
<span v-if="day.details[2].playTimeMinutes" <span v-if="day.details[2].playTimeMinutes"
>{{ day.details[0].playTimeMinutes }}{{$t('v103.details.style.d3')}} >{{ day.details[0].playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}
</span> </span>
</span> </span>
</div> </div>
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
</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>{{$t('v103.details.style.d4')}}</h4> <h4>{{$t('v103.scheduledTripDetails.style.d4')}}</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>
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
</span> </span>
{{ getHotelSuffix() }} {{ getHotelSuffix() }}
</div> </div>
<div class="val" v-else>{{$t('v103.details.style.d5')}}</div> <div class="val" v-else>{{$t('v103.scheduledTripDetails.style.d5')}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -361,19 +361,19 @@ export default defineComponent({ ...@@ -361,19 +361,19 @@ export default defineComponent({
let suffix = ""; let suffix = "";
if (props.day.jiu2.length > 1) { if (props.day.jiu2.length > 1) {
if (props.isDirect === 1) { if (props.isDirect === 1) {
suffix = t('v103.details.style.d6'); suffix = t('v103.scheduledTripDetails.style.d6');
} }
} else { } else {
if ( if (
props.day.jiu2.length == 1 && props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != t('v103.details.style.d7') && props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8') props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d8')
) { ) {
if (props.day.jiu2[0].status == 1) { if (props.day.jiu2[0].status == 1) {
suffix = t('v103.details.style.d9'); suffix = t('v103.scheduledTripDetails.style.d9');
} else { } else {
if (props.isDirect === 1) { if (props.isDirect === 1) {
suffix = t('v103.details.style.d10'); suffix = t('v103.scheduledTripDetails.style.d10');
} }
} }
} }
......
src/components/trip/block/twoday.vue
View file @ 461e7b2b
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<div <div
class="absolute-full flex flex-center bg-blue-1 text-dark" class="absolute-full flex flex-center bg-blue-1 text-dark"
> >
{{$t('v103.details.style.nodata')}} {{$t('v103.scheduledTripDetails.style.nodata')}}
</div> </div>
</template> </template>
</q-img> </q-img>
...@@ -82,12 +82,12 @@ ...@@ -82,12 +82,12 @@
v-if="item.playTimeHour || item.playTimeMinutes" v-if="item.playTimeHour || item.playTimeMinutes"
> >
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}} {{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="item.playTimeHour" <span v-if="item.playTimeHour"
>{{ item.playTimeHour }}{{$t('v103.details.style.d2')}} >{{ item.playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span> </span>
<span v-if="item.playTimeMinutes" <span v-if="item.playTimeMinutes"
>{{ item.playTimeMinutes }}{{$t('v103.details.style.d3')}} >{{ item.playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}
</span> </span>
</span> </span>
</div> </div>
...@@ -124,12 +124,12 @@ ...@@ -124,12 +124,12 @@
v-if="item.playTimeHour || item.playTimeMinutes" v-if="item.playTimeHour || item.playTimeMinutes"
> >
<i class="iconfont icon-shijian1"></i> <i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}} {{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="item.playTimeHour" <span v-if="item.playTimeHour"
>{{ item.playTimeHour }}{{$t('v103.details.style.d2')}} >{{ item.playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span> </span>
<span v-if="item.playTimeMinutes" <span v-if="item.playTimeMinutes"
>{{ item.playTimeMinutes }}{{$t('v103.details.style.d3')}} >{{ item.playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}
</span> </span>
</span> </span>
</div> </div>
...@@ -158,7 +158,7 @@ ...@@ -158,7 +158,7 @@
<div <div
class="absolute-full flex flex-center bg-blue-1 text-dark" class="absolute-full flex flex-center bg-blue-1 text-dark"
> >
{{$t('v103.details.style.nodata')}} {{$t('v103.scheduledTripDetails.style.nodata')}}
</div> </div>
</template> </template>
</q-img> </q-img>
...@@ -176,7 +176,7 @@ ...@@ -176,7 +176,7 @@
</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>{{$t('v103.details.style.d4')}}</h4> <h4>{{$t('v103.scheduledTripDetails.style.d4')}}</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>
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
</span> </span>
{{ getHotelSuffix() }} {{ getHotelSuffix() }}
</div> </div>
<div class="val" v-else>{{$t('v103.details.style.d5')}}</div> <div class="val" v-else>{{$t('v103.scheduledTripDetails.style.d5')}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -272,19 +272,19 @@ export default defineComponent({ ...@@ -272,19 +272,19 @@ export default defineComponent({
let suffix = ""; let suffix = "";
if (props.day.jiu2.length > 1) { if (props.day.jiu2.length > 1) {
if (props.isDirect === 1) { if (props.isDirect === 1) {
suffix = t('v103.details.style.d6'); suffix = t('v103.scheduledTripDetails.style.d6');
} }
} else { } else {
if ( if (
props.day.jiu2.length == 1 && props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != t('v103.details.style.d7') && props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8') props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d8')
) { ) {
if (props.day.jiu2[0].status == 1) { if (props.day.jiu2[0].status == 1) {
suffix = t('v103.details.style.d9'); suffix = t('v103.scheduledTripDetails.style.d9');
} else { } else {
if (props.isDirect === 1) { if (props.isDirect === 1) {
suffix = t('v103.details.style.d10'); suffix = t('v103.scheduledTripDetails.style.d10');
} }
} }
} }
......
src/components/trip/calendar.vue
View file @ 461e7b2b
<template> <template>
<div> <div>
<div class="text-subtitle2 text-weight-bold">選擇日期、選項</div> <div class="text-subtitle2 text-weight-bold">{{$t('v103.scheduledTripDetails.dateoption')}}</div>
<div class="text-grey-6 f12 q-my-md">請選擇出發日期</div> <div class="text-grey-6 f12 q-my-md">{{$t('v103.scheduledTripDetails.pleasedateoption')}}</div>
<div class="rounded-borders" style="border: 1px solid #eee"> <div class="rounded-borders" style="border: 1px solid #eee">
<div class="q-px-lg q-py-sm row items-center"> <div class="q-px-lg q-py-sm row items-center">
<div class="text-subtitle2 text-weight-bold col"> <div class="text-subtitle2 text-weight-bold col">
...@@ -101,20 +101,20 @@ export default defineComponent({ ...@@ -101,20 +101,20 @@ export default defineComponent({
methods.init(); methods.init();
}) })
const data= reactive({ const data= reactive({
chineseWeek: ["日", "一", "二", "三", "四", "五", "六"], chineseWeek: [t('dayOfWeek.sun'), t('dayOfWeek.mon'), t('dayOfWeek.tues'), t('dayOfWeek.wed'), t('dayOfWeek.thur'), t('dayOfWeek.fri'), t('dayOfWeek.sat')],
chineseMonth: [ chineseMonth: [
"一月", t('v103.scheduledTripDetails.month.january'),
"二月", t('v103.scheduledTripDetails.month.february'),
"三月", t('v103.scheduledTripDetails.month.march'),
"四月", t('v103.scheduledTripDetails.month.april'),
"五月", t('v103.scheduledTripDetails.month.may'),
"6月", t('v103.scheduledTripDetails.month.june'),
"七月", t('v103.scheduledTripDetails.month.july'),
"八月", t('v103.scheduledTripDetails.month.august'),
"九月", t('v103.scheduledTripDetails.month.september'),
"十月", t('v103.scheduledTripDetails.month.october'),
"十一月", t('v103.scheduledTripDetails.month.november'),
"十二月", t('v103.scheduledTripDetails.month.december'),
], ],
data: [], data: [],
months: [], months: [],
......
src/components/trip/orderPreview.vue
View file @ 461e7b2b
...@@ -5,27 +5,27 @@ ...@@ -5,27 +5,27 @@
<q-btn <q-btn
color="primary" color="primary"
icon="refresh" icon="refresh"
label="全部重選" :label="$t('v103.scheduledTripDetails.reselect')"
@click="resetHandler" @click="resetHandler"
flat flat
/> />
</div> </div>
<div class="text-grey-6 f12 q-my-md">選擇數量</div> <div class="text-grey-6 f12 q-my-md">{{$t('v103.scheduledTripDetails.selectionquantity')}}</div>
<div class="row items-end"> <div class="row items-end">
<div class="col" :class="{'column':$q.platform.is.mobile}"> <div class="col" :class="{'column':$q.platform.is.mobile}">
<div> <div>
<span class="text-subtitle2 text-weight-bold">成人</span> <span class="text-subtitle2 text-weight-bold">{{$t('v103.scheduledTripDetails.cr')}}</span>
<span class="text-grey-6 f12 q-ml-sm">(12-99歲)</span> <span class="text-grey-6 f12 q-ml-sm">(12-99{{$t('v103.scheduledTripDetails.age')}})</span>
</div> </div>
<div v-if="$q.platform.is.mobile"> <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 {{ p.originalB2BPrice }} /每人 CNY {{ p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span> </span>
</div> </div>
</div> </div>
<div class="row items-end"> <div class="row items-end">
<span v-if="$q.platform.is.desktop" 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 {{ p.originalB2BPrice }} /每人 CNY {{ p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span> </span>
<q-input <q-input
style="width: 150px" style="width: 150px"
...@@ -69,20 +69,20 @@ ...@@ -69,20 +69,20 @@
<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" :class="{'column':$q.platform.is.mobile}"> <div class="col" :class="{'column':$q.platform.is.mobile}">
<div> <div>
<span class="text-subtitle2 text-weight-bold">儿童</span> <span class="text-subtitle2 text-weight-bold">{{$t('v103.scheduledTripDetails.et')}}</span>
<span class="text-grey-6 f12 q-ml-sm">(2-11歲,不占床)</span> <span class="text-grey-6 f12 q-ml-sm">(2-11{{$t('v103.scheduledTripDetails.age')}},{{$t('v103.scheduledTripDetails.noroom')}})</span>
</div> </div>
<div v-if="$q.platform.is.mobile"> <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
{{ p.originalB2BPrice - p.childNoNeedPrice }} /每人 {{ p.originalB2BPrice - p.childNoNeedPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span> </span>
</div> </div>
</div> </div>
<div class="row items-end"> <div class="row items-end">
<span v-if="$q.platform.is.desktop" 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 CNY
{{ p.originalB2BPrice - p.childNoNeedPrice }} /每人 {{ p.originalB2BPrice - p.childNoNeedPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span> </span>
<q-input <q-input
style="width: 150px" style="width: 150px"
...@@ -126,13 +126,13 @@ ...@@ -126,13 +126,13 @@
<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" :class="{ column: $q.platform.is.mobile }"> <div class="col" :class="{ column: $q.platform.is.mobile }">
<div> <div>
<span class="text-subtitle2 text-weight-bold">儿童</span> <span class="text-subtitle2 text-weight-bold">{{$t('v103.scheduledTripDetails.et')}}</span>
<span class="text-grey-6 f12 q-ml-sm">(2-11歲,占床)</span> <span class="text-grey-6 f12 q-ml-sm">(2-11{{$t('v103.scheduledTripDetails.age')}},{{$t('v103.scheduledTripDetails.room')}})</span>
</div> </div>
<div v-if="$q.platform.is.mobile"> <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
{{ p.childNeedPrice + p.originalB2BPrice }} /每人 {{ p.childNeedPrice + p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span> </span>
</div> </div>
</div> </div>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
style="font-size: 13px" style="font-size: 13px"
> >
CNY CNY
{{ p.childNeedPrice + p.originalB2BPrice }} /每人 {{ p.childNeedPrice + p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span> </span>
<q-input <q-input
style="width: 150px" style="width: 150px"
...@@ -187,18 +187,18 @@ ...@@ -187,18 +187,18 @@
<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" :class="{'column':$q.platform.is.mobile}"> <div class="col" :class="{'column':$q.platform.is.mobile}">
<div> <div>
<span class="text-subtitle2 text-weight-bold">婴儿</span> <span class="text-subtitle2 text-weight-bold">{{$t('v103.scheduledTripDetails.ye')}}</span>
<span class="text-grey-6 f12 q-ml-sm">(2歲以下)</span> <span class="text-grey-6 f12 q-ml-sm">(2{{$t('v103.scheduledTripDetails.age')}}{{$t('v103.scheduledTripDetails.yixia')}})</span>
</div> </div>
<div v-if="$q.platform.is.mobile"> <div v-if="$q.platform.is.mobile">
<span v-if="$q.platform.is.desktop" 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 {{ p.babyPrice }} /每人 CNY {{ p.babyPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span> </span>
</div> </div>
</div> </div>
<div class="row items-end"> <div class="row items-end">
<span v-if="$q.platform.is.desktop" 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 {{ p.babyPrice }} /每人 CNY {{ p.babyPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span> </span>
<q-input <q-input
style="width: 150px" style="width: 150px"
...@@ -240,29 +240,29 @@ ...@@ -240,29 +240,29 @@
</div> </div>
<div class="text-grey-6 f12 q-mt-mb" v-if="p.isSupportChildren == 2"> <div class="text-grey-6 f12 q-mt-mb" v-if="p.isSupportChildren == 2">
本團只支持成人出遊 {{$t('v103.scheduledTripDetails.prompt')}}
</div> </div>
<div <div
v-if="p.singleRoomPrice && p.singleRoomPrice > 0" v-if="p.singleRoomPrice && p.singleRoomPrice > 0"
class="q-pt-md q-mt-md" class="q-pt-md q-mt-md"
style="border-top: 1px dashed #eee" style="border-top: 1px dashed #eee"
> >
<div class="text-grey-6 f12">單房服務</div> <div class="text-grey-6 f12">{{$t('v103.scheduledTripDetails.service')}}</div>
<div class="row items-end"> <div class="row items-end">
<div class="col" :class="{'column':$q.platform.is.mobile}"> <div class="col" :class="{'column':$q.platform.is.mobile}">
<div> <div>
<span class="text-subtitle2 text-weight-bold">單房服務</span> <span class="text-subtitle2 text-weight-bold">{{$t('v103.scheduledTripDetails.service')}}</span>
<span class="text-grey-6 f12 q-ml-sm">(獨立單間住宿)</span> <span class="text-grey-6 f12 q-ml-sm">({{$t('v103.scheduledTripDetails.singleroom')}})</span>
</div> </div>
<div v-if="$q.platform.is.mobile"> <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 {{ p.singleRoomPrice }} /每人 CNY {{ p.singleRoomPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span> </span>
</div> </div>
</div> </div>
<div class="row items-end"> <div class="row items-end">
<span v-if="$q.platform.is.desktop" 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 {{ p.singleRoomPrice }} /每人 CNY {{ p.singleRoomPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span> </span>
<q-input <q-input
style="width: 150px" style="width: 150px"
...@@ -308,18 +308,18 @@ ...@@ -308,18 +308,18 @@
class="q-pt-md q-mt-md row items-center" class="q-pt-md q-mt-md row items-center"
style="border-top: 1px dashed #eee" style="border-top: 1px dashed #eee"
> >
<div class="text-grey-6 f12 col">保險服務費</div> <div class="text-grey-6 f12 col">{{$t('v103.scheduledTripDetails.insurance')}}</div>
<div class="product-money f12">CNY {{ p.safeMoney }}/每人</div> <div class="product-money f12">CNY {{ p.safeMoney }}/{{$t('v103.scheduledTripDetails.each')}}</div>
</div> </div>
</div> </div>
<div class="q-mt-md q-pt-md" style="border-top: 1px dashed #eee"> <div class="q-mt-md q-pt-md" style="border-top: 1px dashed #eee">
<div class="row items-center"> <div class="row items-center">
<span class="text-subtitle2 text-grey-6 col">總金額</span> <span class="text-subtitle2 text-grey-6 col">{{$t('v103.scheduledTripDetails.total')}}</span>
<span class="text-h6 text-primary product-price">CNY {{ sumPrice }}</span> <span class="text-h6 text-primary product-price">CNY {{ sumPrice }}</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" >{{$q.platform.is.mobile?'請選擇上面的出行日期':'請選擇左側的出行日期'}} </span> <span class="q-mr-lg f12 text-negative" v-if="!p.startDate" >{{$q.platform.is.mobile?$t('v103.scheduledTripDetails.selectdatetop'):$t('v103.scheduledTripDetails.selectdateleft')}} </span>
<q-btn color="primary" label="立即預定" unelevated class="q-px-lg" :disable="sumPrice==0" @click="goOrderHandler"/> <q-btn color="primary" :label="$t('v103.scheduledTripDetails.book')" unelevated class="q-px-lg" :disable="sumPrice==0" @click="goOrderHandler"/>
</div> </div>
</div> </div>
</div> </div>
......
src/components/trip/style3.vue
View file @ 461e7b2b
...@@ -2721,7 +2721,7 @@ ...@@ -2721,7 +2721,7 @@
</label> </label>
<label class="style3_detail">{{getHotelSuffix(item)}}</label> <label class="style3_detail">{{getHotelSuffix(item)}}</label>
</div> </div>
<div class="val" v-else>{{$t('v103.details.style.d5')}}</div> <div class="val" v-else>{{$t('v103.scheduledTripDetails.style.d5')}}</div>
</div> </div>
</div> </div>
</div> </div>
......
src/components/trip/style5.vue
View file @ 461e7b2b
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
</div> </div>
</div> </div>
<div class="expense"> <div class="expense">
<div class="left">{{$t('v103.details.style.d4')}}</div> <div class="left">{{$t('v103.scheduledTripDetails.style.d4')}}</div>
<div class="right"> <div class="right">
<div v-html="htmlData5"></div> <div v-html="htmlData5"></div>
</div> </div>
......
src/components/trip/style6.vue
View file @ 461e7b2b
...@@ -243,7 +243,7 @@ ...@@ -243,7 +243,7 @@
</label> </label>
{{getHotelSuffix(item)}} {{getHotelSuffix(item)}}
</div> </div>
<div class="style6_val" v-else>{{$t('v103.details.style.d5')}}</div> <div class="style6_val" v-else>{{$t('v103.scheduledTripDetails.style.d5')}}</div>
</div> </div>
</div> </div>
<div class="detail-right"> <div class="detail-right">
......
src/components/trip/trip.vue
View file @ 461e7b2b
<template> <template>
<div class="q-mt-lg" :class="{'q-px-md':$q.platform.is.mobile}"> <div class="q-mt-lg" :class="{'q-px-md':$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">{{$t('v103.details.daily')}}</span> <span class="col">{{$t('v103.scheduledTripDetails.daily')}}</span>
<span class=""> <span class="">
<q-chip class="bg-transparent text-weight-light text-grey-7 f12" icon="iconfont icontime" :label="`${$t('v103.details.headerlabel.d2')}：${trip.dayList.length}${$t('v103.details.headerlabel.d21')}`" /> <q-chip class="bg-transparent text-weight-light text-grey-7 f12" icon="iconfont icontime" :label="`${$t('v103.scheduledTripDetails.headerlabel.d2')}：${trip.dayList.length}${$t('v103.scheduledTripDetails.headerlabel.d21')}`" />
</span> </span>
</div> </div>
<q-tabs <q-tabs
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
active-class="text-primary" active-class="text-primary"
dense dense
> >
<q-tab name="image" @click="changeHandler()" icon="iconfont iconimage" class="no-padding q-mr-lg" :label="$t('v103.details.graphicmode')" /> <q-tab name="image" @click="changeHandler()" icon="iconfont iconimage" class="no-padding q-mr-lg" :label="$t('v103.scheduledTripDetails.graphicmode')" />
<q-tab name="dates" @click="changeHandler()" icon="iconfont iconrili" class="no-padding q-mr-lg" :label="$t('v103.details.calendarmode')" /> <q-tab name="dates" @click="changeHandler()" icon="iconfont iconrili" class="no-padding q-mr-lg" :label="$t('v103.scheduledTripDetails.calendarmode')" />
</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>
......
src/components/trip/tripView/calendar.vue
View file @ 461e7b2b
...@@ -2,17 +2,17 @@ ...@@ -2,17 +2,17 @@
<q-table :rows="days" :columns="cols" flat class="q-mt-md" hide-pagination> <q-table :rows="days" :columns="cols" flat class="q-mt-md" hide-pagination>
<template v-slot:body-cell-day="props"> <template v-slot:body-cell-day="props">
<q-td :props="props"> <q-td :props="props">
<div class="text-h6">{{$t('v103.details.calendarhtml.d1')}} {{ props.row.dayNum }} {{$t('v103.details.calendarhtml.d11')}}</div> <div class="text-h6">{{$t('v103.scheduledTripDetails.calendarhtml.d1')}} {{ props.row.dayNum }} {{$t('v103.scheduledTripDetails.calendarhtml.d11')}}</div>
<div class="f12 text-grey-8">{{ props.row.title }}</div> <div class="f12 text-grey-8">{{ props.row.title }}</div>
</q-td> </q-td>
</template> </template>
<template v-slot:body-cell-dinner="props"> <template v-slot:body-cell-dinner="props">
<q-td :props="props"> <q-td :props="props">
<div class="f12 text-grey-8">{{$t('v103.details.calendarhtml.d2')}}：</div> <div class="f12 text-grey-8">{{$t('v103.scheduledTripDetails.calendarhtml.d2')}}：</div>
<div class="f12 text-grey-8">{{ props.row.breakfast }}</div> <div class="f12 text-grey-8">{{ props.row.breakfast }}</div>
<div class="f12 text-grey-8 q-mt-sm">{{$t('v103.details.calendarhtml.d3')}}：</div> <div class="f12 text-grey-8 q-mt-sm">{{$t('v103.scheduledTripDetails.calendarhtml.d3')}}：</div>
<div class="f12 text-grey-8">{{ props.row.lanuch }}</div> <div class="f12 text-grey-8">{{ props.row.lanuch }}</div>
<div class="f12 text-grey-8 q-mt-sm">{{$t('v103.details.calendarhtml.d4')}}：</div> <div class="f12 text-grey-8 q-mt-sm">{{$t('v103.scheduledTripDetails.calendarhtml.d4')}}：</div>
<div class="f12 text-grey-8">{{ props.row.dinner }}</div> <div class="f12 text-grey-8">{{ props.row.dinner }}</div>
</q-td> </q-td>
</template> </template>
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<q-td :props="props"> <q-td :props="props">
<div v-for="(x,i) in props.row.hotel" :key="i" class="row items-center" > <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" /> <q-chip class="bg-transparent" text-color="blue" dense :label="x.n" />
<span class="q-ml-sm">{{ x.t==0?$t('v103.details.calendarhtml.d5'):$t('v103.details.calendarhtml.d6') }}</span> <span class="q-ml-sm">{{ x.t==0?$t('v103.scheduledTripDetails.calendarhtml.d5'):$t('v103.scheduledTripDetails.calendarhtml.d6') }}</span>
</div> </div>
<div class="q-mt-sm" v-if="props.row.tips">{{ props.row.tips }}</div> <div class="q-mt-sm" v-if="props.row.tips">{{ props.row.tips }}</div>
</q-td> </q-td>
...@@ -52,10 +52,10 @@ export default defineComponent({ ...@@ -52,10 +52,10 @@ export default defineComponent({
const data= reactive({ const data= reactive({
cols: [ cols: [
{ name: "day", label: t('v103.details.calendartitle.d1'), align: "left",style:'vertical-align:top;' }, { name: "day", label: t('v103.scheduledTripDetails.calendartitle.d1'), align: "left",style:'vertical-align:top;' },
{ name: "dinner", label: t('v103.details.calendartitle.d2'), align: "left",style:'vertical-align:top;' }, { name: "dinner", label: t('v103.scheduledTripDetails.calendartitle.d2'), align: "left",style:'vertical-align:top;' },
{ name: "acitvity", label: t('v103.details.calendartitle.d3'), align: "left",style:'vertical-align:top;' }, { name: "acitvity", label: t('v103.scheduledTripDetails.calendartitle.d3'), align: "left",style:'vertical-align:top;' },
{ name: "hotel", label: t('v103.details.calendartitle.d4'), align: "left",style:'vertical-align:top;' }, { name: "hotel", label: t('v103.scheduledTripDetails.calendartitle.d4'), align: "left",style:'vertical-align:top;' },
], ],
days: props.days, days: props.days,
d: props.days d: props.days
...@@ -69,9 +69,9 @@ export default defineComponent({ ...@@ -69,9 +69,9 @@ export default defineComponent({
formatDay() { formatDay() {
if (data.d.length > 0) { if (data.d.length > 0) {
data.d.forEach((x) => { data.d.forEach((x) => {
x.breakfast=t('v103.details.day.d1') x.breakfast=t('v103.scheduledTripDetails.day.d1')
x.lanuch=t('v103.details.day.d1') x.lanuch=t('v103.scheduledTripDetails.day.d1')
x.dinner=t('v103.details.day.d1') x.dinner=t('v103.scheduledTripDetails.day.d1')
x.activity=[] x.activity=[]
x.hotel=[] x.hotel=[]
x.tips='' x.tips=''
...@@ -87,13 +87,13 @@ export default defineComponent({ ...@@ -87,13 +87,13 @@ export default defineComponent({
y.title = methods.formatTraffice(y.childItem.subTraffic); y.title = methods.formatTraffice(y.childItem.subTraffic);
y.icon = "iconfont iconjiaotong"; y.icon = "iconfont iconjiaotong";
} else if (y.type == 4) { } else if (y.type == 4) {
if(y.childItem.dinnerName.indexOf(t('v103.details.day.d2'))==-1 && y.childItem.dinnerName.indexOf(t('v103.details.day.d3'))==-1){ if(y.childItem.dinnerName.indexOf(t('v103.scheduledTripDetails.day.d2'))==-1 && y.childItem.dinnerName.indexOf(t('v103.scheduledTripDetails.day.d3'))==-1){
if(y.childItem.useDinnerType=='1'){ if(y.childItem.useDinnerType=='1'){
x.breakfast =x.breakfast==t('v103.details.day.d1')?y.childItem.dinnerName:x.breakfast+'，'+y.childItem.dinnerName x.breakfast =x.breakfast==t('v103.scheduledTripDetails.day.d1')?y.childItem.dinnerName:x.breakfast+'，'+y.childItem.dinnerName
} else if(y.childItem.useDinnerType=='2'){ } else if(y.childItem.useDinnerType=='2'){
x.lanuch =x.lanuch==t('v103.details.day.d1')?y.childItem.dinnerName:x.lanuch+'，'+y.childItem.dinnerName x.lanuch =x.lanuch==t('v103.scheduledTripDetails.day.d1')?y.childItem.dinnerName:x.lanuch+'，'+y.childItem.dinnerName
} else if(y.childItem.useDinnerType=='3'){ } else if(y.childItem.useDinnerType=='3'){
x.dinner =x.dinner==t('v103.details.day.d1')?y.childItem.dinnerName:x.dinner+'，'+y.childItem.dinnerName x.dinner =x.dinner==t('v103.scheduledTripDetails.day.d1')?y.childItem.dinnerName:x.dinner+'，'+y.childItem.dinnerName
} }
} }
} else if (y.type == 2) { } else if (y.type == 2) {
...@@ -104,7 +104,7 @@ export default defineComponent({ ...@@ -104,7 +104,7 @@ export default defineComponent({
} else if (y.type == 5) { } else if (y.type == 5) {
x.activity.push({ x.activity.push({
t:2, t:2,
n:t('v103.details.day.d4') n:t('v103.scheduledTripDetails.day.d4')
}) })
} else if (y.type == 3) { } else if (y.type == 3) {
x.hotel.push({n:y.childItem.hotelName,t:y.childItem.IsSameLevel}) x.hotel.push({n:y.childItem.hotelName,t:y.childItem.IsSameLevel})
...@@ -116,21 +116,21 @@ export default defineComponent({ ...@@ -116,21 +116,21 @@ export default defineComponent({
} }
}, },
formatTraffice(tras) { formatTraffice(tras) {
let txt = t('v103.details.traffice.d1') + tras[0].startCityName; let txt = t('v103.scheduledTripDetails.traffice.d1') + tras[0].startCityName;
tras.forEach((z, i) => { tras.forEach((z, i) => {
if (i > 0) { if (i > 0) {
txt = t('v103.details.traffice.d2'); txt = t('v103.scheduledTripDetails.traffice.d2');
} }
if (z.arrivalType == 1) { if (z.arrivalType == 1) {
txt += t('v103.details.traffice.d3'); txt += t('v103.scheduledTripDetails.traffice.d3');
} else if (z.arrivalType == 2) { } else if (z.arrivalType == 2) {
txt += t('v103.details.traffice.d4'); txt += t('v103.scheduledTripDetails.traffice.d4');
} else if (z.arrivalType == 3) { } else if (z.arrivalType == 3) {
txt += t('v103.details.traffice.d5'); txt += t('v103.scheduledTripDetails.traffice.d5');
} else { } else {
txt += t('v103.details.traffice.d6'); txt += t('v103.scheduledTripDetails.traffice.d6');
} }
txt += ` ${t('v103.details.traffice.d7')}` + z.arrivalCityName; txt += ` ${t('v103.scheduledTripDetails.traffice.d7')}` + z.arrivalCityName;
}); });
return txt; return txt;
}, },
......
src/components/trip/tripView/list.vue
View file @ 461e7b2b
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<q-timeline color="secondary" layout="dense"> <q-timeline color="secondary" layout="dense">
<q-timeline-entry heading class="small-heading"> <q-timeline-entry heading class="small-heading">
<span class="text-subtitle1 text-grey-9 text-weight-bold" <span class="text-subtitle1 text-grey-9 text-weight-bold"
>{{$t('v103.details.calendarhtml.d1')}} {{ x.dayNum }} {{$t('v103.details.calendarhtml.d11')}}</span >{{$t('v103.scheduledTripDetails.calendarhtml.d1')}} {{ x.dayNum }} {{$t('v103.scheduledTripDetails.calendarhtml.d11')}}</span
> >
<span class="text-subtitle1 text-grey-9 text-weight-bold q-ml-lg">{{ <span class="text-subtitle1 text-grey-9 text-weight-bold q-ml-lg">{{
x.title x.title
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
></div> ></div>
</q-timeline-entry> </q-timeline-entry>
<q-timeline-entry <q-timeline-entry
:subtitle="$t('v103.details.list.d1')" :subtitle="$t('v103.scheduledTripDetails.list.d1')"
icon="iconfont iconjingdian" icon="iconfont iconjingdian"
color="info" color="info"
:key="yi" :key="yi"
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<template v-slot:title> <template v-slot:title>
<div class="row"> <div class="row">
<span class="q-mr-md">{{ <span class="q-mr-md">{{
`${$t('v103.details.list.d2')}${y.childItem.couponsName}` `${$t('v103.scheduledTripDetails.list.d2')}${y.childItem.couponsName}`
}}</span> }}</span>
<div <div
class="row items-center rounded-borders" class="row items-center rounded-borders"
...@@ -43,17 +43,17 @@ ...@@ -43,17 +43,17 @@
class="bg-dark text-white" class="bg-dark text-white"
style="padding: 0 4px; font-size: 12px" style="padding: 0 4px; font-size: 12px"
> >
{{$t('v103.details.list.d3')}} {{$t('v103.scheduledTripDetails.list.d3')}}
</div> </div>
<div <div
class="text-dark" class="text-dark"
style="padding: 0 4px; font-size: 12px; background: #f0bd86" style="padding: 0 4px; font-size: 12px; background: #f0bd86"
> >
<span v-if="y.childItem.playTimeHour > 0" <span v-if="y.childItem.playTimeHour > 0"
>{{ y.childItem.playTimeHour }} {{$t('v103.details.list.d4')}}</span >{{ y.childItem.playTimeHour }} {{$t('v103.scheduledTripDetails.list.d4')}}</span
> >
<span v-if="y.childItem.playTimeMinutes > 0"> <span v-if="y.childItem.playTimeMinutes > 0">
{{ y.childItem.playTimeMinutes }} {{$t('v103.details.list.d5')}}</span {{ y.childItem.playTimeMinutes }} {{$t('v103.scheduledTripDetails.list.d5')}}</span
> >
</div> </div>
</div> </div>
...@@ -141,8 +141,8 @@ ...@@ -141,8 +141,8 @@
</div> </div>
</q-timeline-entry> </q-timeline-entry>
<q-timeline-entry <q-timeline-entry
:title="$t('v103.details.day.d4')" :title="$t('v103.scheduledTripDetails.day.d4')"
:subtitle="$t('v103.details.list.d6')" :subtitle="$t('v103.scheduledTripDetails.list.d6')"
icon="iconfont iconhuodong" icon="iconfont iconhuodong"
:key="yi" :key="yi"
color="grey" color="grey"
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
</div> </div>
</q-timeline-entry> </q-timeline-entry>
<q-timeline-entry <q-timeline-entry
:subtitle="$t('v103.details.list.d7')" :subtitle="$t('v103.scheduledTripDetails.list.d7')"
icon="iconfont iconjiudian" icon="iconfont iconjiudian"
color="dark" color="dark"
:key="yi" :key="yi"
...@@ -193,7 +193,7 @@ ...@@ -193,7 +193,7 @@
<template v-slot:title> <template v-slot:title>
<div class="row items-center"> <div class="row items-center">
<span class="q-mr-md"> <span class="q-mr-md">
<span>{{$t('v103.details.list.d8')}}</span> <span>{{$t('v103.scheduledTripDetails.list.d8')}}</span>
<span class="q-ml-sm"> <span class="q-ml-sm">
{{ y.childItem.hotelName }} {{ y.childItem.hotelName }}
<q-badge transparent align="middle" color="orange"> <q-badge transparent align="middle" color="orange">
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
square square
text-color="grey-2" text-color="grey-2"
dense dense
:label="$t('v103.details.day.d5')" :label="$t('v103.scheduledTripDetails.day.d5')"
v-if="y.childItem.useDinnerType.indexOf('1') != -1" v-if="y.childItem.useDinnerType.indexOf('1') != -1"
/> />
<q-chip <q-chip
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
square square
text-color="grey-2" text-color="grey-2"
dense dense
:label="$t('v103.details.day.d6')" :label="$t('v103.scheduledTripDetails.day.d6')"
v-if="y.childItem.useDinnerType.indexOf('3') != -1" v-if="y.childItem.useDinnerType.indexOf('3') != -1"
/> />
<q-chip <q-chip
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
square square
text-color="grey-2" text-color="grey-2"
dense dense
:label="$t('v103.details.day.d7')" :label="$t('v103.scheduledTripDetails.day.d7')"
v-if="y.childItem.isSameLevel == 0" v-if="y.childItem.isSameLevel == 0"
/> />
<q-chip <q-chip
...@@ -232,10 +232,10 @@ ...@@ -232,10 +232,10 @@
square square
text-color="grey-2" text-color="grey-2"
dense dense
:label="$t('v103.details.day.d8')" :label="$t('v103.scheduledTripDetails.day.d8')"
> >
<q-tooltip class="bg-dark" <q-tooltip class="bg-dark"
>{{$t('v103.details.list.d9')}}</q-tooltip >{{$t('v103.scheduledTripDetails.list.d9')}}</q-tooltip
> >
</q-chip> </q-chip>
</div> </div>
...@@ -277,8 +277,8 @@ ...@@ -277,8 +277,8 @@
</div> </div>
</q-timeline-entry> </q-timeline-entry>
<q-timeline-entry <q-timeline-entry
:title="$t('v103.details.list.d10')" :title="$t('v103.scheduledTripDetails.list.d10')"
:subtitle="$t('v103.details.list.d11')" :subtitle="$t('v103.scheduledTripDetails.list.d11')"
icon="iconfont icontishi" icon="iconfont icontishi"
:key="yi" :key="yi"
color="warning" color="warning"
...@@ -336,7 +336,7 @@ export default defineComponent({ ...@@ -336,7 +336,7 @@ export default defineComponent({
d: props.days, d: props.days,
TitleT: [] TitleT: []
}) })
data.TitleT = [t('v103.details.calendarhtml.d2'), t('v103.details.calendarhtml.d3'), t('v103.details.calendarhtml.d4')] data.TitleT = [t('v103.scheduledTripDetails.calendarhtml.d2'), t('v103.scheduledTripDetails.calendarhtml.d3'), t('v103.scheduledTripDetails.calendarhtml.d4')]
watch(() => props.days,(n,o) => { watch(() => props.days,(n,o) => {
data.d = n; data.d = n;
},{deep: true} },{deep: true}
...@@ -366,21 +366,21 @@ export default defineComponent({ ...@@ -366,21 +366,21 @@ export default defineComponent({
} }
}, },
formatTraffice(tras) { formatTraffice(tras) {
let txt = t('v103.details.traffice.d1') + tras[0].startCityName; let txt = t('v103.scheduledTripDetails.traffice.d1') + tras[0].startCityName;
tras.forEach((z, i) => { tras.forEach((z, i) => {
if (i > 0) { if (i > 0) {
txt = t('v103.details.traffice.d2'); txt = t('v103.scheduledTripDetails.traffice.d2');
} }
if (z.arrivalType == 1) { if (z.arrivalType == 1) {
txt += t('v103.details.traffice.d3'); txt += t('v103.scheduledTripDetails.traffice.d3');
} else if (z.arrivalType == 2) { } else if (z.arrivalType == 2) {
txt += t('v103.details.traffice.d4'); txt += t('v103.scheduledTripDetails.traffice.d4');
} else if (z.arrivalType == 3) { } else if (z.arrivalType == 3) {
txt += t('v103.details.traffice.d5'); txt += t('v103.scheduledTripDetails.traffice.d5');
} else { } else {
txt += t('v103.details.traffice.d6'); txt += t('v103.scheduledTripDetails.traffice.d6');
} }
txt += ` ${t('v103.details.traffice.d7')}` + z.arrivalCityName; txt += ` ${t('v103.scheduledTripDetails.traffice.d7')}` + z.arrivalCityName;
}); });
return txt; return txt;
}, },
......
src/i18n/zh-TW/index.ts
View file @ 461e7b2b
...@@ -1158,7 +1158,7 @@ export default { ...@@ -1158,7 +1158,7 @@ export default {
day3: '60天內', day3: '60天內',
} }
}, },
details:{ scheduledTripDetails:{
since: '起', since: '起',
selectionscheme: '選擇方案', selectionscheme: '選擇方案',
headerlabel:{ headerlabel:{
...@@ -1263,10 +1263,43 @@ export default { ...@@ -1263,10 +1263,43 @@ export default {
d9: '【保证入住】', d9: '【保证入住】',
d10: '或同級', d10: '或同級',
}, },
dateoption: '選擇日期、選項',
pleasedateoption: '請選擇出發日期',
month: {
january: '一月',
february: '二月',
march: '三月',
april: '四月',
may: '五月',
june: '六月',
july: '七月',
august: '八月',
september: '九月',
october: '十月',
november: '十一月',
december: '十二月',
},
reselect: '全部重選',
selectionquantity: '選擇數量',
age: '歲',
each: '每人',
noroom: '不占床',
room: '占床',
cr: '成人',
et: '儿童',
ye: '婴儿',
yixia: '以下',
prompt: '本團只支持成人出遊',
service: '單房服務',
singleroom: '獨立單間住宿',
insurance: '保險服務費',
total: '總金額',
book: '立即預定',
selectdatetop: '請選擇上面的出行日期',
selectdateleft: '請選擇左側的出行日期'
}, },
scheduledTripOrder:{ scheduledTripOrder:{
setorderday: '時間範圍' setorderday: '時間範圍',
} }
} }
//#endregion //#endregion
......
src/pages/scheduledTrip/details.vue
View file @ 461e7b2b
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<div style="max-width: 1200px; margin-left: auto; margin-right: auto" :class="{ 'q-px-md': $q.screen.width < 1220 }" class="q-py-sm row items-center"> <div style="max-width: 1200px; margin-left: auto; margin-right: auto" :class="{ 'q-px-md': $q.screen.width < 1220 }" class="q-py-sm row items-center">
<span class="col product-price text-subtitle1 text-weight-bold" style="text-align: left"> <span class="col product-price text-subtitle1 text-weight-bold" style="text-align: left">
<span>CNY {{ moneyFormat(dataList.priceList[0].originalB2CPrice, 0) }}</span> <span>CNY {{ moneyFormat(dataList.priceList[0].originalB2CPrice, 0) }}</span>
<span class="q-ml-sm f12 text-grey-7">{{$t('v103.details.since')}}</span> <span class="q-ml-sm f12 text-grey-7">{{$t('v103.scheduledTripDetails.since')}}</span>
</span> </span>
<q-btn color="primary" unelevated class="q-px-xl" :label="$t('v103.details.selectionscheme')" @click="goScrollHandler(priceListHeight)" /> <q-btn color="primary" unelevated class="q-px-xl" :label="$t('v103.scheduledTripDetails.selectionscheme')" @click="goScrollHandler(priceListHeight)" />
</div> </div>
</div> </div>
<div v-if="dataList" style="max-width: 1200px; margin-left: auto; margin-right: auto" class="q-mt-md q-mb-lg" :class="{ 'q-px-md': $q.screen.width < 1220 }"> <div v-if="dataList" style="max-width: 1200px; margin-left: auto; margin-right: auto" class="q-mt-md q-mb-lg" :class="{ 'q-px-md': $q.screen.width < 1220 }">
......
src/pages/scheduledTrip/detailsNew.vue
View file @ 461e7b2b
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
<div style="max-width: 1200px; margin-left: auto; margin-right: auto" :class="{ 'q-px-md': $q.screen.width < 1220 }" class="q-py-sm row items-center"> <div style="max-width: 1200px; margin-left: auto; margin-right: auto" :class="{ 'q-px-md': $q.screen.width < 1220 }" class="q-py-sm row items-center">
<span class="col product-price text-subtitle1 text-weight-bold" style="text-align: left"> <span class="col product-price text-subtitle1 text-weight-bold" style="text-align: left">
<span>CNY {{ dataList.priceList[0].originalB2BPrice }}</span> <span>CNY {{ dataList.priceList[0].originalB2BPrice }}</span>
<span class="q-ml-sm f12 text-grey-7">{{$t('v103.details.since')}}</span> <span class="q-ml-sm f12 text-grey-7">{{$t('v103.scheduledTripDetails.since')}}</span>
</span> </span>
<q-btn color="primary" unelevated class="q-px-xl" :label="$t('v103.details.selectionscheme')" @click="goScrollHandler(priceListHeight)" /> <q-btn color="primary" unelevated class="q-px-xl" :label="$t('v103.scheduledTripDetails.selectionscheme')" @click="goScrollHandler(priceListHeight)" />
</div> </div>
</div> </div>
<div <div
...@@ -77,25 +77,25 @@ ...@@ -77,25 +77,25 @@
class="transparent q-mr-xl no-padding" class="transparent q-mr-xl no-padding"
square square
icon="iconfont iconOwner-1" icon="iconfont iconOwner-1"
:label=" $t('v103.details.headerlabel.d1')" :label=" $t('v103.scheduledTripDetails.headerlabel.d1')"
/> />
<q-chip <q-chip
class="transparent q-mr-xl no-padding" class="transparent q-mr-xl no-padding"
square square
icon="iconfont icontime" icon="iconfont icontime"
:label="` ${$t('v103.details.headerlabel.d2')} ${dataList.dayNum} ${$t('v103.details.headerlabel.d21')}`" :label="` ${$t('v103.scheduledTripDetails.headerlabel.d2')} ${dataList.dayNum} ${$t('v103.scheduledTripDetails.headerlabel.d21')}`"
/> />
<!-- <q-chip <!-- <q-chip
class="transparent q-mr-xl no-padding" class="transparent q-mr-xl no-padding"
square square
icon="iconfont iconnetwork-fill" icon="iconfont iconnetwork-fill"
:label="$t('v103.details.headerlabel.d3')" :label="$t('v103.scheduledTripDetails.headerlabel.d3')"
/> --> /> -->
<q-chip <q-chip
class="transparent q-mr-xl no-padding" class="transparent q-mr-xl no-padding"
square square
icon="iconfont iconcancel" icon="iconfont iconcancel"
:label="$t('v103.details.headerlabel.d4')" :label="$t('v103.scheduledTripDetails.headerlabel.d4')"
/> />
</div> </div>
</div> </div>
...@@ -110,12 +110,12 @@ ...@@ -110,12 +110,12 @@
v-if="dataList.priceList.length > 0" v-if="dataList.priceList.length > 0"
> >
CNY：{{ dataList.priceList[0].originalB2BPrice }} CNY：{{ dataList.priceList[0].originalB2BPrice }}
<span class="f12 text-grey-6">{{$t('v103.details.since')}}</span> <span class="f12 text-grey-6">{{$t('v103.scheduledTripDetails.since')}}</span>
</div> </div>
<div v-else class="text-subtitle1 text-grey-6">{{$t('v103.details.nooffer')}}</div> <div v-else class="text-subtitle1 text-grey-6">{{$t('v103.scheduledTripDetails.nooffer')}}</div>
<q-btn <q-btn
color="primary" color="primary"
:label="$t('v103.details.selectionscheme')" :label="$t('v103.scheduledTripDetails.selectionscheme')"
unelevated unelevated
@click="goScrollHandler(priceListHeight)" @click="goScrollHandler(priceListHeight)"
:class="{'q-mt-md full-width':$q.platform.is.desktop}" :class="{'q-mt-md full-width':$q.platform.is.desktop}"
...@@ -131,9 +131,9 @@ ...@@ -131,9 +131,9 @@
</div> </div>
<div v-if="dataList" class="q-pa-lg q-mt-lg text-grey-9" ref="pricelistref"> <div v-if="dataList" class="q-pa-lg q-mt-lg text-grey-9" ref="pricelistref">
<div style="max-width: 1200px; margin-left: auto; margin-right: auto"> <div style="max-width: 1200px; margin-left: auto; margin-right: auto">
<div class="text-h6">{{$t('v103.details.selectionscheme')}}</div> <div class="text-h6">{{$t('v103.scheduledTripDetails.selectionscheme')}}</div>
<div class="rounded-borders bg-white q-pa-md q-mt-md" v-if="$q.platform.is.mobile"> <div class="rounded-borders bg-white q-pa-md q-mt-md" v-if="$q.platform.is.mobile">
<q-field class="q-my-md" stack-label :label="$t('v103.details.selectdate')" standout dense> <q-field class="q-my-md" stack-label :label="$t('v103.scheduledTripDetails.selectdate')" standout dense>
<div class="self-center full-width no-outline" tabindex="0">{{currentPrice.startDate}}</div> <div class="self-center full-width no-outline" tabindex="0">{{currentPrice.startDate}}</div>
<q-popup-proxy ref="qDateProxy"> <q-popup-proxy ref="qDateProxy">
<calendar class="bg-white q-pa-md" <calendar class="bg-white q-pa-md"
...@@ -156,8 +156,8 @@ ...@@ -156,8 +156,8 @@
<div class="q-pa-md row"> <div class="q-pa-md row">
<div class="col"> <div class="col">
<div class="text-subtitle1 text-weight-bold row items-center" v-if="$q.platform.is.desktop"> <div class="text-subtitle1 text-weight-bold row items-center" v-if="$q.platform.is.desktop">
<span class="q-mr-md">{{$t('v103.details.travelplan')}}</span> <span class="q-mr-md">{{$t('v103.scheduledTripDetails.travelplan')}}</span>
<q-chip square color="orange" size="sm" text-color="grey-2" class="text-light" :label="$t('v103.details.headerlabel.d4')" /> <q-chip square color="orange" size="sm" text-color="grey-2" class="text-light" :label="$t('v103.scheduledTripDetails.headerlabel.d4')" />
</div> </div>
<div class="text-grey f12"> <div class="text-grey f12">
<ul class="q-pl-md no-margin"> <ul class="q-pl-md no-margin">
...@@ -170,16 +170,16 @@ ...@@ -170,16 +170,16 @@
<div class="" v-if="$q.platform.is.desktop"> <div class="" v-if="$q.platform.is.desktop">
<div class="row items-center"> <div class="row items-center">
<span class="product-price text-h6 q-mr-md">CNY {{ dataList.priceList[0].originalB2BPrice }}</span> <span class="product-price text-h6 q-mr-md">CNY {{ dataList.priceList[0].originalB2BPrice }}</span>
<q-btn color="primary" outline :label="showOrderPreview ? $t('v103.details.deselect') : $t('v103.details.choose')" @click="changeShowOrderPreviewHandler" class="q-px-lg" /> <q-btn color="primary" outline :label="showOrderPreview ? $t('v103.scheduledTripDetails.deselect') : $t('v103.scheduledTripDetails.choose')" @click="changeShowOrderPreviewHandler" class="q-px-lg" />
</div> </div>
<div class="text-info q-mt-md text-right">{{$t('v103.details.earliest')}}：{{ dataList.priceList[0].startDate }}</div> <div class="text-info q-mt-md text-right">{{$t('v103.scheduledTripDetails.earliest')}}：{{ dataList.priceList[0].startDate }}</div>
</div> </div>
</div> </div>
<div class="q-pa-md" style="border-top: 1px solid #eee" v-if="showOrderPreview"> <div class="q-pa-md" style="border-top: 1px solid #eee" v-if="showOrderPreview">
<div class="q-pa-md bg-grey-2 row items-center rounded-borders"> <div class="q-pa-md bg-grey-2 row items-center rounded-borders">
<div class="text-subtitle2 text-weight-bold q-mr-xl">{{$t('v103.details.thisscheme')}}</div> <div class="text-subtitle2 text-weight-bold q-mr-xl">{{$t('v103.scheduledTripDetails.thisscheme')}}</div>
<q-chip class="transparent q-mr-xl no-padding" square icon="iconfont iconcancel" :label="$t('v103.details.headerlabel.d4')" /> <q-chip class="transparent q-mr-xl no-padding" square icon="iconfont iconcancel" :label="$t('v103.scheduledTripDetails.headerlabel.d4')" />
<q-chip class="transparent q-mr-xl no-padding" square icon="iconfont iconroundcheck" :label="$t('v103.details.confirmationtime')" /> <q-chip class="transparent q-mr-xl no-padding" square icon="iconfont iconroundcheck" :label="$t('v103.scheduledTripDetails.confirmationtime')" />
</div> </div>
<div class="q-mt-lg row" v-if="$q.platform.is.desktop"> <div class="q-mt-lg row" v-if="$q.platform.is.desktop">
<div class="col"> <div class="col">
...@@ -221,10 +221,10 @@ ...@@ -221,10 +221,10 @@
</div> </div>
</div> </div>
<div :class="{'col-8':$q.platform.is.desktop,'col':$q.platform.is.mobile}"> <div :class="{'col-8':$q.platform.is.desktop,'col':$q.platform.is.mobile}">
<div class="text-h5 text-weight-bold text-left" id="feature" :class="{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}">{{$t('v103.details.righttitle.d1')}}</div> <div class="text-h5 text-weight-bold text-left" id="feature" :class="{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}">{{$t('v103.scheduledTripDetails.righttitle.d1')}}</div>
<div class="q-mt-md trip-text q-pb-xl" v-html="dataList.feature.featureContent" v-if="dataList.feature.featureContent != ''" :class="{'q-px-md':$q.platform.is.mobile}"></div> <div class="q-mt-md trip-text q-pb-xl" v-html="dataList.feature.featureContent" v-if="dataList.feature.featureContent != ''" :class="{'q-px-md':$q.platform.is.mobile}"></div>
<div class="q-mt-md q-pb-xl" id="setZoom" ref="diyContext" :style="{ zoom: zoomDiyContext }" v-html="dataList.feature.featureHtml" v-if="dataList.feature.featureHtml != ''"></div> <div class="q-mt-md q-pb-xl" id="setZoom" ref="diyContext" :style="{ zoom: zoomDiyContext }" v-html="dataList.feature.featureHtml" v-if="dataList.feature.featureHtml != ''"></div>
<div class="text-h5 text-weight-bold text-left q-mt-xl" id="product" :class="{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}">{{$t('v103.details.righttitle.d2')}}</div> <div class="text-h5 text-weight-bold text-left q-mt-xl" id="product" :class="{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}">{{$t('v103.scheduledTripDetails.righttitle.d2')}}</div>
<div class="q-pb-xl"> <div class="q-pb-xl">
<smaple :trip="dataList" :class="{'q-px-md':$q.platform.is.mobile}"></smaple> <smaple :trip="dataList" :class="{'q-px-md':$q.platform.is.mobile}"></smaple>
<template v-if="dataList.dayList.length<=3"> <template v-if="dataList.dayList.length<=3">
...@@ -234,16 +234,16 @@ ...@@ -234,16 +234,16 @@
<block :currentHeightDay="currentHeight" :days="days" :tripList="dayList" :isDirect="isDirect" :clickDate="clickDate"></block> <block :currentHeightDay="currentHeight" :days="days" :tripList="dayList" :isDirect="isDirect" :clickDate="clickDate"></block>
</template> </template>
</div> </div>
<div class="text-h5 text-weight-bold text-left q-mt-xl" id="price" :class="{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}">{{$t('v103.details.righttitle.d3')}}</div> <div class="text-h5 text-weight-bold text-left q-mt-xl" id="price" :class="{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}">{{$t('v103.scheduledTripDetails.righttitle.d3')}}</div>
<div class="text-subtitle1 text-weight-bold q-my-md" :class="{'q-px-md':$q.platform.is.mobile}">{{$t('v103.details.righttitle.d31')}}</div> <div class="text-subtitle1 text-weight-bold q-my-md" :class="{'q-px-md':$q.platform.is.mobile}">{{$t('v103.scheduledTripDetails.righttitle.d31')}}</div>
<div class="q-mt-md trip-text" v-html="dataList.feature.feeInclude" :class="{'q-px-md':$q.platform.is.mobile}"></div> <div class="q-mt-md trip-text" v-html="dataList.feature.feeInclude" :class="{'q-px-md':$q.platform.is.mobile}"></div>
<div class="text-subtitle1 text-weight-bold q-my-md" :class="{'q-px-md':$q.platform.is.mobile}">{{$t('v103.details.righttitle.d32')}}</div> <div class="text-subtitle1 text-weight-bold q-my-md" :class="{'q-px-md':$q.platform.is.mobile}">{{$t('v103.scheduledTripDetails.righttitle.d32')}}</div>
<div class="q-mt-md trip-text q-pb-xl" v-html="dataList.feature.feeNonInclude" :class="{'q-px-md':$q.platform.is.mobile}"></div> <div class="q-mt-md trip-text q-pb-xl" v-html="dataList.feature.feeNonInclude" :class="{'q-px-md':$q.platform.is.mobile}"></div>
<div class="text-h5 text-weight-bold text-left q-mt-xl" id="warning" :class="{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}">{{$t('v103.details.righttitle.d4')}}</div> <div class="text-h5 text-weight-bold text-left q-mt-xl" id="warning" :class="{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}">{{$t('v103.scheduledTripDetails.righttitle.d4')}}</div>
<div class="q-mt-lg trip-text bg-orange-1 q-pa-md rounded-borders q-mb-xl" style="border: 1px dashed var(--q-color-warning)" v-html="dataList.feature.importantTip" :class="{'q-mx-md':$q.platform.is.mobile}"></div> <div class="q-mt-lg trip-text bg-orange-1 q-pa-md rounded-borders q-mb-xl" style="border: 1px dashed var(--q-color-warning)" v-html="dataList.feature.importantTip" :class="{'q-mx-md':$q.platform.is.mobile}"></div>
<div class="text-h5 text-weight-bold text-left q-mt-xl" id="tips" :class="{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}">{{$t('v103.details.righttitle.d5')}}</div> <div class="text-h5 text-weight-bold text-left q-mt-xl" id="tips" :class="{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}">{{$t('v103.scheduledTripDetails.righttitle.d5')}}</div>
<div class="q-mt-lg trip-text bg-white q-pa-md rounded-borders q-mb-xl" style="border: 1px dashed var(--q-color-info)" v-html="dataList.feature.warmTip" :class="{'q-px-md':$q.platform.is.mobile}"></div> <div class="q-mt-lg trip-text bg-white q-pa-md rounded-borders q-mb-xl" style="border: 1px dashed var(--q-color-info)" v-html="dataList.feature.warmTip" :class="{'q-px-md':$q.platform.is.mobile}"></div>
<div class="text-h5 text-weight-bold text-left q-mt-xl" id="cancelTips" :class="{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}">{{$t('v103.details.righttitle.d6')}}</div> <div class="text-h5 text-weight-bold text-left q-mt-xl" id="cancelTips" :class="{'q-px-md': $q.screen.width < 1220&&$q.platform.is.mobile}">{{$t('v103.scheduledTripDetails.righttitle.d6')}}</div>
<div class="q-mt-lg trip-text q-mb-xl" :class="{'q-px-md':$q.platform.is.mobile}"> <div class="q-mt-lg trip-text q-mb-xl" :class="{'q-px-md':$q.platform.is.mobile}">
<ul class="no-padding text-grey-9 q-ml-md"> <ul class="no-padding text-grey-9 q-ml-md">
<li v-for="(x,index) in 5" <li v-for="(x,index) in 5"
...@@ -251,7 +251,7 @@ ...@@ -251,7 +251,7 @@
</ul> </ul>
<div class="q-mt-lg f12 text-grey-6"> <div class="q-mt-lg f12 text-grey-6">
<q-icon name="iconfont icontishi" class="q-mr-sm" /> <q-icon name="iconfont icontishi" class="q-mr-sm" />
<span>{{$t('v103.details.righttitle.d12')}}</span> <span>{{$t('v103.scheduledTripDetails.righttitle.d12')}}</span>
</div> </div>
</div> </div>
</div> </div>
...@@ -320,7 +320,7 @@ export default defineComponent({ ...@@ -320,7 +320,7 @@ export default defineComponent({
let { ctx: that, proxy } = getCurrentInstance() let { ctx: that, proxy } = getCurrentInstance()
const data = reactive({ const data = reactive({
tab: t('v103.details.righttitle.d1'), tab: t('v103.scheduledTripDetails.righttitle.d1'),
searchDate:'', searchDate:'',
clickDate: '', clickDate: '',
scrollareaobj: null, scrollareaobj: null,
...@@ -358,10 +358,10 @@ export default defineComponent({ ...@@ -358,10 +358,10 @@ export default defineComponent({
loop: true loop: true
}, },
warnBuy: [ warnBuy: [
t('v103.details.warnbuytext.d1'), t('v103.scheduledTripDetails.warnbuytext.d1'),
t('v103.details.warnbuytext.d2'), t('v103.scheduledTripDetails.warnbuytext.d2'),
t('v103.details.warnbuytext.d3'), t('v103.scheduledTripDetails.warnbuytext.d3'),
t('v103.details.warnbuytext.d4')], t('v103.scheduledTripDetails.warnbuytext.d4')],
showOrderPreview: false, showOrderPreview: false,
videoPosition: 0, videoPosition: 0,
currentHeight: 0, currentHeight: 0,
...@@ -372,37 +372,37 @@ export default defineComponent({ ...@@ -372,37 +372,37 @@ export default defineComponent({
val: 'feature', val: 'feature',
top: 0, top: 0,
isActive: false, isActive: false,
display: t('v103.details.righttitle.d1') display: t('v103.scheduledTripDetails.righttitle.d1')
}, },
{ {
val: 'product', val: 'product',
top: 0, top: 0,
isActive: false, isActive: false,
display: t('v103.details.righttitle.d2') display: t('v103.scheduledTripDetails.righttitle.d2')
}, },
{ {
val: 'price', val: 'price',
top: 0, top: 0,
isActive: false, isActive: false,
display: t('v103.details.righttitle.d3') display: t('v103.scheduledTripDetails.righttitle.d3')
}, },
{ {
val: 'warning', val: 'warning',
top: 0, top: 0,
isActive: false, isActive: false,
display: t('v103.details.righttitle.d4') display: t('v103.scheduledTripDetails.righttitle.d4')
}, },
{ {
val: 'tips', val: 'tips',
top: 0, top: 0,
isActive: false, isActive: false,
display: t('v103.details.righttitle.d5') display: t('v103.scheduledTripDetails.righttitle.d5')
}, },
{ {
val: 'cancelTips', val: 'cancelTips',
top: 0, top: 0,
isActive: false, isActive: false,
display: t('v103.details.righttitle.d6') display: t('v103.scheduledTripDetails.righttitle.d6')
} }
], ],
priceListHeight: 0, priceListHeight: 0,
......
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