Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
Athena
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
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
华国豪
Athena
Commits
2b4b2e58
Commit
2b4b2e58
authored
Sep 06, 2019
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
503c4c33
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
14 deletions
+10
-14
HotelSure.vue
src/components/Hotel/HotelSure.vue
+3
-4
FillItinerary.vue
src/components/Ticket/FillItinerary.vue
+1
-3
Pay.vue
src/components/Ticket/Pay.vue
+4
-3
SchedProduct.vue
src/components/visa/SchedProduct.vue
+2
-4
No files found.
src/components/Hotel/HotelSure.vue
View file @
2b4b2e58
...
@@ -658,7 +658,7 @@
...
@@ -658,7 +658,7 @@
<div
class=
"sureMsgTotalMon"
><span>
日元:
</span>
{{sureMsg.totalPriceJapanese}}
</div>
<div
class=
"sureMsgTotalMon"
><span>
日元:
</span>
{{sureMsg.totalPriceJapanese}}
</div>
<div
class=
"sureMsgTotalMon"
><span>
人民币:
</span>
{{sureMsg.totalChargeableRateInfo}}
</div>
<div
class=
"sureMsgTotalMon"
><span>
人民币:
</span>
{{sureMsg.totalChargeableRateInfo}}
</div>
<div
class=
"sureMsgTotalMon"
><span>
优惠:
</span>
{{sureMsg.DiscountMoney}}
</div>
<div
class=
"sureMsgTotalMon"
><span>
优惠:
</span>
{{sureMsg.DiscountMoney}}
</div>
<div
class=
"sureMsgTotalMon"
><span>
实付款:
</span>
{{
sureMsg.CustomerPayMoney
}}
</div>
<div
class=
"sureMsgTotalMon"
><span>
实付款:
</span>
{{
SettlementPrice
}}
</div>
</div>
</div>
<!-- <span class="HS_RitTop_Left">订单总额</span>
<!-- <span class="HS_RitTop_Left">订单总额</span>
...
@@ -965,7 +965,6 @@ export default {
...
@@ -965,7 +965,6 @@ export default {
this
.
sureMsg
.
DiscountMoney
=
(
this
.
price
-
this
.
SettlementPrice
).
toFixed
(
2
);
this
.
sureMsg
.
DiscountMoney
=
(
this
.
price
-
this
.
SettlementPrice
).
toFixed
(
2
);
this
.
CouponIds
=
this
.
CouponIds
.
substring
(
0
,
this
.
CouponIds
.
length
-
1
)
this
.
CouponIds
=
this
.
CouponIds
.
substring
(
0
,
this
.
CouponIds
.
length
-
1
)
this
.
sureMsg
.
CouponAllotIds
=
this
.
CouponIds
;
this
.
sureMsg
.
CouponAllotIds
=
this
.
CouponIds
;
this
.
sureMsg
.
CustomerPayMoney
=
this
.
SettlementPrice
;
},
},
...
@@ -1116,7 +1115,7 @@ export default {
...
@@ -1116,7 +1115,7 @@ export default {
AdultJapanCount
+=
AdultJapanPrice
*
x
.
roomAdultCount
;
AdultJapanCount
+=
AdultJapanPrice
*
x
.
roomAdultCount
;
childJapanCount
+=
ChildJapanPrice
*
x
.
roomChildCount
;
childJapanCount
+=
ChildJapanPrice
*
x
.
roomChildCount
;
this
.
SettlementPrice
=
this
.
sureMsg
.
totalChargeableRateInfo
;
this
.
SettlementPrice
=
this
.
sureMsg
.
totalChargeableRateInfo
;
this
.
sureMsg
.
CustomerPayMoney
=
this
.
sureMsg
.
totalChargeableRateInfo
;
this
.
SettlementPrice
=
this
.
sureMsg
.
totalChargeableRateInfo
;
this
.
price
=
this
.
sureMsg
.
totalChargeableRateInfo
;
this
.
price
=
this
.
sureMsg
.
totalChargeableRateInfo
;
// AdultJapanCount+=AdultJapanPrice;
// AdultJapanCount+=AdultJapanPrice;
...
@@ -1268,7 +1267,7 @@ export default {
...
@@ -1268,7 +1267,7 @@ export default {
costType
:
res
.
data
.
data
.
costType
,
costType
:
res
.
data
.
data
.
costType
,
orderId
:
res
.
data
.
data
.
orderId
,
orderId
:
res
.
data
.
data
.
orderId
,
bookingNumber
:
res
.
data
.
data
.
parmResult
.
bookingNumber
,
bookingNumber
:
res
.
data
.
data
.
parmResult
.
bookingNumber
,
bookMoney
:
this
.
sureMsg
.
CustomerPayMoney
,
bookMoney
:
this
.
SettlementPrice
,
CancelTime
:
res
.
data
.
data
.
CancelTime
,
CancelTime
:
res
.
data
.
data
.
CancelTime
,
hotelName
:
res
.
data
.
data
.
parmResult
.
hotelName
,
hotelName
:
res
.
data
.
data
.
parmResult
.
hotelName
,
totalPnumber
:
num
totalPnumber
:
num
...
...
src/components/Ticket/FillItinerary.vue
View file @
2b4b2e58
...
@@ -267,7 +267,7 @@
...
@@ -267,7 +267,7 @@
</p>
</p>
<p>
<p>
<span>
实付款
</span>
<span>
实付款
</span>
<span
style=
"font-size:20px;font-weight:400;color:rgba(255,255,255,1);margin:0 15px;"
>
¥
{{
personNum
.
CustomerPayMoney
}}
</span>
<span
style=
"font-size:20px;font-weight:400;color:rgba(255,255,255,1);margin:0 15px;"
>
¥
{{
SettlementPrice
}}
</span>
</p>
</p>
<p
class=
"total"
style=
"margin-top:12px"
>
<p
class=
"total"
style=
"margin-top:12px"
>
<span
:loading=
"submitLoad"
@
click=
"submitForm('personNum')"
style=
"cursor: pointer;;height:32px;background:rgba(238,68,84,1);border-radius:4px;color:#fff;padding:4px 15px"
>
<span
:loading=
"submitLoad"
@
click=
"submitForm('personNum')"
style=
"cursor: pointer;;height:32px;background:rgba(238,68,84,1);border-radius:4px;color:#fff;padding:4px 15px"
>
...
@@ -426,7 +426,6 @@ export default {
...
@@ -426,7 +426,6 @@ export default {
this
.
personNum
.
DiscountMoney
=
(
this
.
price
-
this
.
SettlementPrice
).
toFixed
(
2
);
this
.
personNum
.
DiscountMoney
=
(
this
.
price
-
this
.
SettlementPrice
).
toFixed
(
2
);
this
.
CouponIds
=
this
.
CouponIds
.
substring
(
0
,
this
.
CouponIds
.
length
-
1
)
this
.
CouponIds
=
this
.
CouponIds
.
substring
(
0
,
this
.
CouponIds
.
length
-
1
)
this
.
personNum
.
CouponAllotIds
=
this
.
CouponIds
;
this
.
personNum
.
CouponAllotIds
=
this
.
CouponIds
;
this
.
personNum
.
CustomerPayMoney
=
this
.
SettlementPrice
;
},
},
...
@@ -540,7 +539,6 @@ export default {
...
@@ -540,7 +539,6 @@ export default {
this
.
personNum
.
seatNum
=
this
.
personNum
.
ManNum
+
this
.
personNum
.
ChirdNum
+
this
.
personNum
.
OldPeopleNum
;
this
.
personNum
.
seatNum
=
this
.
personNum
.
ManNum
+
this
.
personNum
.
ChirdNum
+
this
.
personNum
.
OldPeopleNum
;
this
.
personNum
.
PreferPrice
=
this
.
personNum
.
seatNum
*
this
.
getlistSigel
.
scatterB2BPrice
;
this
.
personNum
.
PreferPrice
=
this
.
personNum
.
seatNum
*
this
.
getlistSigel
.
scatterB2BPrice
;
this
.
SettlementPrice
=
this
.
personNum
.
PreferPrice
;
this
.
SettlementPrice
=
this
.
personNum
.
PreferPrice
;
this
.
personNum
.
CustomerPayMoney
=
this
.
personNum
.
PreferPrice
;
this
.
price
=
this
.
personNum
.
PreferPrice
;
this
.
price
=
this
.
personNum
.
PreferPrice
;
this
.
filterCoupon
();
this
.
filterCoupon
();
...
...
src/components/Ticket/Pay.vue
View file @
2b4b2e58
...
@@ -172,9 +172,9 @@ export default {
...
@@ -172,9 +172,9 @@ export default {
let
Visainfo
=
JSON
.
parse
(
sessionStorage
.
Visainfo
);
let
Visainfo
=
JSON
.
parse
(
sessionStorage
.
Visainfo
);
this
.
Commoditydetails
=
Visainfo
;
this
.
Commoditydetails
=
Visainfo
;
this
.
Commoditydetails
.
airOrderId
=
Visainfo
.
AirOrderId
;
this
.
Commoditydetails
.
airOrderId
=
Visainfo
.
AirOrderId
;
this
.
Commoditydetails
.
customerPayMoney
=
Visainfo
.
preferPrice
;
this
.
Commoditydetails
.
customerPayMoney
=
Visainfo
.
customerPayMoney
;
this
.
code
.
OrderSource
=
Visainfo
.
orderResourceId
;
this
.
code
.
OrderSource
=
Visainfo
.
orderResourceId
;
this
.
code
.
total_fee
=
Visainfo
.
preferPrice
+
''
;
this
.
code
.
total_fee
=
Visainfo
.
customerPayMoney
+
''
;
this
.
code
.
body
=
Visainfo
.
description
;
this
.
code
.
body
=
Visainfo
.
description
;
this
.
code
.
attach
=
`
${
Visainfo
.
costType
}
|
${
Visainfo
.
customerName
}
|
${
Visainfo
.
AirOrderId
}
|
${
Visainfo
.
customerId
}
|
${
Visainfo
.
outBranchId
}
`
this
.
code
.
attach
=
`
${
Visainfo
.
costType
}
|
${
Visainfo
.
customerName
}
|
${
Visainfo
.
AirOrderId
}
|
${
Visainfo
.
customerId
}
|
${
Visainfo
.
outBranchId
}
`
}
else
{
}
else
{
...
@@ -195,8 +195,9 @@ export default {
...
@@ -195,8 +195,9 @@ export default {
res
=>
{
res
=>
{
if
(
res
.
data
.
resultCode
==
1
)
{
if
(
res
.
data
.
resultCode
==
1
)
{
this
.
Commoditydetails
=
res
.
data
.
data
;
this
.
Commoditydetails
=
res
.
data
.
data
;
console
.
log
(
"this.Commoditydetails"
,
this
.
Commoditydetails
)
this
.
code
.
OrderSource
=
this
.
Commoditydetails
.
orderResourceId
;
this
.
code
.
OrderSource
=
this
.
Commoditydetails
.
orderResourceId
;
this
.
code
.
total_fee
=
this
.
Commoditydetails
.
preferPrice
+
''
;
this
.
code
.
total_fee
=
this
.
Commoditydetails
.
customerPayMoney
+
''
;
this
.
code
.
body
=
this
.
Commoditydetails
.
description
;
this
.
code
.
body
=
this
.
Commoditydetails
.
description
;
this
.
code
.
attach
=
`
${
this
.
Commoditydetails
.
costType
}
|
${
this
.
Commoditydetails
.
customerName
}
|
${
this
.
AirOrderId
}
|
${
this
.
Commoditydetails
.
customerId
}
|
${
this
.
Commoditydetails
.
outBranchId
}
`
this
.
code
.
attach
=
`
${
this
.
Commoditydetails
.
costType
}
|
${
this
.
Commoditydetails
.
customerName
}
|
${
this
.
AirOrderId
}
|
${
this
.
Commoditydetails
.
customerId
}
|
${
this
.
Commoditydetails
.
outBranchId
}
`
// this.Time15();
// this.Time15();
...
...
src/components/visa/SchedProduct.vue
View file @
2b4b2e58
...
@@ -293,7 +293,7 @@
...
@@ -293,7 +293,7 @@
</p>
</p>
<p>
<p>
<span
class=
"Spanwidth pfR"
>
实付款:
</span>
<span
class=
"Spanwidth pfR"
>
实付款:
</span>
<span
style=
"color:#FF680B;font-size:18px;"
>
¥
{{
formInline
.
CustomerPayMoney
}}
</span>
起
<span
style=
"color:#FF680B;font-size:18px;"
>
¥
{{
SettlementPrice
}}
</span>
起
</p>
</p>
</div>
</div>
...
@@ -326,7 +326,7 @@
...
@@ -326,7 +326,7 @@
</li>
</li>
<li
style=
"color:#FF680B;font-weight:600"
>
<li
style=
"color:#FF680B;font-weight:600"
>
<span>
实付款
</span>
<span>
实付款
</span>
<span>
¥
<span
style=
"font-size:18px;"
>
{{
formInline
.
CustomerPayMoney
}}
</span></span>
<span>
¥
<span
style=
"font-size:18px;"
>
{{
SettlementPrice
}}
</span></span>
</li>
</li>
</ul>
</ul>
</el-col>
</el-col>
...
@@ -494,7 +494,6 @@ export default {
...
@@ -494,7 +494,6 @@ export default {
this
.
formInline
.
DiscountMoney
=
(
this
.
price
-
this
.
SettlementPrice
).
toFixed
(
2
);
this
.
formInline
.
DiscountMoney
=
(
this
.
price
-
this
.
SettlementPrice
).
toFixed
(
2
);
this
.
CouponIds
=
this
.
CouponIds
.
substring
(
0
,
this
.
CouponIds
.
length
-
1
)
this
.
CouponIds
=
this
.
CouponIds
.
substring
(
0
,
this
.
CouponIds
.
length
-
1
)
this
.
formInline
.
CouponAllotIds
=
this
.
CouponIds
;
this
.
formInline
.
CouponAllotIds
=
this
.
CouponIds
;
this
.
formInline
.
CustomerPayMoney
=
this
.
SettlementPrice
;
},
},
...
@@ -601,7 +600,6 @@ export default {
...
@@ -601,7 +600,6 @@ export default {
let
num
=
this
.
formInline
.
AdultPeopleNum
+
this
.
formInline
.
ChildPeopleNum
;
let
num
=
this
.
formInline
.
AdultPeopleNum
+
this
.
formInline
.
ChildPeopleNum
;
this
.
formInline
.
TotalPrice
=
num
*
this
.
price
;
this
.
formInline
.
TotalPrice
=
num
*
this
.
price
;
this
.
SettlementPrice
=
this
.
formInline
.
TotalPrice
;
this
.
SettlementPrice
=
this
.
formInline
.
TotalPrice
;
this
.
formInline
.
CustomerPayMoney
=
this
.
formInline
.
TotalPrice
;
this
.
price
=
this
.
formInline
.
TotalPrice
;
this
.
price
=
this
.
formInline
.
TotalPrice
;
}
else
{
}
else
{
...
...
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