Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
Athena
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
华国豪
Athena
Commits
e2d19d40
Commit
e2d19d40
authored
Aug 27, 2019
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加头部搜索
parent
8cf3f235
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
128 additions
and
60 deletions
+128
-60
common.css
src/assets/css/common.css
+17
-1
IndependentList.vue
src/components/DependentTravel/IndependentList.vue
+10
-1
HotelList.vue
src/components/Hotel/HotelList.vue
+5
-0
LocalCuisine.vue
src/components/LocalTour/LocalCuisine.vue
+11
-1
LocalTourList.vue
src/components/LocalTour/LocalTourList.vue
+21
-48
newHead.vue
src/components/global/newHead.vue
+54
-8
Visalist.vue
src/components/visa/Visalist.vue
+10
-1
No files found.
src/assets/css/common.css
View file @
e2d19d40
...
...
@@ -110,6 +110,22 @@
.commonF
.cff
{
color
:
#ffffff
}
.commonF
.SearchSpan
{
display
:
inline-block
;
width
:
70px
;
height
:
32px
;
line-height
:
32px
;
text-align
:
center
;
color
:
#fff
;
background
:
#EE4454
;
position
:
relative
;
cursor
:
pointer
;
margin
:
0
!important
;
padding
:
0
!important
;
}
.commonF
.SearchKey
.el-input__inner
{
border-radius
:
0
;
}
.del-text
{
text-decoration
:
line-through
}
...
...
@@ -166,4 +182,4 @@
}
.brd0
{
border-radius
:
0
;
}
\ No newline at end of file
}
src/components/DependentTravel/IndependentList.vue
View file @
e2d19d40
<
template
>
<div
class=
"visaList IndependentList"
>
<div
class=
"visaList IndependentList
commonF
"
>
<!--
<div
style=
"padding:10px 0"
>
<el-row
:gutter=
"24"
style=
"box-shadow:0px 4px 8px 0px rgba(107,107,107,0.18);"
>
<div
class=
"common_width"
>
...
...
@@ -87,6 +87,14 @@
</ul>
<!--
<span
class=
"czd"
@
click=
"ChangeSelect(1)"
>
{{
seriescontext
}}
<i
:class=
"seriesn?'rolate':''"
class=
"iconfont icon-moban"
></i></span>
-->
</div>
<div>
<div
class=
"select_title"
style=
"top:20px"
>
搜索词
</div>
<ul
class=
"select_ul"
>
<el-input
size=
"small"
style=
"width:200px;border-right:none;border-radius:0"
v-model=
"listmsg.searchKey"
></el-input>
<span
@
click=
"GetList"
class=
"SearchSpan"
style=
"top: 1px;"
><i
class=
"iconfont icon-search"
></i></span>
</ul>
<!--
<span
class=
"czd"
@
click=
"ChangeSelect(1)"
>
{{
seriescontext
}}
<i
:class=
"seriesn?'rolate':''"
class=
"iconfont icon-moban"
></i></span>
-->
</div>
</div>
<!-- 列表 -->
...
...
@@ -472,6 +480,7 @@ export default {
<
style
>
@import
"../../assets/css/reset.css"
;
@import
"../../assets/css/common.css"
;
.IndependentList
.icon-bb-chufadi
{
font-size
:
12px
;
color
:
#666
;
...
...
src/components/Hotel/HotelList.vue
View file @
e2d19d40
...
...
@@ -892,6 +892,10 @@ export default {
mounted
()
{
},
created
()
{
if
(
this
.
$route
.
query
.
searchKey
){
this
.
keyWords
=
this
.
$route
.
query
.
searchKey
;
this
.
SearchHotel
();
}
if
(
sessionStorage
.
getItem
(
"HotelInfo"
)){
let
msgList
=
JSON
.
parse
(
sessionStorage
.
getItem
(
"HotelInfo"
));
this
.
placeKeyWords
=
msgList
.
place
;
...
...
@@ -908,6 +912,7 @@ export default {
this
.
isShowTime
=
false
;
}
}
},
components
:
{
HTMap
...
...
src/components/LocalTour/LocalCuisine.vue
View file @
e2d19d40
...
...
@@ -6,7 +6,7 @@
<
template
>
<div
class=
"LocalCuisine commonF"
>
<div
class=
"w1200 basefix"
style=
"margin-bottom:20px;"
>
<p
style=
"
margin
-top:14px"
class=
"f12 pfR"
>
当地游 > 当地美食
</p>
<p
style=
"
padding
-top:14px"
class=
"f12 pfR"
>
当地游 > 当地美食
</p>
<ul
class=
"chooseDiv"
>
<li
style=
"padding-bottom:8px"
>
<div
class=
"title pfR f14"
style=
"position: absolute;top:18px;"
>
目的地
</div>
...
...
@@ -51,6 +51,13 @@
</span>
</div>
</li>
<li
style=
"padding-bottom:8px"
>
<div
class=
"title pfR f14"
style=
"position: absolute;top:18px;"
>
搜索词
</div>
<div
class=
"change spanMargin"
style=
"padding-left:80px"
>
<el-input
size=
"small"
style=
"width:200px;border-right:none;border-radius:0"
v-model=
"msg.searchKey"
></el-input>
<span
@
click=
"GetList"
class=
"SearchSpan"
style=
"top: 1px;"
><i
class=
"iconfont icon-search"
></i></span>
</div>
</li>
<div
class=
"pxDiv"
>
<span>
印象推荐
</span>
<span
class=
"px"
>
价格排序
...
...
@@ -191,6 +198,9 @@ export default {
if
(
localStorage
.
LikeList
){
this
.
LikeList
=
JSON
.
parse
(
localStorage
.
LikeList
);
}
if
(
this
.
$route
.
query
.
searchKey
){
this
.
msg
.
searchKey
=
this
.
$route
.
query
.
searchKey
;
}
},
mounted
(){
...
...
src/components/LocalTour/LocalTourList.vue
View file @
e2d19d40
...
...
@@ -120,52 +120,17 @@
</div>
</li>
<!--
<li
class=
"line"
v-if=
"tab==1"
>
<div
class=
"tabLeft"
>
系列
</div>
<div
class=
"tabRight spanMargin"
>
<span
class=
"spanActive"
>
亲子游
</span>
<span>
韩国
</span>
<span>
巴厘岛
</span>
<span>
韩国
</span>
<span>
巴厘岛
</span>
<span>
韩国
</span>
<span>
巴厘岛
</span>
<span>
韩国
</span>
<span>
巴厘岛
</span>
<span>
韩国
</span>
<span>
巴厘岛
</span>
<span>
韩国
</span>
<span>
巴厘岛
</span><span>
韩国
</span>
<span>
巴厘岛
</span>
<span>
韩国
</span>
<span>
巴厘岛
</span>
<span>
韩国
</span>
<span>
巴厘岛
</span>
<span>
韩国
</span>
<span>
巴厘岛
</span>
<span>
韩国
</span>
<span>
巴厘岛
</span>
<span>
韩国
</span>
<span>
巴厘岛
</span>
<div
class=
"liStatus"
>
展开
<i
class=
"iconfont icon-xiabiao"
></i>
</div>
</div>
</li>
-->
<!--
<li
v-if=
"tab==2"
>
<div
class=
"tabLeft"
>
景点主题
<li>
<div
class=
"tabLeft"
style=
"line-height: 43px;"
>
搜索词
</div>
<div
class=
"tabRight spanMargin"
>
<span
class=
"spanActive"
>
日本
</span>
<span>
韩国
</span>
<span>
巴厘岛
</span>
<div
class=
"tabRight SearchKey"
>
<el-input
size=
"small"
style=
"width:200px;border-right:none;border-radius:0;margin-left:20px;"
v-model=
"msg.searchKey"
></el-input>
<span
@
click=
"SearchKey"
class=
"SearchSpan"
style=
"top: 1px;"
><i
class=
"iconfont icon-search"
></i></span>
</div>
</li>
-->
</li>
</ul>
</div>
...
...
@@ -282,15 +247,16 @@ export default {
this
.
msg
.
priceOrderByField
=
4
;
}
this
.
GetLine
();
if
(
this
.
$route
.
query
.
searchKey
){
this
.
msg
.
searchKey
=
this
.
$route
.
query
.
searchKey
;
this
.
tempsearchKey
=
this
.
$route
.
query
.
searchKey
;
}
if
(
this
.
$route
.
query
.
tab
){
this
.
tab
=
this
.
$route
.
query
.
tab
;
if
(
this
.
tab
==
1
){
this
.
GetList
();
}
else
{
if
(
this
.
$route
.
query
.
searchKey
){
this
.
msg
.
searchKey
=
this
.
$route
.
query
.
searchKey
;
this
.
tempsearchKey
=
this
.
$route
.
query
.
searchKey
;
}
this
.
GetTicketList
();
}
}
...
...
@@ -305,6 +271,13 @@ export default {
},
methods
:
{
SearchKey
(){
if
(
this
.
tab
==
1
){
this
.
GetList
();
}
else
{
this
.
GetTicketList
();
}
},
GetHotScen
(){
let
msg
=
{
pageIndex
:
0
,
...
...
src/components/global/newHead.vue
View file @
e2d19d40
...
...
@@ -169,8 +169,13 @@
<el-select
v-model=
"select"
slot=
"prepend"
size=
"mini"
class=
"w100"
placeholder=
"请选择"
>
<el-option
label=
"旅游"
value=
"1"
></el-option>
<!-- <el-option label="酒店" value="2"></el-option> -->
<el-option
label=
"机票"
value=
"3"
></el-option>
<el-option
label=
"定制游"
value=
"4"
></el-option>
<el-option
label=
"一日游"
value=
"5-1"
></el-option>
<el-option
label=
"当地门票"
value=
"5-2"
></el-option>
<el-option
label=
"当地美食"
value=
"5-3"
></el-option>
<el-option
label=
"签证"
value=
"6"
></el-option>
<el-option
label=
"酒店"
value=
"7"
></el-option>
</el-select>
<span
class=
"_splice"
></span>
<el-input
...
...
@@ -408,18 +413,59 @@ export default {
path
:
"search"
,
query
});
}
else
if
(
this
.
select
===
"2
"
)
{
//
酒店
}
else
if
(
this
.
select
===
"3
"
)
{
//
机票
let
query
=
{
keywords
:
encodeURIComponent
(
this
.
searchText
)
};
this
.
$router
.
push
({
path
:
"
search
"
,
path
:
"
TicketList
"
,
query
});
}
else
if
(
this
.
select
===
"3"
)
{
// 机票
let
query
=
{
keywords
:
encodeURIComponent
(
this
.
searchText
)
};
}
else
if
(
this
.
select
===
"4"
)
{
// 定制游
let
query
=
{
keywords
:
this
.
searchText
};
this
.
$router
.
push
({
path
:
"TicketList"
,
path
:
"IndependentList"
,
query
});
}
else
if
(
this
.
select
===
"5-1"
)
{
// 一日游
let
query
=
{
searchKey
:
this
.
searchText
,
tab
:
1
};
this
.
$router
.
push
({
path
:
"LocalTourList"
,
query
});
}
else
if
(
this
.
select
===
"5-2"
)
{
// 当地游门票
let
query
=
{
searchKey
:
this
.
searchText
,
tab
:
2
};
this
.
$router
.
push
({
path
:
"LocalTourList"
,
query
});
}
else
if
(
this
.
select
===
"5-3"
)
{
// 当地游美食
let
query
=
{
searchKey
:
this
.
searchText
};
this
.
$router
.
push
({
path
:
"LocalCuisine"
,
query
});
}
else
if
(
this
.
select
===
"6"
)
{
// 签证
let
query
=
{
searchKey
:
this
.
searchText
};
this
.
$router
.
push
({
path
:
"Visalist"
,
query
});
}
else
if
(
this
.
select
===
"7"
)
{
// 酒店
let
query
=
{
searchKey
:
this
.
searchText
};
this
.
$router
.
push
({
path
:
"HotelList"
,
query
});
}
...
...
src/components/visa/Visalist.vue
View file @
e2d19d40
<
template
>
<div
class=
"visaList"
>
<div
class=
"visaList
commonF
"
>
<div
style=
"padding:10px 0"
>
<el-row
:gutter=
"24"
style=
"box-shadow:0px 4px 8px 0px rgba(107,107,107,0.18);"
>
<div
class=
"common_width"
>
...
...
@@ -75,6 +75,14 @@
<el-button
@
click=
"GetList"
size=
"small"
style=
"background:rgba(238,68,84,1);color:#fff;border:none"
>
查询
</el-button>
</el-col>
</el-row>
<div>
<div
class=
"select_title"
style=
"top:20px"
>
搜索词
</div>
<ul
class=
"select_ul"
>
<el-input
size=
"small"
style=
"width:200px;border-right:none;border-radius:0"
v-model=
"listmsg.searchKey"
></el-input>
<span
@
click=
"GetList"
class=
"SearchSpan"
style=
"top: 1px;"
><i
class=
"iconfont icon-search"
></i></span>
</ul>
</div>
</div>
<!-- 列表 -->
...
...
@@ -337,6 +345,7 @@ export default {
<
style
>
@import
"../../assets/css/reset.css"
;
@import
"../../assets/css/common.css"
;
.visaList
.top_ul
.el-carousel__arrow--left
{
left
:
-30px
;
top
:
25px
;
...
...
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