Skip to content

M
million
Commit a56f8ade authored by youjie's avatar youjie
Browse files
Options

no message

parent 2167f9c3
Hide whitespace changes
Inline Side-by-side
Showing with 105 additions and 62 deletions
src/components/search_sf/search-top.vue
View file @ a56f8ade
...@@ -390,7 +390,7 @@ export default { ...@@ -390,7 +390,7 @@ export default {
watch: { watch: {
'$route': { '$route': {
handler(to, from) { handler(to, from) {
if(to.path.indexOf('searchDida')!=-1||to.path.indexOf('detailHotalDida')!=-1){ if(to.path.indexOf('searchdida')!=-1||to.path.indexOf('searchDida')!=-1||to.path.indexOf('detailHotalDida')!=-1){
this.getHotalHotList() this.getHotalHotList()
}else{ }else{
var jObj = JSON.parse(window.localStorage.getItem('baseifo')); var jObj = JSON.parse(window.localStorage.getItem('baseifo'));
...@@ -508,7 +508,7 @@ export default { ...@@ -508,7 +508,7 @@ export default {
// urlName = `/search` // urlName = `/search`
// }else if(urlType=='detailsVisa'){ // }else if(urlType=='detailsVisa'){
// urlName = `/searchVisa` // urlName = `/searchVisa`
// }else if(urlType=='SearchDida'||urlType=='searchDida'||urlType=='detailHotalDida'){ // }else if(urlType=='searchDida'||urlType=='searchDida'||urlType=='detailHotalDida'){
// qsearchDate = date.formatDate(date.addToDate(new Date(), { days: 8 }), "YYYY/MM/DD") // qsearchDate = date.formatDate(date.addToDate(new Date(), { days: 8 }), "YYYY/MM/DD")
// qsearchEndDate = date.formatDate(date.addToDate(new Date(), { days: 9 }), "YYYY/MM/DD") // qsearchEndDate = date.formatDate(date.addToDate(new Date(), { days: 9 }), "YYYY/MM/DD")
// if(urlType=='detailHotalDida') urlName = `/searchDida` // if(urlType=='detailHotalDida') urlName = `/searchDida`
...@@ -520,7 +520,7 @@ export default { ...@@ -520,7 +520,7 @@ export default {
urlName="/planeticket"; urlName="/planeticket";
}else if(currentUrl.includes('/#/searchVisa')){ }else if(currentUrl.includes('/#/searchVisa')){
urlName="/searchVisa"; urlName="/searchVisa";
}else if(currentUrl.includes('/#/searchdida')||currentUrl.includes('/#/detailHotalDida')){ }else if(currentUrl.includes('/#/searchdida')||currentUrl.includes('/#/searchDida')||currentUrl.includes('/#/detailHotalDida')){
urlName="/searchdida"; urlName="/searchdida";
qsearchDate = date.formatDate(date.addToDate(new Date(), { days: 8 }), "YYYY/MM/DD") qsearchDate = date.formatDate(date.addToDate(new Date(), { days: 8 }), "YYYY/MM/DD")
qsearchEndDate = date.formatDate(date.addToDate(new Date(), { days: 9 }), "YYYY/MM/DD") qsearchEndDate = date.formatDate(date.addToDate(new Date(), { days: 9 }), "YYYY/MM/DD")
...@@ -623,7 +623,7 @@ export default { ...@@ -623,7 +623,7 @@ export default {
// urlName = `/search` // urlName = `/search`
// }else if(urlType=='detailsVisa'){ // }else if(urlType=='detailsVisa'){
// urlName = `/searchVisa` // urlName = `/searchVisa`
// }else if(urlType=='SearchDida'||urlType=='searchDida'||urlType=='detailHotalDida'){ // }else if(urlType=='searchDida'||urlType=='searchDida'||urlType=='detailHotalDida'){
// qsearchDate = date.formatDate(date.addToDate(new Date(), { days: 8 }), "YYYY/MM/DD") // qsearchDate = date.formatDate(date.addToDate(new Date(), { days: 8 }), "YYYY/MM/DD")
// qsearchEndDate = date.formatDate(date.addToDate(new Date(), { days: 9 }), "YYYY/MM/DD") // qsearchEndDate = date.formatDate(date.addToDate(new Date(), { days: 9 }), "YYYY/MM/DD")
// if(urlType=='detailHotalDida') urlName = `/searchDida` // if(urlType=='detailHotalDida') urlName = `/searchDida`
...@@ -635,7 +635,7 @@ export default { ...@@ -635,7 +635,7 @@ export default {
urlName="/planeticket"; urlName="/planeticket";
}else if(currentUrl.includes('/#/searchVisa')){ }else if(currentUrl.includes('/#/searchVisa')){
urlName="/searchVisa"; urlName="/searchVisa";
}else if(currentUrl.includes('/#/searchdida')){ }else if(currentUrl.includes('/#/searchdida')||currentUrl.includes('/#/searchDida')||currentUrl.includes('/#/detailHotalDida')){
urlName="/searchdida"; urlName="/searchdida";
qsearchDate = date.formatDate(date.addToDate(new Date(), { days: 8 }), "YYYY/MM/DD") qsearchDate = date.formatDate(date.addToDate(new Date(), { days: 8 }), "YYYY/MM/DD")
qsearchEndDate = date.formatDate(date.addToDate(new Date(), { days: 9 }), "YYYY/MM/DD") qsearchEndDate = date.formatDate(date.addToDate(new Date(), { days: 9 }), "YYYY/MM/DD")
......
src/components/searchdida/kkday.vue
View file @ a56f8ade
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
Type="1" Type="1"
@change="changeMsg" @change="changeMsg"
@changeCity="changCity" @changeCity="changCity"
@clear="resetQuery"></destination> @clear="clearQuery"></destination>
<div class="q-pt-sm cursor-pointer"> <div class="q-pt-sm cursor-pointer">
<div v-show="regionList.length" class="self-center no-outline text-s" <div v-show="regionList.length" class="self-center no-outline text-s"
tabindex="0" tabindex="0"
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
Type="2" Type="2"
@change="changeMsg" @change="changeMsg"
@changeCity="changCity" @changeCity="changCity"
@clear="resetQuery"></destination> @clear="clearQuery"></destination>
<div class="q-pt-sm cursor-pointer"> <div class="q-pt-sm cursor-pointer">
<div v-show="regionList.length" class="self-center no-outline text-s" <div v-show="regionList.length" class="self-center no-outline text-s"
...@@ -773,14 +773,27 @@ export default { ...@@ -773,14 +773,27 @@ export default {
} }
}, },
methods: { methods: {
clearQuery() {
this.msg.CityCode = ''
this.msg.CityCode2 = ''
this.msg.CityName = ''
this.msg.KeyWords = ''
this.msg.KeyWords2 = ''
this.msg.hotelId = ''
setTimeout(() => {
this.resetQuery()
}, 200);
},
changCity(y){ changCity(y){
this.msg.CityCode2 = y.CityCode this.msg.CityCode2 = y.CityCode
this.msg.CityCode = y.CityCode this.msg.CityCode = y.CityCode
this.resetQuery()
this.getRegion() this.getRegion()
}, },
changeMsg(msg){ changeMsg(msg){
if(msg.KeyWords2)this.msg.KeyWords2 = msg.KeyWords2 this.msg.KeyWords2 = msg.KeyWords2?msg.KeyWords2:''
if(msg.CityCode)this.msg.CityCode = msg.CityCode this.msg.CityCode = msg.CityCode?msg.CityCode:''
this.msg.hotelId = msg.hotelId?msg.hotelId:''
this.resetQuery() this.resetQuery()
}, },
clickHandler(e) { clickHandler(e) {
......
src/pages/SearchDida.vue
View file @ a56f8ade
...@@ -1469,6 +1469,7 @@ export default { ...@@ -1469,6 +1469,7 @@ export default {
ChildAgeDetails: [], ChildAgeDetails: [],
ChildAgeTexts: [],//儿童年龄 ChildAgeTexts: [],//儿童年龄
}], }],
hotelId: '', //酒店id
}, },
ShowType: 0, //显示样式(0-豆腐格，1-列表) ShowType: 0, //显示样式(0-豆腐格，1-列表)
//行程列表 //行程列表
......
src/pages/didaHotel/destination.vue
View file @ a56f8ade
...@@ -3,7 +3,67 @@ ...@@ -3,7 +3,67 @@
<!-- <div class="text-xxs absolute top-0 left-0 q-px-md" style="color: rgba(5,32,50,.8);"> <!-- <div class="text-xxs absolute top-0 left-0 q-px-md" style="color: rgba(5,32,50,.8);">
目的地 目的地
</div> --> </div> -->
<div class=""> <div class="row items-center no-wrap">
<div class="">
<q-btn
dark-percentage
color="primary"
unelevated
style="
border-bottom-right-radius: 0;
border-top-right-radius: 0;
padding: 0"
:style="{'height': Type>0?'46px':'40px'}"
@click="showCity"
>
<span class="row items-center no-wrap overflow-hidden">
<i v-if="!HotalMsg.CityName" class="iconfont icondingweixiao text-s"></i>
<span class="text-xs text-no-wrap overflow-hidden col">{{ HotalMsg.CityName?HotalMsg.CityName:'城市' }}</span>
</span>
</q-btn>
<q-popup-proxy :offset="[0, 10]">
<div class="row no-wrap" id="cit">
<div class="bg-grey-2" style="border-right: 1px solid rgb(238, 238, 238);">
<div v-for="(x,index) in CitiesList" :key="index"
@click="changeGName(x)"
class="GNameBox-l q-py-xs q-px-md text-xs cursor-pointer text-no-wrap"
:class="[GNameActive==x.GName?'active':'']">
{{ x.GName }}
</div>
</div>
<div class="col q-pa-sm" :style="{minWidth: Type==1?'':'400px'}">
<q-scroll-area class="w-full" style="height: 305px;"
:thumb-style="{
right: '2px',
borderRadius: '5px',
backgroundColor: 'rgba(0, 0, 0, .1)',
width: '5px',
opacity: '0.75'
}"
:content-style="{
backgroundColor: 'rgba(0, 0, 0, 0)',
color: '#555'
}"
:content-active-style="{
backgroundColor: 'rgba(0, 0, 0, 0)',
color: 'black'
}">
<div class="row wrap">
<div class="CityNameBox-r col-2 text-center text-xxs
text-no-wrap q-pa-xs q-mr-xs q-mb-xs cursor-pointer
overflow-hidden text-ellipsis" v-for="(y,index) in CityList" :key="index"
:class="[HotalMsg.CityCode==y.CityCode?'active':'']"
@click="changeCity(y)">
{{ y.CityName }}
</div>
</div>
</q-scroll-area>
</div>
</div>
</q-popup-proxy>
</div>
<q-input <q-input
id="search_key" id="search_key"
v-model="HotalMsg.KeyWords2" v-model="HotalMsg.KeyWords2"
...@@ -11,15 +71,14 @@ ...@@ -11,15 +71,14 @@
label="搜索目的地、酒店" label="搜索目的地、酒店"
filled filled
dense dense
standout="bg-grey-2 text-black" standout="col bg-grey-1 text-black"
@input="searchInputHandler" @input="searchInputHandler"
@focus="searchFocusHandler" @focus.stop="searchFocusHandler"
@blur="searchBlurHandler" @blur="searchBlurHandler"
@keyup.enter="searchChangeHandler" @keyup.enter="searchChangeHandler"
@clear="clearHandler" @clear="clearHandler"
:loading="loading" :loading="loading"
> />
</q-input>
</div> </div>
<div> <div>
<div> <div>
...@@ -63,49 +122,7 @@ ...@@ -63,49 +122,7 @@
</template> </template>
</div> </div>
</div> </div>
<div class="self-center no-outline text-xxs absolute bg-white overflow-hidden"
tabindex="0"
style="border-radius: 3px;
box-shadow: 0px 0px 20px 0px rgba(76, 87, 125, 0.2) !important;z-index: 2;"
:style="{width:Type==1?'100%':'500px',top:Type==2?'70px':'50px',left:Type==1?'0':Type==2?'17px':'30px'}"
v-show="showSplitPannel">
<div class="row no-wrap" id="cit">
<div class="bg-grey-2" style="border-right: 1px solid rgb(238, 238, 238);">
<div v-for="(x,index) in CitiesList" :key="index"
@click="changeGName(x)"
class="GNameBox-l q-py-xs q-px-md text-xs cursor-pointer text-no-wrap"
:class="[GNameActive==x.GName?'active':'']">
{{ x.GName }}
</div>
</div>
<div class="col q-pa-sm" :style="{minWidth: Type==1?'':'400px'}">
<q-scroll-area class="w-full" style="height: 305px;"
:thumb-style="{
right: '2px',
borderRadius: '5px',
backgroundColor: 'rgba(0, 0, 0, .1)',
width: '5px',
opacity: '0.75'
}"
:content-style="{
backgroundColor: 'rgba(0, 0, 0, 0)',
color: '#555'
}"
:content-active-style="{
backgroundColor: 'rgba(0, 0, 0, 0)',
color: 'black'
}">
<div class="row wrap">
<div class="CityNameBox-r col-2 text-center text-xxs text-no-wrap q-py-xs q-mr-xs q-mb-xs cursor-pointer" v-for="(y,index) in CityList" :key="index"
:class="[HotalMsg.CityCode==y.CityCode?'active':'']"
@click="changeCity(y)">
{{ y.CityName }}
</div>
</div>
</q-scroll-area>
</div>
</div>
</div>
</div> </div>
</div> </div>
</template> </template>
...@@ -156,6 +173,7 @@ export default { ...@@ -156,6 +173,7 @@ export default {
ChildAgeDetails: [], ChildAgeDetails: [],
ChildAgeTexts: [],//儿童年龄 ChildAgeTexts: [],//儿童年龄
}], }],
hotelId: '', //酒店id
}, },
dataList:[ dataList:[
{ {
...@@ -196,6 +214,9 @@ export default { ...@@ -196,6 +214,9 @@ export default {
this.getCity() this.getCity()
}, },
methods: { methods: {
showCity(){
this.showSplitPannel = !this.showSplitPannel
},
inList(){ inList(){
this.loadingIndex = 0 this.loadingIndex = 0
this.loading = true this.loading = true
...@@ -207,7 +228,7 @@ export default { ...@@ -207,7 +228,7 @@ export default {
if(y.Type==1){ if(y.Type==1){
this.HotalMsg.CityCode = y.Id this.HotalMsg.CityCode = y.Id
this.HotalMsg.CityCode2 = y.Id this.HotalMsg.CityCode2 = y.Id
// this.HotalMsg.CityName = y.Name.split(' ')[0] this.HotalMsg.CityName = y.Name.split(' ')[0]
this.HotalMsg.KeyWords = y.Name.split(' ')[0] this.HotalMsg.KeyWords = y.Name.split(' ')[0]
this.HotalMsg.KeyWords2 = y.Name.split(' ')[0] this.HotalMsg.KeyWords2 = y.Name.split(' ')[0]
this.CommonJump('/searchdida', { this.CommonJump('/searchdida', {
...@@ -215,6 +236,7 @@ export default { ...@@ -215,6 +236,7 @@ export default {
}); });
}else if(y.Type==2){ }else if(y.Type==2){
this.HotalMsg.KeyWords2 = y.Name this.HotalMsg.KeyWords2 = y.Name
this.HotalMsg.hotelId = y.Id
this.$emit('change', this.HotalMsg,y) this.$emit('change', this.HotalMsg,y)
this.showKeyWordsList = false this.showKeyWordsList = false
this.showSplitPannel = false this.showSplitPannel = false
...@@ -291,7 +313,13 @@ export default { ...@@ -291,7 +313,13 @@ export default {
}, },
clearHandler(){ clearHandler(){
this.showKeyWordsList = false this.showKeyWordsList = false
this.showSplitPannel = true this.showSplitPannel = false
this.HotalMsg.CityCode = ''
this.HotalMsg.CityCode2 = ''
this.HotalMsg.CityName = ''
this.HotalMsg.KeyWords = ''
this.HotalMsg.KeyWords2 = ''
this.HotalMsg.hotelId = ''
this.$emit('clear') this.$emit('clear')
return return
this.showSplitPannel = true this.showSplitPannel = true
...@@ -310,7 +338,7 @@ export default { ...@@ -310,7 +338,7 @@ export default {
if(!this.HotalMsg.KeyWords2||this.HotalMsg.KeyWords2==''){ if(!this.HotalMsg.KeyWords2||this.HotalMsg.KeyWords2==''){
this.loading = false this.loading = false
this.showKeyWordsList = false this.showKeyWordsList = false
this.showSplitPannel = true this.showSplitPannel = false
}else{ }else{
// this.inList() // this.inList()
} }
...@@ -325,7 +353,7 @@ export default { ...@@ -325,7 +353,7 @@ export default {
if(!this.HotalMsg.KeyWords2||this.HotalMsg.KeyWords2=='') { if(!this.HotalMsg.KeyWords2||this.HotalMsg.KeyWords2=='') {
this.loading = false this.loading = false
this.showKeyWordsList = false this.showKeyWordsList = false
this.showSplitPannel = true this.showSplitPannel = false
return return
} }
this.lastKeyword = this.HotalMsg.KeyWords2 this.lastKeyword = this.HotalMsg.KeyWords2
...@@ -340,13 +368,13 @@ export default { ...@@ -340,13 +368,13 @@ export default {
this.HotalMsg.regionCode = y.CityCode this.HotalMsg.regionCode = y.CityCode
}, },
changeCity(y){ changeCity(y){
this.HotalMsg.CityName = y.CityName
this.HotalMsg.CityCode = y.CityCode this.HotalMsg.CityCode = y.CityCode
if(this.Type>0) { if(this.Type>0) {
this.$emit('changeCity', y) this.$emit('changeCity', y)
this.showSplitPannel = false this.showSplitPannel = false
}else{ }else{
this.HotalMsg.KeyWords2 = y.CityName this.HotalMsg.KeyWords2 = y.CityName
this.HotalMsg.CityName = y.CityName
this.searchChangeHandler() this.searchChangeHandler()
} }
// this.$emit('change', y) // this.$emit('change', y)
...@@ -427,6 +455,7 @@ export default { ...@@ -427,6 +455,7 @@ export default {
} }
.CityNameBox-r { .CityNameBox-r {
border-radius: 3px; border-radius: 3px;
text-overflow: ellipsis;
} }
.CityNameBox-r:hover{ .CityNameBox-r:hover{
background: rgba(0, 0, 0, 0.1); background: rgba(0, 0, 0, 0.1);
......
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