Commit 51d2cb29 authored by 黄奎's avatar 黄奎

页面修

parent c814c41d
...@@ -74,9 +74,11 @@ ...@@ -74,9 +74,11 @@
if (localStorage.groupinfo) { if (localStorage.groupinfo) {
var jObj = JSON.parse(window.localStorage.getItem('groupinfo')); var jObj = JSON.parse(window.localStorage.getItem('groupinfo'));
this.RB_Group_Id = jObj.GroupId; this.RB_Group_Id = jObj.GroupId;
this.getSite();
this.getConfigData(); this.getConfigData();
} else { } else {
this.getGroupData(); this.getGroupData();
this.getSite();
//获取网站基础配置 //获取网站基础配置
if (localStorage.baseifo) { if (localStorage.baseifo) {
var jObj = JSON.parse(window.localStorage.getItem('baseifo')); var jObj = JSON.parse(window.localStorage.getItem('baseifo'));
...@@ -94,6 +96,21 @@ ...@@ -94,6 +96,21 @@
changeHeadHandler(t) { changeHeadHandler(t) {
this.headType = t; this.headType = t;
}, },
getSite()
{
this.apipost(
"b2b_get_site", {},
res => {
if (res.data.resultCode == 1) {
var jsonData = JSON.stringify(res.data.data);
window.localStorage.setItem("site", jsonData);
}
},
err => {}
);
},
//获取集团数据 //获取集团数据
getGroupData() { getGroupData() {
let locationName = window.location.hostname; let locationName = window.location.hostname;
......
...@@ -570,11 +570,12 @@ ...@@ -570,11 +570,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>
...@@ -585,15 +586,15 @@ ...@@ -585,15 +586,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>
...@@ -661,11 +662,11 @@ ...@@ -661,11 +662,11 @@
</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" 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" v-model="qMsg.maxPrice" @input="changeData" filled autogrow />
</div> </div>
</div> </div>
</div> </div>
...@@ -675,7 +676,7 @@ ...@@ -675,7 +676,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">
...@@ -715,7 +716,8 @@ ...@@ -715,7 +716,8 @@
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
@input="changeData" />
<div class="sortShaixuan" @click="fullHeight = true">更多篩選條件</div> <div class="sortShaixuan" @click="fullHeight = true">更多篩選條件</div>
</div> </div>
</div> </div>
...@@ -726,14 +728,14 @@ ...@@ -726,14 +728,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">
...@@ -746,7 +748,7 @@ ...@@ -746,7 +748,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">
...@@ -782,16 +784,17 @@ ...@@ -782,16 +784,17 @@
</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="qDateProxy" @input="changeData"> <q-popup-proxy ref="qDateProxy" @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.qDateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
...@@ -799,12 +802,12 @@ ...@@ -799,12 +802,12 @@
</div> </div>
<div class="split-word bg-grey-3 q-pl-xs q-pr-xs"></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="qDateProxy" @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.qDateProxy.hide()" />
</q-popup-proxy> </q-popup-proxy>
</q-icon> </q-icon>
</template> </template>
...@@ -970,7 +973,7 @@ ...@@ -970,7 +973,7 @@
//查询参数 //查询参数
qMsg: { qMsg: {
cityId: 0, cityId: 0,
companyId: 0, companyId: -1,
startDate: "", //开始日期 startDate: "", //开始日期
endDate: "", //结束日期 endDate: "", //结束日期
lineId: 0, //线路编号 lineId: 0, //线路编号
...@@ -987,8 +990,8 @@ ...@@ -987,8 +990,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-列表)
//行程列表 //行程列表
...@@ -1088,6 +1091,11 @@ ...@@ -1088,6 +1091,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,
...@@ -1105,7 +1113,7 @@ ...@@ -1105,7 +1113,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,
......
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
return { return {
loginMsg: { loginMsg: {
RB_Group_Id: 0, RB_Group_Id: 0,
account: "15286963456", account: "13022941970",
password: "123456" password: "123456"
}, },
logo:'', logo:'',
......
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