Skip to content

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

行程订单优化

parent 187da1ee
Expand all 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 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
{{$t('v103.details.style.nodata')}}
{{$t('v103.scheduledTripDetails.style.nodata')}}
</div>
</template>
</q-img>
......@@ -77,12 +77,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}}
{{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="x.playTimeHour"
>{{ x.playTimeHour }}{{$t('v103.details.style.d2')}}
>{{ x.playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span>
<span v-if="x.playTimeMinutes"
>{{ x.playTimeMinutes }}{{$t('v103.details.style.d3')}}</span
>{{ x.playTimeMinutes }}{{$t('v103.scheduledTripDetails.style.d3')}}</span
>
</span>
</div>
......@@ -158,19 +158,19 @@
let suffix = "";
if (props.day.jiu2.length > 1) {
if (props.isDirect === 1) {
suffix = t('v103.details.style.d6');
suffix = t('v103.scheduledTripDetails.style.d6');
}
} else {
if (
props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != t('v103.details.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8')
props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d7') &&
props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d8')
) {
if (props.day.jiu2[0].status == 1) {
suffix = t('v103.details.style.d9');
suffix = t('v103.scheduledTripDetails.style.d9');
} else {
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 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
{{$t('v103.details.style.nodata')}}
{{$t('v103.scheduledTripDetails.style.nodata')}}
</div>
</template>
</q-img>
......@@ -75,12 +75,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}}
{{$t('v103.scheduledTripDetails.style.d1')}}
<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 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>
</div>
......@@ -119,7 +119,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
{{$t('v103.details.style.nodata')}}
{{$t('v103.scheduledTripDetails.style.nodata')}}
</div>
</template>
</q-img>
......@@ -162,12 +162,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}}
{{$t('v103.scheduledTripDetails.style.d1')}}
<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 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>
</div>
......@@ -207,7 +207,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
{{$t('v103.details.style.nodata')}}
{{$t('v103.scheduledTripDetails.style.nodata')}}
</div>
</template>
</q-img>
......@@ -252,12 +252,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}}
{{$t('v103.scheduledTripDetails.style.d1')}}
<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 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>
</div>
......@@ -292,7 +292,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
{{$t('v103.details.style.nodata')}}
{{$t('v103.scheduledTripDetails.style.nodata')}}
</div>
</template>
</q-img>
......@@ -337,12 +337,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}}
{{$t('v103.scheduledTripDetails.style.d1')}}
<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 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>
</div>
......@@ -378,7 +378,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
{{$t('v103.details.style.nodata')}}
{{$t('v103.scheduledTripDetails.style.nodata')}}
</div>
</template>
</q-img>
......@@ -418,12 +418,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}}
{{$t('v103.scheduledTripDetails.style.d1')}}
<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 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>
</div>
......@@ -434,7 +434,7 @@
</div>
<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">
<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>{{$t('v103.details.style.d5')}}</div>
<div class="val" v-else>{{$t('v103.scheduledTripDetails.style.d5')}}</div>
</div>
</div>
</div>
......@@ -530,19 +530,19 @@ export default defineComponent({
let suffix = "";
if (props.day.jiu2.length > 1) {
if (props.isDirect === 1) {
suffix = t('v103.details.style.d6');
suffix = t('v103.scheduledTripDetails.style.d6');
}
} else {
if (
props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != t('v103.details.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8')
props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d7') &&
props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d8')
) {
if (props.day.jiu2[0].status == 1) {
suffix = t('v103.details.style.d9');
suffix = t('v103.scheduledTripDetails.style.d9');
} else {
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 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
{{$t('v103.details.style.nodata')}}
{{$t('v103.scheduledTripDetails.style.nodata')}}
</div>
</template>
</q-img>
......@@ -78,12 +78,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}}
{{$t('v103.scheduledTripDetails.style.d1')}}
<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 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>
</div>
......@@ -126,7 +126,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
{{$t('v103.details.style.nodata')}}
{{$t('v103.scheduledTripDetails.style.nodata')}}
</div>
</template>
</q-img>
......@@ -167,12 +167,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}}
{{$t('v103.scheduledTripDetails.style.d1')}}
<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 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>
</div>
......@@ -206,7 +206,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
{{$t('v103.details.style.nodata')}}
{{$t('v103.scheduledTripDetails.style.nodata')}}
</div>
</template>
</q-img>
......@@ -247,12 +247,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}}
{{$t('v103.scheduledTripDetails.style.d1')}}
<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 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>
</div>
......@@ -288,7 +288,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
{{$t('v103.details.style.nodata')}}
{{$t('v103.scheduledTripDetails.style.nodata')}}
</div>
</template>
</q-img>
......@@ -329,12 +329,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}}
{{$t('v103.scheduledTripDetails.style.d1')}}
<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 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>
</div>
......@@ -346,7 +346,7 @@
</div>
<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">
<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>{{$t('v103.details.style.d5')}}</div>
<div class="val" v-else>{{$t('v103.scheduledTripDetails.style.d5')}}</div>
</div>
</div>
</div>
......@@ -442,19 +442,19 @@ export default defineComponent({
let suffix = "";
if (props.day.jiu2.length > 1) {
if (props.isDirect === 1) {
suffix = t('v103.details.style.d6');
suffix = t('v103.scheduledTripDetails.style.d6');
}
} else {
if (
props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != t('v103.details.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8')
props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d7') &&
props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d8')
) {
if (props.day.jiu2[0].status == 1) {
suffix = t('v103.details.style.d9');
suffix = t('v103.scheduledTripDetails.style.d9');
} else {
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 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
{{$t('v103.details.style.nodata')}}
{{$t('v103.scheduledTripDetails.style.nodata')}}
</div>
</template>
</q-img>
......@@ -79,12 +79,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}}
{{$t('v103.scheduledTripDetails.style.d1')}}
<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 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>
</div>
......@@ -95,7 +95,7 @@
</div>
<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">
<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>{{$t('v103.details.style.d5')}}</div>
<div class="val" v-else>{{$t('v103.scheduledTripDetails.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 = t('v103.details.style.d6');
suffix = t('v103.scheduledTripDetails.style.d6');
}
} else {
if (
props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != t('v103.details.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8')
props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d7') &&
props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d8')
) {
if (props.day.jiu2[0].status == 1) {
suffix = t('v103.details.style.d9');
suffix = t('v103.scheduledTripDetails.style.d9');
} else {
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 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
{{$t('v103.details.style.nodata')}}
{{$t('v103.scheduledTripDetails.style.nodata')}}
</div>
</template>
</q-img>
......@@ -80,12 +80,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}}
{{$t('v103.scheduledTripDetails.style.d1')}}
<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 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>
</div>
......@@ -125,12 +125,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}}
{{$t('v103.scheduledTripDetails.style.d1')}}
<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 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>
</div>
......@@ -163,7 +163,7 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
{{$t('v103.details.style.nodata')}}
{{$t('v103.scheduledTripDetails.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')}}
{{$t('v103.scheduledTripDetails.style.nodata')}}
</div>
</template>
</q-img>
......@@ -248,12 +248,12 @@
"
>
<i class="iconfont icon-shijian1"></i>
{{$t('v103.details.style.d1')}}
{{$t('v103.scheduledTripDetails.style.d1')}}
<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 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>
</div>
......@@ -265,7 +265,7 @@
</div>
<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">
<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>{{$t('v103.details.style.d5')}}</div>
<div class="val" v-else>{{$t('v103.scheduledTripDetails.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 = t('v103.details.style.d6');
suffix = t('v103.scheduledTripDetails.style.d6');
}
} else {
if (
props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != t('v103.details.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8')
props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d7') &&
props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d8')
) {
if (props.day.jiu2[0].status == 1) {
suffix = t('v103.details.style.d9');
suffix = t('v103.scheduledTripDetails.style.d9');
} else {
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 @@
<div
class="absolute-full flex flex-center bg-blue-1 text-dark"
>
{{$t('v103.details.style.nodata')}}
{{$t('v103.scheduledTripDetails.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')}}
{{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="item.playTimeHour"
>{{ item.playTimeHour }}{{$t('v103.details.style.d2')}}
>{{ item.playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span>
<span v-if="item.playTimeMinutes"
>{{ item.playTimeMinutes }}{{$t('v103.details.style.d3')}}
>{{ item.playTimeMinutes }}{{$t('v103.scheduledTripDetails.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')}}
{{$t('v103.scheduledTripDetails.style.d1')}}
<span v-if="item.playTimeHour"
>{{ item.playTimeHour }}{{$t('v103.details.style.d2')}}
>{{ item.playTimeHour }}{{$t('v103.scheduledTripDetails.style.d2')}}
</span>
<span v-if="item.playTimeMinutes"
>{{ item.playTimeMinutes }}{{$t('v103.details.style.d3')}}
>{{ item.playTimeMinutes }}{{$t('v103.scheduledTripDetails.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')}}
{{$t('v103.scheduledTripDetails.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>{{$t('v103.details.style.d4')}}</h4>
<h4>{{$t('v103.scheduledTripDetails.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>{{$t('v103.details.style.d5')}}</div>
<div class="val" v-else>{{$t('v103.scheduledTripDetails.style.d5')}}</div>
</div>
</div>
</div>
......@@ -272,19 +272,19 @@ export default defineComponent({
let suffix = "";
if (props.day.jiu2.length > 1) {
if (props.isDirect === 1) {
suffix = t('v103.details.style.d6');
suffix = t('v103.scheduledTripDetails.style.d6');
}
} else {
if (
props.day.jiu2.length == 1 &&
props.day.jiu2[0].name != t('v103.details.style.d7') &&
props.day.jiu2[0].name != t('v103.details.style.d8')
props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d7') &&
props.day.jiu2[0].name != t('v103.scheduledTripDetails.style.d8')
) {
if (props.day.jiu2[0].status == 1) {
suffix = t('v103.details.style.d9');
suffix = t('v103.scheduledTripDetails.style.d9');
} else {
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>
<div>
<div class="text-subtitle2 text-weight-bold">選擇日期、選項</div>
<div class="text-grey-6 f12 q-my-md">請選擇出發日期</div>
<div class="text-subtitle2 text-weight-bold">{{$t('v103.scheduledTripDetails.dateoption')}}</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="q-px-lg q-py-sm row items-center">
<div class="text-subtitle2 text-weight-bold col">
......@@ -101,20 +101,20 @@ export default defineComponent({
methods.init();
})
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: [
"一月",
"二月",
"三月",
"四月",
"五月",
"6月",
"七月",
"八月",
"九月",
"十月",
"十一月",
"十二月",
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'),
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: [],
months: [],
......
src/components/trip/orderPreview.vue
View file @ 461e7b2b
......@@ -5,27 +5,27 @@
<q-btn
color="primary"
icon="refresh"
label="全部重選"
:label="$t('v103.scheduledTripDetails.reselect')"
@click="resetHandler"
flat
/>
</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="col" :class="{'column':$q.platform.is.mobile}">
<div>
<span class="text-subtitle2 text-weight-bold">成人</span>
<span class="text-grey-6 f12 q-ml-sm">(12-99歲)</span>
<span class="text-subtitle2 text-weight-bold">{{$t('v103.scheduledTripDetails.cr')}}</span>
<span class="text-grey-6 f12 q-ml-sm">(12-99{{$t('v103.scheduledTripDetails.age')}})</span>
</div>
<div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ p.originalB2BPrice }} /每人
CNY {{ p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
</div>
</div>
<div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ p.originalB2BPrice }} /每人
CNY {{ p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
<q-input
style="width: 150px"
......@@ -69,20 +69,20 @@
<div class="row items-end q-mt-md" v-if="p.isSupportChildren == 1">
<div class="col" :class="{'column':$q.platform.is.mobile}">
<div>
<span class="text-subtitle2 text-weight-bold">儿童</span>
<span class="text-grey-6 f12 q-ml-sm">(2-11歲,不占床)</span>
<span class="text-subtitle2 text-weight-bold">{{$t('v103.scheduledTripDetails.et')}}</span>
<span class="text-grey-6 f12 q-ml-sm">(2-11{{$t('v103.scheduledTripDetails.age')}},{{$t('v103.scheduledTripDetails.noroom')}})</span>
</div>
<div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px">
CNY
{{ p.originalB2BPrice - p.childNoNeedPrice }} /每人
{{ p.originalB2BPrice - p.childNoNeedPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
</div>
</div>
<div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY
{{ p.originalB2BPrice - p.childNoNeedPrice }} /每人
{{ p.originalB2BPrice - p.childNoNeedPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
<q-input
style="width: 150px"
......@@ -126,13 +126,13 @@
<div class="row items-end q-mt-md" v-if="p.isSupportChildren == 1">
<div class="col" :class="{ column: $q.platform.is.mobile }">
<div>
<span class="text-subtitle2 text-weight-bold">儿童</span>
<span class="text-grey-6 f12 q-ml-sm">(2-11歲,占床)</span>
<span class="text-subtitle2 text-weight-bold">{{$t('v103.scheduledTripDetails.et')}}</span>
<span class="text-grey-6 f12 q-ml-sm">(2-11{{$t('v103.scheduledTripDetails.age')}},{{$t('v103.scheduledTripDetails.room')}})</span>
</div>
<div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px">
CNY
{{ p.childNeedPrice + p.originalB2BPrice }} /每人
{{ p.childNeedPrice + p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
</div>
</div>
......@@ -143,7 +143,7 @@
style="font-size: 13px"
>
CNY
{{ p.childNeedPrice + p.originalB2BPrice }} /每人
{{ p.childNeedPrice + p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
<q-input
style="width: 150px"
......@@ -187,18 +187,18 @@
<div class="row items-end q-mt-md" v-if="p.isSupportChildren == 1">
<div class="col" :class="{'column':$q.platform.is.mobile}">
<div>
<span class="text-subtitle2 text-weight-bold">婴儿</span>
<span class="text-grey-6 f12 q-ml-sm">(2歲以下)</span>
<span class="text-subtitle2 text-weight-bold">{{$t('v103.scheduledTripDetails.ye')}}</span>
<span class="text-grey-6 f12 q-ml-sm">(2{{$t('v103.scheduledTripDetails.age')}}{{$t('v103.scheduledTripDetails.yixia')}})</span>
</div>
<div v-if="$q.platform.is.mobile">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ p.babyPrice }} /每人
CNY {{ p.babyPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
</div>
</div>
<div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ p.babyPrice }} /每人
CNY {{ p.babyPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
<q-input
style="width: 150px"
......@@ -240,29 +240,29 @@
</div>
<div class="text-grey-6 f12 q-mt-mb" v-if="p.isSupportChildren == 2">
本團只支持成人出遊
{{$t('v103.scheduledTripDetails.prompt')}}
</div>
<div
v-if="p.singleRoomPrice && p.singleRoomPrice > 0"
class="q-pt-md q-mt-md"
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="col" :class="{'column':$q.platform.is.mobile}">
<div>
<span class="text-subtitle2 text-weight-bold">單房服務</span>
<span class="text-grey-6 f12 q-ml-sm">(獨立單間住宿)</span>
<span class="text-subtitle2 text-weight-bold">{{$t('v103.scheduledTripDetails.service')}}</span>
<span class="text-grey-6 f12 q-ml-sm">({{$t('v103.scheduledTripDetails.singleroom')}})</span>
</div>
<div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ p.singleRoomPrice }} /每人
CNY {{ p.singleRoomPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
</div>
</div>
<div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ p.singleRoomPrice }} /每人
CNY {{ p.singleRoomPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
<q-input
style="width: 150px"
......@@ -308,18 +308,18 @@
class="q-pt-md q-mt-md row items-center"
style="border-top: 1px dashed #eee"
>
<div class="text-grey-6 f12 col">保險服務費</div>
<div class="product-money f12">CNY {{ p.safeMoney }}/每人</div>
<div class="text-grey-6 f12 col">{{$t('v103.scheduledTripDetails.insurance')}}</div>
<div class="product-money f12">CNY {{ p.safeMoney }}/{{$t('v103.scheduledTripDetails.each')}}</div>
</div>
</div>
<div class="q-mt-md q-pt-md" style="border-top: 1px dashed #eee">
<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>
</div>
<div class="q-mt-md text-right">
<span class="q-mr-lg f12 text-negative" v-if="!p.startDate" >{{$q.platform.is.mobile?'請選擇上面的出行日期':'請選擇左側的出行日期'}} </span>
<q-btn color="primary" label="立即預定" unelevated class="q-px-lg" :disable="sumPrice==0" @click="goOrderHandler"/>
<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="$t('v103.scheduledTripDetails.book')" unelevated class="q-px-lg" :disable="sumPrice==0" @click="goOrderHandler"/>
</div>
</div>
</div>
......
src/components/trip/style3.vue
View file @ 461e7b2b
......@@ -2721,7 +2721,7 @@
</label>
<label class="style3_detail">{{getHotelSuffix(item)}}</label>
</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>
......
src/components/trip/style5.vue
View file @ 461e7b2b
......@@ -127,7 +127,7 @@
</div>
</div>
<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 v-html="htmlData5"></div>
</div>
......
src/components/trip/style6.vue
View file @ 461e7b2b
......@@ -243,7 +243,7 @@
</label>
{{getHotelSuffix(item)}}
</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 class="detail-right">
......
src/components/trip/trip.vue
View file @ 461e7b2b
<template>
<div class="q-mt-lg" :class="{'q-px-md':$q.platform.is.mobile}">
<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="">
<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>
</div>
<q-tabs
......@@ -15,8 +15,8 @@
active-class="text-primary"
dense
>
<q-tab name="image" @click="changeHandler()" icon="iconfont iconimage" class="no-padding q-mr-lg" :label="$t('v103.details.graphicmode')" />
<q-tab name="dates" @click="changeHandler()" icon="iconfont iconrili" class="no-padding q-mr-lg" :label="$t('v103.details.calendarmode')" />
<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.scheduledTripDetails.calendarmode')" />
</q-tabs>
<list :days="trip.dayList" v-if="displayType=='image'"></list>
<calendar :days="trip.dayList" v-if="displayType=='dates'"></calendar>
......
src/components/trip/tripView/calendar.vue
View file @ 461e7b2b
......@@ -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">{{$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>
</q-td>
</template>
<template v-slot:body-cell-dinner="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 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 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>
</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?$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 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: 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;' },
{ name: "day", label: t('v103.scheduledTripDetails.calendartitle.d1'), 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.scheduledTripDetails.calendartitle.d3'), align: "left",style:'vertical-align:top;' },
{ name: "hotel", label: t('v103.scheduledTripDetails.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=t('v103.details.day.d1')
x.lanuch=t('v103.details.day.d1')
x.dinner=t('v103.details.day.d1')
x.breakfast=t('v103.scheduledTripDetails.day.d1')
x.lanuch=t('v103.scheduledTripDetails.day.d1')
x.dinner=t('v103.scheduledTripDetails.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(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'){
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'){
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'){
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) {
......@@ -104,7 +104,7 @@ export default defineComponent({
} else if (y.type == 5) {
x.activity.push({
t:2,
n:t('v103.details.day.d4')
n:t('v103.scheduledTripDetails.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 = t('v103.details.traffice.d1') + tras[0].startCityName;
let txt = t('v103.scheduledTripDetails.traffice.d1') + tras[0].startCityName;
tras.forEach((z, i) => {
if (i > 0) {
txt = t('v103.details.traffice.d2');
txt = t('v103.scheduledTripDetails.traffice.d2');
}
if (z.arrivalType == 1) {
txt += t('v103.details.traffice.d3');
txt += t('v103.scheduledTripDetails.traffice.d3');
} else if (z.arrivalType == 2) {
txt += t('v103.details.traffice.d4');
txt += t('v103.scheduledTripDetails.traffice.d4');
} else if (z.arrivalType == 3) {
txt += t('v103.details.traffice.d5');
txt += t('v103.scheduledTripDetails.traffice.d5');
} 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;
},
......
src/components/trip/tripView/list.vue
View file @ 461e7b2b
......@@ -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"
>{{$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">{{
x.title
......@@ -24,7 +24,7 @@
></div>
</q-timeline-entry>
<q-timeline-entry
:subtitle="$t('v103.details.list.d1')"
:subtitle="$t('v103.scheduledTripDetails.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">{{
`${$t('v103.details.list.d2')}${y.childItem.couponsName}`
`${$t('v103.scheduledTripDetails.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')}}
{{$t('v103.scheduledTripDetails.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 }} {{$t('v103.details.list.d4')}}</span
>{{ y.childItem.playTimeHour }} {{$t('v103.scheduledTripDetails.list.d4')}}</span
>
<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>
......@@ -141,8 +141,8 @@
</div>
</q-timeline-entry>
<q-timeline-entry
:title="$t('v103.details.day.d4')"
:subtitle="$t('v103.details.list.d6')"
:title="$t('v103.scheduledTripDetails.day.d4')"
:subtitle="$t('v103.scheduledTripDetails.list.d6')"
icon="iconfont iconhuodong"
:key="yi"
color="grey"
......@@ -184,7 +184,7 @@
</div>
</q-timeline-entry>
<q-timeline-entry
:subtitle="$t('v103.details.list.d7')"
:subtitle="$t('v103.scheduledTripDetails.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>{{$t('v103.details.list.d8')}}</span>
<span>{{$t('v103.scheduledTripDetails.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="$t('v103.details.day.d5')"
:label="$t('v103.scheduledTripDetails.day.d5')"
v-if="y.childItem.useDinnerType.indexOf('1') != -1"
/>
<q-chip
......@@ -216,7 +216,7 @@
square
text-color="grey-2"
dense
:label="$t('v103.details.day.d6')"
:label="$t('v103.scheduledTripDetails.day.d6')"
v-if="y.childItem.useDinnerType.indexOf('3') != -1"
/>
<q-chip
......@@ -224,7 +224,7 @@
square
text-color="grey-2"
dense
:label="$t('v103.details.day.d7')"
:label="$t('v103.scheduledTripDetails.day.d7')"
v-if="y.childItem.isSameLevel == 0"
/>
<q-chip
......@@ -232,10 +232,10 @@
square
text-color="grey-2"
dense
:label="$t('v103.details.day.d8')"
:label="$t('v103.scheduledTripDetails.day.d8')"
>
<q-tooltip class="bg-dark"
>{{$t('v103.details.list.d9')}}</q-tooltip
>{{$t('v103.scheduledTripDetails.list.d9')}}</q-tooltip
>
</q-chip>
</div>
......@@ -277,8 +277,8 @@
</div>
</q-timeline-entry>
<q-timeline-entry
:title="$t('v103.details.list.d10')"
:subtitle="$t('v103.details.list.d11')"
:title="$t('v103.scheduledTripDetails.list.d10')"
:subtitle="$t('v103.scheduledTripDetails.list.d11')"
icon="iconfont icontishi"
:key="yi"
color="warning"
......@@ -336,7 +336,7 @@ export default defineComponent({
d: props.days,
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) => {
data.d = n;
},{deep: true}
......@@ -366,21 +366,21 @@ export default defineComponent({
}
},
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) => {
if (i > 0) {
txt = t('v103.details.traffice.d2');
txt = t('v103.scheduledTripDetails.traffice.d2');
}
if (z.arrivalType == 1) {
txt += t('v103.details.traffice.d3');
txt += t('v103.scheduledTripDetails.traffice.d3');
} else if (z.arrivalType == 2) {
txt += t('v103.details.traffice.d4');
txt += t('v103.scheduledTripDetails.traffice.d4');
} else if (z.arrivalType == 3) {
txt += t('v103.details.traffice.d5');
txt += t('v103.scheduledTripDetails.traffice.d5');
} 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;
},
......
src/i18n/zh-TW/index.ts
View file @ 461e7b2b
......@@ -1158,7 +1158,7 @@ export default {
day3: '60天內',
}
},
details:{
scheduledTripDetails:{
since: '起',
selectionscheme: '選擇方案',
headerlabel:{
......@@ -1263,10 +1263,43 @@ export default {
d9: '【保证入住】',
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:{
setorderday: '時間範圍'
setorderday: '時間範圍',
}
}
//#endregion
......
src/pages/scheduledTrip/details.vue
View file @ 461e7b2b
......@@ -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">
<span class="col product-price text-subtitle1 text-weight-bold" style="text-align: left">
<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>
<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 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
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment