Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
million
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
viitto
million
Commits
e632b3de
Commit
e632b3de
authored
Nov 28, 2024
by
youjie
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/viitto/million
parents
e90f1ee0
57efb127
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
174 additions
and
145 deletions
+174
-145
hor-big-one.vue
src/components/navs/hor-big-one.vue
+48
-44
Search.vue
src/pages/Search.vue
+126
-101
No files found.
src/components/navs/hor-big-one.vue
View file @
e632b3de
...
@@ -158,7 +158,7 @@
...
@@ -158,7 +158,7 @@
.category-btn
{
.category-btn
{
width
:
100px
;
width
:
100px
;
}
}
.mobile-logo
{
.mobile-logo
{
max-height
:
35px
;
max-height
:
35px
;
max-width
:
120px
;
max-width
:
120px
;
object-fit
:
contain
;
object-fit
:
contain
;
...
@@ -178,23 +178,25 @@
...
@@ -178,23 +178,25 @@
class=
"zk_toolbar flex justify-between"
class=
"zk_toolbar flex justify-between"
:class=
"
{ 'q-px-none': $q.platform.is.desktop }"
:class=
"
{ 'q-px-none': $q.platform.is.desktop }"
>
>
<div
class=
"flex"
><div
class=
"f24"
v-if=
"$q.platform.is.mobile && isHome"
@
click=
"handleShowDialog"
>
<div
class=
"flex"
>
<i
class=
"iconfont iconmore1"
style=
"font-size: 24px;"
></i>
<div
class=
"f24"
v-if=
"$q.platform.is.mobile && isHome"
@
click=
"handleShowDialog"
>
<i
class=
"iconfont iconmore1"
style=
"font-size: 24px"
></i>
</div>
<img
:src=
"baseData.logo"
style=
"
cursor: pointer;
height: 35px;
filter: drop-shadow(0px 0px var(--q-color-primary));
"
class=
"q-mr-lg q-ml-sm"
:class=
"
{ 'mobile-logo': $q.platform.is.mobile }"
@click="CommonJump('/index', {})"
/>
</div>
</div>
<img
<!--HK 2024-11-22 去掉 搜索接口有调整-->
:src=
"baseData.logo"
<searchSf2
v-if=
"!isHome"
:plugData=
"plugData"
></searchSf2>
style=
"
cursor: pointer;
height: 35px;
filter: drop-shadow(0px 0px var(--q-color-primary));
"
class=
"q-mr-lg q-ml-sm"
:class=
"
{'mobile-logo':$q.platform.is.mobile}"
@click="CommonJump('/index', {})"
/>
</div>
<!--
<div
style=
"transform:scale(0.6,0.6)"
>
-->
<searchSf2
v-if=
"!isHome"
:plugData=
"plugData"
></searchSf2>
<!--
</div>
-->
<!-- pc -->
<!-- pc -->
<div
v-if=
"$q.platform.is.desktop"
>
<div
v-if=
"$q.platform.is.desktop"
>
<q-btn
label=
"繁體中文"
flat
>
<q-btn
label=
"繁體中文"
flat
>
...
@@ -215,11 +217,7 @@
...
@@ -215,11 +217,7 @@
unelevated
unelevated
>
>
<template
v-slot:label
>
<template
v-slot:label
>
<img
<img
class=
"avatar"
v-if=
"LoginUser.photo"
:src=
"LoginUser.photo"
/>
class=
"avatar"
v-if=
"LoginUser.photo"
:src=
"LoginUser.photo"
/>
<img
class=
"avatar"
v-else
src=
"../../assets/img/avatar.png"
/>
<img
class=
"avatar"
v-else
src=
"../../assets/img/avatar.png"
/>
<!--
<span>
{{
LoginUser
.
name
||
LoginUser
.
mailbox
}}
</span>
-->
<!--
<span>
{{
LoginUser
.
name
||
LoginUser
.
mailbox
}}
</span>
-->
...
@@ -229,7 +227,7 @@
...
@@ -229,7 +227,7 @@
<q-list
class=
"text-grey-8"
dense
>
<q-list
class=
"text-grey-8"
dense
>
<q-item
clickable
v-close-popup
to=
"/setUserInfo"
>
<q-item
clickable
v-close-popup
to=
"/setUserInfo"
>
<q-item-section
avatar
>
<q-item-section
avatar
>
<q-avatar
icon=
"iconfont iconpeople1"
/>
<q-avatar
icon=
"iconfont iconpeople1"
/>
</q-item-section>
</q-item-section>
<q-item-section>
<q-item-section>
<q-item-label>
個人信息
</q-item-label>
<q-item-label>
個人信息
</q-item-label>
...
@@ -237,7 +235,7 @@
...
@@ -237,7 +235,7 @@
</q-item>
</q-item>
<q-item
clickable
v-close-popup
to=
"/coupon"
>
<q-item
clickable
v-close-popup
to=
"/coupon"
>
<q-item-section
avatar
>
<q-item-section
avatar
>
<q-avatar
icon=
"iconfont iconqianbao"
/>
<q-avatar
icon=
"iconfont iconqianbao"
/>
</q-item-section>
</q-item-section>
<q-item-section>
<q-item-section>
<q-item-label>
優惠券
</q-item-label>
<q-item-label>
優惠券
</q-item-label>
...
@@ -245,7 +243,7 @@
...
@@ -245,7 +243,7 @@
</q-item>
</q-item>
<q-item
clickable
v-close-popup
to=
"/order"
>
<q-item
clickable
v-close-popup
to=
"/order"
>
<q-item-section
avatar
>
<q-item-section
avatar
>
<q-avatar
icon=
"iconfont iconorder"
/>
<q-avatar
icon=
"iconfont iconorder"
/>
</q-item-section>
</q-item-section>
<q-item-section>
<q-item-section>
<q-item-label>
訂單
</q-item-label>
<q-item-label>
訂單
</q-item-label>
...
@@ -254,7 +252,7 @@
...
@@ -254,7 +252,7 @@
<q-separator
inset
class=
"q-mx-lg"
/>
<q-separator
inset
class=
"q-mx-lg"
/>
<q-item
clickable
v-close-popup
to=
"/setUsersList"
>
<q-item
clickable
v-close-popup
to=
"/setUsersList"
>
<q-item-section
avatar
>
<q-item-section
avatar
>
<q-avatar
icon=
"iconfont iconpeople"
/>
<q-avatar
icon=
"iconfont iconpeople"
/>
</q-item-section>
</q-item-section>
<q-item-section>
<q-item-section>
<q-item-label>
出行人信息管理
</q-item-label>
<q-item-label>
出行人信息管理
</q-item-label>
...
@@ -262,7 +260,7 @@
...
@@ -262,7 +260,7 @@
</q-item>
</q-item>
<q-item
clickable
v-close-popup
to=
"/setAddress"
>
<q-item
clickable
v-close-popup
to=
"/setAddress"
>
<q-item-section
avatar
>
<q-item-section
avatar
>
<q-avatar
icon=
"iconfont iconemail"
/>
<q-avatar
icon=
"iconfont iconemail"
/>
</q-item-section>
</q-item-section>
<q-item-section>
<q-item-section>
<q-item-label>
管理邮寄地址
</q-item-label>
<q-item-label>
管理邮寄地址
</q-item-label>
...
@@ -270,7 +268,7 @@
...
@@ -270,7 +268,7 @@
</q-item>
</q-item>
<q-item
clickable
v-close-popup
to=
"/setInfo"
>
<q-item
clickable
v-close-popup
to=
"/setInfo"
>
<q-item-section
avatar
>
<q-item-section
avatar
>
<q-avatar
icon=
"iconfont iconset"
/>
<q-avatar
icon=
"iconfont iconset"
/>
</q-item-section>
</q-item-section>
<q-item-section>
<q-item-section>
<q-item-label>
賬戶設置
</q-item-label>
<q-item-label>
賬戶設置
</q-item-label>
...
@@ -278,7 +276,7 @@
...
@@ -278,7 +276,7 @@
</q-item>
</q-item>
<q-item
clickable
v-close-popup
@
click=
"loginOut"
>
<q-item
clickable
v-close-popup
@
click=
"loginOut"
>
<q-item-section
avatar
>
<q-item-section
avatar
>
<q-avatar
icon=
"iconfont iconlog-in"
/>
<q-avatar
icon=
"iconfont iconlog-in"
/>
</q-item-section>
</q-item-section>
<q-item-section>
<q-item-section>
<q-item-label>
登出
</q-item-label>
<q-item-label>
登出
</q-item-label>
...
@@ -337,8 +335,15 @@
...
@@ -337,8 +335,15 @@
:baseData=
"baseData"
:baseData=
"baseData"
:dataList=
"dataList"
:dataList=
"dataList"
></city-category>
></city-category>
<popup
@
mousemove
.
prevent
id=
"city-category"
v-model=
"showDialog"
mode=
"bottom"
@
close=
"handleDialogClose"
>
<popup
<city-category-mobile
@
close=
"showDialog = false"
@
mousemove
.
prevent
id=
"city-category"
v-model=
"showDialog"
mode=
"bottom"
@
close=
"handleDialogClose"
>
<city-category-mobile
@
close=
"showDialog = false"
:baseData=
"baseData"
:baseData=
"baseData"
:dataList=
"dataList"
:dataList=
"dataList"
></city-category-mobile
></city-category-mobile
...
@@ -350,9 +355,9 @@
...
@@ -350,9 +355,9 @@
import
popup
from
"../props/index"
;
import
popup
from
"../props/index"
;
import
CityCategoryMobile
from
"./city-category-mobile.vue"
;
import
CityCategoryMobile
from
"./city-category-mobile.vue"
;
import
cityCategory
from
"./city-category.vue"
;
import
cityCategory
from
"./city-category.vue"
;
import
searchSf2
from
'../search_sf/search-top.vue'
import
searchSf2
from
"../search_sf/search-top.vue"
;
export
default
{
export
default
{
components
:
{
cityCategory
,
CityCategoryMobile
,
popup
,
searchSf2
},
components
:
{
cityCategory
,
CityCategoryMobile
,
popup
,
searchSf2
},
props
:
{
props
:
{
baseData
:
{
baseData
:
{
type
:
Object
,
type
:
Object
,
...
@@ -369,7 +374,7 @@ export default {
...
@@ -369,7 +374,7 @@ export default {
},
},
data
()
{
data
()
{
return
{
return
{
plugData
:
{
details
:
[],
Title
:
''
},
plugData
:
{
details
:
[],
Title
:
""
},
showDialog
:
false
,
showDialog
:
false
,
searchDate
:
""
,
searchDate
:
""
,
searchEndDate
:
""
,
searchEndDate
:
""
,
...
@@ -401,7 +406,7 @@ export default {
...
@@ -401,7 +406,7 @@ export default {
},
},
$route
:
{
$route
:
{
handler
:
function
(
val
,
oldVal
)
{
handler
:
function
(
val
,
oldVal
)
{
console
.
log
(
'val'
,
val
,
oldVal
)
console
.
log
(
"val"
,
val
,
oldVal
);
this
.
isHome
=
val
.
path
===
"/"
||
val
.
path
===
"/index"
;
this
.
isHome
=
val
.
path
===
"/"
||
val
.
path
===
"/index"
;
// this.isSearch = val.path === "/search";
// this.isSearch = val.path === "/search";
},
},
...
@@ -421,7 +426,7 @@ export default {
...
@@ -421,7 +426,7 @@ export default {
this
.
isHome
=
this
.
isHome
=
this
.
$router
.
history
.
current
.
path
===
"/"
||
this
.
$router
.
history
.
current
.
path
===
"/"
||
this
.
$router
.
history
.
current
.
path
===
"/index"
;
this
.
$router
.
history
.
current
.
path
===
"/index"
;
// this.isSearch = this.$router.history.current.path === "/search";
// this.isSearch = this.$router.history.current.path === "/search";
console
.
log
(
console
.
log
(
'JSON.parse(window.localStorage.getItem("b2bUser"))'
,
'JSON.parse(window.localStorage.getItem("b2bUser"))'
,
JSON
.
parse
(
window
.
localStorage
.
getItem
(
"b2bUser"
))
JSON
.
parse
(
window
.
localStorage
.
getItem
(
"b2bUser"
))
...
@@ -448,19 +453,18 @@ export default {
...
@@ -448,19 +453,18 @@ export default {
// this.getCategoryList();
// this.getCategoryList();
},
},
methods
:
{
methods
:
{
handler
(
event
)
{
event
.
preventDefault
();},
handler
(
event
)
{
event
.
preventDefault
();
},
handleShowDialog
()
{
handleShowDialog
()
{
this
.
showDialog
=
true
;
this
.
showDialog
=
true
;
this
.
scrollTop
=
document
.
querySelector
(
'body'
).
scrollTop
;
this
.
scrollTop
=
document
.
querySelector
(
"body"
).
scrollTop
;
document
.
querySelector
(
document
.
querySelector
(
"body"
).
style
=
`position: fixed; top: -
${
this
.
scrollTop
}
px`
;
"body"
).
style
=
`position: fixed; top: -
${
this
.
scrollTop
}
px`
;
},
},
handleDialogClose
()
{
handleDialogClose
()
{
document
.
querySelector
(
document
.
querySelector
(
"body"
).
style
=
""
;
"body"
},
).
style
=
''
;},
avatarClick
()
{
avatarClick
()
{
if
(
this
.
LoginUser
.
token
)
{
if
(
this
.
LoginUser
.
token
)
{
this
.
CommonJump
(
"/userCenter"
);
this
.
CommonJump
(
"/userCenter"
);
...
...
src/pages/Search.vue
View file @
e632b3de
...
@@ -684,7 +684,7 @@
...
@@ -684,7 +684,7 @@
}
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"SearchMain"
:class=
"
{
'desktop-page':$q.platform.is.desktop
}">
<div
class=
"SearchMain"
:class=
"
{
'desktop-page': $q.platform.is.desktop
}">
<div
class=
"SearchTop"
>
<div
class=
"SearchTop"
>
<div
class=
"q-my-md"
v-if=
"qMsg.searchKey"
>
<div
class=
"q-my-md"
v-if=
"qMsg.searchKey"
>
<q-breadcrumbs>
<q-breadcrumbs>
...
@@ -699,25 +699,26 @@
...
@@ -699,25 +699,26 @@
</div>
</div>
<div
class=
"text-h6 text-left"
v-if=
"qMsg.searchKey"
>
<div
class=
"text-h6 text-left"
v-if=
"qMsg.searchKey"
>
搜尋結果 “
搜尋結果 “
<span
class=
"text-primary"
>
{{
qMsg
.
searchKey
}}
</span>
”
<span
class=
"text-primary"
>
{{
qMsg
.
searchKey
}}
</span
>
”
</div>
</div>
<!-- 电脑端 -->
<!-- 电脑端 -->
<div
class=
"row SearchContent q-mt-md"
v-if=
"!$q.screen.xs && 1
==
0"
>
<div
class=
"row SearchContent q-mt-md"
v-if=
"!$q.screen.xs && 1
==
0"
>
<div
class=
"search-filter-inner"
>
<div
class=
"search-filter-inner"
>
<div
<div
class=
"search-item"
class=
"search-item"
style=
"width:
200px;cursor:pointer;
"
style=
"width:
200px; cursor: pointer
"
@
click=
"
isShowDialog=true,
goSearchHandler"
@
click=
"
(isShowDialog = true),
goSearchHandler"
>
>
<i
class=
"iconfont iconchazhao"
></i>
<i
class=
"iconfont iconchazhao"
></i>
{{
qMsg
.
searchKey
}}
{{
qMsg
.
searchKey
}}
</div>
</div>
<div
class=
"search-item"
@
click=
"
isShowDialog=true,
goSearchHandler"
>
<div
class=
"search-item"
@
click=
"
(isShowDialog = true),
goSearchHandler"
>
<i
class=
"iconfont iconrili"
></i>
<i
class=
"iconfont iconrili"
></i>
{{
qMsg
.
startDate
}}
~
{{
qMsg
.
endDate
}}
{{
qMsg
.
startDate
}}
~
{{
qMsg
.
endDate
}}
</div>
</div>
<div
class=
"search-item"
style=
"margin-left:
20px;
"
>
<div
class=
"search-item"
style=
"margin-left:
20px
"
>
<q-select
<q-select
filled
filled
v-model=
"sortNum"
v-model=
"sortNum"
...
@@ -727,28 +728,36 @@
...
@@ -727,28 +728,36 @@
map-options
map-options
/>
/>
</div>
</div>
<div
class=
"search-item"
style=
"margin-left:20px;"
>
<div
class=
"search-item"
style=
"margin-left: 20px"
>
<span
style=
"display:inline-block;cursor:pointer;"
@
click=
"fullHeight = true"
>
更多篩選條件
</span>
<span
style=
"display: inline-block; cursor: pointer"
@
click=
"fullHeight = true"
>
更多篩選條件
</span
>
</div>
</div>
</div>
</div>
<div
<div
v-show=
"showSplitPannel"
v-show=
"showSplitPannel"
id=
"sb"
id=
"sb"
style=
"z-index:999"
style=
"z-index:
999"
transition-show=
"fade"
transition-show=
"fade"
elevated
elevated
transition-hide=
"scale"
transition-hide=
"scale"
class=
"showbox row"
class=
"showbox row"
>
>
<div
style=
"width:180px;"
>
<div
style=
"width: 180px"
>
<q-scroll-area
:thumb-style=
"thumbStyle"
:bar-style=
"barStyle"
style=
"height: 100%;"
>
<q-scroll-area
:thumb-style=
"thumbStyle"
:bar-style=
"barStyle"
style=
"height: 100%"
>
<q-list>
<q-list>
<q-item
<q-item
v-for=
"(x, i) in areas"
v-for=
"(x, i) in areas"
:key=
"i"
:key=
"i"
clickable
clickable
v-ripple
v-ripple
:active=
"crtAreaIndex
==
i"
:active=
"crtAreaIndex
==
i"
@
click=
"clkAreaHandler(i)"
@
click=
"clkAreaHandler(i)"
active-class=
"my-menu-link"
active-class=
"my-menu-link"
>
>
...
@@ -761,24 +770,44 @@
...
@@ -761,24 +770,44 @@
</div>
</div>
<q-separator
vertical
/>
<q-separator
vertical
/>
<div
class=
"col q-pa-md"
>
<div
class=
"col q-pa-md"
>
<q-scroll-area
:thumb-style=
"thumbStyle"
:bar-style=
"barStyle"
style=
"height: 100%;"
>
<q-scroll-area
:thumb-style=
"thumbStyle"
:bar-style=
"barStyle"
style=
"height: 100%"
>
<template
<template
v-if=
"areas[crtAreaIndex]&&areas[crtAreaIndex].SubList&&areas[crtAreaIndex].SubList.length>0"
v-if=
"
areas[crtAreaIndex] &&
areas[crtAreaIndex].SubList &&
areas[crtAreaIndex].SubList.length > 0
"
>
>
<div
class=
"area-box"
v-for=
"(x, i) in areas[crtAreaIndex].SubList"
:key=
"i"
>
<div
class=
"area-box"
v-for=
"(x, i) in areas[crtAreaIndex].SubList"
:key=
"i"
>
<div
class=
"q-mb-md"
>
<div
class=
"q-mb-md"
>
<div
class=
"h3"
@
click=
"chosenAreaHandler(x.Name)"
>
{{
x
.
Name
}}
</div>
<div
class=
"h3"
@
click=
"chosenAreaHandler(x.Name)"
>
{{
x
.
Name
}}
</div>
</div>
</div>
<template
v-if=
"x&&x.SubList && x.SubList.length>0"
>
<template
v-if=
"x && x.SubList && x.SubList.length > 0"
>
<div
class=
"q-mb-sm row to-end"
v-for=
"(y, yi) in x.SubList"
:key=
"yi"
>
<div
<div
class=
"h4"
@
click=
"chosenAreaHandler(y.Name)"
>
{{
y
.
Name
}}
</div>
class=
"q-mb-sm row to-end"
<template
v-if=
"y&&y.SubList&&y.SubList.length>0"
>
v-for=
"(y, yi) in x.SubList"
:key=
"yi"
>
<div
class=
"h4"
@
click=
"chosenAreaHandler(y.Name)"
>
{{
y
.
Name
}}
</div>
<template
v-if=
"y && y.SubList && y.SubList.length > 0"
>
<div
<div
class=
"h5"
class=
"h5"
@
click=
"chosenAreaHandler(z.Name)"
@
click=
"chosenAreaHandler(z.Name)"
v-for=
"(z, zi) in y.SubList"
v-for=
"(z, zi) in y.SubList"
:key=
"zi"
:key=
"zi"
>
{{
z
.
Name
}}
</div>
>
{{
z
.
Name
}}
</div>
</
template
>
</
template
>
</div>
</div>
</template>
</template>
...
@@ -817,11 +846,11 @@
...
@@ -817,11 +846,11 @@
</div>
</div>
</div> -->
</div> -->
<
template
v-if=
"ShowType
==
0"
>
<
template
v-if=
"ShowType
==
0"
>
<!--豆腐格-->
<!--豆腐格-->
<searchBlock
:DataList=
"DataList"
:qMsg=
"qMsg"
></searchBlock>
<searchBlock
:DataList=
"DataList"
:qMsg=
"qMsg"
></searchBlock>
</
template
>
</
template
>
<
template
v-else-if=
"ShowType
==
1"
>
<
template
v-else-if=
"ShowType
==
1"
>
<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"
>
...
@@ -834,12 +863,12 @@
...
@@ -834,12 +863,12 @@
價格
價格
<span
class=
"clear-filter"
@
click=
"clearPrice()"
>
清除篩選
</span>
<span
class=
"clear-filter"
@
click=
"clearPrice()"
>
清除篩選
</span>
</div>
</div>
<div
style=
"width:
100%;height:57px;display:
none"
></div>
<div
style=
"width:
100%; height: 57px; display:
none"
></div>
<div
class=
"range-text"
>
<div
class=
"range-text"
>
<div
class=
"min"
>
<div
class=
"min"
>
<q-input
<q-input
class=
"full_price"
class=
"full_price"
style=
"width:80%"
style=
"width:
80%"
placeholder=
"最低价"
placeholder=
"最低价"
v-model=
"qMsg.minPrice"
v-model=
"qMsg.minPrice"
@
input=
"changeData"
@
input=
"changeData"
...
@@ -850,7 +879,7 @@
...
@@ -850,7 +879,7 @@
<div
class=
"max"
>
<div
class=
"max"
>
<q-input
<q-input
class=
"full_price"
class=
"full_price"
style=
"width:80%"
style=
"width:
80%"
placeholder=
"最高价"
placeholder=
"最高价"
v-model=
"qMsg.maxPrice"
v-model=
"qMsg.maxPrice"
@
input=
"changeData"
@
input=
"changeData"
...
@@ -868,7 +897,7 @@
...
@@ -868,7 +897,7 @@
<q-checkbox
<q-checkbox
right-label
right-label
v-model=
"dayNum"
v-model=
"dayNum"
v-for=
"(item,index) in dayArray"
v-for=
"(item,
index) in dayArray"
:label=
"item.text"
:label=
"item.text"
:key=
"index"
:key=
"index"
:val=
"item.id"
:val=
"item.id"
...
@@ -896,7 +925,7 @@
...
@@ -896,7 +925,7 @@
<div
class=
"q-gutter-sm"
>
<div
class=
"q-gutter-sm"
>
<q-checkbox
<q-checkbox
v-model=
"WeekDay"
v-model=
"WeekDay"
v-for=
"(item,index) in weekList"
v-for=
"(item,
index) in weekList"
:val=
"item.value"
:val=
"item.value"
:label=
"item.label"
:label=
"item.label"
:key=
"index"
:key=
"index"
...
@@ -914,7 +943,7 @@
...
@@ -914,7 +943,7 @@
<
template
v-else
>
<
template
v-else
>
<kkday
:qMsg=
"qMsg"
@
change=
"handlerSearchChange"
></kkday>
<kkday
:qMsg=
"qMsg"
@
change=
"handlerSearchChange"
></kkday>
</
template
>
</
template
>
<div
v-if=
"DataList.length
==0 && ShowType!=
2"
class=
"blank-block"
>
<div
v-if=
"DataList.length
== 0 && ShowType !=
2"
class=
"blank-block"
>
<i
class=
"iconfont iconchazhao"
></i>
<i
class=
"iconfont iconchazhao"
></i>
<p>
請嘗試其他關鍵字或篩選條件
</p>
<p>
請嘗試其他關鍵字或篩選條件
</p>
</div>
</div>
...
@@ -923,11 +952,11 @@
...
@@ -923,11 +952,11 @@
<q-dialog
v-model=
"fullHeight"
full-height
>
<q-dialog
v-model=
"fullHeight"
full-height
>
<q-card
class=
"column full-height"
style=
"width: 500px"
>
<q-card
class=
"column full-height"
style=
"width: 500px"
>
<div
class=
"moreTiaojiao"
>
更多篩選條件
</div>
<div
class=
"moreTiaojiao"
>
更多篩選條件
</div>
<div
class=
"full_listDiv"
style=
"padding-bottom:20px"
>
<div
class=
"full_listDiv"
style=
"padding-bottom:
20px"
>
<span>
價格:
</span>
<span>
價格:
</span>
<q-input
<q-input
class=
"full_price"
class=
"full_price"
style=
"width:
30%;height:45px;
"
style=
"width:
30%; height: 45px
"
v-model=
"qMsg.minPrice"
v-model=
"qMsg.minPrice"
@
input=
"changeData"
@
input=
"changeData"
filled
filled
...
@@ -935,7 +964,7 @@
...
@@ -935,7 +964,7 @@
/>
/>
<q-input
<q-input
class=
"full_price"
class=
"full_price"
style=
"width:
30%;height:45px;
"
style=
"width:
30%; height: 45px
"
v-model=
"qMsg.maxPrice"
v-model=
"qMsg.maxPrice"
@
input=
"changeData"
@
input=
"changeData"
filled
filled
...
@@ -948,7 +977,7 @@
...
@@ -948,7 +977,7 @@
<q-checkbox
<q-checkbox
right-label
right-label
v-model=
"dayNum"
v-model=
"dayNum"
v-for=
"(item,index) in dayArray"
v-for=
"(item,
index) in dayArray"
:label=
"item.text"
:label=
"item.text"
:key=
"index"
:key=
"index"
:val=
"item.id"
:val=
"item.id"
...
@@ -962,7 +991,7 @@
...
@@ -962,7 +991,7 @@
<div
class=
"q-gutter-sm"
>
<div
class=
"q-gutter-sm"
>
<q-checkbox
<q-checkbox
v-model=
"WeekDay"
v-model=
"WeekDay"
v-for=
"(item,index) in weekList"
v-for=
"(item,
index) in weekList"
:val=
"item.value"
:val=
"item.value"
:label=
"item.label"
:label=
"item.label"
:key=
"index"
:key=
"index"
...
@@ -972,10 +1001,10 @@
...
@@ -972,10 +1001,10 @@
</div>
</div>
</div>
</div>
<div
class=
"full_btndiv"
>
<div
class=
"full_btndiv"
>
<q-btn
color=
"white"
style=
"width:49%"
text-color=
"black"
label=
"清除"
/>
<q-btn
color=
"white"
style=
"width:
49%"
text-color=
"black"
label=
"清除"
/>
<q-btn
<q-btn
color=
"primary"
color=
"primary"
style=
"width:49%"
style=
"width:
49%"
label=
"套用"
label=
"套用"
v-close-popup
v-close-popup
@
click=
"goSearchHandler"
@
click=
"goSearchHandler"
...
@@ -989,18 +1018,18 @@
...
@@ -989,18 +1018,18 @@
<q-card-section>
<q-card-section>
<div
class=
"text-h6"
>
<div
class=
"text-h6"
>
搜尋行程
搜尋行程
<i
class=
"iconfont iconbaseline-close-px"
@
click=
"isShowDialog
=
false"
></i>
<i
class=
"iconfont iconbaseline-close-px"
@
click=
"isShowDialog
=
false"
></i>
</div>
</div>
</q-card-section>
</q-card-section>
<q-separator
/>
<q-separator
/>
<div
style=
"max-height: 550px;
padding:
20px 30px 30px 30px"
class=
"scroll"
>
<div
style=
"max-height: 550px;
padding:
20px 30px 30px 30px"
class=
"scroll"
>
<div
class=
"chosen-box"
>
<div
class=
"chosen-box"
>
<div
class=
"chosen-tab"
>
<div
class=
"chosen-tab"
>
<q-tabs
v-model=
"tab"
align=
"justify"
narrow-indicator
class=
"q-mb-md"
>
<q-tabs
v-model=
"tab"
align=
"justify"
narrow-indicator
class=
"q-mb-md"
>
<q-tab
class=
"text-purple"
name=
"dest"
label=
"目的地"
/>
<q-tab
class=
"text-purple"
name=
"dest"
label=
"目的地"
/>
<q-tab
class=
"text-teal"
name=
"kw"
label=
"關鍵字"
/>
<q-tab
class=
"text-teal"
name=
"kw"
label=
"關鍵字"
/>
</q-tabs>
</q-tabs>
<div
v-show=
"tab
==
'dest'"
>
<div
v-show=
"tab
==
'dest'"
>
<div
class=
"q-mb-md"
>
<div
class=
"q-mb-md"
>
<q-select
<q-select
filled
filled
...
@@ -1043,7 +1072,7 @@
...
@@ -1043,7 +1072,7 @@
/>
/>
</div>
</div>
</div>
</div>
<div
v-show=
"tab
==
'kw'"
class=
"q-mb-md"
>
<div
v-show=
"tab
==
'kw'"
class=
"q-mb-md"
>
<q-input
<q-input
filled
filled
id=
"search_key"
id=
"search_key"
...
@@ -1057,7 +1086,7 @@
...
@@ -1057,7 +1086,7 @@
<q-input
<q-input
filled
filled
v-model=
"qMsg.startDate"
v-model=
"qMsg.startDate"
style=
"width:99%"
style=
"width:
99%"
:label=
"$t('search_date_begin')"
:label=
"$t('search_date_begin')"
mask=
"date"
mask=
"date"
class=
"bg-grey-1"
class=
"bg-grey-1"
...
@@ -1105,10 +1134,10 @@
...
@@ -1105,10 +1134,10 @@
<q-btn
<q-btn
color=
"primary"
color=
"primary"
unelevated
unelevated
style=
"width:
100%;height:50px;margin-top:20px;
"
style=
"width:
100%; height: 50px; margin-top: 20px
"
filled
filled
label=
"搜尋"
label=
"搜尋"
@
click=
"
isShowDialog=false,
goSearchHandler()"
@
click=
"
(isShowDialog = false),
goSearchHandler()"
/>
/>
</div>
</div>
</div>
</div>
...
@@ -1126,7 +1155,7 @@
...
@@ -1126,7 +1155,7 @@
<q-tab
class=
"text-purple"
name=
"dest"
label=
"目的地"
/>
<q-tab
class=
"text-purple"
name=
"dest"
label=
"目的地"
/>
<q-tab
class=
"text-teal"
name=
"kw"
label=
"關鍵字"
/>
<q-tab
class=
"text-teal"
name=
"kw"
label=
"關鍵字"
/>
</q-tabs>
</q-tabs>
<div
v-show=
"tab
==
'dest'"
>
<div
v-show=
"tab
==
'dest'"
>
<div
class=
"q-mb-md"
>
<div
class=
"q-mb-md"
>
<q-select
<q-select
filled
filled
...
@@ -1169,7 +1198,7 @@
...
@@ -1169,7 +1198,7 @@
/>
/>
</div>
</div>
</div>
</div>
<div
v-show=
"tab
==
'kw'"
class=
"q-mb-md"
>
<div
v-show=
"tab
==
'kw'"
class=
"q-mb-md"
>
<q-input
<q-input
filled
filled
id=
"search_key"
id=
"search_key"
...
@@ -1230,10 +1259,10 @@
...
@@ -1230,10 +1259,10 @@
<q-btn
<q-btn
color=
"primary"
color=
"primary"
unelevated
unelevated
style=
"width:100%"
style=
"width:
100%"
filled
filled
label=
"搜尋"
label=
"搜尋"
@
click=
"
showPopup=false,
goSearchHandler()"
@
click=
"
(showPopup = false),
goSearchHandler()"
/>
/>
</div>
</div>
</div>
</div>
...
@@ -1251,7 +1280,7 @@ export default {
...
@@ -1251,7 +1280,7 @@ export default {
popup
,
popup
,
searchBlock
,
searchBlock
,
searchList
,
searchList
,
kkday
kkday
,
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -1266,56 +1295,56 @@ export default {
...
@@ -1266,56 +1295,56 @@ export default {
id
:
1
,
id
:
1
,
min
:
1
,
min
:
1
,
max
:
1
,
max
:
1
,
text
:
"1天"
text
:
"1天"
,
},
},
{
{
id
:
2
,
id
:
2
,
min
:
2
,
min
:
2
,
max
:
2
,
max
:
2
,
text
:
"2天"
text
:
"2天"
,
},
},
{
{
id
:
3
,
id
:
3
,
min
:
3
,
min
:
3
,
max
:
3
,
max
:
3
,
text
:
"3天"
text
:
"3天"
,
},
},
{
{
id
:
4
,
id
:
4
,
min
:
4
,
min
:
4
,
max
:
4
,
max
:
4
,
text
:
"4天"
text
:
"4天"
,
},
},
{
{
id
:
5
,
id
:
5
,
min
:
5
,
min
:
5
,
max
:
5
,
max
:
5
,
text
:
"5天"
text
:
"5天"
,
},
},
{
{
id
:
6
,
id
:
6
,
min
:
6
,
min
:
6
,
max
:
6
,
max
:
6
,
text
:
"6天"
text
:
"6天"
,
},
},
{
{
id
:
7
,
id
:
7
,
min
:
7
,
min
:
7
,
max
:
8
,
max
:
8
,
text
:
"7-8天"
text
:
"7-8天"
,
},
},
{
{
id
:
8
,
id
:
8
,
min
:
9
,
min
:
9
,
max
:
10
,
max
:
10
,
text
:
"9-10天"
text
:
"9-10天"
,
},
},
{
{
id
:
9
,
id
:
9
,
min
:
10
,
min
:
10
,
max
:
null
,
max
:
null
,
text
:
"10天以上"
text
:
"10天以上"
,
}
}
,
],
],
flight
:
[
"长荣"
],
flight
:
[
"长荣"
],
...
@@ -1327,7 +1356,7 @@ export default {
...
@@ -1327,7 +1356,7 @@ export default {
borderRadius
:
"5px"
,
borderRadius
:
"5px"
,
backgroundColor
:
"#027be3"
,
backgroundColor
:
"#027be3"
,
width
:
"5px"
,
width
:
"5px"
,
opacity
:
0.75
opacity
:
0.75
,
},
},
//地区样式
//地区样式
barStyle
:
{
barStyle
:
{
...
@@ -1335,7 +1364,7 @@ export default {
...
@@ -1335,7 +1364,7 @@ export default {
borderRadius
:
"9px"
,
borderRadius
:
"9px"
,
backgroundColor
:
"#027be3"
,
backgroundColor
:
"#027be3"
,
width
:
"9px"
,
width
:
"9px"
,
opacity
:
0.2
opacity
:
0.2
,
},
},
//地区数据
//地区数据
areas
:
[],
areas
:
[],
...
@@ -1343,62 +1372,62 @@ export default {
...
@@ -1343,62 +1372,62 @@ export default {
sortArray
:
[
sortArray
:
[
{
{
label
:
"依推薦程度"
,
label
:
"依推薦程度"
,
value
:
1
value
:
1
,
},
},
{
{
label
:
"低價優先"
,
label
:
"低價優先"
,
value
:
2
value
:
2
,
},
},
{
{
label
:
"高價優先"
,
label
:
"高價優先"
,
value
:
3
value
:
3
,
},
},
{
{
label
:
"最快出發日"
,
label
:
"最快出發日"
,
value
:
4
value
:
4
,
},
},
{
{
label
:
"最晚出發日"
,
label
:
"最晚出發日"
,
value
:
5
value
:
5
,
},
},
{
{
label
:
"天數少到多"
,
label
:
"天數少到多"
,
value
:
6
value
:
6
,
},
},
{
{
label
:
"天數多到少"
,
label
:
"天數多到少"
,
value
:
7
value
:
7
,
}
}
,
],
],
weekList
:
[
weekList
:
[
{
{
label
:
"星期日"
,
label
:
"星期日"
,
value
:
0
value
:
0
,
},
},
{
{
label
:
"星期一"
,
label
:
"星期一"
,
value
:
1
value
:
1
,
},
},
{
{
label
:
"星期二"
,
label
:
"星期二"
,
value
:
2
value
:
2
,
},
},
{
{
label
:
"星期三"
,
label
:
"星期三"
,
value
:
3
value
:
3
,
},
},
{
{
label
:
"星期四"
,
label
:
"星期四"
,
value
:
4
value
:
4
,
},
},
{
{
label
:
"星期五"
,
label
:
"星期五"
,
value
:
5
value
:
5
,
},
},
{
{
label
:
"星期六"
,
label
:
"星期六"
,
value
:
6
value
:
6
,
}
}
,
],
],
showPopup
:
false
,
showPopup
:
false
,
tab
:
"dest"
,
tab
:
"dest"
,
...
@@ -1406,7 +1435,7 @@ export default {
...
@@ -1406,7 +1435,7 @@ export default {
fl
:
""
,
fl
:
""
,
sl
:
""
,
sl
:
""
,
tl
:
""
,
tl
:
""
,
ful
:
""
ful
:
""
,
},
},
//查询参数
//查询参数
qMsg
:
{
qMsg
:
{
...
@@ -1434,11 +1463,11 @@ export default {
...
@@ -1434,11 +1463,11 @@ export default {
dayNumList
:
[],
// 天数
dayNumList
:
[],
// 天数
webSiteCategoryIds
:
""
,
// 分类Id
webSiteCategoryIds
:
""
,
// 分类Id
placeIds
:
""
,
// 目的地城市Id
placeIds
:
""
,
// 目的地城市Id
orderBy
:
0
// 排序 0默认 1价格升序 2价格降序
orderBy
:
0
,
// 排序 0默认 1价格升序 2价格降序
},
},
ShowType
:
0
,
//显示样式(0-豆腐格,1-列表)
ShowType
:
0
,
//显示样式(0-豆腐格,1-列表)
//行程列表
//行程列表
DataList
:
[]
DataList
:
[]
,
};
};
},
},
created
()
{},
created
()
{},
...
@@ -1446,12 +1475,12 @@ export default {
...
@@ -1446,12 +1475,12 @@ export default {
// 支付宝退款 测试使用
// 支付宝退款 测试使用
// this.apipost("GetAliPayReturn_post",{OrderNo:'D202304121702420001'},r=>{
// this.apipost("GetAliPayReturn_post",{OrderNo:'D202304121702420001'},r=>{
// if(r.data.message=="退款成功"){
// if(r.data.message=="退款成功"){
// this.$message.success("退款成功")
// this.$message.success("退款成功")
// }else{
// }else{
// this.$message.error("退款失败")
// this.$message.error("退款失败")
// }
// }
// },e=>{
// },e=>{
// })
// })
if
(
localStorage
.
baseifo
)
{
if
(
localStorage
.
baseifo
)
{
var
jObj
=
JSON
.
parse
(
localStorage
.
baseifo
);
var
jObj
=
JSON
.
parse
(
localStorage
.
baseifo
);
...
@@ -1466,7 +1495,7 @@ export default {
...
@@ -1466,7 +1495,7 @@ export default {
var
qsearchDate
=
this
.
getUrlKey
(
"qsearchDate"
,
window
.
location
.
href
);
var
qsearchDate
=
this
.
getUrlKey
(
"qsearchDate"
,
window
.
location
.
href
);
var
qsearchEndDate
=
this
.
getUrlKey
(
"qsearchEndDate"
,
window
.
location
.
href
);
var
qsearchEndDate
=
this
.
getUrlKey
(
"qsearchEndDate"
,
window
.
location
.
href
);
var
areaId
=
this
.
getUrlKey
(
"areaId"
,
window
.
location
.
href
);
var
areaId
=
this
.
getUrlKey
(
"areaId"
,
window
.
location
.
href
);
var
areaIds
=
this
.
getUrlKey
(
"areaIds"
,
window
.
location
.
href
)
var
areaIds
=
this
.
getUrlKey
(
"areaIds"
,
window
.
location
.
href
);
var
categoryId
=
this
.
getUrlKey
(
"categoryId"
,
window
.
location
.
href
);
var
categoryId
=
this
.
getUrlKey
(
"categoryId"
,
window
.
location
.
href
);
if
(
qsearchKey
)
{
if
(
qsearchKey
)
{
this
.
qMsg
.
searchKey
=
qsearchKey
;
this
.
qMsg
.
searchKey
=
qsearchKey
;
...
@@ -1481,7 +1510,7 @@ export default {
...
@@ -1481,7 +1510,7 @@ export default {
this
.
qMsg
.
areaId
=
Number
(
areaId
);
this
.
qMsg
.
areaId
=
Number
(
areaId
);
}
}
if
(
areaIds
)
{
if
(
areaIds
)
{
this
.
qMsg
.
areaIds
=
areaIds
.
split
(
','
).
map
(
item
=>
Number
(
item
));
this
.
qMsg
.
areaIds
=
areaIds
.
split
(
","
).
map
((
item
)
=>
Number
(
item
));
}
}
if
(
categoryId
)
{
if
(
categoryId
)
{
this
.
qMsg
.
categoryId
=
Number
(
categoryId
);
this
.
qMsg
.
categoryId
=
Number
(
categoryId
);
...
@@ -1522,7 +1551,7 @@ export default {
...
@@ -1522,7 +1551,7 @@ export default {
dayNumList
:
[],
// 天数
dayNumList
:
[],
// 天数
webSiteCategoryIds
:
""
,
// 分类Id
webSiteCategoryIds
:
""
,
// 分类Id
placeIds
:
""
,
// 目的地城市Id
placeIds
:
""
,
// 目的地城市Id
orderBy
:
0
// 排序 0默认 1价格升序 2价格降序
orderBy
:
0
,
// 排序 0默认 1价格升序 2价格降序
};
};
this
.
qMsg
=
msg
;
this
.
qMsg
=
msg
;
this
.
goSearchHandler
();
this
.
goSearchHandler
();
...
@@ -1548,14 +1577,14 @@ export default {
...
@@ -1548,14 +1577,14 @@ export default {
this
.
apipost
(
this
.
apipost
(
"ws_get_GetSearchArea"
,
"ws_get_GetSearchArea"
,
{},
{},
res
=>
{
(
res
)
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
data
)
{
if
(
res
.
data
.
data
)
{
this
.
areas
=
res
.
data
.
data
.
AreaList
;
this
.
areas
=
res
.
data
.
data
.
AreaList
;
}
}
}
}
},
},
err
=>
{}
(
err
)
=>
{}
);
);
},
},
searchFocusHandler
()
{
searchFocusHandler
()
{
...
@@ -1622,11 +1651,7 @@ export default {
...
@@ -1622,11 +1651,7 @@ export default {
companyId
=
groupinfo
.
siteList
[
0
].
companyId
;
companyId
=
groupinfo
.
siteList
[
0
].
companyId
;
}
}
this
.
SearchResult
=
this
.
SearchResult
=
this
.
qMsg
.
startDate
+
this
.
qMsg
.
startDate
+
"-"
+
this
.
qMsg
.
endDate
+
" "
+
this
.
qMsg
.
searchKey
;
"-"
+
this
.
qMsg
.
endDate
+
" "
+
this
.
qMsg
.
searchKey
;
let
msg
=
{
let
msg
=
{
pageIndex
:
this
.
qMsg
.
pageIndex
,
pageIndex
:
this
.
qMsg
.
pageIndex
,
pageSize
:
this
.
qMsg
.
pageSize
,
pageSize
:
this
.
qMsg
.
pageSize
,
...
@@ -1647,7 +1672,7 @@ export default {
...
@@ -1647,7 +1672,7 @@ export default {
orderBySales
:
0
,
orderBySales
:
0
,
startCityId
:
this
.
qMsg
.
startCityId
,
startCityId
:
this
.
qMsg
.
startCityId
,
weekDayList
:
this
.
WeekDay
,
weekDayList
:
this
.
WeekDay
,
dayNumList
:
this
.
dayNum
dayNumList
:
this
.
dayNum
,
};
};
if
(
localStorage
.
b2bUser
)
{
if
(
localStorage
.
b2bUser
)
{
var
b2bUser
=
JSON
.
parse
(
window
.
localStorage
.
getItem
(
"b2bUser"
));
var
b2bUser
=
JSON
.
parse
(
window
.
localStorage
.
getItem
(
"b2bUser"
));
...
@@ -1658,14 +1683,14 @@ export default {
...
@@ -1658,14 +1683,14 @@ export default {
this
.
apipost
(
this
.
apipost
(
"b2c_get_GetB2CMergeProductPageList"
,
"b2c_get_GetB2CMergeProductPageList"
,
msg
,
msg
,
res
=>
{
(
res
)
=>
{
this
.
$q
.
loading
.
hide
();
this
.
$q
.
loading
.
hide
();
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
qMsg
.
PageCount
=
res
.
data
.
data
.
pageCount
;
this
.
qMsg
.
PageCount
=
res
.
data
.
data
.
pageCount
;
this
.
qMsg
.
TotalCount
=
res
.
data
.
data
.
count
;
this
.
qMsg
.
TotalCount
=
res
.
data
.
data
.
count
;
var
tempArray
=
res
.
data
.
data
.
pageData
;
var
tempArray
=
res
.
data
.
data
.
pageData
;
if
(
tempArray
&&
tempArray
.
length
>
0
)
{
if
(
tempArray
&&
tempArray
.
length
>
0
)
{
tempArray
.
forEach
(
item
=>
{
tempArray
.
forEach
(
(
item
)
=>
{
if
(
item
.
imgCover
&&
item
.
imgCover
!=
""
)
{
if
(
item
.
imgCover
&&
item
.
imgCover
!=
""
)
{
try
{
try
{
var
imgArray
=
JSON
.
parse
(
item
.
imgCover
);
var
imgArray
=
JSON
.
parse
(
item
.
imgCover
);
...
@@ -1681,9 +1706,9 @@ export default {
...
@@ -1681,9 +1706,9 @@ export default {
}
}
}
}
},
},
err
=>
{}
(
err
)
=>
{}
);
);
}
}
,
}
}
,
};
};
</
script
>
</
script
>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment