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
6119cba8
Commit
6119cba8
authored
Mar 04, 2020
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改样式
parent
34cca8f9
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
51 additions
and
8 deletions
+51
-8
HotelBook.vue
src/components/Hotel/HotelBook.vue
+1
-1
restaurant.vue
src/components/trip/waterfall/restaurant.vue
+18
-3
scenic.vue
src/components/trip/waterfall/scenic.vue
+16
-2
traffic.vue
src/components/trip/waterfall/traffic.vue
+16
-2
No files found.
src/components/Hotel/HotelBook.vue
View file @
6119cba8
...
@@ -277,7 +277,7 @@
...
@@ -277,7 +277,7 @@
<div
class=
"mcont clearfix"
>
<div
class=
"mcont clearfix"
>
<div
class=
"cont_main"
>
<div
class=
"cont_main"
>
<div
class=
"order_tips_strengthen"
>
<div
class=
"order_tips_strengthen"
>
<p
style=
"margin-top:
50
px;"
>
<p
style=
"margin-top:
25
px;"
>
<span
class=
"bold iencourage_green"
>
免费!7-12岁儿童可免费入住
</span>
<span
class=
"bold iencourage_green"
>
免费!7-12岁儿童可免费入住
</span>
</p>
</p>
<p
style=
"margin-top:20px;"
>
<p
style=
"margin-top:20px;"
>
...
...
src/components/trip/waterfall/restaurant.vue
View file @
6119cba8
<
style
>
.trafficLeft
{
width
:
51px
;
height
:
25px
;
background-color
:
#fff
;
margin-right
:
20px
;
text-align
:
center
;
font-size
:
12px
;
padding
:
5px
0
;
}
</
style
>
<
template
>
<
template
>
<div
class=
"timeline-item"
>
<div
class=
"timeline-item"
>
<div
class=
"left"
>
<div
class=
"trafficLeft"
>
<i
class=
"iconfont icon-yongcan"
></i>
<!--
<i
class=
"iconfont icon-yongcan"
></i>
-->
<span
v-if=
"tripItem.childItem.timeStr!=''"
>
{{
tripItem
.
childItem
.
timeStr
}}
</span>
</div>
</div>
<div
class=
"right"
>
<div
class=
"right"
>
<span
class=
"time"
v-if=
"tripItem.childItem.timeType==1"
>
上午
</span>
<span
class=
"time"
v-if=
"tripItem.childItem.timeType==1"
>
上午
</span>
...
@@ -10,7 +25,7 @@
...
@@ -10,7 +25,7 @@
<span
class=
"title"
>
<span
class=
"title"
>
{{
tripItem
.
childItem
.
dinnerName
+
tripItem
.
childItem
.
mealName
}}
{{
tripItem
.
childItem
.
dinnerName
+
tripItem
.
childItem
.
mealName
}}
</span>
</span>
<span
class=
"playTime"
>
<i
class=
"iconfont icon-shijian"
></i>
用餐时长:
<span
v-if=
"tripItem.childItem.
playTimeHour!=null&&tripItem.childItem.playTimeHour!=''"
>
{{
tripItem
.
childItem
.
playTimeHour
+
'小时'
}}
</span><span
v-if=
"tripItem.childItem.playTimeMinutes!=null&&tripItem.childItem.playTimeMinutes!=''"
>
{{
tripItem
.
childItem
.
play
TimeMinutes
+
'分钟'
}}
</span></span>
<span
class=
"playTime"
>
<i
class=
"iconfont icon-shijian"
></i>
用餐时长:
<span
v-if=
"tripItem.childItem.
useTimeHour!=null&&tripItem.childItem.useTimeHour!=''"
>
{{
tripItem
.
childItem
.
useTimeHour
+
'小时'
}}
</span><span
v-if=
"tripItem.childItem.useTimeMinutes!=null&&tripItem.childItem.useTimeMinutes!=''"
>
{{
tripItem
.
childItem
.
use
TimeMinutes
+
'分钟'
}}
</span></span>
<span
class=
"content"
v-html=
"tripItem.childItem.description"
></span>
<span
class=
"content"
v-html=
"tripItem.childItem.description"
></span>
<div
class=
"img-list"
v-if=
"tripItem.childItem.imaArray.length"
>
<div
class=
"img-list"
v-if=
"tripItem.childItem.imaArray.length"
>
<div
class=
"item"
v-for=
"(img,i) in tripItem.childItem.imaArray"
:key=
"i"
>
<div
class=
"item"
v-for=
"(img,i) in tripItem.childItem.imaArray"
:key=
"i"
>
...
...
src/components/trip/waterfall/scenic.vue
View file @
6119cba8
<
style
>
.trafficLeft
{
width
:
51px
;
height
:
25px
;
background-color
:
#fff
;
margin-right
:
20px
;
text-align
:
center
;
font-size
:
12px
;
padding
:
5px
0
;
}
</
style
>
<
template
>
<
template
>
<div
class=
"timeline-item"
>
<div
class=
"timeline-item"
>
<div
class=
"left"
>
<div
class=
"trafficLeft"
>
<i
class=
"iconfont icon-zuji"
></i>
<!--
<i
class=
"iconfont icon-zuji"
></i>
-->
<span
v-if=
"tripItem.childItem.timeStr!=''"
>
{{
tripItem
.
childItem
.
timeStr
}}
</span>
</div>
</div>
<div
class=
"right"
>
<div
class=
"right"
>
<span
class=
"time"
v-if=
"tripItem.childItem.timeType==1"
>
上午
</span>
<span
class=
"time"
v-if=
"tripItem.childItem.timeType==1"
>
上午
</span>
...
...
src/components/trip/waterfall/traffic.vue
View file @
6119cba8
<
style
>
.trafficLeft
{
width
:
51px
;
height
:
25px
;
background-color
:
#fff
;
margin-right
:
20px
;
text-align
:
center
;
font-size
:
12px
;
padding
:
5px
0
;
}
</
style
>
<
template
>
<
template
>
<div
class=
"timeline-item"
>
<div
class=
"timeline-item"
>
<div
class=
"left"
>
<div
class=
"trafficLeft"
>
<i
class=
"iconfont icon-feiji"
></i>
<!--
<i
class=
"iconfont icon-feiji"
></i>
-->
<span
v-if=
"tripItem.type==1"
v-for=
"(dns,o) in tripItem.childItem.subTraffic"
:key=
"o"
>
<span
v-if=
"dns.startTime!=''"
style=
"margin-right:20px;"
>
{{
dns
.
startTime
}}
</span><span
v-if=
"dns.endTime!=''"
>
-
{{
dns
.
endTime
}}
</span>
</span>
</div>
</div>
<div
class=
"right"
>
<div
class=
"right"
>
<span
class=
"time"
v-if=
"tripItem.childItem.timeType==1"
>
上午
</span>
<span
class=
"time"
v-if=
"tripItem.childItem.timeType==1"
>
上午
</span>
...
...
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