Commit b99b6007 authored by 沈良进's avatar 沈良进

网站优化

parents 591d0f61 ff1e5f31
...@@ -39,7 +39,7 @@ body { ...@@ -39,7 +39,7 @@ body {
background-color: #f6f6f6; background-color: #f6f6f6;
} }
.rounded-borders{ .rounded-borders{
border-radius: 6px !important; border-radius: 8px !important;
} }
.section-block { .section-block {
width: 100%; width: 100%;
......
...@@ -325,6 +325,7 @@ export default { ...@@ -325,6 +325,7 @@ export default {
setTimeout(()=>{ setTimeout(()=>{
this.p = {}; this.p = {};
this.initModel() this.initModel()
this.getCarPriceData2()
},100) },100)
this.$emit("reset"); this.$emit("reset");
}, },
......
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</div> </div>
</div> </div>
<div class="col" :class="{'column':$q.platform.is.desktop,'row no-wrap scroll':$q.platform.is.mobile}"> <div class="col" :class="{'column':$q.platform.is.desktop,'column':$q.platform.is.mobile}">
<div class="relative q-pt-lg q-pb-sm q-pl-md" v-for="(subItem,indexs) in item.roomOptions" <div class="relative q-pt-lg q-pb-sm q-pl-md" v-for="(subItem,indexs) in item.roomOptions"
:style="{'border-bottom': indexs+1!=item.roomOptions.length?'1px solid #F5F5F5':'', :style="{'border-bottom': indexs+1!=item.roomOptions.length?'1px solid #F5F5F5':'',
'min-width':$q.platform.is.mobile?'150px':'auto'}"> 'min-width':$q.platform.is.mobile?'150px':'auto'}">
...@@ -60,7 +60,9 @@ ...@@ -60,7 +60,9 @@
<div>最迟退房时间 {{subItem['finalCheck-outTime']}}</div> <div>最迟退房时间 {{subItem['finalCheck-outTime']}}</div>
</div> </div>
</template> </template>
<div class="col" v-if="getPrice2(subItem.chargeableRateInfoPerPersonForANightBySetCurrency)"> <div class="col"
:class="{'row justify-end q-pb-sm':$q.platform.is.mobile}"
v-if="getPrice2(subItem.chargeableRateInfoPerPersonForANightBySetCurrency)">
<span class="fz13">CNY</span> <span class="fz13">CNY</span>
<span class="text-red text-weight-bold q-px-sm" <span class="text-red text-weight-bold q-px-sm"
:class="{'fz28':$q.platform.is.desktop}">{{getPrice2(subItem.chargeableRateInfoPerPersonForANightBySetCurrency)}} :class="{'fz28':$q.platform.is.desktop}">{{getPrice2(subItem.chargeableRateInfoPerPersonForANightBySetCurrency)}}
...@@ -68,8 +70,8 @@ ...@@ -68,8 +70,8 @@
</span> </span>
<!-- <span>{{getPrice(subItem.chargeableRateInfoPerPersonForANightBySetCurrency)}}</span> --> <!-- <span>{{getPrice(subItem.chargeableRateInfoPerPersonForANightBySetCurrency)}}</span> -->
</div> </div>
<div> <div :class="{'row justify-end':$q.platform.is.mobile}">
<q-btn color="primary" label="立即預訂" unelevated :class="{'q-px-lg':$q.platform.is.desktop}" <q-btn color="primary" :size="$q.platform.is.desktop?'md':'sm'" label="立即預訂" unelevated :class="{'q-px-lg':$q.platform.is.desktop}"
@click="goOrderHandler(subItem.roomOptionCd)"/> @click="goOrderHandler(subItem.roomOptionCd)"/>
</div> </div>
</div> </div>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
} }
.select { .select {
color: #fff; color: #fff;
background-color: $primary; background-color: var(--q-color-primary);
} }
.menu-title { .menu-title {
font-weight: bold; font-weight: bold;
......
...@@ -28,7 +28,8 @@ ...@@ -28,7 +28,8 @@
line-height: 33px; line-height: 33px;
} }
.select { .select {
color: #fff;background-color: $primary; color: #fff;
background-color: var(--q-color-primary);
} }
.menu-title { .menu-title {
font-weight: bold; font-weight: bold;
...@@ -132,7 +133,7 @@ ...@@ -132,7 +133,7 @@
background-color: #eee; background-color: #eee;
} }
.category-l2-select { .category-l2-select {
background: #ee4454; background: var(--q-color-primary);
color: #fff; color: #fff;
} }
.category-l3 { .category-l3 {
...@@ -178,10 +179,10 @@ ...@@ -178,10 +179,10 @@
<img <img
:src="baseData.logo" :src="baseData.logo"
style=" style="
height: 35px;
cursor: pointer; cursor: pointer;
filter: drop-shadow(0px 0px var(--q-color-primary)); filter: drop-shadow(0px 0px var(--q-color-primary));
" "
:style="{'height':$q.platform.is.desktop?'35px':'30px'}"
class="q-mr-lg q-ml-sm" class="q-mr-lg q-ml-sm"
@click="CommonJump('/index', {})" @click="CommonJump('/index', {})"
/></div> /></div>
......
...@@ -139,21 +139,25 @@ ...@@ -139,21 +139,25 @@
square square
id="search_key" id="search_key"
v-model="searchKey" v-model="searchKey"
class="bg-grey-1 col" class="bg-white col"
clearable clearable
label="搜尋目的地、景點、行程觀光或酒店名稱..." label="搜尋目的地、景點、行程觀光或酒店名稱..."
@focus="searchFocusHandler" @focus="searchFocusHandler"
@blur="searchBlurHandler" @blur="searchBlurHandler"
@keyup="searchChangeHandler" @keyup="searchChangeHandler"
@keypress.enter.native="goSearchHandler" @keypress.enter.native="goSearchHandler"
/> >
<template v-slot:prepend>
<q-icon name="search" />
</template>
</q-input>
<q-btn <q-btn
dark-percentage dark-percentage
color="primary" color="primary"
style="border-radius: 0" style="border-radius: 0"
class="col-2" class="col-2"
unelevated unelevated
icon="search" label="搜索"
@click="goSearchHandler" @click="goSearchHandler"
/> />
</div> </div>
...@@ -178,7 +182,7 @@ ...@@ -178,7 +182,7 @@
</q-btn> </q-btn>
</div> </div>
</div> </div>
<div class="text-weight-bold q-pa-sm">熱門目的地</div> <div class="text-weight-bold q-py-sm q-pl-md">熱門目的地</div>
<q-separator /> <q-separator />
<div class="flex flex-wrap"> <div class="flex flex-wrap">
<div class="hot-tag" @click="handleHotTagClick(item)" :class="{'hot-tag-select': setectHotTag === item.Id}" :key="item.Id" v-for="item in hotList">{{item.Name}}</div> <div class="hot-tag" @click="handleHotTagClick(item)" :class="{'hot-tag-select': setectHotTag === item.Id}" :key="item.Id" v-for="item in hotList">{{item.Name}}</div>
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
.fee_line { .fee_line {
width: 32px; width: 32px;
height: 2px; height: 2px;
background: #ee4454; background: var(--q-color-primary);
display: inline-block; display: inline-block;
} }
......
...@@ -49,7 +49,10 @@ ...@@ -49,7 +49,10 @@
color="dark" square>{{liveNvm}}</q-chip> color="dark" square>{{liveNvm}}</q-chip>
</div> </div>
<q-popup-proxy :offset="[0, 10]" ref="qDateProxy"> <q-popup-proxy :offset="[0, 10]" ref="qDateProxy">
<q-date v-model="dateRange" :options="optionsFn" range mask="YYYY/MM/DD" landscape <q-date
v-model="dateRange"
:options="optionsFn"
range mask="YYYY/MM/DD"
@range-end="dateRangeHandler"></q-date> @range-end="dateRangeHandler"></q-date>
</q-popup-proxy> </q-popup-proxy>
</q-field> </q-field>
...@@ -181,7 +184,9 @@ ...@@ -181,7 +184,9 @@
<q-btn v-if="$q.platform.is.mobile" unelevated round class="bg-grey-3 hover" icon="search" title="更多筛选"> <q-btn v-if="$q.platform.is.mobile" unelevated round class="bg-grey-3 hover" icon="search" title="更多筛选">
<q-badge rounded class="din bg-red-2 text-red-14 text-weight-bold" floating label="1"/> <q-badge rounded class="din bg-red-2 text-red-14 text-weight-bold" floating label="1"/>
<q-tooltip>更多</q-tooltip> <q-tooltip>更多</q-tooltip>
<q-popup-proxy class="no-shadow" style="box-shadow: 0 0 50px #ddd !important" :offset="[0, 20]" ref="qDateProxy2"> <q-popup-proxy class="no-shadow" style="box-shadow: 0 0 50px #ddd !important"
:offset="[0, 20]" ref="qDateProxy2"
@before-hide="getRoom(),$refs.qDateProxy2.hide()">
<q-card class="q-pa-md rounded-borders" style="width: 300px"> <q-card class="q-pa-md rounded-borders" style="width: 300px">
<div class="q-mb-md text-subtitle2">更多</div> <div class="q-mb-md text-subtitle2">更多</div>
<div class="q-my-md"> <div class="q-my-md">
...@@ -191,7 +196,6 @@ ...@@ -191,7 +196,6 @@
<template v-if="numberOfChildren>0"> {{numberOfChildren}}儿童</template> <template v-if="numberOfChildren>0"> {{numberOfChildren}}儿童</template>
{{roomGroup}}房 {{roomGroup}}房
</div> </div>
<q-popup-proxy :offset="[0, 10]"> <q-popup-proxy :offset="[0, 10]">
<div class="q-pa-lg q-py-lg bg-white"> <div class="q-pa-lg q-py-lg bg-white">
<div class="items-center" <div class="items-center"
...@@ -310,15 +314,15 @@ ...@@ -310,15 +314,15 @@
</q-popup-proxy> </q-popup-proxy>
</q-field> </q-field>
</div> </div>
<div class="q-my-md row"> <!-- <div class="q-my-md row">
<q-btn <q-btn
color="primary" color="primary"
unelevated unelevated
class="q-px-xl col" class="q-px-xl col"
label="确定" label="确定搜索"
@click="getRoom(),$refs.qDateProxy2.hide()" @click="getRoom(),$refs.qDateProxy2.hide()"
/> />
</div> </div> -->
</q-card> </q-card>
</q-popup-proxy> </q-popup-proxy>
</q-btn> </q-btn>
...@@ -730,9 +734,7 @@ ...@@ -730,9 +734,7 @@
<div class="text-weight-bold text-h6">酒店名稱:{{hotelSummary.hotelName}}</div> <div class="text-weight-bold text-h6">酒店名稱:{{hotelSummary.hotelName}}</div>
<div class="text-grey-9">地址:{{`${hotelSummary.address}`}}</div> <div class="text-grey-9">地址:{{`${hotelSummary.address}`}}</div>
</div> </div>
<div class="q-pa-md" :class="{ <div class="q-pa-md" v-for="(x,index) in travelLngLat" :key="index">
'q-mx-md': $q.screen.width < 1220 && $q.platform.is.mobile,
}" v-for="(x,index) in travelLngLat" :key="index">
<componentsMap v-if="x.Lng&&x.Lat" :AddressObj="x"/> <componentsMap v-if="x.Lng&&x.Lat" :AddressObj="x"/>
<div v-else class="card text-center">经纬度未知</div> <div v-else class="card text-center">经纬度未知</div>
</div> </div>
...@@ -1075,7 +1077,7 @@ export default { ...@@ -1075,7 +1077,7 @@ export default {
this.dateRangeFormat = `${this.msg.arrivalDate} - ${this.msg.departureDate} ` this.dateRangeFormat = `${this.msg.arrivalDate} - ${this.msg.departureDate} `
if (this.$refs.qDateProxy) this.$refs.qDateProxy.hide() if (this.$refs.qDateProxy) this.$refs.qDateProxy.hide()
if(this.$q.platform.is.mobile){ if(this.$q.platform.is.mobile){
this.getData() this.getRoom()
} }
}, },
dateDiffer(DateStart,DateEnd) { dateDiffer(DateStart,DateEnd) {
...@@ -1738,7 +1740,7 @@ export default { ...@@ -1738,7 +1740,7 @@ export default {
color: #36a1fa; color: #36a1fa;
} }
.tag-red { .tag-red {
background: #ee4454; background: var(--q-color-primary);
color: #ee4454; color: #ee4454;
} }
.room-item { .room-item {
......
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