Skip to content

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

修改行程

parent f6f1e7c5
Hide 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 @@ ...@@ -147,7 +147,7 @@
>{{ x.dayNum }} {{$t('v103.scheduledTrip.day')}}</span >{{ x.dayNum }} {{$t('v103.scheduledTrip.day')}}</span
> >
</div> </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> </div>
</div> </div>
...@@ -197,6 +197,7 @@ ...@@ -197,6 +197,7 @@
const $q = useQuasar() const $q = useQuasar()
const qDateProxy = ref(null) as any const qDateProxy = ref(null) as any
const qNameProxy = ref(null) as any const qNameProxy = ref(null) as any
const domain =inject(DirtionmaryHelper.DOMAIN_NAME)
const { locale, t } = useI18n() const { locale, t } = useI18n()
const data = reactive({ const data = reactive({
ordertype: 0, ordertype: 0,
...@@ -255,7 +256,7 @@ ...@@ -255,7 +256,7 @@
data.qMsg = JSON.parse(JSON.stringify(n.msg)) data.qMsg = JSON.parse(JSON.stringify(n.msg))
data.msg = JSON.parse(JSON.stringify(n.msg)) data.msg = JSON.parse(JSON.stringify(n.msg))
if(n.RetrievalState) methods.setSearchHandler() if(n.RetrievalState) methods.setSearchHandler()
},{deep:true}) },{deep:true,immediate:true})
const methods = { const methods = {
changeOrderType(i){ changeOrderType(i){
if(data.orderindex==i){ if(data.orderindex==i){
...@@ -288,10 +289,12 @@ ...@@ -288,10 +289,12 @@
}else if(x.type==5){ }else if(x.type==5){
search.datesId = 0 search.datesId = 0
search.msg.startDate = "" search.msg.startDate = ""
search.msg.endDate = ""
}else if(x.type==6){ }else if(x.type==6){
search.msg.startDate = "" search.msg.startDate = ""
search.msg.endDate = "" search.msg.endDate = ""
} }
search.RetrievalState = true
}, },
// 排序方式 // 排序方式
chosenSortHandler(i) { chosenSortHandler(i) {
...@@ -327,18 +330,18 @@ ...@@ -327,18 +330,18 @@
return false; return false;
} }
} }
var companyId = -1;
if (localStorage.groupinfo) {
var groupinfo = JSON.parse(localStorage.groupinfo);
companyId = groupinfo.siteList[0].companyId;
}
if (localStorage.b2bUser) { if (localStorage.b2bUser) {
var b2bUser = JSON.parse(window.localStorage.getItem("b2bUser")); var b2bUser = JSON.parse(window.localStorage.getItem("b2bUser"));
if (b2bUser) { if (b2bUser) {
data.msg.priceOrderByField = 2; 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 => { scheduledTripService.GetB2BTravelPageList(param).then(r => {
$q.loading.hide(); $q.loading.hide();
if (r.data.resultCode == ApiResult.SUCCESS) { if (r.data.resultCode == ApiResult.SUCCESS) {
...@@ -386,6 +389,7 @@ ...@@ -386,6 +389,7 @@
methods.goSearchHandler(); methods.goSearchHandler();
return { return {
...toRefs(data), ...toRefs(data),
domain,
search, search,
...methods, ...methods,
} }
......
src/components/searchdata/search.vue
View file @ 237e473b
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<q-radio <q-radio
class="addr-list q-px-md q-py-sm row items-center" class="addr-list q-px-md q-py-sm row items-center"
:key="yi" :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> </template>
</div> </div>
</div> </div>
...@@ -58,14 +58,14 @@ ...@@ -58,14 +58,14 @@
<q-radio <q-radio
class="addr-list q-px-md q-py-sm row items-center" class="addr-list q-px-md q-py-sm row items-center"
:key="yi" :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> </template>
</div> </div>
</div> </div>
</div> </div>
</q-popup-proxy> </q-popup-proxy>
</div> </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"> <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>{{$t('v103.scheduledTrip.commlineteam')}}</span> <span>{{$t('v103.scheduledTrip.commlineteam')}}</span>
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
</div> </div>
<div class="q-my-md"> <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"> <div class="q-mt-md text-grey-6 text-subtitle1">
{{ searchClone.priceRange.min }} - {{ searchClone.priceRange.max }} {{ searchClone.priceRange.min }} - {{ searchClone.priceRange.max }}
</div> </div>
...@@ -236,35 +236,67 @@ ...@@ -236,35 +236,67 @@
</q-btn> </q-btn>
<q-btn color="primary" unelevated :label="$t('query')" @click="queryList"/> <q-btn color="primary" unelevated :label="$t('query')" @click="queryList"/>
</div> </div>
<template v-if="$q.platform.is.desktop"> <template v-else>
<q-card flat class="rounded-borders q-py-md"> <q-card flat class="rounded-borders q-py-md">
<div class="row justify-between q-mx-md"> <div class="row justify-between q-mx-md">
<span class="text-subtitle1 text-weight-bold ">{{$t('v103.scheduledTrip.screeningtitle')}}</span> <span class="text-subtitle1 text-weight-bold ">{{$t('v103.scheduledTrip.screeningtitle')}}</span>
</div>
<!-- @update:model-value="changeAddrSearchHandler" -->
<q-input
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">
<div
class="addr-list q-px-md q-py-sm cursor-pointer row items-center"
v-if="x.isShow"
>
<span class="col" @click="changeExplesdHandler(x)">{{$t('v103.scheduledTrip.companylocation')}}</span>
<div>
<span v-if="chosenAddress.length>0" class="q-mr-md text-primary">{{chosenAddress[0].Name}}</span>
<q-icon
@click="changeExplesdHandler(x)"
:name="!x.explsed ? 'keyboard_arrow_down' : 'keyboard_arrow_up'"
size="20px"
/>
</div>
</div>
<div
class="q-mx-md"
v-if="
x.explsed ||
(x.SubList && x.isShowChild && searchClone.searchKey.length > 0)
"
>
<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="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>
</div> </div>
<!-- @update:model-value="changeAddrSearchHandler" --> </div>
<q-input <template v-if="xilies.length==0||!searchClone.lineId">
v-model="searchClone.searchKey" <div v-for="(x, i) in lines" :key="i">
type="text"
standout
:placeholder="$t('v103.scheduledTrip.searchinput')"
class="q-ma-md"
/>
<div v-for="(x, i) in sites" :key="i">
<div class="addr"> <div class="addr">
<div <div
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)">{{$t('v103.scheduledTrip.companylocation')}}</span> <span class="col" @click="changeExplesdHandler(x)">{{$t('v103.scheduledTrip.line')}}</span>
<div> <q-icon
<span v-if="chosenAddress.length>0" class="q-mr-md text-primary">{{chosenAddress[0].Name}}</span>
<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'"
size="20px" size="20px"
/> />
</div>
</div> </div>
<div <div
class="q-mx-md" class="q-mx-md"
...@@ -277,85 +309,21 @@ ...@@ -277,85 +309,21 @@
<q-radio <q-radio
class="addr-list q-px-md q-py-sm row items-center" class="addr-list q-px-md q-py-sm row items-center"
:key="yi" :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="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)"/>
<!-- <span class="col">{{ y.siteName }}</span> -->
</template> </template>
</div> </div>
</div> </div>
</div> </div>
<template v-if="xilies.length==0||!searchClone.lineId"> </template>
<div v-for="(x, i) in lines" :key="i"> <template v-if="searchClone.startCityId==0">
<div class="addr"> <div v-for="(x, i) in startCitys" :key="i">
<div
class="addr-list q-px-md q-py-sm cursor-pointer row items-center"
v-if="x.isShow"
>
<span class="col" @click="changeExplesdHandler(x)">{{$t('v103.scheduledTrip.line')}}</span>
<q-icon
@click="changeExplesdHandler(x)"
:name="!x.explsed ? 'keyboard_arrow_down' : 'keyboard_arrow_up'"
size="20px"
/>
</div>
<div
class="q-mx-md"
v-if="
x.explsed ||
(x.SubList && x.isShowChild && searchClone.searchKey.length > 0)
"
>
<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.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>
<div v-for="(x, i) in startCitys" :key="i">
<div class="addr">
<div
class="addr-list q-px-md q-py-sm cursor-pointer row items-center"
v-if="x.isShow"
>
<span class="col" @click="changeExplesdHandler(x)">{{$t('v103.scheduledTrip.departurecity')}}</span>
<q-icon
@click="changeExplesdHandler(x)"
:name="!x.explsed ? 'keyboard_arrow_down' : 'keyboard_arrow_up'"
size="20px"
/>
</div>
<div
class="q-mx-md"
v-if="
x.explsed ||
(x.SubList && x.isShowChild && searchClone.searchKey.length > 0)
"
>
<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)"/>
</template>
</div>
</div>
</div>
</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>
<div class="add q-mt-md" v-for="(x, i) in xilies" :key="i">
<div class="addr"> <div class="addr">
<div <div
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)">{{$t('v103.scheduledTrip.lineteam')}}</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'"
...@@ -371,100 +339,132 @@ ...@@ -371,100 +339,132 @@
> >
<template v-for="(y, yi) in x.SubList"> <template v-for="(y, yi) in x.SubList">
<q-radio class="addr-list q-px-md q-py-sm row items-center" <q-radio class="addr-list q-px-md q-py-sm row items-center"
:key="yi" :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.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> </template>
</div> </div>
</div> </div>
</div> </div>
</q-card> </template>
</q-card>
<q-card flat class="rounded-borders q-mt-lg column no-padding"> <q-card flat class="rounded-borders q-py-md q-mt-lg" v-if="searchClone.lineId>0&&searchClone.lineTeamId==0">
<template v-if="!searchClone.startDate&&!searchClone.endDate"> <div class="text-subtitle1 text-weight-bold q-mx-md">{{$t('v103.scheduledTrip.allcommoditytype')}}</div>
<div v-for="(x, i) in dates" :key="i"> <div class="add q-mt-md" v-for="(x, i) in xilies" :key="i">
<div class="addr"> <div class="addr">
<div
class="addr-list q-px-md q-py-md cursor-pointer row items-center"
v-if="x.isShow"
>
<span class="col" @click="changeExplesdHandler(x)">{{$t('v103.scheduledTrip.startdate')}}</span>
<q-icon
@click="changeExplesdHandler(x)"
:name="!x.explsed ? 'keyboard_arrow_down' : 'keyboard_arrow_up'"
size="20px"
/>
</div>
<div
class="q-mx-md"
v-if="
x.explsed ||
(x.SubList && x.isShowChild && searchClone.searchKey.length > 0)
"
>
<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="datesId" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" :val="y.id" :label="y.Name" size="sm" @update:model-value="changeCheckHandler(y, x,5)"/>
</template>
</div>
</div>
</div>
</template>
<div class="row bg-grey-3" v-if="!searchClone.startDate">
<div <div
class="q-px-md q-py-md" class="addr-list q-px-md q-py-sm cursor-pointer row items-center"
style="border-right: 1px solid #eee; border-radius: 0 !important" v-if="x.isShow"
> >
<q-icon name="event" size="24px" /> <span class="col" @click="changeExplesdHandler(x)">{{$t('v103.scheduledTrip.lineteam')}}</span>
<q-icon
@click="changeExplesdHandler(x)"
:name="!x.explsed ? 'keyboard_arrow_down' : 'keyboard_arrow_up'"
size="20px"
/>
</div> </div>
<div class="row items-center justify-center col"> <div
<span class="text-grey-8">{{ class="q-mx-md"
dateRange.from v-if="
? `${dateRange.from} - ${dateRange.to}` x.explsed ||
: $t('v103.scheduledTrip.screeningdate') (x.SubList && x.isShowChild && searchClone.searchKey.length > 0)
}}</span> "
<q-popup-proxy :offset="[0, 0]" ref="qDateProxy"> >
<div> <template v-for="(y, yi) in x.SubList">
<q-date <q-radio class="addr-list q-px-md q-py-sm row items-center"
v-model="dateRange" :key="yi"
:options="optionsFn" 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)"/>
range </template>
@range-end="dateRangeHandler"
mask="YYYY/MM/DD"
></q-date>
</div>
</q-popup-proxy>
</div> </div>
</div>
</div> </div>
</q-card> </q-card>
<q-card flat class="rounded-borders q-pa-md q-mt-lg"> <q-card flat class="rounded-borders q-mt-lg column no-padding">
<div class="text-subtitle1 text-weight-bold">{{$t('v103.scheduledTrip.screeningprice')}}（CNY）</div> <template v-if="!searchClone.startDate&&!searchClone.endDate">
<div class="q-mt-md text-grey-6 text-subtitle1"> <div v-for="(x, i) in dates" :key="i">
{{ searchClone.priceRange.min }} - {{ searchClone.priceRange.max }} <div class="addr">
</div> <div
<q-range class="addr-list q-px-md q-py-md cursor-pointer row items-center"
v-model="searchClone.priceRange" v-if="x.isShow"
:min="1" >
:max="100000" <span class="col" @click="changeExplesdHandler(x)">{{$t('v103.scheduledTrip.startdate')}}</span>
:step="1" <q-icon
@change="testHandler" @click="changeExplesdHandler(x)"
color="primary" :name="!x.explsed ? 'keyboard_arrow_down' : 'keyboard_arrow_up'"
class="q-mt-md" size="20px"
/> />
</q-card> </div>
<q-card flat class="rounded-borders q-mt-lg overflow-hidden"> <div
<q-expansion-item class="q-mx-md"
expand-separator v-if="
:label="$t('v103.scheduledTrip.journeytime')" x.explsed ||
class="text-subtitle1 text-weight-bold rounded-borders" (x.SubList && x.isShowChild && searchClone.searchKey.length > 0)
> "
<q-radio class="addr-list q-px-md q-py-sm row items-center" >
v-for="(y, yi) in dayArray" <template v-for="(y, yi) in x.SubList">
:key="yi" v-model="DayId" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" :val="y.id" :label="y.text" size="sm" @update:model-value="changeCheckHandler(y,dayArray,4)"/> <q-radio class="addr-list q-px-md q-py-sm row items-center"
</q-expansion-item> :key="yi"
</q-card> v-if="y.isShow" v-model="datesId" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" :val="y.id" :label="y.Name" size="sm" @update:model-value="changeCheckHandler(y, x,5)"/>
</template> </template>
</div>
</div>
</div>
</template>
<div class="row bg-grey-3" v-if="!searchClone.startDate">
<div
class="q-px-md q-py-md"
style="border-right: 1px solid #eee; border-radius: 0 !important"
>
<q-icon name="event" size="24px" />
</div>
<div class="row items-center justify-center col">
<span class="text-grey-8">{{
dateRange.from
? `${dateRange.from} - ${dateRange.to}`
: $t('v103.scheduledTrip.screeningdate')
}}</span>
<q-popup-proxy :offset="[0, 0]" ref="qDateProxy">
<div>
<q-date
v-model="dateRange"
:options="optionsFn"
range
@range-end="dateRangeHandler"
mask="YYYY/MM/DD"
></q-date>
</div>
</q-popup-proxy>
</div>
</div>
</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')}}（{{domain==`id.oytour`?'IDR':'CNY'}}）</div>
<div class="q-mt-md text-grey-6 text-subtitle1">
{{ searchClone.priceRange.min }} - {{ searchClone.priceRange.max }}
</div>
<q-range
v-model="searchClone.priceRange"
:min="1"
:max="100000"
:step="1"
@change="testHandler"
color="primary"
class="q-mt-md"
/>
</q-card>
<q-card flat class="rounded-borders q-mt-lg overflow-hidden">
<q-expansion-item
expand-separator
:label="$t('v103.scheduledTrip.journeytime')"
class="text-subtitle1 text-weight-bold rounded-borders"
>
<q-radio class="addr-list q-px-md q-py-sm row items-center"
v-for="(y, yi) in dayArray"
:key="yi" v-model="DayId" checked-icon="task_alt" unchecked-icon="panorama_fish_eye" :val="y.id" :label="y.text" size="sm" @update:model-value="changeCheckHandler(y,dayArray,4)"/>
</q-expansion-item>
</q-card>
</template>
</template> </template>
<script lang="ts"> <script lang="ts">
...@@ -507,6 +507,7 @@ ...@@ -507,6 +507,7 @@
searchItem: [], searchItem: [],
sites: [],//公司所在城市 sites: [],//公司所在城市
city: 0,//公司城市 city: 0,//公司城市
companyId:0,
dates: [],//开始日期 dates: [],//开始日期
areaList: [], areaList: [],
chosenAddress: [],//已选项 chosenAddress: [],//已选项
...@@ -573,6 +574,7 @@ ...@@ -573,6 +574,7 @@
userInfo: {} as any, userInfo: {} as any,
}) })
const search = inject(DirtionmaryHelper.TICKET_QUERY_PARAM) const search = inject(DirtionmaryHelper.TICKET_QUERY_PARAM)
const domain =inject(DirtionmaryHelper.DOMAIN_NAME)
data.chosenAddress = JSON.parse(JSON.stringify(search.chosenAddress)) data.chosenAddress = JSON.parse(JSON.stringify(search.chosenAddress))
data.searchClone = JSON.parse(JSON.stringify(search.msg)) data.searchClone = JSON.parse(JSON.stringify(search.msg))
data.DayId = search.DayId data.DayId = search.DayId
...@@ -583,15 +585,6 @@ ...@@ -583,15 +585,6 @@
data.dateRange = { from: data.searchClone.startDate, to: data.searchClone.endDate }; data.dateRange = { from: data.searchClone.startDate, to: data.searchClone.endDate };
data.userInfo = getStoreGetter<UserGetter>('user', 'getUser') data.userInfo = getStoreGetter<UserGetter>('user', 'getUser')
const methods = { 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) { removeChosen(x,i,type) {
if(type==1||type==2){ if(type==1||type==2){
...@@ -643,23 +636,7 @@ ...@@ -643,23 +636,7 @@
list.push({SubList: [],explsed: false,isShow:true}) list.push({SubList: [],explsed: false,isShow:true})
list[0].SubList = data.dates list[0].SubList = data.dates
data.dates = list; 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(){ GetB2BSite(){
...@@ -675,17 +652,26 @@ ...@@ -675,17 +652,26 @@
arrList(r.data.data) arrList(r.data.data)
let list = [] let list = []
list.push({SubList: [],explsed: false,isShow:true}) list.push({SubList: [],explsed: false,isShow:true})
list[0].SubList = r.data.data
data.sites = list;
if(data.userInfo){ if(data.userInfo){
let rB_Branch_id = data.userInfo.salesBaseInfo let rB_Branch_id = data.userInfo.salesBaseInfo.rB_Branch_id;
.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;
data.sites[0].SubList.forEach(item=>{ data.sites[0].SubList.forEach(item=>{
if(item.companyId==rB_Branch_id){ if(item.companyId==rB_Branch_id){
state = true; state = true;
data.city = item.companyId; data.city = item.companyId;
data.searchClone.cityId = item.cityId data.searchClone.cityId = item.cityId
search.msg.companyId = data.city
// localStorage.setItem('site', data.city) // localStorage.setItem('site', data.city)
// localStorage.setItem('cityId', item.cityId) // localStorage.setItem('cityId', item.cityId)
methods.changeChosenHandler(item) methods.changeChosenHandler(item)
...@@ -695,7 +681,7 @@ ...@@ -695,7 +681,7 @@
state = true; state = true;
data.city = data.sites[0].SubList[0].companyId; data.city = data.sites[0].SubList[0].companyId;
data.searchClone.cityId = data.sites[0].SubList[0].cityId 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('site', data.city)
// localStorage.setItem('cityId', data.searchClone.cityId) // localStorage.setItem('cityId', data.searchClone.cityId)
methods.changeChosenHandler(data.sites[0].SubList[0],data.sites[0]) methods.changeChosenHandler(data.sites[0].SubList[0],data.sites[0])
...@@ -777,8 +763,9 @@ ...@@ -777,8 +763,9 @@
// 出发地 // 出发地
changeCheckHandler(x, p = null,type) { changeCheckHandler(x, p = null,type) {
if(!type){ if(!type){
data.city = x.companyId; // data.city = x.companyId;
search.msg.cityId = data.searchClone.cityId // search.msg.cityId = data.searchClone.cityId
search.msg.companyId = x.companyId
methods.loadRecoItems() methods.loadRecoItems()
}else if(type==1){ }else if(type==1){
let arrList = function(arr){ let arrList = function(arr){
...@@ -792,10 +779,12 @@ ...@@ -792,10 +779,12 @@
list.push({SubList: [],explsed: false,isShow:true}) list.push({SubList: [],explsed: false,isShow:true})
list[0].SubList = x.lineTeam list[0].SubList = x.lineTeam
data.xilies = list data.xilies = list
search.msg.lineId = x.id
} }
setTimeout(()=>{ setTimeout(()=>{
methods.changeChosenHandler(x,p,type); methods.changeChosenHandler(x,p,type);
},200) },200)
}, },
changeChosenHandler(x,p,type) { changeChosenHandler(x,p,type) {
let obj= {} let obj= {}
...@@ -836,9 +825,9 @@ ...@@ -836,9 +825,9 @@
}) })
}) })
if(type==1){ if(type==1){
search.msg.lineId = data.searchClone.lineId search.msg.lineId = x.id
}if(type==2){ }if(type==2){
search.msg.lineTeamId = data.searchClone.lineTeamId search.msg.lineTeamId = x.id
} }
if($q.platform.is.mobile){ if($q.platform.is.mobile){
if(type==1&&qDateProxy1.value) qDateProxy1.value.hide() if(type==1&&qDateProxy1.value) qDateProxy1.value.hide()
...@@ -860,7 +849,7 @@ ...@@ -860,7 +849,7 @@
} }
}) })
}) })
search.msg.startCityId = data.searchClone.startCityId search.msg.startCityId = x.id
if($q.platform.is.mobile){ if($q.platform.is.mobile){
if(qDateProxy3.value) qDateProxy3.value.hide() if(qDateProxy3.value) qDateProxy3.value.hide()
} }
...@@ -897,7 +886,8 @@ ...@@ -897,7 +886,8 @@
Name: x.Name, Name: x.Name,
Id: x.id, Id: x.id,
type: type, 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=>{ p.SubList.forEach(y=>{
search.chosenAddress.forEach((z,index)=>{ search.chosenAddress.forEach((z,index)=>{
...@@ -909,11 +899,11 @@ ...@@ -909,11 +899,11 @@
if($q.platform.is.mobile){ if($q.platform.is.mobile){
if(qDateProxy5.value) qDateProxy5.value.hide() if(qDateProxy5.value) qDateProxy5.value.hide()
} }
setTimeout(()=>{ search.datesId = x.id
search.datesId = x.id search.msg.startDate = obj.min
search.msg.startDate = obj.d search.msg.endDate = obj.max
search.chosenAddress.push(obj); console.log(search.msg)
},200) search.chosenAddress.push(obj);
}else if(type==6){ }else if(type==6){
obj= { obj= {
Name: x.startDate+'-'+x.endDate, Name: x.startDate+'-'+x.endDate,
...@@ -934,6 +924,7 @@ ...@@ -934,6 +924,7 @@
search.chosenAddress.push(obj); search.chosenAddress.push(obj);
},200) },200)
} }
search.RetrievalState = true
if(p){ if(p){
p.explsed = false; p.explsed = false;
} }
...@@ -962,7 +953,7 @@ ...@@ -962,7 +953,7 @@
search.msg.priceRange.max = e.max; search.msg.priceRange.max = e.max;
search.msg.minPrice = e.min; search.msg.minPrice = e.min;
search.msg.maxPrice = e.max; search.msg.maxPrice = e.max;
// methods.queryList() methods.queryList()
}, },
queryList(){ queryList(){
search.RetrievalState=true search.RetrievalState=true
...@@ -1061,6 +1052,7 @@ ...@@ -1061,6 +1052,7 @@
qDateProxy5, qDateProxy5,
qDateProxy6, qDateProxy6,
qNameProxy, qNameProxy,
domain
} }
} }
}) })
......
src/components/trip/orderPreview.vue
View file @ 237e473b
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
</div> </div>
<div v-if="$q.platform.is.mobile"> <div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px"> <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> </span>
</div> </div>
</div> </div>
<div class="row items-end"> <div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px"> <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> </span>
<q-input <q-input
style="width: 150px" style="width: 150px"
...@@ -74,14 +74,14 @@ ...@@ -74,14 +74,14 @@
</div> </div>
<div v-if="$q.platform.is.mobile"> <div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px"> <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')}} {{ p.originalB2BPrice - p.childNoNeedPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span> </span>
</div> </div>
</div> </div>
<div class="row items-end"> <div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px"> <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')}} {{ p.originalB2BPrice - p.childNoNeedPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span> </span>
<q-input <q-input
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
</div> </div>
<div v-if="$q.platform.is.mobile"> <div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px"> <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')}} {{ p.childNeedPrice + p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span> </span>
</div> </div>
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
class="text-grey-7 product-price" class="text-grey-7 product-price"
style="font-size: 13px" style="font-size: 13px"
> >
CNY {{domain==`id.oytour`?'IDR':'CNY'}}
{{ p.childNeedPrice + p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}} {{ p.childNeedPrice + p.originalB2BPrice }} /{{$t('v103.scheduledTripDetails.each')}}
</span> </span>
<q-input <q-input
...@@ -192,13 +192,13 @@ ...@@ -192,13 +192,13 @@
</div> </div>
<div v-if="$q.platform.is.mobile"> <div v-if="$q.platform.is.mobile">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px"> <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> </span>
</div> </div>
</div> </div>
<div class="row items-end"> <div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px"> <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> </span>
<q-input <q-input
style="width: 150px" style="width: 150px"
...@@ -256,13 +256,13 @@ ...@@ -256,13 +256,13 @@
</div> </div>
<div v-if="$q.platform.is.mobile"> <div v-if="$q.platform.is.mobile">
<span class="text-grey-7 product-price" style="font-size: 13px"> <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> </span>
</div> </div>
</div> </div>
<div class="row items-end"> <div class="row items-end">
<span v-if="$q.platform.is.desktop" class="text-grey-7 product-price" style="font-size: 13px"> <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> </span>
<q-input <q-input
style="width: 150px" style="width: 150px"
...@@ -309,13 +309,13 @@ ...@@ -309,13 +309,13 @@
style="border-top: 1px dashed #eee" style="border-top: 1px dashed #eee"
> >
<div class="text-grey-6 f12 col">{{$t('v103.scheduledTripDetails.insurance')}}</div> <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> </div>
<div class="q-mt-md q-pt-md" style="border-top: 1px dashed #eee"> <div class="q-mt-md q-pt-md" style="border-top: 1px dashed #eee">
<div class="row items-center"> <div class="row items-center">
<span class="text-subtitle2 text-grey-6 col">{{$t('v103.scheduledTripDetails.total')}}</span> <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>
<div class="q-mt-md text-right"> <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> <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({ ...@@ -340,6 +340,7 @@ export default defineComponent({
components: { }, components: { },
props: ['msg','price'], props: ['msg','price'],
setup(props, context) { setup(props, context) {
const domain =inject(DirtionmaryHelper.DOMAIN_NAME)
const $router = useRouter() const $router = useRouter()
const { t } = useI18n() const { t } = useI18n()
const $q = useQuasar() const $q = useQuasar()
...@@ -462,6 +463,7 @@ export default defineComponent({ ...@@ -462,6 +463,7 @@ export default defineComponent({
return { return {
...toRefs(data), ...toRefs(data),
...methods, ...methods,
domain,
moneyFormat, moneyFormat,
} }
} }
......
src/pages/scheduledTrip/TripOrderPreview.vue
View file @ 237e473b
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
/> />
x {{ chosenObj.crCount }} x {{ chosenObj.crCount }}
</div> </div>
<div>CNY {{ price.originalB2BPrice }}</div> <div>{{domain==`id.oytour`?'IDR':'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"> <div class="col">
...@@ -214,7 +214,7 @@ ...@@ -214,7 +214,7 @@
x {{ chosenObj.etzcCount }} x {{ chosenObj.etzcCount }}
</div> </div>
<div> <div>
CNY {{domain==`id.oytour`?'IDR':'CNY'}}
{{ price.originalB2BPrice + price.childNeedPrice }} {{ price.originalB2BPrice + price.childNeedPrice }}
</div> </div>
</div> </div>
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
x {{ chosenObj.etbzcCount }} x {{ chosenObj.etbzcCount }}
</div> </div>
<div> <div>
CNY {{domain==`id.oytour`?'IDR':'CNY'}}
{{ price.originalB2BPrice - price.childNoNeedPrice }} {{ price.originalB2BPrice - price.childNoNeedPrice }}
</div> </div>
</div> </div>
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
/> />
x {{ chosenObj.yeCount }} x {{ chosenObj.yeCount }}
</div> </div>
<div>CNY {{ price.babyPrice }}</div> <div>{{domain==`id.oytour`?'IDR':'CNY'}} {{ price.babyPrice }}</div>
</div> </div>
<div v-if="price.safeMoney > 0"> <div v-if="price.safeMoney > 0">
...@@ -263,7 +263,7 @@ ...@@ -263,7 +263,7 @@
{{ price.safeMoney }}/{{ $t("v103.scheduledTripDetails.people") }} {{ price.safeMoney }}/{{ $t("v103.scheduledTripDetails.people") }}
</div> </div>
<div> <div>
CNY {{domain==`id.oytour`?'IDR':'CNY'}}
{{ {{
moneyFormat( moneyFormat(
price.safeMoney * price.safeMoney *
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
}} }}
</div> </div>
<div> <div>
CNY {{domain==`id.oytour`?'IDR':'CNY'}}
{{ {{
moneyFormat( moneyFormat(
price.visaPrice * price.visaPrice *
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
{{ price.otherPrice }}/{{ $t("v103.scheduledTripDetails.people") }} {{ price.otherPrice }}/{{ $t("v103.scheduledTripDetails.people") }}
</div> </div>
<div> <div>
CNY {{domain==`id.oytour`?'IDR':'CNY'}}
{{ {{
price.otherPrice * price.otherPrice *
(chosenObj.crCount + chosenObj.etCount + chosenObj.yeCount) (chosenObj.crCount + chosenObj.etCount + chosenObj.yeCount)
...@@ -319,13 +319,13 @@ ...@@ -319,13 +319,13 @@
<div class="col"> <div class="col">
{{ $t("v103.scheduledTripDetails.surcharge") }} x {{ chosenObj.etCount }} {{ $t("v103.scheduledTripDetails.surcharge") }} x {{ chosenObj.etCount }}
</div> </div>
<div>CNY {{ price.babyChargePrice }}</div> <div>{{domain==`id.oytour`?'IDR':'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"> <div class="col">
{{ $t("v103.scheduledTripDetails.pricedifference") }} x {{ chosenObj.df }} {{ $t("v103.scheduledTripDetails.pricedifference") }} x {{ chosenObj.df }}
</div> </div>
<div>CNY {{ price.singleRoomPrice }}</div> <div>{{domain==`id.oytour`?'IDR':'CNY'}} {{ price.singleRoomPrice }}</div>
</div> </div>
</div> </div>
<div class="q-pt-md q-mb-lg text-right" style="border-top: 1px dashed #eee"> <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"; ...@@ -382,6 +382,7 @@ import { useI18n } from "vue-i18n";
import { DirtionmaryHelper } from "../../config/dictionary"; import { DirtionmaryHelper } from "../../config/dictionary";
import TicketCard from "../../components/ticket/TicketCard.vue"; import TicketCard from "../../components/ticket/TicketCard.vue";
import { date, useQuasar } from "quasar"; import { date, useQuasar } from "quasar";
import { moneyFormat } from 'src/utils/tools'
export default defineComponent({ export default defineComponent({
components: { TicketCard }, components: { TicketCard },
setup(props) { setup(props) {
...@@ -392,6 +393,7 @@ export default defineComponent({ ...@@ -392,6 +393,7 @@ export default defineComponent({
const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any; const pageTitle = inject(DirtionmaryHelper.PAGE_TITLE_KEY) as any;
pageTitle.value = t("v102.ticket.preview.pageTitle"); pageTitle.value = t("v102.ticket.preview.pageTitle");
setTitle(pageTitle.value); setTitle(pageTitle.value);
const domain =inject(DirtionmaryHelper.DOMAIN_NAME)
const data = reactive({ const data = reactive({
loading: false, loading: false,
...@@ -770,6 +772,8 @@ export default defineComponent({ ...@@ -770,6 +772,8 @@ export default defineComponent({
guestEName, guestEName,
guestMobile, guestMobile,
guestAddress, guestAddress,
domain,
moneyFormat
}; };
}, },
}); });
......
src/pages/scheduledTrip/detailsNew.vue
View file @ 237e473b
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
style="text-align: left" style="text-align: left"
v-if="dataList.priceList.length > 0" 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">{{ <span class="q-ml-sm f12 text-grey-7">{{
$t("v103.scheduledTripDetails.since") $t("v103.scheduledTripDetails.since")
}}</span> }}</span>
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
}" }"
> >
<div class="product-price text-h6" v-if="dataList.priceList.length > 0"> <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">{{ <span class="f12 text-grey-6">{{
$t("v103.scheduledTripDetails.since") $t("v103.scheduledTripDetails.since")
}}</span> }}</span>
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
<span <span
class="product-price text-h6 q-mr-md" class="product-price text-h6 q-mr-md"
v-if="dataList.priceList.length > 0" v-if="dataList.priceList.length > 0"
>CNY {{ dataList.priceList[0].originalB2BPrice }}</span >{{domain==`id.oytour`?'IDR':'CNY'}} {{ dataList.priceList[0].originalB2BPrice }}</span
> >
<q-btn <q-btn
color="primary" color="primary"
...@@ -638,6 +638,7 @@ export default defineComponent({ ...@@ -638,6 +638,7 @@ export default defineComponent({
}, },
props: [], props: [],
setup(props) { setup(props) {
const domain =inject(DirtionmaryHelper.DOMAIN_NAME)
const $router = useRouter(); const $router = useRouter();
const { t } = useI18n(); const { t } = useI18n();
const $q = useQuasar(); const $q = useQuasar();
...@@ -1032,6 +1033,7 @@ export default defineComponent({ ...@@ -1032,6 +1033,7 @@ export default defineComponent({
...toRefs(data), ...toRefs(data),
...methods, ...methods,
moneyFormat, moneyFormat,
domain,
calendarRef, calendarRef,
qDateProxy, qDateProxy,
getDivDom, getDivDom,
......
src/utils/validate.ts
View file @ 237e473b
...@@ -67,16 +67,17 @@ export function compareArray(arrA: any[], arrB: any[]) { ...@@ -67,16 +67,17 @@ export function compareArray(arrA: any[], arrB: any[]) {
export function getDomainName() { export function getDomainName() {
let domainNameUrl = window.location.hostname; let domainNameUrl = window.location.hostname;
if (domainNameUrl == 'localhost') { if (domainNameUrl == 'localhost') {
return 'pic.oytour' return 'id.oytour'
} else if (domainNameUrl.indexOf("192.168.10") > -1) { } else if (domainNameUrl.indexOf("192.168.10") > -1) {
return "typic.oytour" return "typic.oytour"
} }
else if (domainNameUrl == "typic.oytour.com") { else if (domainNameUrl == "typic.oytour.com") {
return "typic.oytour" return "typic.oytour"
} } else if (domainNameUrl == 'pic.oytour.com') {
else if (domainNameUrl == 'pic.oytour.com') {
return 'pic.oytour' return 'pic.oytour'
} else if (domainNameUrl == 'sell.oytour.com') { } else if (domainNameUrl == 'sell.oytour.com') {
return 'sell.oytour' 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