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
1f4aa46e
Commit
1f4aa46e
authored
Jan 09, 2020
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
eb72c7a7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
272 additions
and
289 deletions
+272
-289
tripMap.vue
src/components/global/tripMap.vue
+1
-1
newTrip.vue
src/components/mall/newTrip.vue
+271
-288
No files found.
src/components/global/tripMap.vue
View file @
1f4aa46e
...
...
@@ -143,7 +143,7 @@
let
lat
=
parseFloat
(
startArray
[
0
]);
let
lng
=
parseFloat
(
startArray
[
1
]);
this
.
map
.
setCenter
(
new
google
.
maps
.
LatLng
(
lat
,
lng
));
this
.
map
.
setZoom
(
1
3
);
this
.
map
.
setZoom
(
1
0
);
//全部
if
(
this
.
type
==
1
)
{
/* 循环标出所有坐标 */
...
...
src/components/mall/newTrip.vue
View file @
1f4aa46e
...
...
@@ -92,12 +92,6 @@
max-width
:
480px
;
margin-left
:
250px
;
}
.swiper-slide
{
position
:
relative
;
-webkit-overflow-scrolling
:
touch
;
}
.tripViewContainer
.inner
{
margin
:
15px
;
color
:
#869096
;
...
...
@@ -167,12 +161,6 @@
font-size
:
20px
;
font-family
:
'PingFangR'
;
}
.swiper-slide
,
.swiperMobile
.swiper-slide
{
background
:
#fff
;
}
.tripViewContainer
.inner
.articleCont
{
min-height
:
30px
;
margin-bottom
:
20px
;
...
...
@@ -295,11 +283,6 @@
top
:
10px
;
content
:
" "
;
}
.swiper-slide
{
margin
:
30px
0
;
}
.arrangements
.arrangementSubContainer
{
border
:
1px
solid
#DBE0E4
;
border-radius
:
5px
;
...
...
@@ -910,6 +893,11 @@
box-sizing
:
border-box
;
/* padding: 0 30px; */
}
.slideList
{
background
:
#fff
;
margin
:
30px
0
;
position
:
relative
;
}
</
style
>
<
template
>
<div
class=
"pageViewTrip"
v-if=
"isShow"
>
...
...
@@ -952,9 +940,7 @@
<div
class=
"border"
></div>
</div>
<div
class=
"tripViewContainer main "
>
<div
class=
"swiper-container"
>
<div
class=
"swiper-wrapper"
>
<div
class=
"swiper-slide"
id=
"tripLine"
>
<div
class=
"slideList"
id=
"tripLine"
>
<div
class=
"inner"
>
<div
class=
"slideHeader"
>
行程路线
</div>
<div>
...
...
@@ -985,7 +971,7 @@
</div>
</div>
</div>
<div
class=
"swiper-slide
"
id=
"aboutTrip"
>
<div
class=
"slideList
"
id=
"aboutTrip"
>
<div
class=
"inner"
>
<div
class=
"slideHeader"
>
关于这次旅行
</div>
<div
class=
"articleCont articleTxt"
>
...
...
@@ -999,7 +985,7 @@
</div>
</div>
</div>
<div
class=
"swiper-slide
"
id=
"tripArrange"
>
<div
class=
"slideList
"
id=
"tripArrange"
>
<div
class=
"inner slideQuote"
>
<div
class=
"slideHeader"
>
行程安排
</div>
<div
class=
"arrangements"
>
...
...
@@ -1084,7 +1070,7 @@
</div>
</div>
</div>
<div
class=
"swiper-slide
"
v-for=
"(item,index) in dataList.dayList"
:id=
"'dayList'+(index+1)"
<div
class=
"slideList
"
v-for=
"(item,index) in dataList.dayList"
:id=
"'dayList'+(index+1)"
:key=
"index"
>
<div
class=
"inner"
>
<div
class=
"slideHeader"
style=
"position:relative;"
>
...
...
@@ -1245,8 +1231,7 @@
</div>
</div>
<div
class=
"showMore"
@
click=
"getShowMore(subItem.childItem)"
>
{{subItem.childItem.isShow==true?'点我收起':'点我展开详情'}}
</div>
@
click=
"getShowMore(subItem.childItem)"
>
{{subItem.childItem.isShow==true?'点我收起':'点我展开详情'}}
</div>
</div>
<div
class=
"Divtriangle"
>
<span></span>
...
...
@@ -1260,8 +1245,6 @@
</div>
</div>
</div>
</div>
</div>
<div
class=
"viewTripMap"
>
<tripMap
:locationArray=
"travelLngLat"
:type=
"showType"
ref=
"tripMap"
></tripMap>
</div>
...
...
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