Skip to content

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

修改行程

parent f6f1e7c5
Show whitespace changes
Inline Side-by-side
Showing with 261 additions and 256 deletions
src/components/searchdata/rightList.vue
View file @ 237e473b
......@@ -147,7 +147,7 @@
>{{ x.dayNum }} {{$t('v103.scheduledTrip.day')}}</span
>
</div>
<div class="text-h6 product-price">CNY：{{ x.b2BPrice }}</div>
<div class="text-h6 product-price">{{domain==`id.oytour`?'IDR':'CNY'}}：{{ x.b2BPrice }}</div>
</div>
</div>
</div>
......@@ -197,6 +197,7 @@
const $q = useQuasar()
const qDateProxy = ref(null) as any
const qNameProxy = ref(null) as any
const domain =inject(DirtionmaryHelper.DOMAIN_NAME)
const { locale, t } = useI18n()
const data = reactive({
ordertype: 0,
......@@ -255,7 +256,7 @@
data.qMsg = JSON.parse(JSON.stringify(n.msg))
data.msg = JSON.parse(JSON.stringify(n.msg))
if(n.RetrievalState) methods.setSearchHandler()
},{deep:true})
},{deep:true,immediate:true})
const methods = {
changeOrderType(i){
if(data.orderindex==i){
......@@ -288,10 +289,12 @@
}else if(x.type==5){
search.datesId = 0
search.msg.startDate = ""
search.msg.endDate = ""
}else if(x.type==6){
search.msg.startDate = ""
search.msg.endDate = ""
}
search.RetrievalState = true
},
// 排序方式
chosenSortHandler(i) {
......@@ -327,18 +330,18 @@
return false;
}
}
var companyId = -1;
if (localStorage.groupinfo) {
var groupinfo = JSON.parse(localStorage.groupinfo);
companyId = groupinfo.siteList[0].companyId;
}
if (localStorage.b2bUser) {
var b2bUser = JSON.parse(window.localStorage.getItem("b2bUser"));
if (b2bUser) {
data.msg.priceOrderByField = 2;
}
}
let param = Object.assign(data.msg,search.msg)
let param = Object.assign(search.msg,data.msg)
if(domain == 'id.oytour') {
param.companyId = 1252
}
scheduledTripService.GetB2BTravelPageList(param).then(r => {
$q.loading.hide();
if (r.data.resultCode == ApiResult.SUCCESS) {
......@@ -386,6 +389,7 @@
methods.goSearchHandler();
return {
...toRefs(data),
domain,
search,
...methods,
}
......
src/components/searchdata/search.vue
View file @ 237e473b
......@@ -31,7 +31,7 @@
<q-radio
class="addr-list q-px-md q-py-sm row items-center"
:key="yi"
v-if="y.isShow" v-model="searchClone.cityId" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" :val="y.cityId" :label="y.siteName" size="sm" @update:model-value="changeCheckHandler(y, x,0)"/>
v-if="y.isShow" v-model="companyId" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" :val="y.companyId" :label="y.siteName" size="sm" @update:model-value="changeCheckHandler(y, x,0)"/>
</template>
</div>
</div>
......@@ -58,14 +58,14 @@
<q-radio
class="addr-list q-px-md q-py-sm row items-center"
:key="yi"
v-if="y.isShow" v-model="searchClone.lineId" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" :val="y.id" :label="y.name" size="sm" @update:model-value="changeCheckHandler(y, x,1)"/>
v-if="y.isShow" v-model="search.msg.lineId" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" :val="y.id" :label="y.name" size="sm" @update:model-value="changeCheckHandler(y, x,1)"/>
</template>
</div>
</div>
</div>
</q-popup-proxy>
</div>
<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="search.msg.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">
<span class="text-grey-8 col-12 row justify-between">
<span>{{$t('v103.scheduledTrip.commlineteam')}}</span>
......@@ -194,7 +194,7 @@
</div>
<div class="q-my-md">
<div class="text-subtitle1 text-weight-bold">{{$t('v103.scheduledTrip.screeningprice')}}（CNY）</div>
<div class="text-subtitle1 text-weight-bold">{{$t('v103.scheduledTrip.screeningprice')}}（{{domain==`id.oytour`?'IDR':'CNY'}}）</div>
<div class="q-mt-md text-grey-6 text-subtitle1">
{{ searchClone.priceRange.min }} - {{ searchClone.priceRange.max }}
</div>
......@@ -236,18 +236,19 @@
</q-btn>
<q-btn color="primary" unelevated :label="$t('query')" @click="queryList"/>
</div>
<template v-if="$q.platform.is.desktop">
<template v-else>
<q-card flat class="rounded-borders q-py-md">
<div class="row justify-between q-mx-md">
<span class="text-subtitle1 text-weight-bold ">{{$t('v103.scheduledTrip.screeningtitle')}}</span>
</div>
<!-- @update:model-value="changeAddrSearchHandler" -->
<q-input
v-model="searchClone.searchKey"
v-model="search.msg.searchKey"
type="text"
standout
:placeholder="$t('v103.scheduledTrip.searchinput')"
class="q-ma-md"
@keypress.enter="queryList"
/>
<div v-for="(x, i) in sites" :key="i">
<div class="addr">
......@@ -277,7 +278,7 @@
<q-radio
class="addr-list q-px-md q-py-sm row items-center"
:key="yi"
v-if="y.isShow" v-model="searchClone.cityId" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" :val="y.cityId" :label="y.siteName" size="sm" @update:model-value="changeCheckHandler(y, x,0)"/>
v-if="y.isShow" v-model="companyId" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" :val="y.companyId" :label="y.siteName" size="sm" @update:model-value="changeCheckHandler(y, x,0)"/>
<!-- <span class="col">{{ y.siteName }}</span> -->
</template>
</div>
......@@ -308,14 +309,14 @@
<q-radio
class="addr-list q-px-md q-py-sm row items-center"
:key="yi"
v-if="y.isShow" v-model="searchClone.lineId" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" :val="y.id" :label="y.name" size="sm" @update:model-value="changeCheckHandler(y, x,1)"/>
v-if="y.isShow" v-model="search.msg.lineId" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" :val="y.id" :label="y.name" size="sm" @update:model-value="changeCheckHandler(y, x,1)"/>
</template>
</div>
</div>
</div>
</template>
<template v-if="searchClone.startCityId==0"></template>
<template v-if="searchClone.startCityId==0">
<div v-for="(x, i) in startCitys" :key="i">
<div class="addr">
<div
......@@ -339,13 +340,12 @@
<template v-for="(y, yi) in x.SubList">
<q-radio class="addr-list q-px-md q-py-sm row items-center"
:key="yi"
v-if="y.isShow" v-model="searchClone.startCityId" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" :val="y.id" :label="y.startCityName" size="sm" @update:model-value="changeCheckHandler(y, x,3)"/>
v-if="y.isShow" v-model="search.msg.startCityId" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" :val="y.id" :label="y.startCityName" size="sm" @update:model-value="changeCheckHandler(y, x,3)"/>
</template>
</div>
</div>
</div>
</template>
</q-card>
<q-card flat class="rounded-borders q-py-md q-mt-lg" v-if="searchClone.lineId>0&&searchClone.lineTeamId==0">
<div class="text-subtitle1 text-weight-bold q-mx-md">{{$t('v103.scheduledTrip.allcommoditytype')}}</div>
......@@ -372,7 +372,7 @@
<template v-for="(y, yi) in x.SubList">
<q-radio class="addr-list q-px-md q-py-sm row items-center"
:key="yi"
v-if="y.isShow" v-model="searchClone.lineTeamId" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" :val="y.id" :label="y.name" size="sm" @update:model-value="changeCheckHandler(y, x,2)"/>
v-if="y.isShow" v-model="search.msg.lineTeamId" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" :val="y.id" :label="y.name" size="sm" @update:model-value="changeCheckHandler(y, x,2)"/>
</template>
</div>
</div>
......@@ -439,7 +439,7 @@
</q-card>
<q-card flat class="rounded-borders q-pa-md q-mt-lg">
<div class="text-subtitle1 text-weight-bold">{{$t('v103.scheduledTrip.screeningprice')}}（CNY）</div>
<div class="text-subtitle1 text-weight-bold">{{$t('v103.scheduledTrip.screeningprice')}}（{{domain==`id.oytour`?'IDR':'CNY'}}）</div>
<div class="q-mt-md text-grey-6 text-subtitle1">
{{ searchClone.priceRange.min }} - {{ searchClone.priceRange.max }}
</div>
......@@ -507,6 +507,7 @@
searchItem: [],
sites: [],//公司所在城市
city: 0,//公司城市
companyId:0,
dates: [],//开始日期
areaList: [],
chosenAddress: [],//已选项
......@@ -573,6 +574,7 @@
userInfo: {} as any,
})
const search = inject(DirtionmaryHelper.TICKET_QUERY_PARAM)
const domain =inject(DirtionmaryHelper.DOMAIN_NAME)
data.chosenAddress = JSON.parse(JSON.stringify(search.chosenAddress))
data.searchClone = JSON.parse(JSON.stringify(search.msg))
data.DayId = search.DayId
......@@ -583,15 +585,6 @@
data.dateRange = { from: data.searchClone.startDate, to: data.searchClone.endDate };
data.userInfo = getStoreGetter<UserGetter>('user', 'getUser')
const methods = {
// 出发城市变更
changeSite(e: number, option: any, pathValues: Array<any>) {
if (pathValues) {
if (pathValues.length > 0) {
data.searchClone.cityId = pathValues[0].companyId
methods.loadRecoItems()
}
}
},
// 删除目的地、商品类别、旅游时间
removeChosen(x,i,type) {
if(type==1||type==2){
......@@ -643,23 +636,7 @@
list.push({SubList: [],explsed: false,isShow:true})
list[0].SubList = data.dates
data.dates = list;
return
let jObj = JSON.parse(localStorage.getItem("baseifo"));
jObj.AreaList.forEach((x) => {
x.SubList.forEach((y) => {
y.checked = false;
y.explsed = false;
y.isShow = true;
if (y.SubList) {
y.SubList.forEach((z) => {
z.checked = false;
z.explsed = false;
z.isShow = true;
});
}
});
data.areaList.push(...x.SubList);
});
},
// 获取当前城市
GetB2BSite(){
......@@ -675,17 +652,26 @@
arrList(r.data.data)
let list = []
list.push({SubList: [],explsed: false,isShow:true})
if(data.userInfo){
let rB_Branch_id = data.userInfo.salesBaseInfo.rB_Branch_id;
search.msg.companyId = data.rB_Branch_id
if(domain == 'id.oytour') {
search.msg.companyId = 1252
list[0].SubList = r.data.data.filter(branch=>branch.companyId==1252)
list[0].SubList[0].siteName = 'Jakarta'
}else{
list[0].SubList = r.data.data
search.msg.companyId = data.rB_Branch_id
}
data.companyId = search.msg.companyId
search.RetrievalState = true
data.sites = list;
if(data.userInfo){
let rB_Branch_id = data.userInfo.salesBaseInfo
.rB_Branch_id;
data.sites[0].SubList.forEach(item=>{
if(item.companyId==rB_Branch_id){
state = true;
data.city = item.companyId;
data.searchClone.cityId = item.cityId
search.msg.companyId = data.city
// localStorage.setItem('site', data.city)
// localStorage.setItem('cityId', item.cityId)
methods.changeChosenHandler(item)
......@@ -695,7 +681,7 @@
state = true;
data.city = data.sites[0].SubList[0].companyId;
data.searchClone.cityId = data.sites[0].SubList[0].cityId
search.msg.companyId = data.city
search.msg.companyId = data.companyId
// localStorage.setItem('site', data.city)
// localStorage.setItem('cityId', data.searchClone.cityId)
methods.changeChosenHandler(data.sites[0].SubList[0],data.sites[0])
......@@ -777,8 +763,9 @@
// 出发地
changeCheckHandler(x, p = null,type) {
if(!type){
data.city = x.companyId;
search.msg.cityId = data.searchClone.cityId
// data.city = x.companyId;
// search.msg.cityId = data.searchClone.cityId
search.msg.companyId = x.companyId
methods.loadRecoItems()
}else if(type==1){
let arrList = function(arr){
......@@ -792,10 +779,12 @@
list.push({SubList: [],explsed: false,isShow:true})
list[0].SubList = x.lineTeam
data.xilies = list
search.msg.lineId = x.id
}
setTimeout(()=>{
methods.changeChosenHandler(x,p,type);
},200)
},
changeChosenHandler(x,p,type) {
let obj= {}
......@@ -836,9 +825,9 @@
})
})
if(type==1){
search.msg.lineId = data.searchClone.lineId
search.msg.lineId = x.id
}if(type==2){
search.msg.lineTeamId = data.searchClone.lineTeamId
search.msg.lineTeamId = x.id
}
if($q.platform.is.mobile){
if(type==1&&qDateProxy1.value) qDateProxy1.value.hide()
......@@ -860,7 +849,7 @@
}
})
})
search.msg.startCityId = data.searchClone.startCityId
search.msg.startCityId = x.id
if($q.platform.is.mobile){
if(qDateProxy3.value) qDateProxy3.value.hide()
}
......@@ -897,7 +886,8 @@
Name: x.Name,
Id: x.id,
type: type,
d: new Date().getFullYear()+'/'+x.MM+'/01'
min: new Date().getFullYear()+'/'+x.MM+'/01',
max: new Date().getFullYear()+'/'+x.MM+'/'+new Date(new Date().getFullYear(), x.MM, 0).getDate(),
}
p.SubList.forEach(y=>{
search.chosenAddress.forEach((z,index)=>{
......@@ -909,11 +899,11 @@
if($q.platform.is.mobile){
if(qDateProxy5.value) qDateProxy5.value.hide()
}
setTimeout(()=>{
search.datesId = x.id
search.msg.startDate = obj.d
search.msg.startDate = obj.min
search.msg.endDate = obj.max
console.log(search.msg)
search.chosenAddress.push(obj);
},200)
}else if(type==6){
obj= {
Name: x.startDate+'-'+x.endDate,
......@@ -934,6 +924,7 @@
search.chosenAddress.push(obj);
},200)
}
search.RetrievalState = true
if(p){
p.explsed = false;
}
......@@ -962,7 +953,7 @@
search.msg.priceRange.max = e.max;
search.msg.minPrice = e.min;
search.msg.maxPrice = e.max;
// methods.queryList()
methods.queryList()
},
queryList(){
search.RetrievalState=true
......@@ -1061,6 +1052,7 @@
qDateProxy5,
qDateProxy6,
qNameProxy,
domain
}
}
})
......
src/components/trip/orderPreview.vue
View file @ 237e473b
......@@ -19,13 +19,13 @@
</div>
<div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
{{domain==`id.oytour`?'IDR':'CNY'}} {{ p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
</div>
</div>
<div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
{{domain==`id.oytour`?'IDR':'CNY'}} {{ p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
<q-input
style="width: 150px"
......@@ -74,14 +74,14 @@
</div>
<div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px">
CNY
{{domain==`id.oytour`?'IDR':'CNY'}}
{{ p.originalB2BPrice - p.childNoNeedPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
</div>
</div>
<div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY
{{domain==`id.oytour`?'IDR':'CNY'}}
{{ p.originalB2BPrice - p.childNoNeedPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
<q-input
......@@ -131,7 +131,7 @@
</div>
<div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px">
CNY
{{domain==`id.oytour`?'IDR':'CNY'}}
{{ p.childNeedPrice + p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
</div>
......@@ -142,7 +142,7 @@
class="text-grey-7 product-price"
style="font-size: 13px"
>
CNY
{{domain==`id.oytour`?'IDR':'CNY'}}
{{ p.childNeedPrice + p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
<q-input
......@@ -192,13 +192,13 @@
</div>
<div v-if="$q.platform.is.mobile">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ p.babyPrice }} /{{$t('v103.scheduledTripDetails.each')}}
{{domain==`id.oytour`?'IDR':'CNY'}} {{ p.babyPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
</div>
</div>
<div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ p.babyPrice }} /{{$t('v103.scheduledTripDetails.each')}}
{{domain==`id.oytour`?'IDR':'CNY'}} {{ p.babyPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
<q-input
style="width: 150px"
......@@ -256,13 +256,13 @@
</div>
<div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ p.singleRoomPrice }} /{{$t('v103.scheduledTripDetails.each')}}
{{domain==`id.oytour`?'IDR':'CNY'}} {{ p.singleRoomPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
</div>
</div>
<div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px">
CNY {{ p.singleRoomPrice }} /{{$t('v103.scheduledTripDetails.each')}}
{{domain==`id.oytour`?'IDR':'CNY'}} {{ p.singleRoomPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span>
<q-input
style="width: 150px"
......@@ -309,13 +309,13 @@
style="border-top: 1px dashed #eee"
>
<div class="text-grey-6 f12 col">{{$t('v103.scheduledTripDetails.insurance')}}</div>
<div class="product-money f12">CNY {{ p.safeMoney }}/{{$t('v103.scheduledTripDetails.each')}}</div>
<div class="product-money f12">{{domain==`id.oytour`?'IDR':'CNY'}} {{ p.safeMoney }}/{{$t('v103.scheduledTripDetails.each')}}</div>
</div>
</div>
<div class="q-mt-md q-pt-md" style="border-top: 1px dashed #eee">
<div class="row items-center">
<span class="text-subtitle2 text-grey-6 col">{{$t('v103.scheduledTripDetails.total')}}</span>
<span class="text-h6 text-primary product-price">CNY {{ sumPrice }}</span>
<span class="text-h6 text-primary product-price">{{domain==`id.oytour`?'IDR':'CNY'}} {{ sumPrice }}</span>
</div>
<div class="q-mt-md text-right">
<span class="q-mr-lg f12 text-negative" v-if="!p.startDate" >{{$q.platform.is.mobile?$t('v103.scheduledTripDetails.selectdatetop'):$t('v103.scheduledTripDetails.selectdateleft')}} </span>
......@@ -340,6 +340,7 @@ export default defineComponent({
components: { },
props: ['msg','price'],
setup(props, context) {
const domain =inject(DirtionmaryHelper.DOMAIN_NAME)
const $router = useRouter()
const { t } = useI18n()
const $q = useQuasar()
......@@ -462,6 +463,7 @@ export default defineComponent({
return {
...toRefs(data),
...methods,
domain,
moneyFormat,
}
}
......
src/pages/scheduledTrip/TripOrderPreview.vue
View file @ 237e473b
......@@ -198,7 +198,7 @@
/>
x {{ chosenObj.crCount }}
</div>
<div>CNY {{ price.originalB2BPrice }}</div>
<div>{{domain==`id.oytour`?'IDR':'CNY'}} {{ price.originalB2BPrice }}</div>
</div>
<div class="row q-my-sm" v-if="chosenObj.etzcCount > 0">
<div class="col">
......@@ -214,7 +214,7 @@
x {{ chosenObj.etzcCount }}
</div>
<div>
CNY
{{domain==`id.oytour`?'IDR':'CNY'}}
{{ price.originalB2BPrice + price.childNeedPrice }}
</div>
</div>
......@@ -232,7 +232,7 @@
x {{ chosenObj.etbzcCount }}
</div>
<div>
CNY
{{domain==`id.oytour`?'IDR':'CNY'}}
{{ price.originalB2BPrice - price.childNoNeedPrice }}
</div>
</div>
......@@ -249,7 +249,7 @@
/>
x {{ chosenObj.yeCount }}
</div>
<div>CNY {{ price.babyPrice }}</div>
<div>{{domain==`id.oytour`?'IDR':'CNY'}} {{ price.babyPrice }}</div>
</div>
<div v-if="price.safeMoney > 0">
......@@ -263,7 +263,7 @@
{{ price.safeMoney }}/{{ $t("v103.scheduledTripDetails.people") }}
</div>
<div>
CNY
{{domain==`id.oytour`?'IDR':'CNY'}}
{{
moneyFormat(
price.safeMoney *
......@@ -286,7 +286,7 @@
}}
</div>
<div>
CNY
{{domain==`id.oytour`?'IDR':'CNY'}}
{{
moneyFormat(
price.visaPrice *
......@@ -302,7 +302,7 @@
{{ price.otherPrice }}/{{ $t("v103.scheduledTripDetails.people") }}
</div>
<div>
CNY
{{domain==`id.oytour`?'IDR':'CNY'}}
{{
price.otherPrice *
(chosenObj.crCount + chosenObj.etCount + chosenObj.yeCount)
......@@ -319,13 +319,13 @@
<div class="col">
{{ $t("v103.scheduledTripDetails.surcharge") }} x {{ chosenObj.etCount }}
</div>
<div>CNY {{ price.babyChargePrice }}</div>
<div>{{domain==`id.oytour`?'IDR':'CNY'}} {{ price.babyChargePrice }}</div>
</div>
<div class="row q-mb-sm" v-if="chosenObj.df > 0">
<div class="col">
{{ $t("v103.scheduledTripDetails.pricedifference") }} x {{ chosenObj.df }}
</div>
<div>CNY {{ price.singleRoomPrice }}</div>
<div>{{domain==`id.oytour`?'IDR':'CNY'}} {{ price.singleRoomPrice }}</div>
</div>
</div>
<div class="q-pt-md q-mb-lg text-right" style="border-top: 1px dashed #eee">
......@@ -382,6 +382,7 @@ import { useI18n } from "vue-i18n";
import { DirtionmaryHelper } from "../../config/dictionary";
import TicketCard from "../../components/ticket/TicketCard.vue";
import { date, useQuasar } from "quasar";
import { moneyFormat } from 'src/utils/tools'
export default defineComponent({
components: { TicketCard },
setup(props) {
......@@ -392,6 +393,7 @@ export default defineComponent({
const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any;
pageTitle.value = t("v102.ticket.preview.pageTitle");
setTitle(pageTitle.value);
const domain =inject(DirtionmaryHelper.DOMAIN_NAME)
const data = reactive({
loading: false,
......@@ -770,6 +772,8 @@ export default defineComponent({
guestEName,
guestMobile,
guestAddress,
domain,
moneyFormat
};
},
});
......
src/pages/scheduledTrip/detailsNew.vue
View file @ 237e473b
......@@ -34,7 +34,7 @@
style="text-align: left"
v-if="dataList.priceList.length > 0"
>
<span>CNY {{ dataList.priceList[0].originalB2BPrice }}</span>
<span>{{domain==`id.oytour`?'IDR':'CNY'}} {{ dataList.priceList[0].originalB2BPrice }}</span>
<span class="q-ml-sm f12 text-grey-7">{{
$t("v103.scheduledTripDetails.since")
}}</span>
......@@ -172,7 +172,7 @@
}"
>
<div class="product-price text-h6" v-if="dataList.priceList.length > 0">
CNY：{{ dataList.priceList[0].originalB2BPrice }}
{{domain==`id.oytour`?'IDR':'CNY'}}：{{ dataList.priceList[0].originalB2BPrice }}
<span class="f12 text-grey-6">{{
$t("v103.scheduledTripDetails.since")
}}</span>
......@@ -278,7 +278,7 @@
<span
class="product-price text-h6 q-mr-md"
v-if="dataList.priceList.length > 0"
>CNY {{ dataList.priceList[0].originalB2BPrice }}</span
>{{domain==`id.oytour`?'IDR':'CNY'}} {{ dataList.priceList[0].originalB2BPrice }}</span
>
<q-btn
color="primary"
......@@ -638,6 +638,7 @@ export default defineComponent({
},
props: [],
setup(props) {
const domain =inject(DirtionmaryHelper.DOMAIN_NAME)
const $router = useRouter();
const { t } = useI18n();
const $q = useQuasar();
......@@ -1032,6 +1033,7 @@ export default defineComponent({
...toRefs(data),
...methods,
moneyFormat,
domain,
calendarRef,
qDateProxy,
getDivDom,
......
src/utils/validate.ts
View file @ 237e473b
......@@ -67,16 +67,17 @@ export function compareArray(arrA: any[], arrB: any[]) {
export function getDomainName() {
let domainNameUrl = window.location.hostname;
if (domainNameUrl == 'localhost') {
return 'pic.oytour'
return 'id.oytour'
} else if (domainNameUrl.indexOf("192.168.10") > -1) {
return "typic.oytour"
}
else if (domainNameUrl == "typic.oytour.com") {
return "typic.oytour"
}
else if (domainNameUrl == 'pic.oytour.com') {
} else if (domainNameUrl == 'pic.oytour.com') {
return 'pic.oytour'
} else if (domainNameUrl == 'sell.oytour.com') {
return 'sell.oytour'
} else if (domainNameUrl == 'id.oytour.com') {
return 'id.oytour'
}
}
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