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
ad99bf34
Commit
ad99bf34
authored
Mar 18, 2020
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
5ec16224
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
50 additions
and
38 deletions
+50
-38
confirmationOrderDownLoad.vue
src/components/confirmationOrderDownLoad.vue
+6
-9
newConfimationOrder.vue
src/components/newConfimationOrder.vue
+44
-29
No files found.
src/components/confirmationOrderDownLoad.vue
View file @
ad99bf34
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
@
click=
"gernalFeature(0)"
/>
@
click=
"gernalFeature(0)"
/>
<input
type=
"button"
style=
"width: auto !important;"
class=
"travelControlTripBtn"
value=
"下载电脑版WORD"
<input
type=
"button"
style=
"width: auto !important;"
class=
"travelControlTripBtn"
value=
"下载电脑版WORD"
@
click=
"gernalFeature(1)"
/>
-->
@
click=
"gernalFeature(1)"
/>
-->
<input
type=
"button"
value=
"新版行程"
class=
"travelControlTripBtn"
style=
"display:none;"
@
click=
"goUrlView()"
/>
<input
type=
"button"
value=
"新版行程"
class=
"travelControlTripBtn"
@
click=
"goUrlView()"
/>
<a
class=
"travelControlTripBtn"
v-if=
"priceList.length>0&& priceList[0].wordPath!=''"
style=
"display:inline-block;text-decoration:none;
<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;"
width:135px;text-align:center;line-height:30px;font-size:13px;position:relative;top:2px;"
:href=
"domainManager().ViittoFileUrl+priceList[0].wordPath"
>
下载WORD行程
</a>
:href=
"domainManager().ViittoFileUrl+priceList[0].wordPath"
>
下载WORD行程
</a>
...
@@ -1659,14 +1659,11 @@
...
@@ -1659,14 +1659,11 @@
let
routeData
=
this
.
$router
.
resolve
({
let
routeData
=
this
.
$router
.
resolve
({
name
:
'newConfimationOrder'
,
name
:
'newConfimationOrder'
,
query
:
{
query
:
{
// configId: item.ID,
configId
:
this
.
$route
.
query
.
configId
,
// cityId: cityId,
cityId
:
this
.
$route
.
query
.
cityId
,
// tcid: item.TCID,
tcid
:
this
.
$route
.
query
.
tcid
,
// orderId: 0,
orderId
:
this
.
$route
.
query
.
orderId
,
// vshowL: false,
isClick
:
1
//不计算点击
// vshowM: false,
// vshowTCNUM: true,
// isClick: 1 //不计算点击
}
}
});
});
window
.
open
(
routeData
.
href
,
"_blank"
);
window
.
open
(
routeData
.
href
,
"_blank"
);
...
...
src/components/newConfimationOrder.vue
View file @
ad99bf34
...
@@ -11,62 +11,81 @@
...
@@ -11,62 +11,81 @@
height
:
auto
!important
;
height
:
auto
!important
;
font-family
:
'PingFang SC Regular'
;
font-family
:
'PingFang SC Regular'
;
}
}
.newTripCom_Img
{
.newTrip
_Main
.newTrip
Com_Img
{
width
:
100%
;
width
:
100%
;
}
}
.newTripCom_Img
img
{
.newTrip
_Main
.newTrip
Com_Img
img
{
width
:
100%
;
width
:
100%
;
}
}
.newCenterContent
{
.new
Trip_Main
.new
CenterContent
{
width
:
100%
;
width
:
100%
;
height
:
auto
;
height
:
auto
;
color
:
#111111
;
color
:
#111111
;
}
}
.newTripTitle
{
.newTrip
_Main
.newTrip
Title
{
font-size
:
30px
;
font-size
:
30px
;
margin-bottom
:
10px
;
margin-bottom
:
10px
;
width
:
100%
;
width
:
100%
;
text-align
:
center
;
text-align
:
center
;
font-weight
:
bold
;
font-weight
:
bold
;
}
}
.newTripCankao
{
.newTrip
_Main
.newTrip
Cankao
{
width
:
100%
;
width
:
100%
;
font-size
:
20px
;
font-size
:
20px
;
text-align
:
center
;
text-align
:
center
;
}
}
.newtripComTitle
{
.new
Trip_Main
.new
tripComTitle
{
font-weight
:
bold
;
font-weight
:
bold
;
}
}
.newTripStartInfo
{
.newTrip
_Main
.newTrip
StartInfo
{
font-size
:
20px
;
font-size
:
20px
;
margin-top
:
20px
;
margin-top
:
20px
;
}
}
.newTripStartInfo
>
div
{
.newTrip
_Main
.newTrip
StartInfo
>
div
{
margin-bottom
:
20px
;
margin-bottom
:
20px
;
}
}
.newtripList
>
div
{
.new
Trip_Main
.new
tripList
>
div
{
margin-bottom
:
20px
;
margin-bottom
:
20px
;
}
}
.newTripDay
{
.newTrip
_Main
.newTrip
Day
{
font-size
:
20px
;
font-size
:
20px
;
}
}
.newTripFly
{
.newTrip
_Main
.newTrip
Fly
{
font-size
:
25px
;
font-size
:
25px
;
font-weight
:
bold
;
font-weight
:
bold
;
}
}
.newTripTable
{
.newTrip
_Main
.newTrip
Table
{
font-size
:
20px
;
font-size
:
20px
;
}
}
.newTripTable
tr
td
{
.newTrip
_Main
.newTrip
Table
tr
td
{
vertical-align
:
top
;
vertical-align
:
top
;
}
}
.newTripTable
span
{
.newTrip
_Main
.newTrip
Table
span
{
font-weight
:
bold
;
font-weight
:
bold
;
}
}
.
tripLeftCan
,
.tripRightCan
{
.
newTrip_Main
.tripLeftCan
,
.newTrip_Main
.tripRightCan
{
display
:
inline-block
;
display
:
inline-block
;
}
}
.newTrip_Main
.newTripDateTime
{
font-size
:
15px
;
}
.newTrip_Main
.warmTipsTitle
{
display
:
inline-block
;
width
:
100px
;
vertical-align
:
top
;
margin-top
:
20px
;
}
.newTrip_Main
.warmTipsContent
{
display
:
inline-block
;
width
:
90%
;
}
.newTrip_Main
.newTripDay
div
{
margin-bottom
:
20px
;
}
.newTrip_Main
.newTripTutle
{
font-weight
:
bold
;
margin-bottom
:
10px
!important
;
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"newTrip_Main"
>
<div
class=
"newTrip_Main"
>
...
@@ -89,21 +108,17 @@
...
@@ -89,21 +108,17 @@
</div>
</div>
<div
class=
"newtripList"
v-for=
"(item,index) in tripList"
:key=
"index"
>
<div
class=
"newtripList"
v-for=
"(item,index) in tripList"
:key=
"index"
>
<div
class=
"newTripFly"
>
DAY
{{
item
.
dayNum
}}
</div>
<div
class=
"newTripFly"
>
DAY
{{
item
.
dayNum
}}
</div>
<div
class=
"newTripDateTime"
>
{{
item
.
dateTime
}}
</div>
<!--
<div
class=
"newTripFly"
>
西安
<i
class=
"iconfont icon-Shape1"
></i>
东京成田 参考航班 HU7927 08:15---14:25
</div>
-->
<!--
<div
class=
"newTripFly"
>
西安
<i
class=
"iconfont icon-Shape1"
></i>
东京成田 参考航班 HU7927 08:15---14:25
</div>
-->
<div
class=
"newTripFly"
>
<div
class=
"newTripFly"
>
{{
item
.
title
}}
{{
item
.
title
}}
</div>
</div>
<div
class=
"newTripDay"
v-for=
"(subItem,subIndex) in item.details"
:key=
"subIndex"
>
<div
class=
"newTripDay"
style=
"margin-bottom:0;"
v-for=
"(subItem,subIndex) in item.details"
:key=
"subIndex"
>
{{
subItem
.
title
}}
<div
class=
"newTripTutle"
>
{{
subItem
.
title
}}
</div>
</div>
<div>
{{
subItem
.
content
}}
</div>
<div
class=
"newTripDay"
>
特别提示:
{{
item
.
tips
.
content
}}
</div>
</div>
<div
class=
"newTripDay"
>
<div
class=
"newTripDay"
>
富士山:被日本人民誉为“圣岳”,是日本民族的象征。整个山体呈圆锥状,一眼望去,恰似一把悬空倒挂
<div
class=
"warmTipsTitle"
>
温馨提示:
</div><div
class=
"warmTipsContent"
v-html=
"item.tips[0].content"
></div>
的扇子,日本诗人曾用“玉扇倒悬东海天”、“富士白雪映朝阳”等诗句赞美它。富士山由山脚到山顶分为
十合,由山脚下出发到半山腰称为五合目,利用巴士可上到2305 米的五合目,这里的景色一年四季随季节
变化而不同,日出日落,气候变化,都会令富士山瞬间呈现不同的身影,千姿百态!
</div>
</div>
<div>
<div>
<table
class=
"newTripTable"
>
<table
class=
"newTripTable"
>
...
@@ -396,10 +411,10 @@
...
@@ -396,10 +411,10 @@
},
},
init
()
{
init
()
{
this
.
apipost
(
'b2b_get_GetB2BTravelInfoNoDes'
,
{
this
.
apipost
(
'b2b_get_GetB2BTravelInfoNoDes'
,
{
configId
:
5799
,
configId
:
this
.
$route
.
query
.
configId
,
cityId
:
262
,
cityId
:
this
.
$route
.
query
.
cityId
,
tcid
:
8953
,
tcid
:
this
.
$route
.
query
.
tcid
,
orderId
:
0
,
orderId
:
this
.
$route
.
query
.
orderId
,
isClick
:
1
//不算统计
isClick
:
1
//不算统计
},
res
=>
{
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
...
...
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