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
bf1ece5a
Commit
bf1ece5a
authored
Mar 17, 2020
by
zhengke
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
3fd98b82
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
43 additions
and
16 deletions
+43
-16
newConfimationOrder.vue
src/components/newConfimationOrder.vue
+43
-16
No files found.
src/components/newConfimationOrder.vue
View file @
bf1ece5a
<
style
>
<
style
>
.newTrip_Main
{
.newTrip_Main
{
display
:
block
!important
;
display
:
block
!important
;
width
:
11
23
px
;
width
:
11
66
px
;
-webkit-box-sizing
:
border-box
;
-webkit-box-sizing
:
border-box
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
background
:
#fff
;
background
:
#fff
;
...
@@ -84,20 +84,20 @@
...
@@ -84,20 +84,20 @@
<div><span
class=
"newtripComTitle"
>
返回日期:
</span>
{{
orderMsg
.
endDate
}}
</div>
<div><span
class=
"newtripComTitle"
>
返回日期:
</span>
{{
orderMsg
.
endDate
}}
</div>
<div><span
class=
"newtripComTitle"
>
行程天数:
</span>
{{
orderMsg
.
dayNum
}}
</div>
<div><span
class=
"newtripComTitle"
>
行程天数:
</span>
{{
orderMsg
.
dayNum
}}
</div>
</div>
</div>
<div
class=
"newFeature"
>
<div
class=
"newFeature"
v-html=
"feature.featureHtml"
>
</div>
</div>
<div
class=
"newtripList"
>
<div
class=
"newtripList"
v-for=
"(item,index) in tripList"
:key=
"index"
>
<div
class=
"newTripFly"
>
DAY
01
</div>
<div
class=
"newTripFly"
>
DAY
{{
item
.
dayNum
}}
</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=
"newTrip
Da
y"
>
<div
class=
"newTrip
Fl
y"
>
05:15 从西安咸阳机场出发,乘坐海南航空航班飞往日本成田国际机场。抵达后导游接机。
{{
item
.
title
}}
</div>
</div>
<div
class=
"newTripDay"
>
<div
class=
"newTripDay"
v-for=
"(subItem,subIndex) in item.details"
:key=
"subIndex"
>
14:35 入住酒店休息,养精蓄锐,开启美好旅程。(方便游玩,本日晚餐自理)
{{
subItem
.
title
}}
</div>
</div>
<div
class=
"newTripDay"
>
<div
class=
"newTripDay"
>
特别提示:
因天气原因富士山下雪封路,巴士可能只能上到一合目或二合目,如一合目封山替换为平和公园敬请谅解!
特别提示:
{{
item
.
tips
.
content
}}
</div>
</div>
<div
class=
"newTripDay"
>
<div
class=
"newTripDay"
>
富士山:被日本人民誉为“圣岳”,是日本民族的象征。整个山体呈圆锥状,一眼望去,恰似一把悬空倒挂
富士山:被日本人民誉为“圣岳”,是日本民族的象征。整个山体呈圆锥状,一眼望去,恰似一把悬空倒挂
...
@@ -108,16 +108,24 @@
...
@@ -108,16 +108,24 @@
<div>
<div>
<table
class=
"newTripTable"
>
<table
class=
"newTripTable"
>
<tr>
<tr>
<td
style=
"width:50%"
><span>
酒店:
</span>
成田ANA 皇冠假日酒店或同级
</td>
<td
style=
"width:45%"
>
<td
style=
"width:25%"
>
<span>
酒店:
</span>
<template
v-if=
'item.jiu2.length>0'
>
<span
v-for=
"(t,k) in item.jiu2"
style=
"cursor: pointer"
:key=
"k"
>
{{
k
==
item
.
jiu2
.
length
-
1
?
(
t
.
newTitle
!=
''
&&
t
.
newTitle
!=
t
.
name
?
t
.
newTitle
:
t
.
name
)
:
(
t
.
newTitle
!=
''
&&
t
.
newTitle
!=
t
.
name
?
t
.
newTitle
:
t
.
name
)
+
' / '
}}
</span>
</
template
>
{{getHotelSuffix(item)}}
</td>
<td
style=
"width:30%"
>
<div
class=
"tripLeftCan"
style=
"vertical-align:top;"
>
<div
class=
"tripLeftCan"
style=
"vertical-align:top;"
>
<span>
用餐:
</span>
<span>
用餐:
</span>
</div>
</div>
<div
class=
"tripRightCan"
>
<div
class=
"tripRightCan"
>
<!-- <div>无</div> -->
<!-- <div>无</div> -->
<div>
早
(温泉餐)
</div>
<div>
早
({{item.can.breakfirst}})
</div>
<div>
中
(温泉餐)
</div>
<div>
中
({{item.can.lanuch}})
</div>
<div>
晚
(温泉餐)
</div>
<div>
晚
({{item.can.dinner}})
</div>
</div>
</div>
</td>
</td>
<td
style=
"width:25%"
><span>
交通:
</span>
飞机、酒店/机场班车
</td>
<td
style=
"width:25%"
><span>
交通:
</span>
飞机、酒店/机场班车
</td>
...
@@ -190,6 +198,25 @@
...
@@ -190,6 +198,25 @@
this
.
getDataList
();
this
.
getDataList
();
},
},
methods
:
{
methods
:
{
getHotelSuffix
(
item
)
{
let
suffix
=
""
;
if
(
item
.
jiu2
.
length
>
1
)
{
if
(
this
.
isDirect
===
1
)
{
suffix
=
"或同級"
}
}
else
{
if
(
item
.
jiu2
.
length
==
1
&&
item
.
jiu2
[
0
].
name
!=
'温馨的家'
&&
item
.
jiu2
[
0
].
name
!=
'机场附近酒店'
)
{
if
(
item
.
jiu2
[
0
].
status
==
1
)
{
suffix
=
"【保证入住】"
}
else
{
if
(
this
.
isDirect
===
1
)
{
suffix
=
"或同級"
}
}
}
}
return
suffix
;
},
// 获取标题
// 获取标题
getDataList
(){
getDataList
(){
this
.
apiJavaPost
(
'/api/rssarticle/getArticleList'
,
this
.
listMsg
,
res
=>
{
this
.
apiJavaPost
(
'/api/rssarticle/getArticleList'
,
this
.
listMsg
,
res
=>
{
...
@@ -695,7 +722,7 @@
...
@@ -695,7 +722,7 @@
this
.
$set
(
this
.
tripList
,
j
,
x
)
this
.
$set
(
this
.
tripList
,
j
,
x
)
x
.
dateTime
=
this
.
setDate
(
j
);
x
.
dateTime
=
this
.
setDate
(
j
);
//
console.log(this.tripList,'triplistttt');
console
.
log
(
this
.
tripList
,
'triplistttt'
);
})
})
},
},
},
},
...
...
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