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
b817527d
Commit
b817527d
authored
May 15, 2019
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
行程下载修改
parent
1808976d
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
145 additions
and
762 deletions
+145
-762
salefeture2.css
src/assets/css/salefeture2.css
+0
-622
SalesconfirmationOrder.vue
src/components/SalesconfirmationOrder.vue
+145
-140
No files found.
src/assets/css/salefeture2.css
deleted
100644 → 0
View file @
1808976d
This diff is collapsed.
Click to expand it.
src/components/SalesconfirmationOrder.vue
View file @
b817527d
...
@@ -15,9 +15,9 @@
...
@@ -15,9 +15,9 @@
<div
class=
"trip_cover"
v-show=
"pdfLoading"
v-loading=
"pdfLoading"
></div>
<div
class=
"trip_cover"
v-show=
"pdfLoading"
v-loading=
"pdfLoading"
></div>
<input
type=
"button"
style=
"width: auto !important;"
class=
"travelControlTripBtn"
value=
"下载电脑版PDF"
<input
type=
"button"
style=
"width: auto !important;"
class=
"travelControlTripBtn"
value=
"下载电脑版PDF"
@
click=
"toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')"
/>
@
click=
"toPDF(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')"
/>
<input
type=
"button"
style=
"width: auto !important;"
class=
"travelControlTripBtn"
value=
"下载手机版WORD"
<input
type=
"button"
style=
"width: auto !important;
display:none;
"
class=
"travelControlTripBtn"
value=
"下载手机版WORD"
@
click=
"gernalFeature(0)"
/>
@
click=
"gernalFeature(0)"
/>
<input
type=
"button"
style=
"width: auto !important;"
class=
"travelControlTripBtn"
value=
"下载电脑版WORD"
<input
type=
"button"
style=
"width: auto !important;
display:none;
"
class=
"travelControlTripBtn"
value=
"下载电脑版WORD"
@
click=
"gernalFeature(1)"
/>
@
click=
"gernalFeature(1)"
/>
<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;"
...
@@ -305,11 +305,14 @@
...
@@ -305,11 +305,14 @@
<span
class=
"title"
>
<span
class=
"title"
>
{{
son
.
childItem
.
couponsName
}}
{{
son
.
childItem
.
couponsName
}}
</span>
</span>
<span
class=
"playTime"
>
<i
class=
"iconfont icon-shijian"
></i>
游玩时间:
<span
v-if=
"son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''"
>
{{
son
.
childItem
.
playTimeHour
+
'小时'
}}
</span><span
v-if=
"son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''"
>
{{
son
.
childItem
.
playTimeMinutes
+
'分钟'
}}
</span></span>
<div
class=
"playTime"
>
<i
class=
"iconfont icon-shijian"
></i>
游玩时间:
<span
class=
"content"
v-html=
"son.childItem.description"
></span>
<span
v-if=
"son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''"
>
{{
son
.
childItem
.
playTimeHour
+
'小时'
}}
</span>
<div
class=
"Newimg-list"
v-if=
"son.childItem.imaArray.length"
>
<span
v-if=
"son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''"
>
{{
son
.
childItem
.
playTimeMinutes
+
'分钟'
}}
</span>
</div>
<div
class=
"content"
v-html=
"son.childItem.description"
></div>
<div
class=
"Newimg-list clearfix"
v-if=
"son.childItem.imaArray.length"
>
<div
class=
"item"
v-for=
"(img,i) in son.childItem.imaArray"
:key=
"i"
>
<div
class=
"item"
v-for=
"(img,i) in son.childItem.imaArray"
:key=
"i"
>
<img
:src=
'img.url'
/>
<img
:src=
'img.url'
/>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -325,13 +328,13 @@
...
@@ -325,13 +328,13 @@
<span
class=
"time"
v-if=
"son.childItem.timeType==1"
>
上午
</span>
<span
class=
"time"
v-if=
"son.childItem.timeType==1"
>
上午
</span>
<span
class=
"time"
v-if=
"son.childItem.timeType==2"
>
下午
</span>
<span
class=
"time"
v-if=
"son.childItem.timeType==2"
>
下午
</span>
<span
class=
"time"
v-if=
"son.childItem.timeType==0"
>
全天
</span>
<span
class=
"time"
v-if=
"son.childItem.timeType==0"
>
全天
</span>
<span
class=
"title"
>
<div
class=
"title"
>
{{
son
.
childItem
.
hotelName
+
son
.
childItem
.
hotelProductName
}}
{{
son
.
childItem
.
hotelName
+
son
.
childItem
.
hotelProductName
}}
</span
>
</div
>
<span
class=
"content"
v-html=
"son.childItem.description"
></span
>
<div
class=
"content"
v-html=
"son.childItem.description"
></div
>
<div
class=
"Newimg-list
"
v-if=
"son.childItem.imaArray.length"
>
<div
class=
"Newimg-list clearfix
"
v-if=
"son.childItem.imaArray.length"
>
<div
class=
"item"
v-for=
"(img,i) in son.childItem.imaArray"
:key=
"i"
>
<div
class=
"item"
v-for=
"(img,i) in son.childItem.imaArray"
:key=
"i"
>
<img
:src=
'img.url'
/>
<img
:src=
'img.url'
/>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -349,11 +352,13 @@
...
@@ -349,11 +352,13 @@
<span
class=
"title"
>
<span
class=
"title"
>
{{
son
.
childItem
.
dinnerName
+
son
.
childItem
.
mealName
}}
{{
son
.
childItem
.
dinnerName
+
son
.
childItem
.
mealName
}}
</span>
</span>
<span
class=
"playTime"
>
<i
class=
"iconfont icon-shijian"
></i>
用餐时长:
<span
v-if=
"son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''"
>
{{
son
.
childItem
.
playTimeHour
+
'小时'
}}
</span><span
v-if=
"son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''"
>
{{
son
.
childItem
.
playTimeMinutes
+
'分钟'
}}
</span></span>
<div
class=
"playTime"
>
<i
class=
"iconfont icon-shijian"
></i>
用餐时长:
<span
<span
class=
"content"
v-html=
"son.childItem.description"
></span>
v-if=
"son.childItem.playTimeHour!=null&&son.childItem.playTimeHour!=''"
>
{{
son
.
childItem
.
playTimeHour
+
'小时'
}}
</span><span
<div
class=
"Newimg-list"
v-if=
"son.childItem.imaArray.length"
>
v-if=
"son.childItem.playTimeMinutes!=null&&son.childItem.playTimeMinutes!=''"
>
{{
son
.
childItem
.
playTimeMinutes
+
'分钟'
}}
</span></div>
<div
class=
"content"
v-html=
"son.childItem.description"
></div>
<div
class=
"Newimg-list clearfix"
v-if=
"son.childItem.imaArray.length"
>
<div
class=
"item"
v-for=
"(img,i) in son.childItem.imaArray"
:key=
"i"
>
<div
class=
"item"
v-for=
"(img,i) in son.childItem.imaArray"
:key=
"i"
>
<img
:src=
'img.url'
/>
<img
:src=
'img.url'
/>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -961,7 +966,7 @@
...
@@ -961,7 +966,7 @@
url
:
urlObj
.
DomainUrl
+
'/api/file/GetWebHtmlTwo'
,
url
:
urlObj
.
DomainUrl
+
'/api/file/GetWebHtmlTwo'
,
data
:
{
data
:
{
"msg"
:
pageData
,
"msg"
:
pageData
,
isSale
:
1
sign
:
"sale_pdf"
}
}
}).
then
(
res
=>
{
}).
then
(
res
=>
{
if
(
res
.
data
.
resultCode
===
1
)
{
if
(
res
.
data
.
resultCode
===
1
)
{
...
@@ -1044,7 +1049,7 @@
...
@@ -1044,7 +1049,7 @@
},
res
=>
{
},
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
let
data
=
(
res
.
data
.
data
);
let
data
=
(
res
.
data
.
data
);
console
.
log
(
data
,
'dataaaa'
);
console
.
log
(
data
,
'dataaaa'
);
this
.
orderTripdiff
=
data
.
orderTripdiff
;
this
.
orderTripdiff
=
data
.
orderTripdiff
;
this
.
orderMsg
=
data
.
orderMsg
;
this
.
orderMsg
=
data
.
orderMsg
;
if
(
this
.
orderTripdiff
&&
this
.
orderTripdiff
.
flightInfoJson
)
{
if
(
this
.
orderTripdiff
&&
this
.
orderTripdiff
.
flightInfoJson
)
{
...
@@ -1397,7 +1402,7 @@
...
@@ -1397,7 +1402,7 @@
</
script
>
</
script
>
<
style
>
<
style
>
@import
url('../assets/css/tripIndex.css')
;
@import
url('../assets/css/tripIndex.css')
;
@import
url('../assets/css/sale
feture2
.css')
;
@import
url('../assets/css/sale
_pdf
.css')
;
.edit_form_box
{
.edit_form_box
{
display
:
flex
;
display
:
flex
;
...
...
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