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
ccbcfdaa
Commit
ccbcfdaa
authored
Sep 06, 2019
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
928b5bcc
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
10 deletions
+13
-10
HotelSure.vue
src/components/Hotel/HotelSure.vue
+1
-1
FillItinerary.vue
src/components/Ticket/FillItinerary.vue
+1
-1
Pay.vue
src/components/Ticket/Pay.vue
+4
-4
FoodTable.vue
...ewPersonalCenter/block/model/OrderInfoModel/FoodTable.vue
+3
-1
ScenTable.vue
...ewPersonalCenter/block/model/OrderInfoModel/ScenTable.vue
+2
-1
VisaTable.vue
...ewPersonalCenter/block/model/OrderInfoModel/VisaTable.vue
+1
-1
SchedProduct.vue
src/components/visa/SchedProduct.vue
+1
-1
No files found.
src/components/Hotel/HotelSure.vue
View file @
ccbcfdaa
...
...
@@ -581,7 +581,7 @@
<span
v-else
class=
"iconfont icon-xuanzhong2"
></span>
</div>
</li>
<div
v-if=
"UserCanUseCouponList.leng
g
th==0"
class=
"_no_coupon"
>
<div
v-if=
"UserCanUseCouponList.length==0"
class=
"_no_coupon"
>
<p>
暂无可用优惠券
</p>
</div>
</ul>
...
...
src/components/Ticket/FillItinerary.vue
View file @
ccbcfdaa
...
...
@@ -244,7 +244,7 @@
<span
v-else
class=
"iconfont icon-xuanzhong2"
></span>
</div>
</li>
<div
v-if=
"UserCanUseCouponList.leng
g
th==0"
class=
"_no_coupon"
>
<div
v-if=
"UserCanUseCouponList.length==0"
class=
"_no_coupon"
>
<p>
暂无可用优惠券
</p>
</div>
</ul>
...
...
src/components/Ticket/Pay.vue
View file @
ccbcfdaa
...
...
@@ -23,7 +23,7 @@
<div
style=
"text-align:center;float:right"
>
<span
style=
"font-weight:200"
>
应付金额
</span>
<span
style=
"color:#FF680B;font-size:18px"
>
¥
{{
Commoditydetails
.
preferPrice
|
priceFormat
}}
</span>
<span
style=
"color:#FF680B;font-size:18px"
>
¥
{{
Commoditydetails
.
customerPayMoney
|
priceFormat
}}
</span>
</div>
</div>
...
...
@@ -38,7 +38,7 @@
<div
class=
"triangle_border_left"
></div>
</div>
<p
style=
"text-align:center;font-size:18px"
>
支付金额
<span
style=
"color:#FF680B;font-size:20px;font-weight:700"
>
¥
{{
Commoditydetails
.
preferPrice
|
priceFormat
}}
</span>
<span
style=
"color:#FF680B;font-size:20px;font-weight:700"
>
¥
{{
Commoditydetails
.
customerPayMoney
|
priceFormat
}}
</span>
</p>
<el-row
style=
"margin-top:15px"
v-loading=
"codeLoading"
>
<el-col
class=
"position"
style=
"padding-right:50px"
:span=
"12"
>
...
...
@@ -110,7 +110,7 @@
</div>
<div
class=
"div_2"
>
<p>
<span>
支付金额:¥
{{
Commoditydetails
.
preferPrice
|
priceFormat
}}
</span>
<span>
支付金额:¥
{{
Commoditydetails
.
customerPayMoney
|
priceFormat
}}
</span>
<!--
<span>
支付平台:支付宝
</span>
-->
</p>
<p>
...
...
@@ -173,7 +173,7 @@ export default {
this
.
Commoditydetails
=
Visainfo
;
this
.
Commoditydetails
.
airOrderId
=
Visainfo
.
AirOrderId
;
this
.
code
.
OrderSource
=
Visainfo
.
orderResourceId
;
this
.
code
.
total_fee
=
Visainfo
.
preferPrice
+
''
;
this
.
code
.
total_fee
=
Visainfo
.
customerPayMoney
+
''
;
this
.
code
.
body
=
Visainfo
.
description
;
this
.
code
.
attach
=
`
${
Visainfo
.
costType
}
|
${
Visainfo
.
customerName
}
|
${
Visainfo
.
AirOrderId
}
|
${
Visainfo
.
customerId
}
|
${
Visainfo
.
outBranchId
}
`
}
else
{
...
...
src/components/newPersonalCenter/block/model/OrderInfoModel/FoodTable.vue
View file @
ccbcfdaa
...
...
@@ -215,7 +215,9 @@
<p>
使用日期:
{{
item
.
useDate
}}
</p>
</td>
<td
class=
"money"
>
<p>
{{
item
.
preferPrice
|
priceFormat
}}
</p>
<p>
总金额:
{{
item
.
preferPrice
|
priceFormat
}}
</p>
<p>
实付款:
{{
item
.
customerPayMoney
|
priceFormat
}}
</p>
<p>
优惠金额:
{{
item
.
discountMoney
|
priceFormat
}}
</p>
</td>
<td
class=
"color333 font-size12"
>
...
...
src/components/newPersonalCenter/block/model/OrderInfoModel/ScenTable.vue
View file @
ccbcfdaa
...
...
@@ -223,7 +223,8 @@
<p
style=
"margin-top:6px"
>
{{
item
.
contactMobile
}}
</p>
</td>
<td
class=
"money"
>
<p>
{{
item
.
preferPrice
|
priceFormat
}}
</p>
<p>
总金额:
{{
item
.
preferPrice
|
priceFormat
}}
</p>
<p>
实付款:
{{
item
.
customerPayMoney
|
priceFormat
}}
</p>
<p
style=
"color:#999999"
>
已优惠:
{{
item
.
discountMoney
|
priceFormat
}}
</p>
</td>
...
...
src/components/newPersonalCenter/block/model/OrderInfoModel/VisaTable.vue
View file @
ccbcfdaa
...
...
@@ -235,7 +235,7 @@
<!--
<p>
婴儿:0
</p>
-->
</td>
<td
class=
"money"
>
<p>
总额 ¥
{{
item
.
totalPrice
|
priceFormat
}}
</p>
<p>
总额 ¥
{{
item
.
customerPayMoney
|
priceFormat
}}
</p>
<!--
<p
class=
"__cp pay_no"
v-if=
"!item.payShow"
@
click=
"item.payShow = true"
>
已付总额 ¥
{{
item
.
totalPrice
|
priceFormat
}}
<i
class=
"iconfont icon-xia"
></i></p>
-->
<p
class=
"__cp pay_no"
@
click=
"item.payShow = false"
>
已付总额 ¥
{{
item
.
income
|
priceFormat
}}
<p>
优惠金额 ¥
{{
item
.
discountMoney
|
priceFormat
}}
...
...
src/components/visa/SchedProduct.vue
View file @
ccbcfdaa
...
...
@@ -273,7 +273,7 @@
<span
v-else
class=
"iconfont icon-xuanzhong2"
></span>
</div>
</li>
<div
v-if=
"UserCanUseCouponList.leng
g
th==0"
class=
"_no_coupon"
>
<div
v-if=
"UserCanUseCouponList.length==0"
class=
"_no_coupon"
>
<p>
暂无可用优惠券
</p>
</div>
</ul>
...
...
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