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
9c411202
Commit
9c411202
authored
Sep 19, 2023
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
0c292bad
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
40 additions
and
86 deletions
+40
-86
travelDays.vue
src/components/LeaveGroupDownload/travelDays.vue
+28
-83
confirmationOrderDownLoadNew.vue
src/components/confirmationOrderDownLoadNew.vue
+12
-3
No files found.
src/components/LeaveGroupDownload/travelDays.vue
View file @
9c411202
<
template
>
<div
id=
"pdf_3"
v-if=
"vshowD"
>
<!--
<div
class=
"trip-box"
>
<div>
<div
class=
"trip-block pdf_3_block"
style=
"padding-top:0px !important;border-bottom:none;padding-bottom:0px !important;"
>
<div
class=
"module-title"
id=
"pdf_3_header"
style=
"font-size:36px;font-weight:bolder;margin-top:20px;border-bottom:1px solid #000; text-align:center;"
>
每日详细行程
</div>
</div>
</div>
</div>
-->
<div
class=
"UpgradedVersion-boxHeight height UpgradedVersion-homebj relative"
v-for=
"(item,index) in tripList"
>
<div
class=
"z-index1"
>
<Header
:TripColor=
"dataAll.tripColor"
:orderMsg=
"orderMsg"
></Header>
...
...
@@ -33,54 +24,16 @@
<div
:id=
"'travelDaysMasterMap_'+index"
class=
"travelDaysMasterMap relative"
>
<div
class=
"travelDaysMasterMap-one"
:style=
"
{'color':'#fff'}">
<div
class=
"travelDaysMasterMap-oneImg bjF6"
:id=
"'travelDaysImg_one'+index"
>
<img
v-if=
"item.details&&item.details.length>0&&item.details[0].img&&item.details[0].img!=''"
class=
"absolute"
:src=
"item.details[0].img"
>
<img
v-if=
"item.details&&item.details.length>0&&item.details[0].img&&item.details[0].img!=''"
class=
"absolute"
:src=
"item.details[0].img"
>
<img
v-else
class=
"absolute"
:src=
"domainManager().ViittoFileUrl+'/Upload/DefalutImage/DMC/defaultairline.png'"
>
</div>
<div
class=
"travelDaysMasterMap-text absolute z-index2"
>
{{
item
.
details
[
0
].
title
}}
</div>
</div>
<div
class=
"travelDaysMasterMap-two absolute z-index2"
style=
"display: none;"
>
<div
class=
"travelDaysMasterMap-twoImg relative bjF6"
:style=
"
{'color':'#fff'}"
:id="'travelDaysImg_two'+index"
v-if="(item.details
&&
item.details.length>1
&&
item.details[1].img)||(item.jiu2
&&
item.jiu2.length>0
&&
item.jiu2[0].url)">
<template
v-if=
"item.details.length>1&&item.details[1].img"
>
<img
:src=
"item.details[1].img"
>
<div
class=
"travelDaysMasterMap-text textTwo absolute z-index2"
>
【
{{
item
.
details
[
1
].
title
}}
】
</div>
</
template
>
<
template
v-else
>
<template
v-for=
"(jiudian,j) in item.jiu2"
>
<template
v-if=
"jiudian.url&&j==0"
>
<img
v-if=
"jiudian.url"
:src=
"jiudian.url"
>
<div
class=
"travelDaysMasterMap-text textTwo absolute z-index2"
>
【
{{
jiudian
.
newTitle
}}
】
</div>
</
template
>
</template>
</template>
</div>
<div
class=
"travelDaysMasterMap-twoImg relative bjF6"
style=
"margin-top: 47px;"
:style=
"{'color':'#fff'}"
:id=
"'travelDaysImg_three'+index"
v-if=
"(item.details&&item.details.length>2&&item.details[2].img)||(item.jiu2&&item.jiu2.length>1&&item.jiu2[0].url)"
>
<
template
v-if=
"item.details.length>2&&item.details[2].img"
>
<img
:src=
"item.details[2].img"
>
<div
class=
"travelDaysMasterMap-text textTwo absolute z-index2"
>
【
{{
item
.
details
[
2
].
title
}}
】
</div>
</
template
>
<
template
v-else
>
<template
v-for=
"(jiudian,j) in item.jiu2"
>
<template
v-if=
"jiudian.url&&j==1"
>
<img
v-if=
"jiudian.url"
:src=
"jiudian.url"
>
<div
class=
"travelDaysMasterMap-text textTwo absolute z-index2"
>
【
{{
jiudian
.
name
}}
】
</div>
</
template
>
</template>
</template>
</div>
<!--
<div
class=
"travelDaysMasterMap-text absolute z-index2"
>
{{
item
.
details
[
0
].
title
}}
</div>
-->
</div>
</div>
<div
class=
"travelDaysContent column"
>
<div
class=
"travelDaysContent-text"
v-for=
"(jindian,j) in item.details"
v-if=
"item.details.length>0"
>
<span>
...
...
@@ -102,42 +55,37 @@
<span>
暂无描述
</span>
</div>
</div>
<
template
v-for=
"(t,i) in item.tips"
>
<div
class=
"travelDaysdetails-tsTextBox"
>
<div
class=
"travelDaysdetails-tsText row"
:style=
"
{'background':backgroundColor2}">
<
template
v-for=
"(t,tIndex) in item.tips"
>
<div
:key=
"tIndex"
class=
"travelDaysdetails-tsTextBox"
v-if=
"t.content&&getHtmlPlainText(t.content).length>0"
>
<div
class=
"travelDaysdetails-tsText row"
:style=
"
{'background':backgroundColor2}">
<span
class=
"travelDaysdetails-text0"
>
温馨提示:
</span>
<template
v-if=
"t.content&&getHtmlPlainText(t.content).length>0"
>
{{
getHtmlPlainText
(
t
.
content
)
}}
</
template
>
<
template
v-else
>
暂无提示
</
template
>
<span
v-html=
"t.content"
></span>
</div>
</div>
</
template
>
<div
class=
"travelDaysdetails"
>
<div
class=
"travelDaysdetailsBJ column"
:style=
"{'background':backgroundColor}
"
>
<div
class=
"travelDaysdetails-textBox
row"
>
<div
class=
"travelDaysdetails-text row"
>
<span
class=
"travelDaysdetails-text0"
>
早餐:
</span
>
<
div>
{{item.can.breakfirst?item.can.breakfirst:'无'}}
<
/div>
</div
>
<div
class=
"travelDaysdetails-text row"
>
<span
class=
"travelDaysdetails-text0"
>
午餐:
</span
>
<
div>
{{item.can.lanuch?item.can.lanuch:'无'}}
<
/div>
</div
>
<div
class=
"travelDaysdetails-text row"
>
<span
class=
"travelDaysdetails-text0"
>
晚餐:
</span
>
<
div>
{{item.can.dinner?item.can.dinner:'无'}}
<
/div>
<div
class=
"travelDaysdetailsBJ column"
:style=
"{'background':backgroundColor}"
>
<div
class=
"travelDaysdetails-textBox row
"
>
<div
class=
"travelDaysdetails-text
row"
>
<span
class=
"travelDaysdetails-text0"
>
早餐:
</span
>
<div>
{{item.can.breakfirst?item.can.breakfirst:'无'}}
</div
>
</div>
<div
class=
"travelDaysdetails-text row"
>
<span
class=
"travelDaysdetails-text0"
>
午餐:
</span
>
<div>
{{item.can.lanuch?item.can.lanuch:'无'}}
</div
>
</div>
<div
class=
"travelDaysdetails-text row"
>
<span
class=
"travelDaysdetails-text0"
>
晚餐:
</span
>
<div>
{{item.can.dinner?item.can.dinner:'无'}}
</div
>
</div>
</div>
</div
>
<div
class=
"travelDaysdetails-textBox
"
>
<div
class=
"travelDaysdetails-text right0 row"
>
<span
class=
"travelDaysdetails-text0"
>
住宿:
</span>
<
template
v-for=
"(j,i) in item.jiu2"
>
{{
j
.
name
}}
</
template
>
或同级
<div
class=
"travelDaysdetails-textBox"
>
<div
class=
"travelDaysdetails-text right0 row
"
>
<span
class=
"travelDaysdetails-text0"
>
住宿:
</span
>
<
template
v-for=
"(j,i) in item.jiu2"
>
{{
j
.
name
}}
</
template
>
或同级
<
/div>
</div>
</div>
</div>
</div>
<!-- otherJourney-footer -->
<div
class=
"footer"
>
...
...
@@ -153,12 +101,9 @@
</div>
</div>
</div>
</div>
</div>
</template>
<
script
>
import
Header
from
"./components/header"
;
export
default
{
...
...
src/components/confirmationOrderDownLoadNew.vue
View file @
9c411202
...
...
@@ -494,7 +494,7 @@
return
postData
;
},
gernalFeature
(
isPc
)
{
var
title
=
this
.
orderMsg
.
startDate
+
this
.
orderMsg
.
lineteamName
+
this
.
orderMsg
.
dayNum
+
'日游'
var
title
=
this
.
orderMsg
.
startDate
+
this
.
orderMsg
.
lineteamName
+
this
.
orderMsg
.
dayNum
+
'日游'
if
(
this
.
showType
>=
4
)
{
// 判断是否为行程特色
this
.
ToWord_2023
(
title
,
isPc
)
}
else
{
...
...
@@ -799,10 +799,15 @@
title
+=
z
.
arrivalCityName
}
})
var
imgUrl
=
""
;
if
(
y
.
childItem
.
trafficIntroduce
&&
y
.
childItem
.
trafficIntroduce
.
introduceImage
&&
y
.
childItem
.
trafficIntroduce
.
introduceImage
!=
''
)
{
imgUrl
=
y
.
childItem
.
trafficIntroduce
.
introduceImage
;
}
let
obj
=
{
title
:
title
,
content
:
y
.
childItem
.
description
,
img
:
''
,
img
:
imgUrl
,
ticketName
:
''
,
playTimeHour
:
null
,
playTimeMinutes
:
null
,
...
...
@@ -900,8 +905,12 @@
if
(
jin
.
length
>
0
)
{
details
=
jin
}
else
if
(
dadian
.
length
>
0
)
{
details
=
dadian
if
(
dadian
[
0
].
img
==
''
&&
jiao
[
0
].
img
!=
''
)
{
dadian
[
0
].
img
=
jiao
[
0
].
img
;
}
details
=
dadian
;
}
else
if
(
jiao
.
length
>
0
)
{
if
(
j
==
this
.
tripList
.
length
-
1
)
{
let
obj
=
{
title
:
'温暖的家'
,
...
...
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