Skip to content

M
million
Commit 6148ad53 authored by 黄奎's avatar 黄奎
Browse files
Options

123123

parents 51d2cb29 db582861
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 54 deletions
src/pages/Search.vue
View file @ 6148ad53
...@@ -35,8 +35,8 @@ ...@@ -35,8 +35,8 @@
.Search_Zhi { .Search_Zhi {
display: inline-block; display: inline-block;
margin: 0 10px; margin: 0 10px;
height: 60px; height: 40px;
line-height: 60px; line-height: 40px;
} }
.full_price { .full_price {
...@@ -558,23 +558,33 @@ ...@@ -558,23 +558,33 @@
.SearchMain .q-field__marginal { .SearchMain .q-field__marginal {
height: 46px; height: 46px;
} }
.search-filter-inner {
position: relative;
display: flex;
flex-wrap: wrap;
width: 100%;
height: 100%;
margin: 0 auto;
max-width: 1160px;
}
</style> </style>
<template> <template>
<div class="SearchMain"> <div class="SearchMain">
<div class="SearchTop"> <div class="SearchTop">
<!-- 电脑端 --> <!-- 电脑端 -->
<div class="row SearchContent" v-if="!$q.screen.xs"> <div class="row SearchContent" v-if="!$q.screen.xs">
<div class="search-filter-inner">
</div>
<div class="col-3"> <div class="col-3">
<q-input filled id="search_key" v-model="qMsg.searchKey" class="bg-grey-1" style="margin-right:10px;" <q-input filled id="search_key" v-model="qMsg.searchKey" class="bg-grey-1" style="margin-right:10px;"
:label="$t('search')" @focus="searchFocusHandler" @blur="searchBlurHandler" @keyup="searchChangeHandler" /> :label="$t('search')" @focus="searchFocusHandler" @blur="searchBlurHandler" @keyup="searchChangeHandler" />
</div> </div>
<div class="col-2"> <div class="col-2">
<q-input filled v-model="qMsg.startDate" mask="date"> <q-input filled v-model="qMsg.startDate" mask="date" >
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qStartDateProxy" transition-show="scale" transition-hide="scale" <q-popup-proxy ref="qStartDateProxy" transition-show="scale" transition-hide="scale" @input="changeData">
@input="changeData">
<q-date v-model="qMsg.startDate" @input="() => $refs.qStartDateProxy.hide()" /> <q-date v-model="qMsg.startDate" @input="() => $refs.qStartDateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
...@@ -596,9 +606,9 @@ ...@@ -596,9 +606,9 @@
<div class="col-2" style="margin-left:10px;"> <div class="col-2" style="margin-left:10px;">
<q-select filled v-model="sortNum" :options="sortArray" @input="changeData" emit-value map-options /> <q-select filled v-model="sortNum" :options="sortArray" @input="changeData" emit-value map-options />
</div> </div>
<div class="col-2" style="margin-left:10px;"> <!-- <div class="col-2" style="margin-left:10px;">
<span style="margin-top:15px;display:inline-block;cursor:pointer;" @click="fullHeight = true">更多篩選條件</span> <span style="margin-top:15px;display:inline-block;cursor:pointer;" @click="fullHeight = true">更多篩選條件</span>
</div> </div> -->
<div v-show="showSplitPannel" id="sb" style="z-index:999" transition-show="fade" elevated <div v-show="showSplitPannel" id="sb" style="z-index:999" transition-show="fade" elevated
transition-hide="scale" class="showbox row"> transition-hide="scale" class="showbox row">
<div style="width:180px;"> <div style="width:180px;">
...@@ -645,6 +655,19 @@ ...@@ -645,6 +655,19 @@
<searchBlock :DataList="DataList" :qMsg="qMsg"></searchBlock> <searchBlock :DataList="DataList" :qMsg="qMsg"></searchBlock>
</template> </template>
<template v-else> <template v-else>
<!-- 手机端 -->
<div v-if="$q.screen.xs">
<div class="search-bar-m">
<i class="iconfont iconchazhao"></i>
<input type="text" placeholder="搜尋" value="" @click="showPopup=true,goSearchHandler" readonly="readonly"
class="keyword-input">
</div>
<div class="sortDiv">
<q-select filled style="width:50%" v-model="sortNum" :options="sortArray" emit-value map-options @input="changeData" />
<div class="sortShaixuan" @click="fullHeight = true">更多篩選條件</div>
</div>
</div>
<div class="wl-section-block search-content"> <div class="wl-section-block search-content">
<div class="search-filter-aside"> <div class="search-filter-aside">
<div class="search-header"> <div class="search-header">
...@@ -657,16 +680,16 @@ ...@@ -657,16 +680,16 @@
價格 價格
<span class="clear-filter">清除篩選</span> <span class="clear-filter">清除篩選</span>
</div> </div>
<div style="width:100%;height:57px;"> <div style="width:100%;height:57px;display:none">
</div> </div>
<div class="range-text"> <div class="range-text">
<div class="min"> <div class="min">
<q-input class="full_price" v-model="qMsg.minPrice" @input="changeData" filled autogrow /> <q-input class="full_price" style="width:80%" v-model="qMsg.minPrice" @input="changeData" filled autogrow />
</div> </div>
<div class="max"> <div class="max">
<q-input class="full_price" v-model="qMsg.maxPrice" @input="changeData" filled autogrow /> <q-input class="full_price" style="width:80%" v-model="qMsg.maxPrice" @input="changeData" filled autogrow />
</div> </div>
</div> </div>
</div> </div>
...@@ -707,20 +730,6 @@ ...@@ -707,20 +730,6 @@
<searchList :DataList="DataList" :qMsg="qMsg"></searchList> <searchList :DataList="DataList" :qMsg="qMsg"></searchList>
</div> </div>
</template> </template>
<!-- 手机端 -->
<div v-if="$q.screen.xs">
<div class="search-bar-m">
<i class="iconfont iconchazhao"></i>
<input type="text" placeholder="搜尋" value="" @click="showPopup=true,goSearchHandler" readonly="readonly"
class="keyword-input">
</div>
<div class="sortDiv">
<q-select filled style="width:50%" v-model="sortNum" :options="sortArray" emit-value map-options
@input="changeData" />
<div class="sortShaixuan" @click="fullHeight = true">更多篩選條件</div>
</div>
</div>
</div> </div>
<q-dialog v-model="fullHeight" full-height> <q-dialog v-model="fullHeight" full-height>
...@@ -784,30 +793,28 @@ ...@@ -784,30 +793,28 @@
</div> </div>
</div> </div>
<div v-show="tab=='kw'" class="q-mb-md"> <div v-show="tab=='kw'" class="q-mb-md">
<q-input filled id="search_key" v-model="qMsg.searchKey" @input="changeData" class="bg-grey-1" <q-input filled id="search_key" v-model="qMsg.searchKey" @input="changeData" class="bg-grey-1" :label="$t('search')" />
:label="$t('search')" />
</div> </div>
<div class="q-mb-md row"> <div class="q-mb-md row">
<div class="col"> <div class="col">
<q-input filled v-model="searchDate" :label="$t('search_date_begin')" mask="date" class="bg-grey-1"> <q-input filled v-model="searchDate" :label="$t('search_date_begin')" mask="date" class="bg-grey-1" >
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" @input="changeData"> <q-popup-proxy ref="qDateProxy7" @input="changeData">
<q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchDate" <q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchDate"
@input="() => $refs.qDateProxy.hide()" /> @input="() => $refs.qDateProxy7.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
</q-input> </q-input>
</div> </div>
<div class="split-word bg-grey-3 q-pl-xs q-pr-xs">至</div>
<div class="col"> <div class="col">
<q-input filled v-model="searchEndDate" :label="$t('search_date_end')" mask="date" class="bg-grey-1"> <q-input filled v-model="searchEndDate" :label="$t('search_date_end')" mask="date" class="bg-grey-1" >
<template v-slot:append> <template v-slot:append>
<q-icon name="event" class="cursor-pointer"> <q-icon name="event" class="cursor-pointer">
<q-popup-proxy ref="qDateProxy" @input="changeData"> <q-popup-proxy ref="qDateProxy8" @input="changeData">
<q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchEndDate" <q-date mask="YYYY-MM-DD" :title="$t('search_date_begin')" subtitle="選擇" v-model="searchEndDate"
@input="() => $refs.qDateProxy.hide()" /> @input="() => $refs.qDateProxy8.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
...@@ -973,7 +980,7 @@ ...@@ -973,7 +980,7 @@
//查询参数 //查询参数
qMsg: { qMsg: {
cityId: 0, cityId: 0,
companyId: -1, companyId: 0,
startDate: "", //开始日期 startDate: "", //开始日期
endDate: "", //结束日期 endDate: "", //结束日期
lineId: 0, //线路编号 lineId: 0, //线路编号
...@@ -990,8 +997,8 @@ ...@@ -990,8 +997,8 @@
priceOrderByField: 4, priceOrderByField: 4,
searchKey: "", searchKey: "",
startCityId: 0, startCityId: 0,
PageCount: 0, PageCount:0,
TotalCount: 0, TotalCount:0,
}, },
ShowType: 0, //显示样式(0-豆腐格，1-列表) ShowType: 0, //显示样式(0-豆腐格，1-列表)
//行程列表 //行程列表
...@@ -1062,9 +1069,11 @@ ...@@ -1062,9 +1069,11 @@
this.crtAreaIndex = i; this.crtAreaIndex = i;
}, },
clickHandler(e) { clickHandler(e) {
if(document.querySelector("#sb")){
if (!document.querySelector("#sb").contains(e.target)) { if (!document.querySelector("#sb").contains(e.target)) {
this.showSplitPannel = false; this.showSplitPannel = false;
} }
}
}, },
chosenAreaHandler(name) { chosenAreaHandler(name) {
this.qMsg.searchKey = name; this.qMsg.searchKey = name;
...@@ -1091,11 +1100,6 @@ ...@@ -1091,11 +1100,6 @@
return false return false
} }
} }
var companyId = -1;
if (localStorage.site) {
var siteArray = JSON.parse(localStorage.site);
companyId = siteArray[0].companyId;
}
let msg = { let msg = {
pageIndex: this.qMsg.pageIndex, pageIndex: this.qMsg.pageIndex,
pageSize: this.qMsg.pageSize, pageSize: this.qMsg.pageSize,
...@@ -1113,7 +1117,7 @@ ...@@ -1113,7 +1117,7 @@
orderByPrice: this.sortNum == 2 ? 1 : (this.sortNum == 3 ? 2 : 0), orderByPrice: this.sortNum == 2 ? 1 : (this.sortNum == 3 ? 2 : 0),
orderByDay: this.sortNum == 6 ? 1 : (this.sortNum == 7 ? 2 : 0), orderByDay: this.sortNum == 6 ? 1 : (this.sortNum == 7 ? 2 : 0),
priceOrderByField: 4, priceOrderByField: 4,
companyId: companyId, companyId: 0,
orderBySales: 0, orderBySales: 0,
startCityId: this.qMsg.startCityId, startCityId: this.qMsg.startCityId,
weekDayList: this.WeekDay, weekDayList: this.WeekDay,
......
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