Skip to content

B
bigwood
Commit 54c6dbc0 authored by youjie's avatar youjie
Browse files
Options

no message

parent 968812b3
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 57 deletions
src/api/scheduledTrip.ts
View file @ 54c6dbc0
...@@ -3,6 +3,10 @@ import request from './request' ...@@ -3,6 +3,10 @@ import request from './request'
import requestJava from './requestJava' import requestJava from './requestJava'
class scheduledTripService { class scheduledTripService {
// 取消跟团订单列表
static async B2BRemoveOrder(param:any):Promise<HttpResponse>{
return requestJava('/api/b2b/user/sellorder_post_B2BRemoveOrder',param)
}
// 跟团订单列表 // 跟团订单列表
static async Getrecentorder(param:any):Promise<HttpResponse>{ static async Getrecentorder(param:any):Promise<HttpResponse>{
return requestJava('/api/b2b/user/getrecentorder',param) return requestJava('/api/b2b/user/getrecentorder',param)
......
src/components/searchdata/block.vue
View file @ 54c6dbc0
...@@ -9,16 +9,16 @@ ...@@ -9,16 +9,16 @@
<div class="pd-price"> <div class="pd-price">
<div class="price"> <div class="price">
{{item.dayNum}} {{item.dayNum}}
<small class="unit">天</small> {{item.b2BPrice}} <small class="unit">{{$t('v103.scheduledTrip.day')}}</small> {{item.b2BPrice}}
<small class="unit">元起</small> <small class="unit">{{$t('v103.scheduledTrip.since')}}</small>
</div> </div>
</div> </div>
</div> </div>
<div class="pd-content"> <div class="pd-content">
<h3 class="pd-title">{{item.title}}</h3> <h3 class="pd-title">{{item.title}}</h3>
<div class="pd-departure"> <div class="pd-departure">
出發日期：{{item.startDate}} {{$t('v103.scheduledTrip.startdate')}}：{{item.startDate}}
<span class="more" @click="GotoDetails(item)" style="cursor:pointer">...更多</span> <span class="more" @click="GotoDetails(item)" style="cursor:pointer">...{{$t('Notifications.more')}}</span>
</div> </div>
</div> </div>
</a> </a>
......
src/components/searchdata/rightList.vue
View file @ 54c6dbc0
...@@ -213,43 +213,28 @@ ...@@ -213,43 +213,28 @@
dataList: [], dataList: [],
sortNum: 1, sortNum: 1,
sortArray: [ sortArray: [
// {
// label: t('v103.scheduledTrip.recommend'),
// value: 1,
// icon: "iconfont icongood",
// },
// {
// label: t('v103.scheduledTrip.ascendingorder'),
// value: 2,
// icon: "iconfont iconmeiyuan",
// },
// {
// label: t('v103.scheduledTrip.descendingorder'),
// value: 3,
// icon: "iconfont iconmeiyuan",
// },
{ {
label: t('v103.scheduledTrip.recommend'), label: t('v103.scheduledTrip.recommend'),
value: 0, value: 0,
icon: "iconfont icongood", icon: "iconfont icongood",
}, },
{ {
label: '团期', label: t('v103.scheduledTrip.ascendingorder'),
value: 1, value: 1,
icon: "iconfont iconon", icon: "iconfont iconon",
}, },
{ {
label: '价格', label: t('v103.scheduledTrip.descendingorder'),
value: 2, value: 2,
icon: "iconfont iconmeiyuan", icon: "iconfont iconmeiyuan",
}, },
{ {
label: '销量', label: t('v103.scheduledTrip.salesvolume'),
value: 3, value: 3,
icon: "iconfont icongood", icon: "iconfont icongood",
}, },
// { // {
// label: '评论数', // label: t('v103.scheduledTrip.commentcount'),
// value: 4, // value: 4,
// icon: "iconfont icongood", // icon: "iconfont icongood",
// }, // },
......
src/components/searchdata/search.vue
View file @ 54c6dbc0
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<div class="q-mb-md text-subtitle2">{{ $t('morequery') }}</div> <div class="q-mb-md text-subtitle2">{{ $t('morequery') }}</div>
<div class="rounded-borders q-my-md q-px-xs q-py-xs bg-grey-3"> <div class="rounded-borders q-my-md q-px-xs q-py-xs bg-grey-3">
<div class="q-px-sm q-py-xs row justify-between"> <div class="q-px-sm q-py-xs row justify-between">
<span>公司所在地</span> <span>{{$t('v103.scheduledTrip.companylocation')}}</span>
<template v-for="(x, i) in chosenAddress"> <template v-for="(x, i) in chosenAddress">
<span class="text-primary" v-if="i==0">{{x.Name}}</span> <span class="text-primary" v-if="i==0">{{x.Name}}</span>
</template> </template>
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
</div> </div>
<q-popup-proxy :offset="[0, 10]" ref="qDateProxy0"> <q-popup-proxy :offset="[0, 10]" ref="qDateProxy0">
<div class="bg-white q-pb-lg" style="width: 300px;"> <div class="bg-white q-pb-lg" style="width: 300px;">
<div class="q-px-lg q-py-md fz18">公司所在地</div> <div class="q-px-lg q-py-md fz18">{{$t('v103.scheduledTrip.companylocation')}}</div>
<div v-for="(x, i) in sites" :key="i"> <div v-for="(x, i) in sites" :key="i">
<div class="addr"> <div class="addr">
<div <div
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
</div> </div>
<div class="rounded-borders q-my-md q-px-xs q-py-xs bg-grey-3"> <div class="rounded-borders q-my-md q-px-xs q-py-xs bg-grey-3">
<div class="q-px-sm q-py-xs row justify-between"> <div class="q-px-sm q-py-xs row justify-between">
<span>线路</span> <span>{{$t('v103.scheduledTrip.line')}}</span>
<template v-for="(x, i) in chosenAddress"> <template v-for="(x, i) in chosenAddress">
<span class="text-primary" v-if="x.type==1"> <span class="text-primary" v-if="x.type==1">
{{x.Name}} {{x.Name}}
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</div> </div>
<q-popup-proxy :offset="[0, 10]" ref="qDateProxy1"> <q-popup-proxy :offset="[0, 10]" ref="qDateProxy1">
<div class="bg-white q-pb-lg" style="width: 300px;"> <div class="bg-white q-pb-lg" style="width: 300px;">
<div class="q-px-lg q-py-md fz18">线路</div> <div class="q-px-lg q-py-md fz18">{{$t('v103.scheduledTrip.line')}}</div>
<div class="add" v-for="(x, i) in lines" :key="i"> <div class="add" v-for="(x, i) in lines" :key="i">
<div class="q-mx-md"> <div class="q-mx-md">
<template v-for="(y, yi) in x.SubList"> <template v-for="(y, yi) in x.SubList">
...@@ -68,8 +68,8 @@ ...@@ -68,8 +68,8 @@
<div v-if="searchClone.lineId&&xilies.length>0" class="rounded-borders q-my-md q-px-xs q-py-xs bg-grey-3"> <div v-if="searchClone.lineId&&xilies.length>0" class="rounded-borders q-my-md q-px-xs q-py-xs bg-grey-3">
<div class="q-px-sm q-py-xs row justify-between"> <div class="q-px-sm q-py-xs row justify-between">
<span class="text-grey-8 col-12 row justify-between"> <span class="text-grey-8 col-12 row justify-between">
<span>商品系列</span> <span>{{$t('v103.scheduledTrip.commlineteam')}}</span>
<span v-if="!searchClone.lineTeamId">选择商品系列</span> <span v-if="!searchClone.lineTeamId">{{$t('v103.scheduledTrip.closelineteam')}}</span>
<template v-for="(x, i) in chosenAddress"> <template v-for="(x, i) in chosenAddress">
<span class="text-primary" v-if="x.type==2"> <span class="text-primary" v-if="x.type==2">
{{x.Name}} {{x.Name}}
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
</div> </div>
<q-popup-proxy :offset="[0, 10]" ref="qDateProxy2"> <q-popup-proxy :offset="[0, 10]" ref="qDateProxy2">
<div class="bg-white q-pb-lg" style="width: 300px;"> <div class="bg-white q-pb-lg" style="width: 300px;">
<div class="q-px-lg q-py-md fz18">系列</div> <div class="q-px-lg q-py-md fz18">{{$t('v103.scheduledTrip.lineteam')}}</div>
<div class="add" v-for="(x, i) in xilies" :key="i"> <div class="add" v-for="(x, i) in xilies" :key="i">
<div class="q-mx-md"> <div class="q-mx-md">
<template v-for="(y, yi) in x.SubList"> <template v-for="(y, yi) in x.SubList">
...@@ -98,8 +98,8 @@ ...@@ -98,8 +98,8 @@
<div class="rounded-borders q-my-md q-px-xs q-py-xs bg-grey-3"> <div class="rounded-borders q-my-md q-px-xs q-py-xs bg-grey-3">
<div class="q-px-sm q-py-xs row justify-between"> <div class="q-px-sm q-py-xs row justify-between">
<span class="text-grey-8 col-12 row justify-between"> <span class="text-grey-8 col-12 row justify-between">
<span>出发城市</span> <span>{{$t('v103.scheduledTrip.departurecity')}}</span>
<span v-if="!searchClone.startCityId">选择出发城市</span> <span v-if="!searchClone.startCityId">{{$t('v103.scheduledTrip.closedeparturecity')}}</span>
<template v-for="(x, i) in chosenAddress"> <template v-for="(x, i) in chosenAddress">
<span class="text-primary" v-if="x.type==3"> <span class="text-primary" v-if="x.type==3">
{{x.Name}} {{x.Name}}
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</div> </div>
<q-popup-proxy :offset="[0, 10]" ref="qDateProxy3"> <q-popup-proxy :offset="[0, 10]" ref="qDateProxy3">
<div class="bg-white q-pb-lg" style="width: 300px;"> <div class="bg-white q-pb-lg" style="width: 300px;">
<div class="q-px-lg q-py-md fz18">出发城市</div> <div class="q-px-lg q-py-md fz18">{{$t('v103.scheduledTrip.departurecity')}}</div>
<div class="add" v-for="(x, i) in startCitys" :key="i"> <div class="add" v-for="(x, i) in startCitys" :key="i">
<div class="q-mx-md"> <div class="q-mx-md">
<template v-for="(y, yi) in x.SubList"> <template v-for="(y, yi) in x.SubList">
...@@ -129,8 +129,8 @@ ...@@ -129,8 +129,8 @@
<div v-if="(searchClone.startDate&&!searchClone.endDate)||(!searchClone.startDate&&!searchClone.endDate)" class="rounded-borders q-my-md q-px-xs q-py-xs bg-grey-3"> <div v-if="(searchClone.startDate&&!searchClone.endDate)||(!searchClone.startDate&&!searchClone.endDate)" class="rounded-borders q-my-md q-px-xs q-py-xs bg-grey-3">
<div class="q-px-sm q-py-xs row justify-between"> <div class="q-px-sm q-py-xs row justify-between">
<span class="text-grey-8 col-12 row justify-between"> <span class="text-grey-8 col-12 row justify-between">
<span>出发日期</span> <span>{{$t('v103.scheduledTrip.startdate')}}</span>
<span v-if="!datesId">选择出发日期</span> <span v-if="!datesId">{{$t('v103.scheduledTrip.closestartdate')}}</span>
<template v-for="(x, i) in chosenAddress"> <template v-for="(x, i) in chosenAddress">
<span class="text-primary" v-if="x.type==5"> <span class="text-primary" v-if="x.type==5">
{{x.Name}} {{x.Name}}
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
</div> </div>
<q-popup-proxy :offset="[0, 10]" ref="qDateProxy5"> <q-popup-proxy :offset="[0, 10]" ref="qDateProxy5">
<div class="bg-white q-pb-lg" style="width: 300px;"> <div class="bg-white q-pb-lg" style="width: 300px;">
<div class="q-px-lg q-py-md fz18">出发日期</div> <div class="q-px-lg q-py-md fz18">{{$t('v103.scheduledTrip.startdate')}}</div>
<div class="add" v-for="(x, i) in dates" :key="i"> <div class="add" v-for="(x, i) in dates" :key="i">
<div class="q-mx-md"> <div class="q-mx-md">
<template v-for="(y, yi) in x.SubList"> <template v-for="(y, yi) in x.SubList">
...@@ -255,7 +255,7 @@ ...@@ -255,7 +255,7 @@
class="addr-list q-px-md q-py-sm cursor-pointer row items-center" class="addr-list q-px-md q-py-sm cursor-pointer row items-center"
v-if="x.isShow" v-if="x.isShow"
> >
<span class="col" @click="changeExplesdHandler(x)">公司所在地</span> <span class="col" @click="changeExplesdHandler(x)">{{$t('v103.scheduledTrip.companylocation')}}</span>
<div> <div>
<span v-if="chosenAddress.length>0" class="q-mr-md text-primary">{{chosenAddress[0].Name}}</span> <span v-if="chosenAddress.length>0" class="q-mr-md text-primary">{{chosenAddress[0].Name}}</span>
<q-icon <q-icon
...@@ -290,7 +290,7 @@ ...@@ -290,7 +290,7 @@
class="addr-list q-px-md q-py-sm cursor-pointer row items-center" class="addr-list q-px-md q-py-sm cursor-pointer row items-center"
v-if="x.isShow" v-if="x.isShow"
> >
<span class="col" @click="changeExplesdHandler(x)">线路</span> <span class="col" @click="changeExplesdHandler(x)">{{$t('v103.scheduledTrip.line')}}</span>
<q-icon <q-icon
@click="changeExplesdHandler(x)" @click="changeExplesdHandler(x)"
:name="!x.explsed ? 'keyboard_arrow_down' : 'keyboard_arrow_up'" :name="!x.explsed ? 'keyboard_arrow_down' : 'keyboard_arrow_up'"
...@@ -322,7 +322,7 @@ ...@@ -322,7 +322,7 @@
class="addr-list q-px-md q-py-sm cursor-pointer row items-center" class="addr-list q-px-md q-py-sm cursor-pointer row items-center"
v-if="x.isShow" v-if="x.isShow"
> >
<span class="col" @click="changeExplesdHandler(x)">出发城市</span> <span class="col" @click="changeExplesdHandler(x)">{{$t('v103.scheduledTrip.departurecity')}}</span>
<q-icon <q-icon
@click="changeExplesdHandler(x)" @click="changeExplesdHandler(x)"
:name="!x.explsed ? 'keyboard_arrow_down' : 'keyboard_arrow_up'" :name="!x.explsed ? 'keyboard_arrow_down' : 'keyboard_arrow_up'"
...@@ -355,7 +355,7 @@ ...@@ -355,7 +355,7 @@
class="addr-list q-px-md q-py-sm cursor-pointer row items-center" class="addr-list q-px-md q-py-sm cursor-pointer row items-center"
v-if="x.isShow" v-if="x.isShow"
> >
<span class="col" @click="changeExplesdHandler(x)">系列</span> <span class="col" @click="changeExplesdHandler(x)">{{$t('v103.scheduledTrip.lineteam')}}</span>
<q-icon <q-icon
@click="changeExplesdHandler(x)" @click="changeExplesdHandler(x)"
:name="!x.explsed ? 'keyboard_arrow_down' : 'keyboard_arrow_up'" :name="!x.explsed ? 'keyboard_arrow_down' : 'keyboard_arrow_up'"
...@@ -387,7 +387,7 @@ ...@@ -387,7 +387,7 @@
class="addr-list q-px-md q-py-md cursor-pointer row items-center" class="addr-list q-px-md q-py-md cursor-pointer row items-center"
v-if="x.isShow" v-if="x.isShow"
> >
<span class="col" @click="changeExplesdHandler(x)">出发日期</span> <span class="col" @click="changeExplesdHandler(x)">{{$t('v103.scheduledTrip.startdate')}}</span>
<q-icon <q-icon
@click="changeExplesdHandler(x)" @click="changeExplesdHandler(x)"
:name="!x.explsed ? 'keyboard_arrow_down' : 'keyboard_arrow_up'" :name="!x.explsed ? 'keyboard_arrow_down' : 'keyboard_arrow_up'"
......
src/components/trip/order/TripOrderHeader.vue
View file @ 54c6dbc0
<template> <template>
<div class="rounded-borders bg-white row items-center q-pa-md"> <div class="rounded-borders bg-white row items-center q-pa-md">
<q-select v-if="$q.platform.is.desktop" class="q-mr-md" style="min-width: 150px" v-model="search.orderState" @update:model-value="setorderState" dense :options="status" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('hotelorder.search.status')" standout /> <q-select v-if="$q.platform.is.desktop" class="q-mr-md" style="min-width: 150px" v-model="search.orderState" @update:model-value="setorderState" dense :options="status" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('hotelorder.search.status')" standout />
<q-select class="q-mr-md" style="min-width: 150px" v-model="search.queryDays" @update:model-value="setorderDay" dense :options="Days" emit-value option-label="StatusName" option-value="StatusId" map-options label="时间范围" standout /> <q-select class="q-mr-md" style="min-width: 150px" v-model="search.queryDays" @update:model-value="setorderDay" dense :options="Days" emit-value option-label="StatusName" option-value="StatusId" map-options :label="$t('v103.scheduledTripOrder.setorderday')" standout />
<div class="col"></div> <div class="col"></div>
<q-btn color="primary" unelevated :label="$t('query')" @click="setQueryHandler" /> <q-btn color="primary" unelevated :label="$t('query')" @click="setQueryHandler" />
</div> </div>
......
src/components/trip/order/TripOrderList.vue
View file @ 54c6dbc0
...@@ -32,9 +32,13 @@ ...@@ -32,9 +32,13 @@
</div> </div>
</div> </div>
<span class="fz14 text-orange-7">已付总额：<span class="fz17">￥{{moneyFormat(x.customerPayMoney)}}</span> </span> <span class="fz14 text-orange-7">已付总额：<span class="fz17">￥{{moneyFormat(x.customerPayMoney)}}</span> </span>
<div class="q-pt-sm" v-if="x.orderState==1||x.orderState==2">
<q-btn color="primary" unelevated size="sm"
@click="cancel(x)">取消订单</q-btn>
</div>
</div> </div>
</div> </div>
</div> </div>
</q-card> </q-card>
<q-card class="light-shadow q-pa-md bg-white rounded-borders q-mb-md" v-if="pages.pageCount > 0" flat> <q-card class="light-shadow q-pa-md bg-white rounded-borders q-mb-md" v-if="pages.pageCount > 0" flat>
...@@ -107,6 +111,32 @@ export default defineComponent({ ...@@ -107,6 +111,32 @@ export default defineComponent({
}) })
const methods = { const methods = {
cancel(obj){
$q.dialog({
title: t('dialog.titles.horder'),
message: t('dialog.contents.horder'),
cancel: true,
persistent: true
}).onOk(() => {
methods.cancellations(obj)
})
},
// 取消用车
cancellations(obj) {
scheduledTripService.B2BRemoveOrder({ID:obj.orderId})
.then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) {
methods.getList()
methods.GetWaitDealOrderPageList()
message.successMsg(`${t('success')}`)
} else {
message.errorMsg(r.data.message)
}
})
.catch(e => {
message.errorMsg(e.message)
})
},
ViewPayment() { ViewPayment() {
data.showBankAccount = true data.showBankAccount = true
}, },
...@@ -117,10 +147,9 @@ export default defineComponent({ ...@@ -117,10 +147,9 @@ export default defineComponent({
.then(r => { .then(r => {
data.loading = false data.loading = false
if (r.data.resultCode == ApiResult.SUCCESS) { if (r.data.resultCode == ApiResult.SUCCESS) {
console.log(r.data.data,'====') r.data.data.pageData&&r.data.data.pageData.forEach((x: any) => {
r.data.data.pageData.forEach((x: any) => { x.typeInfo = data.status.find(y => y.StatusId == x.orderState) ?? data.status[1]
x.typeInfo = data.status.find(y => y.StatusId == x.OrderStatus) ?? data.status[1] // x.SendType = data.sends.find(y => y.Id == x.MailingState) ?? data.sends[0]
x.SendType = data.sends.find(y => y.Id == x.MailingState) ?? data.sends[0]
// x.Money = 0 // x.Money = 0
// let Money = 0 // let Money = 0
// x.DetailList.forEach((y:any)=>{ // x.DetailList.forEach((y:any)=>{
...@@ -130,6 +159,7 @@ export default defineComponent({ ...@@ -130,6 +159,7 @@ export default defineComponent({
}) })
data.orders = r.data.data.pageData data.orders = r.data.data.pageData
data.pages.pageCount = r.data.data.pageCount data.pages.pageCount = r.data.data.pageCount
methods.GetWaitDealOrderPageList()
} else { } else {
message.errorMsg(r.data.message) message.errorMsg(r.data.message)
} }
...@@ -137,11 +167,17 @@ export default defineComponent({ ...@@ -137,11 +167,17 @@ export default defineComponent({
message.errorMsg(e.message) message.errorMsg(e.message)
data.loading = false data.loading = false
}) })
let param2 = Object.assign(data.pages, search)
},
GetWaitDealOrderPageList(){
let param = {
pageIndex: 1,
pageSize: 100
};
scheduledTripService.GetWaitDealOrderPageList(param) scheduledTripService.GetWaitDealOrderPageList(param)
.then(r => { .then(r => {
if (r.data.resultCode == ApiResult.SUCCESS) { if (r.data.resultCode == ApiResult.SUCCESS) {
console.log(r.data.data,'---')
} }
} }
) )
......
src/i18n/zh-TW/index.ts
View file @ 54c6dbc0
...@@ -1125,12 +1125,38 @@ export default { ...@@ -1125,12 +1125,38 @@ export default {
day: '天', day: '天',
above: '天以上', above: '天以上',
recommend: '強力推薦', recommend: '強力推薦',
ascendingorder: '價格低到高', ascendingorder: '團期',
descendingorder: '價格高到低', descendingorder: '價格',
salesvolume: '銷量',
commentcount: '評論數',
sightseeingitinerary: '觀光行程', sightseeingitinerary: '觀光行程',
daytrip: '半/一日遊', daytrip: '半/一日遊',
multiday: '多日遊', multiday: '多日遊',
interval: '價格區間的最低價格不能低於最大價格', interval: '價格區間的最低價格不能低於最大價格',
since: '元起',
startdate: '出發日期',
closestartdate: '選擇出發日期',
companylocation: '公司所在地',
line: '線路',
commlineteam: '商品系列',
lineteam: '系列',
closelineteam: '選擇商品系列',
departurecity: '出發城市',
closedeparturecity: '選擇出發城市',
orderStatus: {
normal: '全部訂單',
apply1: '待付定金',
apply2: '待付尾款',
apply3: '待發團',
check: '交易完成',
cancel: '已取消',
},
orderStatusDay: {
normal: '全部',
day1: '10天內',
day2: '30天內',
day3: '60天內',
}
}, },
details:{ details:{
since: '起', since: '起',
...@@ -1236,7 +1262,11 @@ export default { ...@@ -1236,7 +1262,11 @@ export default {
d8: '机场附近酒店', d8: '机场附近酒店',
d9: '【保证入住】', d9: '【保证入住】',
d10: '或同級', d10: '或同級',
} },
},
scheduledTripOrder:{
setorderday: '時間範圍'
} }
} }
//#endregion //#endregion
......
src/pages/scheduledTrip/TripOrderPreview.vue
View file @ 54c6dbc0
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
<div class="col"> <div class="col">
<q-card class="q-pa-md" flat> <q-card class="q-pa-md" flat>
<div> <div>
<div class="text-h6 q-mb-md">团期</div> <div class="text-h6 q-mb-md">{{$t('v103.scheduledTrip.ascendingorder')}}</div>
<div class="bg-light-blue-1 q-pa-md fz14 rounded-borders q-mt-md"> <div class="bg-light-blue-1 q-pa-md fz14 rounded-borders q-mt-md">
<!-- <div class="text-weight-bold">团期</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">集合出发城市： {{detailsObj.startCityName}}</div>
......
src/pages/scheduledTrip/scheduledTripList.vue
View file @ 54c6dbc0
...@@ -715,7 +715,7 @@ export default defineComponent({ ...@@ -715,7 +715,7 @@ export default defineComponent({
let {ctx:that, proxy} = getCurrentInstance() let {ctx:that, proxy} = getCurrentInstance()
let { setTitle } = useMetaModule() let { setTitle } = useMetaModule()
const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any
pageTitle.value = '預訂行程' pageTitle.value = t('v103.scheduledTrip.pageTitle')
setTitle(pageTitle.value) setTitle(pageTitle.value)
const data= reactive({ const data= reactive({
......
src/utils/tools.ts
View file @ 54c6dbc0
...@@ -196,7 +196,7 @@ export function getHotelOrderStatus():Array<StandardStatus>{ ...@@ -196,7 +196,7 @@ export function getHotelOrderStatus():Array<StandardStatus>{
// 行程订单状态 // 行程订单状态
export function getTripOrderStatus():Array<StandardStatus>{ export function getTripOrderStatus():Array<StandardStatus>{
let status=[] as Array<StandardStatus> let status=[] as Array<StandardStatus>
let text = ['全部','待付定金','待付尾款','待发团','交易完成','取消'] let text = [t('v103.scheduledTrip.orderStatus.normal'),t('v103.scheduledTrip.orderStatus.apply1'),t('v103.scheduledTrip.orderStatus.apply2'),t('v103.scheduledTrip.orderStatus.apply3'),t('v103.scheduledTrip.orderStatus.check'),t('v103.scheduledTrip.orderStatus.cancel')]
let color = ['','positive','dark','orange','negative','orange','negative'] let color = ['','positive','dark','orange','negative','orange','negative']
let icons = ['','update','done','offline_bolt','cached','offline_bolt','cached'] let icons = ['','update','done','offline_bolt','cached','offline_bolt','cached']
text.forEach((x,i:number)=>{ text.forEach((x,i:number)=>{
...@@ -214,7 +214,7 @@ export function getTripOrderStatus():Array<StandardStatus>{ ...@@ -214,7 +214,7 @@ export function getTripOrderStatus():Array<StandardStatus>{
// 行程订单天数 // 行程订单天数
export function getTripOrderType():Array<StandardStatus>{ export function getTripOrderType():Array<StandardStatus>{
let status=[] as Array<StandardStatus> let status=[] as Array<StandardStatus>
let text = ['全部','10天内','30天内','60天内'] let text = [t('v103.scheduledTrip.orderStatusDay.normal'),t('v103.scheduledTrip.orderStatusDay.day1'),t('v103.scheduledTrip.orderStatusDay.day2'),t('v103.scheduledTrip.orderStatusDay.day3')]
let days = [0,10,30,60] let days = [0,10,30,60]
let color = ['','positive','dark','orange'] let color = ['','positive','dark','orange']
let icons = ['','update','done','offline_bolt'] let icons = ['','update','done','offline_bolt']
......
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