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
59462332
Commit
59462332
authored
Dec 27, 2019
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
c537e89e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
200 additions
and
3 deletions
+200
-3
agendaBorder.png
src/assets/img/newtrip/agendaBorder.png
+0
-0
detailTwo.vue
src/components/mall/detailTwo.vue
+5
-2
newTrip.vue
src/components/mall/newTrip.vue
+195
-1
No files found.
src/assets/img/newtrip/agendaBorder.png
0 → 100644
View file @
59462332
938 Bytes
src/components/mall/detailTwo.vue
View file @
59462332
...
...
@@ -245,7 +245,7 @@
<i
class=
"iconfont icon-hangchenganpai"
></i>
PDF下载
</li>
<li
@
click=
"goUrlTrip()"
style=
"display:none;"
>
<li
@
click=
"goUrlTrip()"
>
<i
class=
"iconfont icon-hangchenganpai"
></i>
行程
</li>
...
...
@@ -1080,7 +1080,10 @@ export default {
goUrlTrip
(){
this
.
$router
.
push
({
name
:
"newTrip"
,
query
:
{}
query
:
{
ID
:
decodeURIComponent
(
this
.
$route
.
params
.
id
),
tcid
:
decodeURIComponent
(
this
.
$route
.
params
.
tcid
)
}
})
},
handleScroll
(){
...
...
src/components/mall/newTrip.vue
View file @
59462332
...
...
@@ -422,7 +422,6 @@
.tripViewAgendaList
.agendaBox
.txtCont
{
padding
:
10px
20px
;
box-shadow
:
rgba
(
0
,
0
,
0
,
.1
)
0
1px
1px
0
;
border
:
1px
solid
#DCDEDF
;
white-space
:
pre-wrap
;
}
.tripViewAgendaList
.agendaBox
.agendaPoi
.bed
{
...
...
@@ -445,6 +444,7 @@
.tripViewAgendaList
.agendaBox
.detailSection
{
border-top
:
1px
#eee
solid
;
padding
:
10px
0
;
margin-top
:
20px
;
}
.tripViewAgendaList
.agendaBox
.item
{
margin
:
8px
0
;
...
...
@@ -462,6 +462,103 @@
width
:
72%
;
vertical-align
:
top
;
}
.subSection
{
border-top
:
1px
#eee
solid
;
padding-top
:
20px
;
}
.tripViewAgendaList
.agendaBox
.table
.item
{
margin
:
8px
0
;
}
.tripViewAgendaList
.agendaBox
.table
.label
{
display
:
inline-block
;
width
:
22%
;
color
:
#959595
;
vertical-align
:
top
;
padding-right
:
15px
;
text-align
:
right
;
}
.tripViewAgendaList
.agendaBox
.table
.purchaseNote
,
.tripViewAgendaList
.agendaBox
.table
.text
{
display
:
-webkit-inline-box
;
width
:
72%
;
vertical-align
:
top
;
}
.Divtriangle
{
position
:
absolute
;
left
:
26px
;
bottom
:
-16px
;
width
:
0
;
height
:
0
;
border-left
:
15px
solid
transparent
;
border-right
:
15px
solid
transparent
;
border-top
:
15px
solid
#DCDEDF
;
}
.Divtriangle
span
{
display
:
block
;
width
:
0
;
height
:
0
;
border-left
:
28px
solid
transparent
;
border-right
:
28px
solid
transparent
;
border-top
:
28px
solid
#fff
;
position
:
absolute
;
left
:
-28px
;
top
:
-29px
;
}
/* .xuxian{
position: absolute;
width:1px;
height:30px;
bottom:-50px;
left:38px;
background: url('../../assets/img/newtrip/agendaBorder.png');
background-size:2px auto;
} */
.tripViewAgendaList
.agendaBox
.numberList
{
background
:
#00A4A8
;
color
:
#fff
;
top
:
-16px
;
left
:
20px
;
}
.tripViewAgendaList
.agendaPoi
{
margin-top
:
10px
;
}
.tripViewAgendaList
.agendaBox
.food
{
color
:
#00A4A8
!important
;
}
.tripViewAgendaList
.agendaBox
.food1
{
font-size
:
22px
!important
;
}
.tripAgendaTransitBox
{
overflow
:
hidden
;
margin-bottom
:
60px
;
}
.tripAgendaTransitBox
.transitIcon
{
float
:
left
;
margin
:
5px
0
0
60px
;
font-size
:
22px
;
}
.tripAgendaTransitBox
.transitIcon
{
float
:
left
;
margin
:
5px
0
0
60px
;
font-size
:
22px
;
}
.tripAgendaTransitBox
.transitInfoTxt
{
line-height
:
34px
;
position
:
relative
;
top
:
3px
;
margin-left
:
10px
;
}
.tripViewAgendaList
{
margin-top
:
30px
;
background
:
url(../../assets/img/newtrip/agendaBorder.png)
40px
top
repeat-y
;
background-size
:
2px
auto
;
}
.pageViewTrip
.viewTripMap
{
position
:
fixed
;
top
:
0
;
left
:
730px
;
right
:
0
;
height
:
100%
;
}
</
style
>
<
template
>
<div
class=
"pageViewTrip"
>
...
...
@@ -687,6 +784,95 @@
</span>
</div>
</div>
<div
class=
"subSection"
>
皇家花园酒店-THE羽田是游览东京的完美住宿选择。 酒店内设施齐全,可为住客提供舒适的入住体验。 一切生活必需品,例如免费房内无线网络, 24小时前台, 无障碍设施, 行李存放服务, 无线网络(公共区域)等都已为您准备就绪。客房内饰优雅,便利设施齐全。 酒店内设多种休闲娱乐设施。 不论您出行东京的原因为何,皇家花园酒店-THE羽田都可让您感受到家的温馨与舒适。
</div>
<div
class=
"detailSection"
style=
"margin-top:0;"
>
<div
class=
"item"
>
<span
class=
"label"
>
英文名称
</span>
<span
class=
"text"
>
Royal Park Hotel The Haneda Tokyo
</span>
</div>
<div
class=
"item"
>
<span
class=
"label"
>
地址
</span>
<span
class=
"text"
>
大田区羽田空港2-6-5 羽田空港国際線旅客ターミナルビル内,
</span>
</div>
<div
class=
"item"
>
<span
class=
"label"
>
开放时间
</span>
<span
class=
"text"
>
入住时间:从15:00时退房时间:11:00时之前
</span>
</div>
</div>
</div>
<div
class=
"Divtriangle"
>
<span></span>
</div>
</div>
</div>
<div
class=
"agendaBox"
>
<div
class=
"indexNum numberList"
>
1
</div>
<div
class=
"coverWrap"
></div>
<div
class=
"txtCont icon-triangle"
>
<div
class=
"agendaPoi"
>
<i
class=
"iconfont icon-fan food food1"
></i>
<span
class=
"title food"
>
皇家花园酒店-THE羽田
</span>
</div>
<div
class=
"detailBox"
>
<div
class=
"subSection"
style=
"border-top:0"
>
皇家花园酒店-THE羽田是游览东京的完美住宿选择。 酒店内设施齐全,可为住客提供舒适的入住体验。 一切生活必需品,例如免费房内无线网络, 24小时前台, 无障碍设施, 行李存放服务, 无线网络(公共区域)等都已为您准备就绪。客房内饰优雅,便利设施齐全。 酒店内设多种休闲娱乐设施。 不论您出行东京的原因为何,皇家花园酒店-THE羽田都可让您感受到家的温馨与舒适。
</div>
<div
class=
"detailSection"
style=
"margin-top:0;"
>
<div
class=
"item"
>
<span
class=
"label"
>
英文名称
</span>
<span
class=
"text"
>
Royal Park Hotel The Haneda Tokyo
</span>
</div>
<div
class=
"item"
>
<span
class=
"label"
>
地址
</span>
<span
class=
"text"
>
大田区羽田空港2-6-5 羽田空港国際線旅客ターミナルビル内,
</span>
</div>
<div
class=
"item"
>
<span
class=
"label"
>
开放时间
</span>
<span
class=
"text"
>
入住时间:从15:00时退房时间:11:00时之前
</span>
</div>
</div>
</div>
<div
class=
"Divtriangle"
>
<span></span>
</div>
</div>
</div>
<div
class=
"tripAgendaTransitBox"
>
<div
class=
"transitIcon"
>
<i
class=
"iconfont icon-cheliang"
></i>
</div>
<div
class=
"transitInfo"
style=
"margin:4px 0 0 10px;"
>
<span
class=
"transitInfoTxt"
>
专车
</span>
</div>
</div>
<div
class=
"agendaBox"
>
<div
class=
"indexNum numberList"
>
2
</div>
<div
class=
"coverWrap"
></div>
<div
class=
"txtCont icon-triangle"
>
<div
class=
"agendaPoi"
>
<i
class=
"iconfont icon-fan food food1"
></i>
<span
class=
"title food"
>
皇家花园酒店-THE羽田
</span>
</div>
<div
class=
"detailBox"
>
<div
class=
"subSection"
style=
"border-top:0"
>
皇家花园酒店-THE羽田是游览东京的完美住宿选择。 酒店内设施齐全,可为住客提供舒适的入住体验。 一切生活必需品,例如免费房内无线网络, 24小时前台, 无障碍设施, 行李存放服务, 无线网络(公共区域)等都已为您准备就绪。客房内饰优雅,便利设施齐全。 酒店内设多种休闲娱乐设施。 不论您出行东京的原因为何,皇家花园酒店-THE羽田都可让您感受到家的温馨与舒适。
</div>
<div
class=
"detailSection"
style=
"margin-top:0;"
>
<div
class=
"item"
>
<span
class=
"label"
>
英文名称
</span>
<span
class=
"text"
>
Royal Park Hotel The Haneda Tokyo
</span>
</div>
<div
class=
"item"
>
<span
class=
"label"
>
地址
</span>
<span
class=
"text"
>
大田区羽田空港2-6-5 羽田空港国際線旅客ターミナルビル内,
</span>
</div>
<div
class=
"item"
>
<span
class=
"label"
>
开放时间
</span>
<span
class=
"text"
>
入住时间:从15:00时退房时间:11:00时之前
</span>
</div>
</div>
</div>
<div
class=
"Divtriangle"
>
<span></span>
</div>
</div>
</div>
...
...
@@ -697,18 +883,26 @@
</div>
</div>
</div>
<div
class=
"viewTripMap"
>
<HTMap
:dataList=
"travelLngLat"
:type=
"1"
></HTMap>
</div>
</div>
</div>
</
template
>
<
script
>
import
HTMap
from
'../global/HTMap'
export
default
{
data
(){
return
{
defaultImg
:
'this.src="'
+
require
(
'../../assets/img/newtrip/hotel.jpg'
)
+
'"'
,
travelLngLat
:[]
}
},
mounted
()
{
},
components
:
{
HTMap
},
methods
:
{
...
...
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