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
cadcb918
Commit
cadcb918
authored
Jun 17, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
187e8ed5
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
19 additions
and
11 deletions
+19
-11
localtourhome.css
src/assets/css/localtourhome.css
+2
-3
diving.vue
src/components/GroupTour/block/diving.vue
+2
-2
index.vue
src/components/GroupTour/index.vue
+5
-0
Home.vue
src/components/Home.vue
+1
-1
AdmissionTicket.vue
src/components/LocalTour/AdmissionTicket.vue
+4
-2
Localtourhome.vue
src/components/LocalTour/Localtourhome.vue
+1
-1
OnedayList.vue
src/components/LocalTour/OnedayList.vue
+4
-2
No files found.
src/assets/css/localtourhome.css
View file @
cadcb918
...
...
@@ -133,7 +133,6 @@
.Localtourhome
.outoneday
.dayContent
.dayConDiv1
div
.daydes
{
position
:
absolute
;
width
:
83px
;
height
:
53px
;
overflow
:
hidden
;
font-size
:
12px
;
color
:
#333333
;
...
...
@@ -142,7 +141,7 @@
overflow
:
hidden
;
text-overflow
:
ellipsis
;
display
:
-webkit-box
;
-webkit-line-clamp
:
2
;
-webkit-line-clamp
:
3
;
-webkit-box-orient
:
vertical
;
}
.Localtourhome
.outoneday
.dayContent
.dayConDiv1
div
.price
{
...
...
@@ -183,7 +182,6 @@
height
:
100%
;
}
.Localtourhome
.outoneday
.dayContent
.dayConDiv2
.imgDiv
.country
{
width
:
40px
;
height
:
28px
;
background
:
rgba
(
249
,
201
,
0
,
1
);
display
:
inline-block
;
...
...
@@ -193,6 +191,7 @@
top
:
0
;
left
:
0
;
font-size
:
12px
;
padding
:
0
4px
;
}
.Localtourhome
.outoneday
.dayContent
.dayConDiv2
.imgDiv
.price
{
position
:
absolute
;
...
...
src/components/GroupTour/block/diving.vue
View file @
cadcb918
...
...
@@ -105,9 +105,9 @@
<template
v-for=
"(item, index) in data"
>
<el-col
:span=
"6"
v-if=
"index
<
8
"
>
<div
class=
"item"
@
click=
"goUrl(item)"
>
<div
class=
"label"
>
<
!--
<
div
class=
"label"
>
{{
item
.
title
.
substr
(
0
,
2
)
}}
</div>
</div>
-->
<div
class=
"img"
>
<img
v-if=
'item.imgCover!=null&&item.imgCover.length'
:src=
'compressImg(item.imgCover[0].url, "filt", 245, "")'
alt=
""
>
<img
class=
"notamin"
src=
"../../../assets/img/bg_c2@3x.png"
v-else
/>
...
...
src/components/GroupTour/index.vue
View file @
cadcb918
...
...
@@ -67,6 +67,11 @@
<img
class=
"bgImg"
src=
"../../assets/img/groupTour/top_bg.jpg"
alt=
""
>
</router-link>
-->
<el-carousel
style=
"width:100%;position:absolute;left:0;top:0"
arrow=
"always"
height=
"522px"
:interval=
"10000"
trigger=
"click"
>
<el-carousel-item>
<!--
<router-link
to=
"IceCreamTask"
>
-->
<img
src=
"../../assets/img/groupTour/top_bg.jpg"
alt=
""
>
<!--
</router-link>
-->
</el-carousel-item>
<el-carousel-item>
<router-link
:to=
"
{ path: '/search',query:{'keywords':'','lineId':'出境日本线'}}">
<img
src=
'../../assets/img/groupTour/01.jpg'
>
...
...
src/components/Home.vue
View file @
cadcb918
...
...
@@ -459,7 +459,7 @@
src=
"../assets/img/active/huodong_img1.png"
alt
>
</
!
-->
-->
</
!
-->
<!-- 景点门票 -->
<div
class=
"Ticket_spots"
>
<ul
class=
"common_ul_tab"
>
...
...
src/components/LocalTour/AdmissionTicket.vue
View file @
cadcb918
...
...
@@ -5,7 +5,8 @@
<div
v-for=
"(item,index) in dataList"
:key=
"index+5000"
style=
"margin-bottom:20px"
>
<li>
<div>
<img
style=
"width:143px;height:106px;"
:src=
'compressImg(item.coverImgs[0], "filt", 245, "")'
alt=
""
>
<img
style=
"width:143px;height:106px;"
v-if=
"item.coverImgs[0]"
:src=
'compressImg(item.coverImgs[0], "filt", 245, "")'
alt=
""
>
<img
style=
"width:143px;height:106px;"
v-else
src=
"../../assets/img/activy.jpg"
alt=
""
>
</div>
<div
class=
"secondDiv"
>
<p
@
click=
"GoUrl(item)"
style=
"font-size:16px;color:#2A5532;cursor:pointer"
>
{{
item
.
name
}}
</p>
...
...
@@ -54,7 +55,8 @@
<ul
class=
"hottour_ul"
>
<p
class=
"pfR font14"
style=
"margin-bottom:8px"
>
热门景点
</p>
<li
@
click=
"GoUrl(item)"
v-for=
"(item,index) in hotList"
:key=
"index+2000"
>
<img
:src=
'compressImg(item.coverImgs[0], "filt", 245, "")'
alt=
""
>
<img
v-if=
"item.coverImgs[0]"
:src=
'compressImg(item.coverImgs[0], "filt", 245, "")'
alt=
""
>
<img
v-else
src=
"../../assets/img/activy.jpg"
alt=
""
>
<div
class=
"hotcontent"
>
<span
style=
"color:#fff;width:125px;"
class=
"textHidden font12"
>
{{
item
.
name
}}
</span>
<span
style=
"width:75px;color:#FDAC11;text-align:right"
>
...
...
src/components/LocalTour/Localtourhome.vue
View file @
cadcb918
...
...
@@ -146,7 +146,7 @@
<ul
v-loading=
"ticketLoad"
class=
"ticketRight basefix"
>
<li
@
click=
"GoTicket(item)"
v-for=
"item in ticketList"
:key=
"item.id"
>
<!--
<img
:src=
"item.coverImgs[0]"
alt=
""
>
-->
<img
:src=
'compressImg(item.coverImgs[0], "filt", 245, "")'
alt=
""
>
<img
v-if=
"item.coverImgs[0]"
:src=
'compressImg(item.coverImgs[0], "filt", 245, "")'
alt=
""
>
<!--
<div
class=
"title"
>
<img
src=
"../../assets/img/localtour/ticket1.png"
alt=
""
>
<p
style=
"margin-top:3px;"
>
电影
</p>
...
...
src/components/LocalTour/OnedayList.vue
View file @
cadcb918
...
...
@@ -3,7 +3,8 @@
<ul
class=
"oneList"
>
<li
@
click=
"goOneDayDetail(item)"
v-for=
"(item,index) in dataList"
:key=
"index+200"
>
<div
style=
"width:199px;height:148px;"
>
<img
style=
"width:100%;height:100%;"
:src=
'compressImg(item.imgCover[0].url, "filt", 245, "")'
alt=
""
>
<img
style=
"width:100%;height:100%;"
v-if=
"item.imgCover[0].url"
:src=
'compressImg(item.imgCover[0].url, "filt", 245, "")'
alt=
""
>
<img
style=
"width:100%;height:100%;"
v-else
src=
"../../assets/img/activy.jpg"
alt=
""
>
</div>
<div
class=
"secondDiv"
>
<p
style=
"font-size:16px;color:#2A5532;cursor:pointer"
>
{{
item
.
title
}}
</p>
...
...
@@ -36,7 +37,8 @@
<ul
class=
"hottour_ul"
>
<p
class=
"pfR font14"
style=
"margin-bottom:8px"
>
历史浏览
</p>
<li
@
click=
"goOneDayDetail(item)"
v-for=
"(item,index) in Historylist"
:key=
"index+2000"
>
<img
:src=
'compressImg(item.imgCover[0].url, "filt", 245, "")'
alt=
""
>
<img
v-if=
"item.imgCover[0].url"
:src=
'compressImg(item.imgCover[0].url, "filt", 245, "")'
alt=
""
>
<img
v-else
src=
"../../assets/img/activy.jpg"
alt=
""
>
<div
class=
"hotcontent"
>
<span
class=
"textHidden font12"
>
{{
item
.
title
}}
</span>
<p
class=
"font12"
style=
"color:#FDAC11;text-align:right;padding-top:4px;padding-right:6px"
>
¥
<span
class=
"pfR font14"
>
...
...
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