Skip to content

B
bigwood
Commit 73db6e0a authored by 沈良进's avatar 沈良进
Browse files
Options

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

parents bd48c688 921e7142
Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 44 deletions
src/components/searchdata/rightList.vue
View file @ 73db6e0a
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
</div> </div>
</div> </div>
<div v-if="$q.platform.is.mobile" class="bg-white q-my-md q-pa-sm rounded-borders"> <div v-if="$q.platform.is.mobile&&PageCount > 1" class="bg-white q-my-md q-pa-sm rounded-borders">
<q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="PageCount" :input="true" @update:model-value="goSearchHandler" /> <q-pagination class="full-width justify-end" v-model="msg.pageIndex" color="primary" :max="PageCount" :input="true" @update:model-value="goSearchHandler" />
</div> </div>
<div v-else class="q-mb-md row justify-center"> <div v-else class="q-mb-md row justify-center">
...@@ -314,10 +314,10 @@ ...@@ -314,10 +314,10 @@
goSearchHandler() { goSearchHandler() {
$q.loading.show(); $q.loading.show();
data.DataList = []; data.DataList = [];
let minTripDay = -1, let minTripDay = -1
maxTripDay = -1, let maxTripDay = -1
minPrice = -1, let minPrice = -1
maxPrice = -1; let maxPrice = -1
if (data.qMsg.minPrice != "") { if (data.qMsg.minPrice != "") {
minPrice = parseFloat(data.qMsg.minPrice); minPrice = parseFloat(data.qMsg.minPrice);
} }
...@@ -344,7 +344,7 @@ ...@@ -344,7 +344,7 @@
$q.loading.hide(); $q.loading.hide();
if (r.data.resultCode == ApiResult.SUCCESS) { if (r.data.resultCode == ApiResult.SUCCESS) {
if (r.data.data) { if (r.data.data) {
data.msg.pageIndex = 1 // data.msg.pageIndex = 1
data.PageCount = r.data.data.pageCount; data.PageCount = r.data.data.pageCount;
data.TotalCount = r.data.data.count; data.TotalCount = r.data.data.count;
var tempArray = r.data.data.pageData; var tempArray = r.data.data.pageData;
......
src/components/searchdata/search.vue
View file @ 73db6e0a
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
:min="1" :min="1"
:max="100000" :max="100000"
:step="1" :step="1"
@input="testHandler" @change="testHandler"
color="primary" color="primary"
class="q-mt-md" class="q-mt-md"
/> />
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</q-card> </q-card>
</q-popup-proxy> </q-popup-proxy>
</q-btn> </q-btn>
<q-btn color="primary" unelevated :label="$t('query')" @click="search.RetrievalState=true"/> <q-btn color="primary" unelevated :label="$t('query')" @click="queryList"/>
</div> </div>
<template v-if="$q.platform.is.desktop"> <template v-if="$q.platform.is.desktop">
<q-card flat class="rounded-borders q-py-md"> <q-card flat class="rounded-borders q-py-md">
...@@ -448,7 +448,7 @@ ...@@ -448,7 +448,7 @@
:min="1" :min="1"
:max="100000" :max="100000"
:step="1" :step="1"
@input="testHandler" @change="testHandler"
color="primary" color="primary"
class="q-mt-md" class="q-mt-md"
/> />
...@@ -626,7 +626,7 @@ ...@@ -626,7 +626,7 @@
d++ d++
d=d>12?d-12:d d=d>12?d-12:d
let obj = { let obj = {
Name: `${d}月`, Name: `${d}${t('v103.scheduledTrip.month')}`,
id: 1+i, id: 1+i,
MM: d MM: d
} }
...@@ -957,8 +957,16 @@ ...@@ -957,8 +957,16 @@
data.searchClone.maxTripDay == "0" ? "" : data.searchClone.maxTripDay; data.searchClone.maxTripDay == "0" ? "" : data.searchClone.maxTripDay;
}, },
testHandler(e) { testHandler(e) {
search.msg.minPrice = data.searchClone.minPrice = e.min; data.searchClone.minPrice = e.min;
search.msg.maxPrice = data.searchClone.maxPrice = e.max; data.searchClone.maxPrice = e.max;
search.msg.priceRange.min = e.min;
search.msg.priceRange.max = e.max;
search.msg.minPrice = e.min;
search.msg.maxPrice = e.max;
// methods.queryList()
},
queryList(){
search.RetrievalState=true
}, },
// 选择时间区间 // 选择时间区间
optionsFn(cd) { optionsFn(cd) {
......
src/components/trip/order/TripOrderList.vue
View file @ 73db6e0a
...@@ -12,29 +12,29 @@ ...@@ -12,29 +12,29 @@
</span> --> </span> -->
<span class="f12 text-grey-6">{{ $t('hotelorder.createTime') }}：{{x.createDate}}</span> <span class="f12 text-grey-6">{{ $t('hotelorder.createTime') }}：{{x.createDate}}</span>
</div> </div>
<div class="q-pt-sm" :class="{'row justify-between':$q.platform.is.desktop,'column col':$q.platform.is.mobile}"> <div class="q-pt-sm" :class="{'row justify-between':$q.platform.is.desktop,'col':$q.platform.is.mobile}">
<div :class="{'row col':$q.platform.is.desktop}"> <div :class="{'row col':$q.platform.is.desktop,'col-12':$q.platform.is.mobile}">
<div :style="{'width':$q.platform.is.desktop?'150px':'100%'}"> <div :style="{'width':$q.platform.is.desktop?'150px':'100%'}">
<q-img class="rounded-borders" :style="{'width':$q.platform.is.desktop?'150px':'100%'}" :ratio="16 / 9" src="http://imgfile.oytour.com/Upload/DMC/yEiRE8pRWE5ZF8cPNRnAiQST8WbyaGQc.jpg" spinner-color="grey" spinner-size="50px" fit="cover"/> <q-img class="rounded-borders" :style="{'width':$q.platform.is.desktop?'150px':'100%'}" :ratio="16 / 9" src="http://imgfile.oytour.com/Upload/DMC/yEiRE8pRWE5ZF8cPNRnAiQST8WbyaGQc.jpg" spinner-color="grey" spinner-size="50px" fit="cover"/>
</div> </div>
<div class="column" :class="{'q-pl-lg':$q.platform.is.desktop,'q-pt-sm':$q.platform.is.mobile}"> <div class="column" :class="{'q-pl-lg':$q.platform.is.desktop,'q-pt-sm':$q.platform.is.mobile}">
<span class="text-subtitle1 text-weight-bolder ellipsis cursor-pointer" >{{x.title}}</span> <span class="text-subtitle1 text-weight-bolder ellipsis cursor-pointer" >{{x.title}}</span>
<span class="f12 text-grey-700 ellipsis q-py-sm">{{x.ltName}}</span> <span class="f12 text-grey-700 ellipsis q-py-sm">{{x.ltName}}</span>
<span class="f13 text-grey-700">团号：{{x.tcid}} ( <span class="text-red">{{ x.guestNum }} </span>旅客 ) </span> <span class="f13 text-grey-700">{{$t('v103.scheduledTripOrder.number')}}：{{x.tcid}} ( <span class="text-red">{{ x.guestNum }} </span>{{$t('v103.scheduledTripOrder.passenger')}} ) </span>
</div> </div>
</div> </div>
<div :class="{'row items-end':$q.platform.is.desktop}" :style="{'flex-shrink': $q.platform.is.desktop?0:'inherit'}"> <div :class="{'row items-end':$q.platform.is.desktop}" :style="{'flex-shrink': $q.platform.is.desktop?0:'inherit'}">
<div class="column text-right"> <div class="column text-right">
<div class="fz13" :class="{'row justify-end q-pt-lg q-pb-xs':$q.platform.is.mobile||$q.platform.is.desktop}"> <div class="fz13" :class="{'row justify-end q-pt-lg q-pb-xs':$q.platform.is.desktop}">
<span class="">总金额：<span class="fz15">￥{{moneyFormat(x.preferPrice)}}</span> </span> <span class="">{{$t('v103.scheduledTripOrder.total')}}：<span class="fz15">CNY {{moneyFormat(x.preferPrice)}}</span> </span>
<div v-if="x.discountMoney>0" class="q-pl-lg" :class="{'':$q.platform.is.desktop}"> <div v-if="x.discountMoney>0" class="q-pl-lg" :class="{'':$q.platform.is.desktop}">
<span class=" text-red">优惠金额：<span class="fz15">￥{{moneyFormat(x.discountMoney)}}</span></span> <span class=" text-red">{{$t('v103.scheduledTripOrder.hui')}}：<span class="fz15">CNY {{moneyFormat(x.discountMoney)}}</span></span>
</div> </div>
</div> </div>
<span class="fz14 text-orange-7">已付总额：<span class="fz17">￥{{moneyFormat(x.customerPayMoney)}}</span> </span> <span class="fz14 text-orange-7">{{$t('v103.scheduledTripOrder.paid')}}：<span class="fz17">CNY {{moneyFormat(x.customerPayMoney)}}</span> </span>
<div class="q-pt-sm" v-if="x.orderState==1||x.orderState==2"> <div class="q-pt-sm" v-if="x.orderState==1||x.orderState==2">
<q-btn color="primary" unelevated size="sm" <q-btn color="primary" unelevated size="sm"
@click="cancel(x)">取消订单</q-btn> @click="cancel(x)">{{$t('hotelm.cancel')}}</q-btn>
</div> </div>
</div> </div>
</div> </div>
......
src/i18n/zh-TW/index.ts
View file @ 73db6e0a
...@@ -1156,7 +1156,15 @@ export default { ...@@ -1156,7 +1156,15 @@ export default {
day1: '10天內', day1: '10天內',
day2: '30天內', day2: '30天內',
day3: '60天內', day3: '60天內',
} },
setout: '集合出发城市',
address: '集合详细地址',
time: '集合时间',
arrive: '返回抵达城市',
surplus: '剩余席位',
nosupport: '暂不支持候补',
passenger: '旅客資料',
month: '月'
}, },
scheduledTripDetails:{ scheduledTripDetails:{
since: '起', since: '起',
...@@ -1292,14 +1300,26 @@ export default { ...@@ -1292,14 +1300,26 @@ export default {
prompt: '本團只支持成人出遊', prompt: '本團只支持成人出遊',
service: '單房服務', service: '單房服務',
singleroom: '獨立單間住宿', singleroom: '獨立單間住宿',
singleroom1: '單房間',
insurance: '保險服務費', insurance: '保險服務費',
insurance1: '保險費',
total: '總金額', total: '總金額',
book: '立即預定', book: '立即預定',
selectdatetop: '請選擇上面的出行日期', selectdatetop: '請選擇上面的出行日期',
selectdateleft: '請選擇左側的出行日期' selectdateleft: '請選擇左側的出行日期',
people: '人',
visafee: '簽證費',
miscellaneous: '雜費',
surcharge: '兒童附加費',
pricedifference: '單房差價',
}, },
scheduledTripOrder:{ scheduledTripOrder:{
setorderday: '時間範圍', setorderday: '時間範圍',
number: '團號',
passenger: '旅客',
total: '總金額',
hui: '優惠金額',
paid: '已付總額'
} }
} }
//#endregion //#endregion
......
src/pages/scheduledTrip/TripOrderPreview.vue
View file @ 73db6e0a
...@@ -9,15 +9,15 @@ ...@@ -9,15 +9,15 @@
<!-- <div class="text-weight-bold">{{$t('v103.scheduledTrip.ascendingorder')}}</div> --> <!-- <div class="text-weight-bold">{{$t('v103.scheduledTrip.ascendingorder')}}</div> -->
<div class="text-grey-900 q-mt-sm f12"> <div class="text-grey-900 q-mt-sm f12">
<div class="row wrap"> <div class="row wrap">
<div class="col-6 q-py-xs" v-if="detailsObj.startCityName">集合出发城市： {{detailsObj.startCityName}}</div> <div class="col-6 q-py-xs" v-if="detailsObj.startCityName">{{$t('v103.scheduledTrip.setout')}}： {{detailsObj.startCityName}}</div>
<div class="col-6 q-py-xs" v-if="priceFlight.gatherAddres">集合详细地址： {{priceFlight.gatherAddress}}</div> <div class="col-6 q-py-xs" v-if="priceFlight.gatherAddres">{{$t('v103.scheduledTrip.address')}}： {{priceFlight.gatherAddress}}</div>
<div class="col-6 q-py-xs" v-if="priceFlight.startDate||priceFlight.gatherTime">集合时间： {{priceFlight.startDate}} {{priceFlight.gatherTime}}</div> <div class="col-6 q-py-xs" v-if="priceFlight.startDate||priceFlight.gatherTime">{{$t('v103.scheduledTrip.time')}}： {{priceFlight.startDate}} {{priceFlight.gatherTime}}</div>
<div class="col-6 q-py-xs" v-if="detailsObj.returnArriveCityName">返回抵达城市： {{detailsObj.returnArriveCityName}}</div> <div class="col-6 q-py-xs" v-if="detailsObj.returnArriveCityName">{{$t('v103.scheduledTrip.arrive')}}： {{detailsObj.returnArriveCityName}}</div>
<div class="col-6 q-py-xs" v-if="detailsObj.currentPriceInfo"> <div class="col-6 q-py-xs" v-if="detailsObj.currentPriceInfo">
剩余席位： {{$t('v103.scheduledTrip.surplus')}}：
{{detailsObj.currentPriceInfo.surplusCSeat+detailsObj.currentPriceInfo.surplusFSeat+detailsObj.currentPriceInfo.surplusYSeat}} {{detailsObj.currentPriceInfo.surplusCSeat+detailsObj.currentPriceInfo.surplusFSeat+detailsObj.currentPriceInfo.surplusYSeat}}
</div> </div>
<div class="col-6 q-py-xs text-red">暂不支持候补</div> <div class="col-6 q-py-xs text-red">{{$t('v103.scheduledTrip.nosupport')}}</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</q-card> </q-card>
<q-card class="q-pa-md q-mt-lg" flat> <q-card class="q-pa-md q-mt-lg" flat>
<div> <div>
<div class="text-h6 q-mb-md">旅客資料</div> <div class="text-h6 q-mb-md">{{$t('v103.scheduledTrip.passenger')}}</div>
<div class="row"> <div class="row">
<q-img <q-img
:src="detailsObj&&detailsObj.imgCover&&detailsObj.imgCover[0].Url" :src="detailsObj&&detailsObj.imgCover&&detailsObj.imgCover[0].Url"
...@@ -60,19 +60,19 @@ ...@@ -60,19 +60,19 @@
<div class="text-grey-9 q-ml-md"> <div class="text-grey-9 q-ml-md">
<q-icon name="person" size="20px" class="q-mr-sm" /> <q-icon name="person" size="20px" class="q-mr-sm" />
<span class="q-mr-sm" v-if="chosenObj.crCount > 0" <span class="q-mr-sm" v-if="chosenObj.crCount > 0"
>成人 x {{ chosenObj.crCount }}</span >{{$t('v103.scheduledTripDetails.cr')}} x {{ chosenObj.crCount }}</span
> >
<span class="q-mr-sm" v-if="chosenObj.etzcCount" <span class="q-mr-sm" v-if="chosenObj.etzcCount"
>兒童占床 x {{ chosenObj.etzcCount }}</span >{{$t('v103.scheduledTripDetails.et')}}{{$t('v103.scheduledTripDetails.room')}} x {{ chosenObj.etzcCount }}</span
> >
<span class="q-mr-sm" v-if="chosenObj.etbzcCount" <span class="q-mr-sm" v-if="chosenObj.etbzcCount"
>兒童不占床 x {{ chosenObj.etbzcCount }}</span >{{$t('v103.scheduledTripDetails.et')}}{{$t('v103.scheduledTripDetails.noroom')}} x {{ chosenObj.etbzcCount }}</span
> >
<span class="q-mr-sm" v-if="chosenObj.yeCount" <span class="q-mr-sm" v-if="chosenObj.yeCount"
>婴儿 x {{ chosenObj.yeCount }}</span >{{$t('v103.scheduledTripDetails.ye')}} x {{ chosenObj.yeCount }}</span
> >
<span class="q-mr-sm" v-if="chosenObj.df" <span class="q-mr-sm" v-if="chosenObj.df"
>单房间 x {{ chosenObj.df }}</span >{{$t('v103.scheduledTripDetails.singleroom1')}} x {{ chosenObj.df }}</span
> >
</div> </div>
</div> </div>
...@@ -112,16 +112,16 @@ ...@@ -112,16 +112,16 @@
</div> </div>
</div> </div>
</div> </div>
<div class="q-pt-md text-grey-6">出發日期: {{chosenObj.startDate}}</div> <div class="q-pt-md text-grey-6">{{$t('v103.scheduledTrip.startdate')}}: {{chosenObj.startDate}}</div>
</div> </div>
<div class="q-pt-md q-mb-lg" style="border-top: 1px dashed #eee"> <div class="q-pt-md q-mb-lg" style="border-top: 1px dashed #eee">
<div class="text-grey-900 text-subtitle2 text-weight-bold">{{ $t('v102.ticket.ms') }}</div> <div class="text-grey-900 text-subtitle2 text-weight-bold">{{ $t('v102.ticket.ms') }}</div>
<div class="row q-my-sm" v-if="chosenObj.crCount > 0"> <div class="row q-my-sm" v-if="chosenObj.crCount > 0">
<div class="col"><q-badge color="grey-3" style="padding: 5px 8px" text-color="info" label="成人佔床" /> x {{ chosenObj.crCount }}</div> <div class="col"><q-badge color="grey-3" style="padding: 5px 8px" text-color="info" :label="$t('v103.scheduledTripDetails.cr')+$t('v103.scheduledTripDetails.room')" /> x {{ chosenObj.crCount }}</div>
<div>CNY {{ price.originalB2BPrice }}</div> <div>CNY {{ price.originalB2BPrice }}</div>
</div> </div>
<div class="row q-my-sm" v-if="chosenObj.etzcCount > 0"> <div class="row q-my-sm" v-if="chosenObj.etzcCount > 0">
<div class="col"><q-badge color="grey-3" style="padding: 5px 8px" text-color="info" label="兒童佔床" /> x {{ chosenObj.etzcCount }}</div> <div class="col"><q-badge color="grey-3" style="padding: 5px 8px" text-color="info" :label="$t('v103.scheduledTripDetails.et')+$t('v103.scheduledTripDetails.room')" /> x {{ chosenObj.etzcCount }}</div>
<div> <div>
CNY CNY
{{ {{
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
</div> </div>
</div> </div>
<div class="row q-my-sm" v-if="chosenObj.etbzcCount > 0"> <div class="row q-my-sm" v-if="chosenObj.etbzcCount > 0">
<div class="col"><q-badge color="grey-3" style="padding: 5px 8px" text-color="info" label="兒童不佔床" /> x {{ chosenObj.etbzcCount }}</div> <div class="col"><q-badge color="grey-3" style="padding: 5px 8px" text-color="info" :label="$t('v103.scheduledTripDetails.et')+$t('v103.scheduledTripDetails.noroom')" /> x {{ chosenObj.etbzcCount }}</div>
<div> <div>
CNY CNY
{{ {{
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
</div> </div>
</div> </div>
<div class="row q-my-sm" v-if="chosenObj.yeCount > 0"> <div class="row q-my-sm" v-if="chosenObj.yeCount > 0">
<div class="col"><q-badge color="grey-3" style="padding: 5px 8px" text-color="info" label="嬰兒不佔床" /> x {{ chosenObj.yeCount }}</div> <div class="col"><q-badge color="grey-3" style="padding: 5px 8px" text-color="info" :label="$t('v103.scheduledTripDetails.yr')+$t('v103.scheduledTripDetails.noroom')" /> x {{ chosenObj.yeCount }}</div>
<div>CNY {{ price.babyPrice }}</div> <div>CNY {{ price.babyPrice }}</div>
</div> </div>
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
class="bg-transparent q-mb-sm" class="bg-transparent q-mb-sm"
/> />
<div class="row q-mb-sm" v-if="price.safeMoney > 0"> <div class="row q-mb-sm" v-if="price.safeMoney > 0">
<div class="col">保險費 x {{ price.safeMoney }}/人</div> <div class="col">{{$t('v103.scheduledTripDetails.insurance1')}} x {{ price.safeMoney }}/{{$t('v103.scheduledTripDetails.people')}}</div>
<div> <div>
CNY CNY
{{ {{
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
class="bg-transparent q-mb-sm" class="bg-transparent q-mb-sm"
/> />
<div class="row q-mb-sm" v-if="price.visaPrice > 0"> <div class="row q-mb-sm" v-if="price.visaPrice > 0">
<div class="col">簽證費 x {{ price.visaPrice }}/人</div> <div class="col">{{$t('v103.scheduledTripDetails.visafee')}} x {{ price.visaPrice }}/{{$t('v103.scheduledTripDetails.people')}}</div>
<div> <div>
CNY CNY
{{ {{
...@@ -185,7 +185,7 @@ ...@@ -185,7 +185,7 @@
</div> </div>
</div> </div>
<div class="row q-mb-sm" v-if="price.otherPrice > 0"> <div class="row q-mb-sm" v-if="price.otherPrice > 0">
<div class="col">雜費 x {{ price.otherPrice }}/人</div> <div class="col">{{$t('v103.scheduledTripDetails.miscellaneous')}} x {{ price.otherPrice }}/{{$t('v103.scheduledTripDetails.people')}}</div>
<div> <div>
CNY CNY
{{ {{
...@@ -202,11 +202,11 @@ ...@@ -202,11 +202,11 @@
class="bg-transparent q-mb-sm" class="bg-transparent q-mb-sm"
/> />
<div class="row q-mb-sm" v-if="chosenObj.etCount > 0"> <div class="row q-mb-sm" v-if="chosenObj.etCount > 0">
<div class="col">兒童附加費 x {{ chosenObj.etCount }}</div> <div class="col">{{$t('v103.scheduledTripDetails.surcharge')}} x {{ chosenObj.etCount }}</div>
<div>CNY {{ price.babyChargePrice }}</div> <div>CNY {{ price.babyChargePrice }}</div>
</div> </div>
<div class="row q-mb-sm" v-if="chosenObj.df > 0"> <div class="row q-mb-sm" v-if="chosenObj.df > 0">
<div class="col">單房差價 x {{ chosenObj.df }}</div> <div class="col">{{$t('v103.scheduledTripDetails.pricedifference')}} x {{ chosenObj.df }}</div>
<div>CNY {{ price.singleRoomPrice }}</div> <div>CNY {{ price.singleRoomPrice }}</div>
</div> </div>
</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