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
850528be
Commit
850528be
authored
Mar 18, 2020
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
e1c2ce70
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
66 additions
and
11 deletions
+66
-11
newTripCommon.vue
src/components/commonPage/newTripCommon.vue
+43
-0
confirmationOrderDownLoad.vue
src/components/confirmationOrderDownLoad.vue
+1
-1
newConfimationOrder.vue
src/components/newConfimationOrder.vue
+22
-10
No files found.
src/components/commonPage/newTripCommon.vue
0 → 100644
View file @
850528be
<
style
>
.newTripOneImg
img
{
width
:
100%
;
}
.newTripHalfImg
{
display
:
inline-block
;
width
:
49%
;
height
:
300px
;
}
.newTripHalfImg
img
{
width
:
100%
;
height
:
100%
;
}
</
style
>
<
template
>
<div
class=
"newTripImgContent"
>
<div
class=
"newTripOneImg"
v-if=
"day.length==1"
>
<img
:src=
"day[0].img"
alt=
""
/>
</div>
<div
class=
"newTripTwoImg"
v-if=
"day.length==2"
>
<div
class=
"newTripHalfImg"
>
<img
:src=
"day[0].img"
alt=
""
>
</div>
<div
class=
"newTripHalfImg"
>
<img
:src=
"day[1].img"
alt=
""
>
</div>
</div>
</div>
</
template
>
<
script
>
export
default
{
props
:
{
day
:{}
},
methods
:
{
},
mounted
()
{
console
.
log
(
this
.
day
,
'dayyyyy'
);
}
};
</
script
>
src/components/confirmationOrderDownLoad.vue
View file @
850528be
...
...
@@ -51,7 +51,7 @@
@
click=
"gernalFeature(0)"
/>
<input
type=
"button"
style=
"width: auto !important;"
class=
"travelControlTripBtn"
value=
"下载电脑版WORD"
@
click=
"gernalFeature(1)"
/>
-->
<input
type=
"button"
value=
"新版行程"
class=
"travelControlTripBtn"
@
click=
"goUrlView()"
/>
<input
type=
"button"
value=
"新版行程"
class=
"travelControlTripBtn"
style=
"display:none;"
@
click=
"goUrlView()"
/>
<a
class=
"travelControlTripBtn"
v-if=
"priceList.length>0&& priceList[0].wordPath!=''"
style=
"display:inline-block;text-decoration:none;
width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;"
:href=
"domainManager().ViittoFileUrl+priceList[0].wordPath"
>
下载WORD行程
</a>
...
...
src/components/newConfimationOrder.vue
View file @
850528be
...
...
@@ -86,11 +86,14 @@
font-weight
:
bold
;
margin-bottom
:
10px
!important
;
}
.newTripImgList
{
width
:
100%
;
}
</
style
>
<
template
>
<div
class=
"newTrip_Main"
>
<div
class=
"newTripCom_Img"
>
<img
src=
"../assets/img/trip/japanTop.pn
g"
alt=
""
/>
<img
:src=
"lineTripFeatureTopB
g"
alt=
""
/>
</div>
<div
class=
"newCenterContent"
>
<div
class=
"newTripTitle"
>
...
...
@@ -147,19 +150,19 @@
</tr>
</table>
</div>
<div
class=
""
>
<div
class=
"
newTripImgList
"
>
<newTripCommon
:day=
"item.details"
></newTripCommon>
</div>
</div>
</div>
<
!-- <
div class="newTripCom_Img">
<img
src="../assets/img/trip/japanBtm.pn
g" alt=""/>
</div>
-->
<div
class=
"newTripCom_Img"
>
<img
:src=
"lineTripFeatureBottomB
g"
alt=
""
/>
</div>
</div>
</template>
<
script
>
import
oneday
from
'./commonPage/oneday
'
import
newTripCommon
from
'./commonPage/newTripCommon
'
export
default
{
data
()
{
return
{
...
...
@@ -200,7 +203,11 @@
orderTripdiff
:
{},
title
:
''
,
isDirect
:
1
,
//是否是直采 0:否,1:是
isClick
:
this
.
$route
.
query
.
isClick
===
undefined
?
0
:
1
//不算统计
isClick
:
this
.
$route
.
query
.
isClick
===
undefined
?
0
:
1
,
//不算统计
//顶部图片
lineTripFeatureTopBg
:
''
,
//底部图片
lineTripFeatureBottomBg
:
''
}
},
mounted
()
{
...
...
@@ -419,7 +426,9 @@
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
(
res
.
data
.
data
);
// console.log(res,'resss');
console
.
log
(
res
,
'resssssss'
);
this
.
lineTripFeatureTopBg
=
data
.
lineTripFeatureTopBg
;
this
.
lineTripFeatureBottomBg
=
data
.
lineTripFeatureBottomBg
;
this
.
orderTripdiff
=
data
.
orderTripdiff
;
this
.
orderMsg
=
data
.
orderMsg
;
if
(
this
.
orderTripdiff
&&
this
.
orderTripdiff
.
flightInfoJson
)
{
...
...
@@ -737,10 +746,13 @@
this
.
$set
(
this
.
tripList
,
j
,
x
)
x
.
dateTime
=
this
.
setDate
(
j
);
console
.
log
(
this
.
tripList
,
'triplistttt'
);
console
.
log
(
this
.
tripList
,
'triplistttt'
);
})
},
},
components
:
{
newTripCommon
},
}
</
script
>
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