Commit 75bce450 authored by 黄奎's avatar 黄奎

Merge branch 'master' of http://gitlab.oytour.com/luochao/bigwood

# Conflicts:
#	src/i18n/zh-TW/index.ts
#	src/router/routes.ts
parents 488bbe9a 74f96b36
...@@ -101,7 +101,10 @@ ...@@ -101,7 +101,10 @@
<div :class="{ 'q-px-lg': $q.platform.is.desktop }"> <div :class="{ 'q-px-lg': $q.platform.is.desktop }">
<div class="q-mt-lg row"> <div class="q-mt-lg row">
<div class="col-3 f12 text-grey-500">{{ $t('v102.ticket.d1') }}</div> <div class="col-3 f12 text-grey-500">{{ $t('v102.ticket.d1') }}</div>
<div class="col text-subtitle2 text-weight-bolder">{{t.OpeningHours}} {{t.OpeningHours.substring(6,13)}} {{ $t('v102.ticket.stoppage') }}</div> <div class="col text-subtitle2 text-weight-bolder">{{t.OpeningHours}}
<!-- {{t.OpeningHours.substring(6,13)}} {{ $t('v102.ticket.stoppage') }} -->
</div>
</div> </div>
</div> </div>
<div :class="{ 'q-px-lg': $q.platform.is.desktop }"> <div :class="{ 'q-px-lg': $q.platform.is.desktop }">
......
...@@ -139,7 +139,7 @@ export default { ...@@ -139,7 +139,7 @@ export default {
if (qDateProxy.value) qDateProxy.value.hide() if (qDateProxy.value) qDateProxy.value.hide()
}, },
optionsFn(cd: any) { optionsFn(cd: any) {
return cd >= date.formatDate(date.addToDate(new Date(), { days: 1 }), 'YYYY/MM/DD') return cd >= date.formatDate(date.addToDate(new Date(), { days: 0 }), 'YYYY/MM/DD')
}, },
} }
const searchCnt = computed(() => { const searchCnt = computed(() => {
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,8 @@
</q-popup-proxy> </q-popup-proxy>
</q-field> </q-field>
</div> </div>
<div class="mobile-only q-mt-md"> <div class="q-mt-md">
<q-field clearable v-model="dateRangeFormatUse" :label="$t('hotelorder.search.daterange')" standout style="min-width: 190px" dense @clear="getDateRangeUse"> <q-field clearable v-model="dateRangeFormatUse" :label="$t('v102.ticket.starttime')" standout style="min-width: 190px" dense @clear="getDateRangeUse">
<div class="self-center full-width no-outline" tabindex="0">{{ dateRangeFormatUse }}</div> <div class="self-center full-width no-outline" tabindex="0">{{ dateRangeFormatUse }}</div>
<q-popup-proxy :offset="[0, 10]" ref="qDateProxyUse"> <q-popup-proxy :offset="[0, 10]" ref="qDateProxyUse">
<q-date v-model="dateRangeUse" :options="optionsFnUse" range mask="YYYY/MM/DD" @range-end="dateRangeHandlerUse" ></q-date> <q-date v-model="dateRangeUse" :options="optionsFnUse" range mask="YYYY/MM/DD" @range-end="dateRangeHandlerUse" ></q-date>
......
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<div class="q-mt-md" v-if="x.OrderStatus != 3" :class="{ row: $q.platform.is.desktop, 'column reverse': $q.platform.is.mobile }"> <div class="q-mt-md" v-if="x.OrderStatus != 3" :class="{ row: $q.platform.is.desktop, 'column reverse': $q.platform.is.mobile }">
<div class="pay row text-grey rounded-borders" :class="{ 'bg-grey-2 q-mt-md': $q.platform.is.mobile, col: $q.platform.is.desktop }"> <div class="pay row text-grey rounded-borders" :class="{ 'bg-grey-2 q-mt-md': $q.platform.is.mobile, col: $q.platform.is.desktop }">
<div class="bg-orange-1 col-12 rounded-borders q-pa-md"> <div class="bg-orange-1 col-12 rounded-borders q-pa-md">
<div v-if="x.MailingState==1||x.MailingState==2"> <div v-if="x.MailingState==2||x.MailingState==3">
<div class="text-subtitle2 text-dark text-weight-bolder row items-center"> <div class="text-subtitle2 text-dark text-weight-bolder row items-center">
<span class="col">{{ $t('v102.ticket.sjc.c5') }}:</span> <span class="col">{{ $t('v102.ticket.sjc.c5') }}:</span>
<span class="f12" :class="[x.SendType.Color]">{{ x.SendType.Name }}</span> <span class="f12" :class="[x.SendType.Color]">{{ x.SendType.Name }}</span>
......
...@@ -804,119 +804,125 @@ export default { ...@@ -804,119 +804,125 @@ export default {
recommendTime: '推薦遊玩', recommendTime: '推薦遊玩',
hour: '小時', hour: '小時',
minutes: '分鐘', minutes: '分鐘',
load: '圖片加載失敗', load: '圖片加載失敗',
showtt: { showtt: {
t1: '共', t1: '共',
t2: '種票型' t2: '種票型',
}, load: '圖加載失敗',
buy: '立即订票', showtt: {
shortBuy: '預訂', t1: '共',
addr: '地址', t2: '種票型'
map: '地圖',
jing: '景點', },
detail: '景區詳情', buy: '立即订票',
d1: '開放時間', shortBuy: '預訂',
d2: '景區特色', addr: '地址',
d3: '交通說明', map: '地圖',
d4: '溫馨提醒', jing: '景點',
d5: '預訂須知', detail: '景區詳情',
preview: { d1: '開放時間',
pageTitle: '订单预览' d2: '景區特色',
}, d3: '交通說明',
ordertip: '請在遊玩前一天的23:00前完成預訂', d4: '溫馨提醒',
pt: '遊玩日期', d5: '預訂須知',
tt: '選擇票型', preview: {
ti: '票券信息', pageTitle: '订单预览'
bc: '購買張數', },
gi: '取票方式', ordertip: '請在遊玩前一天的23:00前完成預訂',
zq: '自行取票', pt: '遊玩日期',
yj: '郵寄票券', tt: '選擇票型',
zqs: '自行取票說明', ti: '票券信息',
zqd: '自行前往指定位置取票,當您完成付款後我們將通過郵件通知您取票的門票訊息', bc: '購買張數',
sj: '客人訊息', gi: '取票方式',
youji: '郵寄訊息', zq: '自行取票',
unit: '張', yj: '郵寄票券',
sex: { zqs: '自行取票說明',
man: '男', zqd: '自行前往指定位置取票,當您完成付款後我們將通過郵件通知您取票的門票訊息',
women: '女' sj: '客人訊息',
}, youji: '郵寄訊息',
sjc: { unit: '張',
c1: '中文姓名', sex: {
c2: '英文姓名', man: '男',
c3: '性別', women: '女'
c4: '聯絡電話', },
c5: '收件地址' sjc: {
}, c1: '中文姓名',
sjcp: { c2: '英文姓名',
c1: '請輸入中文姓名', c3: '性別',
c2: '請輸入英文姓名', c4: '聯絡電話',
c4: '請輸入聯絡電話', c5: '收件地址'
c5: '請輸入收件地址' },
}, sjcp: {
st: '結算帳單', c1: '請輸入中文姓名',
rtt: '退票限制', c2: '請輸入英文姓名',
rtc: '未消費隨時可退,多張票訂單不支持部分退款', c4: '請輸入聯絡電話',
ms: '訂票明細', c5: '請輸入收件地址'
nt: '沒有選擇票券', },
ds: '訂單總額', st: '結算帳單',
sb: '提交訂單', rtt: '退票限制',
or: '訂單備註', rtc: '未消費隨時可退,多張票訂單不支持部分退款',
zqa: '自取地址', ms: '訂票明細',
nzqa: '等待客服確認後,才能看到自取地址,我們將會第一時間通過郵件告知您' nt: '沒有選擇票券',
}, ds: '訂單總額',
to: { sb: '提交訂單',
pageTitle: '票券訂單列表', or: '訂單備註',
ticketName: '景點名稱', zqa: '自取地址',
Name: '客人名稱', nzqa: '等待客服確認後,才能看到自取地址,我們將會第一時間通過郵件告知您'
qj: '取券方式',
qjc: '取件人姓名(中/英)',
qjp: '取件人電話',
ps: {
p1: '等待配送',
p2: '已配送'
},
m: {
t: '修改取件方式',
c: '取消修改',
s: '保存修改'
}, },
to: {
pageTitle: '票券訂單列表',
ticketName: '景點名稱',
Name: '客人名稱',
qj: '取券方式',
qjc: '取件人姓名(中/英)',
qjp: '取件人電話',
ps: {
p1: '等待配送',
p2: '已配送'
},
m: {
t: '修改取件方式',
c: '取消修改',
s: '保存修改'
},
},
vehicle: {
title: '客戶訂車確認單(小車)',
title1: "訂車單位",
title2: "訂車人",
title3: "接機信息",
title4: "去程航班",
title5: "回程航班",
title6: "用車人數",
title7: "開始日期",
title8: "行程天數",
title9: "用車類型",
title10: "導遊信息",
title11: "团队信息",
title12: "創建時間",
title13: "車型選擇",
title14: "接送機時間",
tatle: {
th1: '日期',
th2: '第幾天',
th3: '用車類型',
th4: '行程信息',
}, },
add: '添加', vehicle: {
add2: '修改', title: '客戶訂車確認單(小車)',
add3: '取消用車', title1: "訂車單位",
add4: '原因', title2: "訂車人",
add5: '確定', title3: "接機信息",
list: { title4: "去程航班",
s1: '用車公司', title5: "回程航班",
s2: '用車人', title6: "用車人數",
s3: '團隊名稱', title7: "開始日期",
s4: '請選擇預定日期', title8: "行程天數",
s5: '编辑', title9: "用車類型",
title10: "導遊信息",
title11: "团队信息",
title12: "創建時間",
title13: "車型選擇",
title14: "接送機時間",
tatle: {
th1: '日期',
th2: '第幾天',
th3: '用車類型',
th4: '行程信息',
},
add: '添加',
add2: '修改',
add3: '取消用車',
add4: '原因',
add5: '確定',
list: {
s1: '用車公司',
s2: '用車人',
s3: '團隊名稱',
s4: '請選擇預定日期',
s5: '编辑',
}
} }
} },
}, //#endregion
//#endregion }
}
...@@ -31,7 +31,7 @@ export default defineComponent({ ...@@ -31,7 +31,7 @@ export default defineComponent({
QCity: 0, QCity: 0,
QDistrict: 0, QDistrict: 0,
Name:'', Name:'',
OpenTime: date.formatDate(date.addToDate(new Date(), { days: 1 }), 'YYYY/MM/DD'), OpenTime: date.formatDate(date.addToDate(new Date(), { days: 0 }), 'YYYY/MM/DD'),
StartPrice: '', StartPrice: '',
EndPrice: '', EndPrice: '',
ViewType:1,//列表模式 ViewType:1,//列表模式
......
...@@ -39,7 +39,7 @@ export default defineComponent({ ...@@ -39,7 +39,7 @@ export default defineComponent({
UseETime: '',//门票结束时间 UseETime: '',//门票结束时间
MailingState: -1 MailingState: -1
}) })
//search.OrderId = currentRouter.currentRoute.value.params.orderId search.OrderId = currentRouter.currentRoute.value.params.orderId
provide(DirtionmaryHelper.TICKET_ORDER_SEARCH, search) provide(DirtionmaryHelper.TICKET_ORDER_SEARCH, search)
const menu = inject(DirtionmaryHelper.MENU_KEYS) as any const menu = inject(DirtionmaryHelper.MENU_KEYS) as any
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div class="q-mr-md"> <div class="q-mr-md">
<q-img v-if="detailsObj.PicPathList&&detailsObj.PicPathList.length>0" :src="detailsObj.PicPathList[0]" :ratio="16 / 9" spinner-color="grey" spinner-size="50px" width="100px" fit="cover" class="rounded-borders"> <q-img v-if="detailsObj.PicPathList&&detailsObj.PicPathList.length>0" :src="detailsObj.PicPathList[0]" :ratio="16 / 9" spinner-color="grey" spinner-size="50px" width="100px" fit="cover" class="rounded-borders">
<template v-slot:error> <template v-slot:error>
<div class="absolute-full flex flex-center bg-blue-1 text-dark"> <div class="absolute-full flex flex-center bg-blue-1 text-dark fz12">
{{$t('v102.ticket.load')}} {{$t('v102.ticket.load')}}
</div> </div>
</template> </template>
...@@ -174,6 +174,7 @@ ...@@ -174,6 +174,7 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { useRouter } from 'vue-router'
import { ApiResult } from 'src/@types/enumHelper' import { ApiResult } from 'src/@types/enumHelper'
import TicketService from '../../api/ticket' import TicketService from '../../api/ticket'
import message from '../../utils/message' import message from '../../utils/message'
...@@ -187,6 +188,7 @@ import { date } from 'quasar' ...@@ -187,6 +188,7 @@ import { date } from 'quasar'
export default defineComponent({ export default defineComponent({
components: { TicketCard }, components: { TicketCard },
setup(props) { setup(props) {
const $router = useRouter()
let { setTitle } = useMetaModule() let { setTitle } = useMetaModule()
const { t } = useI18n() const { t } = useI18n()
const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any
...@@ -225,7 +227,7 @@ export default defineComponent({ ...@@ -225,7 +227,7 @@ export default defineComponent({
data.msg.CouponsId = currentRouter.currentRoute.value.params.ticketId data.msg.CouponsId = currentRouter.currentRoute.value.params.ticketId
// date.formatDate(date.addToDate(new Date(), { days: 1 }), 'MM月DD日 ddd') // date.formatDate(date.addToDate(new Date(), { days: 1 }), 'MM月DD日 ddd')
data.msg.UseDate = date.formatDate(date.addToDate(new Date(), { days: 1 }), 'YYYY/MM/DD') data.msg.UseDate = date.formatDate(date.addToDate(new Date(), { days: 0 }), 'YYYY/MM/DD')
const menu = inject(DirtionmaryHelper.MENU_KEYS) as any const menu = inject(DirtionmaryHelper.MENU_KEYS) as any
menu.value = 8 menu.value = 8
...@@ -296,6 +298,7 @@ export default defineComponent({ ...@@ -296,6 +298,7 @@ export default defineComponent({
.then(r => { .then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) { if (r.data.resultCode == ApiResult.SUCCESS) {
message.successMsg(`${t('success')}`) message.successMsg(`${t('success')}`)
$router.push({ path:'/ticket/order' })
} else { } else {
message.errorMsg(r.data.message) message.errorMsg(r.data.message)
} }
...@@ -310,7 +313,7 @@ export default defineComponent({ ...@@ -310,7 +313,7 @@ export default defineComponent({
data.showDetails = true data.showDetails = true
}, },
optionsFn(cd: any) { optionsFn(cd: any) {
return cd > date.formatDate(new Date(), 'YYYY/MM/DD') return cd >= date.formatDate(date.addToDate(new Date(), { days: 0 }), 'YYYY/MM/DD')
}, },
changeDetailListHandler(e: any) { changeDetailListHandler(e: any) {
if (e.checked) { if (e.checked) {
......
...@@ -17,9 +17,12 @@ const routes: RouteRecordRaw[] = [ ...@@ -17,9 +17,12 @@ const routes: RouteRecordRaw[] = [
{ path: '/scattered/HotelOrder', component: () => import('pages/scattered/HotelOrder.vue') }, { path: '/scattered/HotelOrder', component: () => import('pages/scattered/HotelOrder.vue') },
{ path: '/comingsoon', component: () => import('pages/ComingSoon.vue') }, { path: '/comingsoon', component: () => import('pages/ComingSoon.vue') },
{ path: '/ticket/list', component: () => import('pages/ticket/TicketList.vue') }, { path: '/ticket/list', component: () => import('pages/ticket/TicketList.vue') },
{ path: '/ticket/preview/:ticketId/:Time', component: () => import('pages/ticket/TicketOrderPreview.vue') }, { path: '/ticket/preview/:ticketId/:Time', component: () => import('pages/ticket/TicketOrderPreview.vue') },
{ path: '/ticket/order', component: () => import('pages/ticket/TicketOrder.vue') }, { path: '/ticket/order', component: () => import('pages/ticket/TicketOrder.vue') },
{ path: '/vehicle/index', component: () => import('pages/vehicle/index.vue') }//车辆 { path: '/vehicle/index', component: () => import('pages/vehicle/index.vue') },//车辆
{ path: '/ticket/preview/:ticketId/:Time', component: () => import('pages/ticket/TicketOrderPreview.vue') },
{ path: '/ticket/order/:orderId?', component: () => import('pages/ticket/TicketOrder.vue') }
] ]
}, },
{ {
......
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