Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cauchy-ui
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
ui
cauchy-ui
Commits
1b4f8c5a
Commit
1b4f8c5a
authored
Aug 30, 2021
by
郭志伟
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 跟新收银台享花券字段
parent
3903cd87
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
PayCardItem.vue
src/views/pay/components/PayCardItem.vue
+1
-1
index.vue
src/views/pay/index.vue
+5
-5
No files found.
src/views/pay/components/PayCardItem.vue
View file @
1b4f8c5a
...
...
@@ -23,7 +23,7 @@
<div
v-if=
"showCoupon && value.payType === 1"
class=
"coupon"
>
<p
class=
"couponDes"
:class=
"
{ disable: couponDisabled }" @click.stop="openCouponModal">
<span
v-if=
"couponInfo.pickupId"
>
{{
`满${couponInfo.limitAmount
}
减${couponInfo.faceValue
}
元`
}}
{{
`满${couponInfo.limitAmount
New
}
减${couponInfo.faceValueNew
}
元`
}}
<
/span
>
<
span
v
-
else
>
未选择优惠券
...
...
src/views/pay/index.vue
View file @
1b4f8c5a
...
...
@@ -191,9 +191,9 @@ export default {
return
this
.
isRiskLimit
();
},
amount
()
{
return
IS_THIRD_PAY
(
this
.
payType
)
||
!
this
.
selectedCoupon
.
faceValue
return
IS_THIRD_PAY
(
this
.
payType
)
||
!
this
.
selectedCoupon
.
faceValue
New
?
this
.
displayInfo
.
orderAmt
:
(
this
.
displayInfo
.
orderAmt
-
this
.
selectedCoupon
.
faceValue
).
toFixed
(
2
);
:
(
this
.
displayInfo
.
orderAmt
-
this
.
selectedCoupon
.
faceValue
New
).
toFixed
(
2
);
},
isShowProtocol
()
{
return
(
...
...
@@ -204,7 +204,7 @@ export default {
},
canUseAmount
()
{
return
(
((
this
.
selectedCoupon
?.
faceValue
&&
+
this
.
selectedCoupon
.
faceValue
)
||
0
)
+
((
this
.
selectedCoupon
?.
faceValue
New
&&
+
this
.
selectedCoupon
.
faceValueNew
)
||
0
)
+
((
this
.
displayInfo
?.
creditPayInfo
?.
canAmt
&&
+
this
.
displayInfo
.
creditPayInfo
.
canAmt
)
||
0
)
-
((
this
.
displayInfo
?.
orderAmt
&&
+
this
.
displayInfo
.
orderAmt
)
||
0
)
);
...
...
@@ -327,7 +327,7 @@ export default {
const
{
accountStatus
,
riskManagementAmt
}
=
this
.
creditPayInfo
;
const
{
orderAmt
}
=
this
.
displayInfo
;
if
(
accountStatus
===
ACCOUNT_APPLY_SUCCESS
)
{
const
coupon
=
+
this
.
selectedCoupon
.
faceValue
||
0
;
const
coupon
=
+
this
.
selectedCoupon
.
faceValue
New
||
0
;
return
+
riskManagementAmt
+
coupon
<
+
orderAmt
;
}
else
{
return
false
;
...
...
@@ -599,7 +599,7 @@ export default {
return
Object
.
keys
(
obj
);
},
setAmount
()
{
const
faceValue
=
+
this
.
selectedCoupon
?.
faceValue
||
0
;
const
faceValue
=
+
this
.
selectedCoupon
?.
faceValue
New
||
0
;
const
orderAmt
=
+
this
.
displayInfo
?.
orderAmt
||
0
;
const
finalAmt
=
IS_THIRD_PAY
(
this
.
payType
)
||
!
this
.
showCoupon
...
...
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