Skip to content

B
bigwood
Commit cdce09dc authored by 罗超's avatar 罗超
Browse files
Options

修改

parent 8832469f
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 20 deletions
quasar.conf.js
View file @ cdce09dc
...@@ -64,7 +64,7 @@ module.exports = configure(function (ctx) { ...@@ -64,7 +64,7 @@ module.exports = configure(function (ctx) {
publicPath: ctx.dev ? '/' : './', publicPath: ctx.dev ? '/' : './',
env: ctx.dev env: ctx.dev
? { ? {
BASE_APP_API: 'http://reborn.oytour.com/api/common/post', BASE_APP_API: 'http://192.168.5.46:/api/common/post',
JAVA_URL_API: 'http://efficient.oytour.com', JAVA_URL_API: 'http://efficient.oytour.com',
VERSION:require('./package.json').version, VERSION:require('./package.json').version,
......
src/i18n/en-US/index.ts
View file @ cdce09dc
...@@ -359,7 +359,7 @@ export default { ...@@ -359,7 +359,7 @@ export default {
three: 'Remittance instructions' three: 'Remittance instructions'
}, },
travel: { travel: {
first: 'Consrotium', first: 'Consortium',
second: 'Group Detail', second: 'Group Detail',
three: 'Booking list', three: 'Booking list',
four: 'Settlement', four: 'Settlement',
...@@ -390,6 +390,11 @@ export default { ...@@ -390,6 +390,11 @@ export default {
} }
}, },
travel: { travel: {
type:'Type',
b2cPirce:'Normal Pprice',
b2bPirce:'Member Price',
MiddlePrice:'Consortium',
priceDetail:'Price Details',
status:{ status:{
normal:'All', normal:'All',
regular:'Regular', regular:'Regular',
...@@ -1497,6 +1502,7 @@ export default { ...@@ -1497,6 +1502,7 @@ export default {
query_flightNum: 'Flight number', query_flightNum: 'Flight number',
queryarrivalTime: 'Arrival time', queryarrivalTime: 'Arrival time',
query_stopCity: 'Stopped city', query_stopCity: 'Stopped city',
query_arrivalTime: 'Arrival time',
ph_flightTime: 'Departure time', ph_flightTime: 'Departure time',
}, },
//#endregion //#endregion
......
src/i18n/ja-RB/index.ts
View file @ cdce09dc
...@@ -367,7 +367,32 @@ export default { ...@@ -367,7 +367,32 @@ export default {
second: 'リスト', second: 'リスト',
} }
}, },
notice: {
pageTitle: 'お知らせ',
search: {
title: 'お知らせのタイトル',
},
column: {
title: 'お知らせのタイトル',
publisher: '発行者',
releaseDate: '発行日',
action: '操作',
},
placeholder: {
title: 'タイトルを入力してください',
},
view:'View',
detail: {
title: 'お知らせの詳細',
file: '添付ファイル',
}
},
travel: { travel: {
type:'タイプ',
b2cPirce:'B2C価格',
b2bPirce:'B2B価格',
MiddlePrice:'中心価格',
priceDetail:'価格詳細',
status:{ status:{
normal:'すべて', normal:'すべて',
regular:'正常', regular:'正常',
......
src/i18n/zh-SW/index.ts
View file @ cdce09dc
...@@ -367,7 +367,33 @@ export default { ...@@ -367,7 +367,33 @@ export default {
second: '列表', second: '列表',
} }
}, },
notice: {
pageTitle: '公告',
search: {
title: '公告標題',
},
column: {
title: '公告標題',
publisher: '發佈者',
releaseDate: '發佈日期',
action: '操作',
},
placeholder: {
title: '請輸入標題',
},
view:'查看',
detail: {
title: '公告詳情',
file: '附件',
}
},
travel: { travel: {
type:'类型',
b2cPirce:'直客价格',
b2bPirce:'代理价格',
MiddlePrice:'中心价',
priceDetail:'价格详情',
status:{ status:{
normal:'全部', normal:'全部',
regular:'正常', regular:'正常',
......
src/i18n/zh-TW/index.ts
View file @ cdce09dc
...@@ -369,9 +369,31 @@ export default { ...@@ -369,9 +369,31 @@ export default {
} }
}, },
notice: { notice: {
pageTitle: '公告欄', pageTitle: '公告',
search: {
title: '公告標題',
},
column: {
title: '公告標題',
publisher: '發佈者',
releaseDate: '發佈日期',
action: '操作',
},
placeholder: {
title: '請輸入標題',
},
view:'查看',
detail: {
title: '公告詳情',
file: '附件',
}
}, },
travel: { travel: {
b2cPirce:'直客價格',
b2bPirce:'代理價格',
MiddlePrice:'中心價',
priceDetail:'價格詳情',
type:'Type',
status:{ status:{
normal:'全部', normal:'全部',
regular:'正常', regular:'正常',
......
src/pages/travel/components/productList.vue
View file @ cdce09dc
...@@ -24,21 +24,21 @@ ...@@ -24,21 +24,21 @@
<!-- <i class="iconfont icon-hangban1"></i><span>{{ $t('travel.airInfo') }}</span> --> <!-- <i class="iconfont icon-hangban1"></i><span>{{ $t('travel.airInfo') }}</span> -->
</div> </div>
<div class="FlightDiv-TCL cursor-pointer" @click="showDialogF(x)"> <div class="FlightDiv-TCL cursor-pointer" @click="showDialogF(x)">
<div v-for="(subItem, subIndex) in x.TravelTeamFlightList" :key="subIndex + 1000" class="TCL-flighInfoList"> <div v-for="(subItem, subIndex) in x.SelfFlightList" :key="subIndex" class="TCL-flighInfoList">
<span class="travelnowrap"> <span class="travelnowrap">
<span class="TCL-FlightNumber">{{ subItem.Flight_number }}</span> <span class="TCL-FlightNumber">{{ subItem.Flight_number }}</span>
<span <span
><template v-if="subItem.DIATA">({{ subItem.DIATA }})</template> <template v-else>({{ subItem.dName }})</template></span ><template v-if="subItem.DIATA">({{ subItem.DIATA }})</template> <template v-else>({{ subItem.dName }})</template></span
> >
{{ subItem.DepartureName }} {{ subItem.DepartureName }}
{{ subItem.StopoverName == '' ? '' : '-(' + subItem.StopoverIATA + ')' + subItem.StopoverName }} <!-- {{ subItem.StopoverName == '' ? '' : '-(' + subItem.StopoverIATA + ')' + subItem.StopoverName }} -->
<template v-if="subItem.ArrivalCityName"> <template v-if="subItem.ArrivalCityName">
<span v-if="subItem.AIATA"> -({{ subItem.AIATA }}) </span> <span v-if="subItem.AIATA"> -({{ subItem.AIATA }}) </span>
<span v-else>-</span> <span v-else>-</span>
{{ subItem.ArrivalCityName }} {{ subItem.ArrivalCityName }}
<template v-if="!subItem.DIATA">({{ subItem.aName }})</template> <template v-if="!subItem.DIATA">({{ subItem.aName }})</template>
</template> </template>
<span v-if="subItem.FlightState == 1" class="TCL-greenType">【OK】</span> <!-- <span v-if="subItem.FlightState == 1" class="TCL-greenType">【OK】</span> -->
<span v-else class="TCL-redType">【{{ $t('travel.tmp') }}】</span> <span v-else class="TCL-redType">【{{ $t('travel.tmp') }}】</span>
</span> </span>
</div> </div>
...@@ -111,29 +111,90 @@ ...@@ -111,29 +111,90 @@
<div class="mb-title"> <div class="mb-title">
<i class="iconfont icon-jiage"></i><span>{{ $t('travel.priceInfo') }}</span> <i class="iconfont icon-jiage"></i><span>{{ $t('travel.priceInfo') }}</span>
</div> </div>
<div class="mb bold" v-if="isMember"> <div class="bold" v-if="isMember">
<span class="item-title">{{ $t('travel.midPrice') }}: </span>{{ x.B2BMemberPrice }} <span class="item-title">{{ $t('travel.MiddlePrice') }}: </span>{{ x.B2BMemberPrice }}
</div> </div>
<div class="mb bold"> <div class="q-mt-sm bold">
<span class="item-title">{{ $t('travel.b2bPirce') }}: </span>{{ x.B2BShowPrice }}
</div>
<div class="q-mt-sm bold">
<span class="item-title">{{ $t('travel.b2cPirce') }}: </span>{{ x.B2CShowPrice }}
</div>
<div class="q-mt-sm">
<q-btn color="primary" flat dense >{{ $t('travel.priceDetail') }}</q-btn>
<q-popup-proxy :offset="[0, 10]">
<q-card style="min-width: 375px; width: 40vw;" class="q-pa-none" flat>
<div class="row items-center bg-grey-2">
<div class="q-pa-sm text-center col" style="border-right: 1px solid #eee;">{{ $t('travel.type') }}</div>
<div class="q-pa-sm text-center col" style="border-right: 1px solid #eee;" v-if="isMember">{{ $t('travel.MiddlePrice') }}</div>
<div class="q-pa-sm text-center col" style="border-right: 1px solid #eee;">{{ $t('travel.b2bPirce') }}</div>
<div class="q-pa-sm text-center col">{{ $t('travel.b2cPirce') }}</div>
</div>
<div class="row items-center" style="border-top: 1px solid #eee;">
<div class="q-pa-sm text-center col" style="border-right: 1px solid #eee;"> {{ $t('travel.man') }}</div>
<div class="q-pa-sm text-center col" v-if="isMember" style="border-right: 1px solid #eee;">{{ x.MiddlePrice }}</div>
<div class="q-pa-sm text-center col" style="border-right: 1px solid #eee;">{{ x.B2BShowPrice }}</div>
<div class="q-pa-sm text-center col">{{ x.B2CShowPrice }}</div>
</div>
<div class="row items-center" style="border-top: 1px solid #eee;">
<div class="q-pa-sm text-center col" style="border-right: 1px solid #eee;"> {{ $t('travel.childNeedBed') }}</div>
<div class="q-pa-sm text-center col" v-if="isMember" style="border-right: 1px solid #eee;">{{ x.MiddlePrice+x.ChildNeedPrice }}</div>
<div class="q-pa-sm text-center col" style="border-right: 1px solid #eee;">{{ x.B2BShowPrice+x.ChildNeedPrice }}</div>
<div class="q-pa-sm text-center col">{{ x.B2CShowPrice+x.ChildNeedPrice }}</div>
</div>
<div class="row items-center" style="border-top: 1px solid #eee;">
<div class="q-pa-sm text-center col" style="border-right: 1px solid #eee;"> {{ $t('travel.NoNeedBed') }}</div>
<div class="q-pa-sm text-center col" v-if="isMember" style="border-right: 1px solid #eee;">{{ x.MiddlePrice+x.ChildNoNeedPrice }}</div>
<div class="q-pa-sm text-center col" style="border-right: 1px solid #eee;">{{ x.B2BShowPrice+x.ChildNoNeedPrice }}</div>
<div class="q-pa-sm text-center col">{{ x.B2CShowPrice+x.ChildNoNeedPrice }}</div>
</div>
<div class="row items-center" style="border-top: 1px solid #eee;">
<div class="q-pa-sm text-center col" style="border-right: 1px solid #eee;"> {{ $t('travel.Baby') }}</div>
<div class="q-pa-sm text-center col">{{ x.BabyPrice }}</div>
<div class="q-pa-sm text-center col">&nbsp;</div>
<div class="q-pa-sm text-center col" v-if="isMember">&nbsp;</div>
</div>
<div class="q-pa-md" style="border-top: 1px solid #eee; border-bottom: 1px solid #eee;">
{{ $t('travel.OtherPrice') }}
</div>
<div class="row items-center bg-grey-2">
<div class="q-pa-sm text-center col" style="border-right: 1px solid #eee;">{{ $t('travel.VisaPrice') }}</div>
<div class="q-pa-sm text-center col" style="border-right: 1px solid #eee;">{{ $t('travel.SingleRoomPrice') }}</div>
<div class="q-pa-sm text-center col">{{ $t('travel.OtherPrice') }}</div>
</div>
<div class="row items-center" style="border-top: 1px solid #eee;">
<div class="q-pa-sm text-center col" style="border-right: 1px solid #eee;">{{ x.VisaPrice }}</div>
<div class="q-pa-sm text-center col" style="border-right: 1px solid #eee;">{{ x.SingleRoomPrice }}</div>
<div class="q-pa-sm text-center col">{{ x.OtherPrice }}</div>
</div>
</q-card>
</q-popup-proxy>
</div>
<!-- <div class="mb bold">
<span class="item-title">{{ $t('travel.childNeedBed') }}: </span>{{ x.ChildNeedPrice }} <span class="item-title">{{ $t('travel.childNeedBed') }}: </span>{{ x.ChildNeedPrice }}
<span class="item-title q-ml-md">{{ $t('travel.NoNeedBed') }}:</span> <span class="item-title q-ml-md">{{ $t('travel.NoNeedBed') }}:</span>
{{ x.ChildNoNeedPrice }} {{ x.ChildNoNeedPrice }}
</div> </div>
<div class="mb bold"> <div class="mb bold">
<span class="item-title">{{ $t('travel.Baby') }}:</span> {{ x.BabyPrice }} <span class="item-title">{{ $t('travel.Baby') }}:</span> {{ x.BabyPrice }}
<!-- <span class="item-title q-ml-md">{{ $t('travel.BabyChargePrice') }}: </span>{{ x.BabyChargePrice }} --> <span class="item-title q-ml-md">{{ $t('travel.BabyChargePrice') }}: </span>{{ x.BabyChargePrice }}
<span class="item-title q-ml-md">{{ $t('travel.VisaPrice') }}: </span>{{ x.VisaPrice }} <span class="item-title q-ml-md">{{ $t('travel.VisaPrice') }}: </span>{{ x.VisaPrice }}
</div> </div>
<!-- <div class="mb bold"> <div class="mb bold">
<span class="item-title">{{ $t('travel.OldManChargePrice') }}:</span> <span class="item-title">{{ $t('travel.OldManChargePrice') }}:</span>
{{ x.OldManChargePrice }} {{ x.OldManChargePrice }}
<span class="item-title q-ml-md">{{ $t('travel.VisaPrice') }}: </span>{{ x.VisaPrice }} <span class="item-title q-ml-md">{{ $t('travel.VisaPrice') }}: </span>{{ x.VisaPrice }}
</div> --> </div>
<div class="mb bold"> <div class="mb bold">
<span class="item-title">{{ $t('travel.SingleRoomPrice') }}:</span> <span class="item-title">{{ $t('travel.SingleRoomPrice') }}:</span>
{{ x.SingleRoomPrice }} {{ x.SingleRoomPrice }}
<span class="item-title q-ml-md">{{ $t('travel.OtherPrice') }}: </span>{{ x.OtherPrice }} <span class="item-title q-ml-md">{{ $t('travel.OtherPrice') }}: </span>{{ x.OtherPrice }}
</div> </div> -->
</div> </div>
<div class="col-1"> <div class="col-1">
<q-btn color="primary" flat dense @click="ViewPayment(x)">{{ $t('travel.buy') }}</q-btn> <q-btn color="primary" flat dense @click="ViewPayment(x)">{{ $t('travel.buy') }}</q-btn>
...@@ -147,13 +208,13 @@ ...@@ -147,13 +208,13 @@
<th width="80">{{ $t('system.query_flightNum') }}</th> <th width="80">{{ $t('system.query_flightNum') }}</th>
<th width="150">{{ $t('system.ph_flightTime') }}</th> <th width="150">{{ $t('system.ph_flightTime') }}</th>
<th width="80">{{ $t('system.query_arrivalTime') }}</th> <th width="80">{{ $t('system.query_arrivalTime') }}</th>
<th width="100">{{ $t('system.query_stopCity') }}</th> <!-- <th width="100">{{ $t('system.query_stopCity') }}</th> -->
</tr> </tr>
<tr v-for="(fItem, fIndex) in dialogObj.TravelTeamFlightList" :key="fIndex" style="text-align: center"> <tr v-for="(fItem, fIndex) in dialogObj.SelfFlightList" :key="fIndex" style="text-align: center">
<td class="_d_name _color_666"> <td class="_d_name _color_666">
<span v-if="fIndex == 0">{{ $t('Airticket.Air_go') }}</span> <span v-if="fIndex == 0">{{ $t('Airticket.Air_go') }}</span>
<span v-else-if="fIndex == dialogObj.TravelTeamFlightList.length - 1">{{ $t('Airticket.Air_returnTrip') }}</span> <span v-else-if="fIndex == dialogObj.SelfFlightList.length - 1">{{ $t('Airticket.Air_returnTrip') }}</span>
<span v-else-if="fIndex > 0 && fIndex != dialogObj.TravelTeamFlightList.length - 1">{{ $t('Airticket.Air_transit') }}</span> <span v-else-if="fIndex > 0 && fIndex != dialogObj.SelfFlightList.length - 1">{{ $t('Airticket.Air_transit') }}</span>
</td> </td>
<td> <td>
<div>{{ fItem.Flight_number }}</div> <div>{{ fItem.Flight_number }}</div>
...@@ -167,15 +228,17 @@ ...@@ -167,15 +228,17 @@
</div> </div>
</td> </td>
<td> <td>
<div>{{ fItem.FlightArrivalTime }} {{ fItem.Arrival_time }}</div> <div>{{ fItem.FlightArrivalTime }} {{ fItem.Arrival_time }}
<span v-if="fItem.aDay && fItem.aDay != '' && fItem.aDay != '0'" class="text-negative q-ml-sm f12">+{{ fItem.aDay }}</span>
</div>
<div style="margin-top: 5px"> <div style="margin-top: 5px">
<span v-if="fItem.AIATA">({{ fItem.AIATA }})</span> <span v-if="fItem.AIATA">({{ fItem.AIATA }})</span>
{{ fItem.aName }} {{ fItem.aName }}
</div> </div>
</td> </td>
<td> <!-- <td>
<template v-if="fItem.StopoverIATA">({{ fItem.StopoverIATA }})</template>{{ fItem.StopoverName }} <template v-if="fItem.StopoverIATA">({{ fItem.StopoverIATA }})</template>{{ fItem.StopoverName }}
</td> </td> -->
</tr> </tr>
</table> </table>
</div> </div>
......
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