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

# Conflicts:
#	src/i18n/zh-TW/index.ts
#	src/router/routes.ts

src/components/ticket/TicketCard.vue

@@ -101,7 +101,10 @@
       <div :class="{ 'q-px-lg': $q.platform.is.desktop }">
         <div class="q-mt-lg row">
           <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 :class="{ 'q-px-lg': $q.platform.is.desktop }">

src/components/ticket/list/ListHeader.vue

@@ -139,7 +139,7 @@ export default {
         if (qDateProxy.value) qDateProxy.value.hide()
       },
       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(() => {

src/components/ticket/order/TicketOrderHeader.vue

@@ -28,8 +28,8 @@
               </q-popup-proxy>
             </q-field>
           </div>
-          <div class="mobile-only q-mt-md">
-            <q-field clearable v-model="dateRangeFormatUse" :label="$t('hotelorder.search.daterange')" standout style="min-width: 190px" dense @clear="getDateRangeUse">
+          <div class="q-mt-md">
+            <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>
               <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>

src/components/ticket/order/TicketOrderList.vue

@@ -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="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 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">
                 <span class="col">{{ $t('v102.ticket.sjc.c5') }}：</span>
                 <span class="f12" :class="[x.SendType.Color]">{{ x.SendType.Name }}</span>

src/i18n/zh-TW/index.ts

@@ -804,10 +804,16 @@ export default {
       recommendTime: '推薦遊玩',
       hour: '小時',
       minutes: '分鐘',
+
       load: '圖片加載失敗',
+      showtt: {
+        t1: '共',
+        t2: '種票型',
+        load: '圖加載失敗',
         showtt: {
           t1: '共',
           t2: '種票型'
+
         },
         buy: '立即订票',
         shortBuy: '預訂',
@@ -919,4 +925,4 @@ export default {
       }
     },
     //#endregion
-}
+  }

src/pages/ticket/TicketList.vue

@@ -31,7 +31,7 @@ export default defineComponent({
         QCity: 0,
         QDistrict: 0,
         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: '',
         EndPrice: '',
         ViewType:1,//列表模式

src/pages/ticket/TicketOrder.vue

@@ -39,7 +39,7 @@ export default defineComponent({
       UseETime: '',//门票结束时间
       MailingState: -1
     })
-    //search.OrderId = currentRouter.currentRoute.value.params.orderId
+    search.OrderId = currentRouter.currentRoute.value.params.orderId
 
     provide(DirtionmaryHelper.TICKET_ORDER_SEARCH, search)
     const menu = inject(DirtionmaryHelper.MENU_KEYS) as any

src/pages/ticket/TicketOrderPreview.vue

@@ -8,7 +8,7 @@
             <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">
                 <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')}}
                   </div>
                 </template>
@@ -174,6 +174,7 @@
 </template>
 
 <script lang="ts">
+import { useRouter } from 'vue-router'
 import { ApiResult } from 'src/@types/enumHelper'
 import TicketService from '../../api/ticket'
 import message from '../../utils/message'
@@ -187,6 +188,7 @@ import { date } from 'quasar'
 export default defineComponent({
   components: { TicketCard },
   setup(props) {
+    const $router = useRouter()
     let { setTitle } = useMetaModule()
     const { t } = useI18n()
     const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any
@@ -225,7 +227,7 @@ export default defineComponent({
     
     data.msg.CouponsId = currentRouter.currentRoute.value.params.ticketId
     // 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
     menu.value = 8
@@ -296,6 +298,7 @@ export default defineComponent({
           .then(r => {
             if (r.data.resultCode == ApiResult.SUCCESS) {
               message.successMsg(`${t('success')}`)
+              $router.push({ path:'/ticket/order' })
             } else {
               message.errorMsg(r.data.message)
             }
@@ -310,7 +313,7 @@ export default defineComponent({
         data.showDetails = true
       },
       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) {
         if (e.checked) {

src/router/routes.ts

@@ -17,9 +17,12 @@ const routes: RouteRecordRaw[] = [
       { path: '/scattered/HotelOrder', component: () => import('pages/scattered/HotelOrder.vue') },
       { path: '/comingsoon', component: () => import('pages/ComingSoon.vue') },
       { path: '/ticket/list', component: () => import('pages/ticket/TicketList.vue') },
+
       { path: '/ticket/preview/:ticketId/:Time', component: () => import('pages/ticket/TicketOrderPreview.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') }
     ]
   },
   {