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
3edec8ce
Commit
3edec8ce
authored
Jan 08, 2020
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
c7ff5db1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
122 additions
and
10 deletions
+122
-10
App.vue
src/App.vue
+1
-1
newTrip.vue
src/components/mall/newTrip.vue
+121
-9
No files found.
src/App.vue
View file @
3edec8ce
...
...
@@ -101,7 +101,7 @@ export default {
<
style
>
@import
'./assets/global/font.css'
;
@import
'//at.alicdn.com/t/font_863923_
jgikji5npg
.css'
;
@import
'//at.alicdn.com/t/font_863923_
4bpjepv71zd
.css'
;
@import
'./assets/global/global.css'
;
@import
'./assets/css/common.css'
;
body
,
html
{
...
...
src/components/mall/newTrip.vue
View file @
3edec8ce
...
...
@@ -674,21 +674,17 @@
.tripAgendaTransitBox
{
overflow
:
hidden
;
margin
-bottom
:
60px
;
margin
:
60px
0
;
}
.tripAgendaTransitBox
.transitIcon
{
float
:
left
;
margin
:
5px
0
0
60px
;
font-size
:
22
px
;
font-size
:
16
px
;
}
.tripAgendaTransitBox
.transitIcon
{
float
:
left
;
margin
:
5px
0
0
60px
;
font-size
:
22px
;
.tripAgendaTransitBox
.transitIcon
i
{
font-size
:
20px
;
}
.tripAgendaTransitBox
.transitInfoTxt
{
line-height
:
34px
;
position
:
relative
;
...
...
@@ -842,6 +838,71 @@
margin-bottom
:
20px
;
-webkit-box-orient
:
vertical
;
}
.tripAgendaTransitBox
.btnTransit
{
border
:
2px
#00A4A8
solid
;
color
:
#00A4A8
;
font-size
:
16px
;
cursor
:
pointer
;
float
:
left
;
border-radius
:
40px
;
padding
:
6px
15px
;
margin-left
:
20px
;
margin-right
:
10px
;
background
:
#fff
;
}
.tripViewPop
{
top
:
0
;
left
:
0
;
width
:
100%
;
height
:
100%
;
background
:
rgba
(
0
,
0
,
0
,
.6
);
z-index
:
201
;
position
:
fixed
;
}
.tripViewPop
.detailBox
{
position
:
absolute
;
top
:
50%
;
left
:
50%
;
width
:
400px
;
margin-left
:
-200px
;
background
:
#fff
;
border-radius
:
5px
;
padding
:
70px
0
20px
;
min-height
:
140px
;
-webkit-overflow-scrolling
:
touch
;
-webkit-transform
:
translateY
(
-50%
);
-ms-transform
:
translateY
(
-50%
);
transform
:
translateY
(
-50%
);
-moz-transform
:
translateY
(
-50%
);
-webkit-box-shadow
:
1px
1px
8px
rgba
(
0
,
0
,
0
,
.16
);
-moz-box-shadow
:
1px
1px
8px
rgba
(
0
,
0
,
0
,
.16
);
box-shadow
:
1px
1px
8px
rgba
(
0
,
0
,
0
,
.16
);
}
.tripViewPop
.detailBox
.btnClose
{
position
:
absolute
;
right
:
20px
;
top
:
20px
;
width
:
40px
;
height
:
40px
;
line-height
:
40px
;
text-align
:
center
;
cursor
:
pointer
;
z-index
:
2
;
color
:
#fff
;
border-radius
:
40px
;
-webkit-box-shadow
:
rgba
(
0
,
0
,
0
,
.2
)
2px
2px
6px
;
-moz-box-shadow
:
rgba
(
0
,
0
,
0
,
.2
)
2px
2px
6px
;
box-shadow
:
rgba
(
0
,
0
,
0
,
.2
)
2px
2px
6px
;
background
:
#00A4A8
;
}
.tripViewPop
.detailBox
.tripViewPopCont
{
width
:
100%
;
min-height
:
140px
;
max-height
:
calc
(
100vh
-
120px
);
overflow-y
:
auto
;
box-sizing
:
border-box
;
/* padding: 0 30px; */
}
</
style
>
<
template
>
<div
class=
"pageViewTrip"
v-if=
"isShow"
>
...
...
@@ -1086,6 +1147,39 @@
</div>
</div>
</div>
<
template
v-if=
"subItem.childItem.trafficType==1"
>
<div
class=
"tripAgendaTransitBox"
>
<div
class=
"transitIcon"
>
<i
class=
"iconfont icon-feiji2"
></i>
飞机
</div>
</div>
</
template
>
<
template
v-if=
"subItem.childItem.trafficType==2"
>
<div
class=
"tripAgendaTransitBox"
>
<div
class=
"transitIcon"
>
<i
class=
"iconfont icon-icon-"
style=
"font-size:25px;"
></i>
专车
</div>
</div>
</
template
>
<
template
v-if=
"subItem.childItem.trafficType==3"
>
<div
class=
"tripAgendaTransitBox"
>
<div
class=
"btnTransit"
@
click=
"getSubWay(subItem.childItem.trafficImage)"
>
<i
class=
"iconfont icon-subway"
style=
"margin-right:10px;font-size:18px;"
></i>
查看交通详情
</div>
<div
class=
"transitIcon"
style=
"margin-left:0;"
>
<span>
地铁
</span>
</div>
</div>
</
template
>
<
template
v-if=
"subItem.childItem.trafficType==4"
>
<div
class=
"tripAgendaTransitBox"
>
<div
class=
"transitIcon"
>
<i
class=
"iconfont icon-walking"
></i>
{{
subItem
.
childItem
.
trafficContent
}}
</div>
</div>
</
template
>
</template>
<
template
v-if=
"subItem.type==3"
>
<div
class=
"agendaBox"
>
...
...
@@ -1160,6 +1254,16 @@
<div
class=
"viewTripMap"
>
<tripMap
:locationArray=
"travelLngLat"
:type=
"1"
ref=
"tripMap"
></tripMap>
</div>
<div
class=
"tripViewPop"
v-if=
"showSubwayDiv"
>
<div
class=
"detailBox"
>
<div
class=
"btnClose icon-close"
@
click=
"showSubwayDiv=false"
>
×
</div>
<div
class=
"tripViewPopCont"
>
<div
class=
"detailHtml"
>
<img
:src=
"subWaySrc"
alt=
""
>
</div>
</div>
</div>
</div>
</div>
<viewer
style=
"display:none"
:images=
"images"
:options=
'imageOptions'
@
inited=
"inited"
class=
"viewer"
ref=
"viewer"
>
...
...
@@ -1191,7 +1295,9 @@
title
:
false
},
FlightList
:
[],
StartData
:
""
StartData
:
""
,
showSubwayDiv
:
false
,
subWaySrc
:
''
}
},
mounted
()
{
...
...
@@ -1236,6 +1342,7 @@
this
.
FlightList
=
res
.
data
.
data
.
currentPriceInfo
.
priceFlight
;
this
.
StartData
=
res
.
data
.
data
.
currentPriceInfo
.
startDate
;
this
.
isShow
=
true
;
console
.
log
(
this
.
dataList
,
'dataList'
);
this
.
getAllPoint
();
//装载景点酒店图片以供预览
this
.
images
=
[];
...
...
@@ -1538,6 +1645,11 @@
getShowMore
(
item
)
{
item
.
isShow
=
!
item
.
isShow
;
this
.
$forceUpdate
();
},
//查看
getSubWay
(
url
){
this
.
showSubwayDiv
=
true
;
this
.
subWaySrc
=
url
;
}
}
}
...
...
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