Commit 1dbe946a authored by 黄奎's avatar 黄奎

页面修改

parent 6148ad53
...@@ -558,6 +558,7 @@ ...@@ -558,6 +558,7 @@
.SearchMain .q-field__marginal { .SearchMain .q-field__marginal {
height: 46px; height: 46px;
} }
.search-filter-inner { .search-filter-inner {
position: relative; position: relative;
display: flex; display: flex;
...@@ -567,6 +568,7 @@ ...@@ -567,6 +568,7 @@
margin: 0 auto; margin: 0 auto;
max-width: 1160px; max-width: 1160px;
} }
</style> </style>
<template> <template>
<div class="SearchMain"> <div class="SearchMain">
...@@ -581,11 +583,12 @@ ...@@ -581,11 +583,12 @@
: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" @input="changeData"> <q-popup-proxy ref="qStartDateProxy" transition-show="scale" transition-hide="scale"
<q-date v-model="qMsg.startDate" @input="() => $refs.qStartDateProxy.hide()" /> @input="changeData">
<q-date v-model="qMsg.startDate" @input="() => $refs.qStartDateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
...@@ -596,15 +599,15 @@ ...@@ -596,15 +599,15 @@
<q-input filled v-model="qMsg.endDate" mask="date"> <q-input filled v-model="qMsg.endDate" 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="qDateProxy" transition-show="scale" transition-hide="scale" @input="changeData"> <q-popup-proxy ref="qDateProxy" transition-show="scale" transition-hide="scale" @input="changeData">
<q-date v-model="qMsg.endDate" @input="() => $refs.qDateProxy.hide()" /> <q-date v-model="qMsg.endDate" @input="() => $refs.qDateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
</q-input> </q-input>
</div> </div>
<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>
...@@ -655,18 +658,19 @@ ...@@ -655,18 +658,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 v-if="$q.screen.xs">
<div class="search-bar-m"> <div class="search-bar-m">
<i class="iconfont iconchazhao"></i> <i class="iconfont iconchazhao"></i>
<input type="text" placeholder="搜尋" value="" @click="showPopup=true,goSearchHandler" readonly="readonly" <input type="text" placeholder="搜尋" value="" @click="showPopup=true,goSearchHandler" readonly="readonly"
class="keyword-input"> class="keyword-input">
</div> </div>
<div class="sortDiv"> <div class="sortDiv">
<q-select filled style="width:50%" v-model="sortNum" :options="sortArray" emit-value map-options @input="changeData" /> <q-select filled style="width:50%" v-model="sortNum" :options="sortArray" emit-value map-options
<div class="sortShaixuan" @click="fullHeight = true">更多篩選條件</div> @input="changeData" />
<div class="sortShaixuan" @click="fullHeight = true">更多篩選條件</div>
</div>
</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">
...@@ -685,11 +689,13 @@ ...@@ -685,11 +689,13 @@
</div> </div>
<div class="range-text"> <div class="range-text">
<div class="min"> <div class="min">
<q-input class="full_price" style="width:80%" 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" style="width:80%" 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>
...@@ -699,7 +705,7 @@ ...@@ -699,7 +705,7 @@
<span class="clear-filter">清除篩選</span> <span class="clear-filter">清除篩選</span>
</div> </div>
<q-checkbox right-label v-model="dayNum" v-for="(item,index) in dayArray" :label="item.text" <q-checkbox right-label v-model="dayNum" v-for="(item,index) in dayArray" :label="item.text"
:key="index" :val="item.id" @input="changeData" /> :key="index" :val="item.id" @input="changeData" />
</div> </div>
<div class="search-type"> <div class="search-type">
<div class="search-title"> <div class="search-title">
...@@ -737,14 +743,14 @@ ...@@ -737,14 +743,14 @@
<div class="moreTiaojiao">更多篩選條件</div> <div class="moreTiaojiao">更多篩選條件</div>
<div class="full_listDiv" style="padding-bottom:0"> <div class="full_listDiv" style="padding-bottom:0">
<span>價格:</span> <span>價格:</span>
<q-input class="full_price" v-model="qMsg.minPrice" @input="changeData" filled autogrow /> <q-input class="full_price" v-model="qMsg.minPrice" @input="changeData" filled autogrow />
<q-input class="full_price" v-model="qMsg.maxPrice" @input="changeData" filled autogrow /> <q-input class="full_price" v-model="qMsg.maxPrice" @input="changeData" filled autogrow />
</div> </div>
<div class="full_listDiv"> <div class="full_listDiv">
<div class="full_title">天數</div> <div class="full_title">天數</div>
<div class="q-gutter-sm"> <div class="q-gutter-sm">
<q-checkbox right-label v-model="dayNum" v-for="(item,index) in dayArray" :label="item.text" :key="index" <q-checkbox right-label v-model="dayNum" v-for="(item,index) in dayArray" :label="item.text" :key="index"
:val="item.id" @input="changeData" /> :val="item.id" @input="changeData" />
</div> </div>
</div> </div>
<!-- <div class="full_listDiv"> <!-- <div class="full_listDiv">
...@@ -757,7 +763,7 @@ ...@@ -757,7 +763,7 @@
<div class="full_title">出發星期</div> <div class="full_title">出發星期</div>
<div class="q-gutter-sm"> <div class="q-gutter-sm">
<q-checkbox v-model="WeekDay" v-for="(item,index) in weekList" :val="item.value" :label="item.label" <q-checkbox v-model="WeekDay" v-for="(item,index) in weekList" :val="item.value" :label="item.label"
:key="index" color="teal" @input="changeData" /> :key="index" color="teal" @input="changeData" />
</div> </div>
</div> </div>
<div class="full_btndiv"> <div class="full_btndiv">
...@@ -793,28 +799,29 @@ ...@@ -793,28 +799,29 @@
</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" :label="$t('search')" /> <q-input filled id="search_key" v-model="qMsg.searchKey" @input="changeData" class="bg-grey-1"
: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="qDateProxy7" @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.qDateProxy7.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="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="qDateProxy8" @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.qDateProxy8.hide()" /> @input="() => $refs.qDateProxy8.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
...@@ -997,8 +1004,8 @@ ...@@ -997,8 +1004,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-列表)
//行程列表 //行程列表
...@@ -1069,7 +1076,7 @@ ...@@ -1069,7 +1076,7 @@
this.crtAreaIndex = i; this.crtAreaIndex = i;
}, },
clickHandler(e) { clickHandler(e) {
if(document.querySelector("#sb")){ if (document.querySelector("#sb")) {
if (!document.querySelector("#sb").contains(e.target)) { if (!document.querySelector("#sb").contains(e.target)) {
this.showSplitPannel = false; this.showSplitPannel = false;
} }
...@@ -1100,6 +1107,11 @@ ...@@ -1100,6 +1107,11 @@
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,
...@@ -1117,7 +1129,7 @@ ...@@ -1117,7 +1129,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: 0, companyId: companyId,
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