Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
00e9402e
Commit
00e9402e
authored
Jan 29, 2019
by
qiaoyajun
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/luochao/superman
parents
e33eb603
6b96539e
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
8 deletions
+9
-8
tripIndex.css
src/assets/css/tripIndex.css
+3
-2
confirmationOrderDownLoad.vue
src/components/confirmationOrderDownLoad.vue
+6
-6
No files found.
src/assets/css/tripIndex.css
View file @
00e9402e
...
...
@@ -615,9 +615,10 @@
.travelControlTrip
.essential-item
p
.pkey
{
font-size
:
14px
;
color
:
#000
;
margin
:
10px
0
0
0
;
}
.travelControlTrip
.essential-item
p
.pvalue
{
font-size
:
18px
;
color
:
#000
;
margin-top
:
5px
;
}
.travelControlTrip
.collection
{
margin-bottom
:
40px
;
width
:
100%
;}
.travelControlTrip
.collection-item
{
width
:
400px
;
height
:
110px
;
border-bottom
:
1px
solid
#ddd
;
margin-left
:
60px
;
box-sizing
:
border-box
;
color
:
#666
;
display
:
flex
;
align-items
:
center
}
.travelControlTrip
.collection-item
{
width
:
400px
;
height
:
110px
;
border-bottom
:
1px
solid
#ddd
;
margin-left
:
60px
;
box-sizing
:
border-box
;
color
:
#666
;}
.travelControlTrip
.collection-item
>
div
{
width
:
130px
;
float
:
left
;
padding-top
:
25px
;}
.travelControlTrip
.collection-item
img
{
vertical-align
:
sub
;
margin-right
:
12px
;}
.travelControlTrip
.collection-item
span
{
font-size
:
18px
;
color
:
#000
;
margin-left
:
20px
;
width
:
265px
;
display
:
inline-block
}
.travelControlTrip
.collection-item
span
{
font-size
:
18px
;
color
:
#000
;
width
:
270px
;
display
:
inline-block
;
float
:
left
;
padding-top
:
25px
;
}
.travelControlTrip
.flight-table
{
width
:
960px
;
color
:
#666
;
margin-bottom
:
90px
;
background
:
#fff
;}
.travelControlTrip
.flight-table
td
.thClass
{
height
:
50px
;
background
:
#e2e2e2
;
font-size
:
16px
;
font-weight
:
normal
;
padding
:
0
!important
;}
.travelControlTrip
.flight-table
tr
td
{
background
:
#f7f7f7
;
text-align
:
center
;
font-size
:
14px
;
padding
:
15px
10px
;
}
...
...
src/components/confirmationOrderDownLoad.vue
View file @
00e9402e
...
...
@@ -68,14 +68,14 @@
<table
v-if=
'vshowL'
class=
"collection"
>
<tr>
<td>
<div
class=
"collection-item"
>
<div
class=
"collection-item
clearfix
"
>
<div><img
src=
"../assets/img/TravelControlTripIcon9.png"
/>
本团领队
</div>
<span>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
leaderInfo
:
orderMsg
.
leaderName
+
(
orderMsg
.
leaderMobile
!=
null
?
"/"
+
orderMsg
.
leaderMobile
:
""
)
}}
</span>
</div>
</td>
<td>
<div
class=
"collection-item"
>
<div
class=
"collection-item
clearfix
"
>
<div><img
src=
"../assets/img/TravelControlTripIcon10.png"
/>
集合时间
</div>
<span>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
gatheringTime
:
orderMsg
.
gatheringTime
}}
</span>
...
...
@@ -84,14 +84,14 @@
</tr>
<tr>
<td>
<div
class=
"collection-item"
>
<div
class=
"collection-item
clearfix
"
>
<div><img
src=
"../assets/img/TravelControlTripIcon11.png"
/>
机场服务
</div>
<span>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
airportService
:
orderMsg
.
airportServicePerson
+
"/"
+
orderMsg
.
airportServicePhone
}}
</span>
</div>
</td>
<td>
<div
class=
"collection-item"
>
<div
class=
"collection-item
clearfix
"
>
<div><img
src=
"../assets/img/TravelControlTripIcon12.png"
/>
集合标识
</div>
<span>
{{
orderTripdiff
!=
null
?
orderTripdiff
.
gatherIdent
:
orderMsg
.
bName
}}
</span>
...
...
@@ -100,7 +100,7 @@
</tr>
<tr>
<td>
<div
class=
"collection-item"
>
<div
class=
"collection-item
clearfix
"
>
<div><img
src=
"../assets/img/TravelControlTripIcon13.png"
/>
紧急联系人
</div>
<template>
<span
v-if=
'vshowLLR'
>
{{
orderTripdiff
!=
null
?
...
...
@@ -111,7 +111,7 @@
</div>
</td>
<td>
<div
class=
"collection-item"
>
<div
class=
"collection-item
clearfix
"
>
<div><img
src=
"../assets/img/TravelControlTripIcon14.png"
/>
集合地点
</div>
<span>
{{orderTripdiff!=null? orderTripdiff.gatheringAddress :
orderMsg.gatheringAddress}}
</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