Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
group-buy-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
group-buy-ui
Commits
2d8d5a84
Commit
2d8d5a84
authored
Sep 27, 2021
by
Xuguangxing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix
parent
5c6d3c66
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
index.vue
src/views/pay/index.vue
+7
-3
payResult.vue
src/views/pay/payResult.vue
+4
-4
No files found.
src/views/pay/index.vue
View file @
2d8d5a84
...
@@ -186,7 +186,8 @@ export default {
...
@@ -186,7 +186,8 @@ export default {
payContractInfo
:
{},
payContractInfo
:
{},
isCheckAgreement
:
false
,
isCheckAgreement
:
false
,
mergePayPretreatmentInfo
:
{},
mergePayPretreatmentInfo
:
{},
tradeType
:
isWechat
?
'
JSAPI
'
:
'
MWEB
'
tradeType
:
isWechat
?
'
JSAPI
'
:
'
MWEB
'
,
amountInfo
:
{}
};
};
},
},
computed
:
{
computed
:
{
...
@@ -252,7 +253,7 @@ export default {
...
@@ -252,7 +253,7 @@ export default {
async
queryPayInfo
()
{
async
queryPayInfo
()
{
const
[
data
,
error
]
=
await
queryPayInfo
({
const
[
data
,
error
]
=
await
queryPayInfo
({
orderNo
:
this
.
orderNo
,
orderNo
:
this
.
orderNo
,
isUsedMergePayMethod
:
cookies
.
get
(
'
source
'
)
!==
'
tob
'
// 是否需要组合支付,true需要。false不需要
isUsedMergePayMethod
:
false
});
});
if
(
error
&&
codeArr
.
indexOf
(
error
?.
response
?.
businessCode
)
<
0
)
{
if
(
error
&&
codeArr
.
indexOf
(
error
?.
response
?.
businessCode
)
<
0
)
{
this
.
payResult
(
'
Fail
'
);
this
.
payResult
(
'
Fail
'
);
...
@@ -523,7 +524,9 @@ export default {
...
@@ -523,7 +524,9 @@ export default {
query
:
{
query
:
{
reason
:
error
,
reason
:
error
,
orderNo
:
this
.
orderNo
,
orderNo
:
this
.
orderNo
,
payType
:
this
.
payType
payType
:
this
.
payType
,
finalAmt
:
this
.
amountInfo
.
finalAmt
||
''
,
freeAmount
:
this
.
amountInfo
.
freeAmount
||
''
}
}
});
});
},
},
...
@@ -620,6 +623,7 @@ export default {
...
@@ -620,6 +623,7 @@ export default {
:
(
orderAmt
-
faceValue
||
0
).
toFixed
(
2
);
:
(
orderAmt
-
faceValue
||
0
).
toFixed
(
2
);
const
freeAmount
=
const
freeAmount
=
!
IS_THIRD_PAY
(
this
.
payType
)
&&
this
.
showCoupon
?
faceValue
||
'
0.00
'
:
'
0.00
'
;
!
IS_THIRD_PAY
(
this
.
payType
)
&&
this
.
showCoupon
?
faceValue
||
'
0.00
'
:
'
0.00
'
;
this
.
amountInfo
=
{
finalAmt
,
freeAmount
};
cookies
.
set
(
'
amount
'
,
{
finalAmt
,
freeAmount
});
cookies
.
set
(
'
amount
'
,
{
finalAmt
,
freeAmount
});
},
},
async
reissueContract
()
{
async
reissueContract
()
{
...
...
src/views/pay/payResult.vue
View file @
2d8d5a84
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
<cr-image
src=
"@/assets/images/groupBuy/activity.png"
/>
<cr-image
src=
"@/assets/images/groupBuy/activity.png"
/>
</div>
</div>
<div
v-if=
"isSuccess && couponList.length"
class=
"coupon-box"
>
<
!--
<
div
v-if=
"isSuccess && couponList.length"
class=
"coupon-box"
>
<p
class=
"coupon-tip"
>
本单已享以下权益
</p>
<p
class=
"coupon-tip"
>
本单已享以下权益
</p>
<div
class=
"coupon-wrap"
>
<div
class=
"coupon-wrap"
>
<CouponCard
<CouponCard
...
@@ -62,13 +62,13 @@
...
@@ -62,13 +62,13 @@
@
click=
"goViewCouponDetail"
@
click=
"goViewCouponDetail"
/>
/>
</div>
</div>
</div>
</div>
-->
<!--
<Goods
/>
-->
<!--
<Goods
/>
-->
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
import
{
goUrlExtends
}
from
'
./extends
'
;
import
{
goUrlExtends
}
from
'
./extends
'
;
import
CouponCard
from
'
./components/CouponCard.vue
'
;
//
import CouponCard from './components/CouponCard.vue';
import
{
getCouponList
}
from
'
@/api/pay.api
'
;
import
{
getCouponList
}
from
'
@/api/pay.api
'
;
import
groupBuyApi
from
'
@/api/groupBuy
'
;
import
groupBuyApi
from
'
@/api/groupBuy
'
;
// import Goods from '@/components/RecoGoods/RecoGoods.vue';
// import Goods from '@/components/RecoGoods/RecoGoods.vue';
...
@@ -77,7 +77,7 @@ import { EventBus } from '@/service/utils.service';
...
@@ -77,7 +77,7 @@ import { EventBus } from '@/service/utils.service';
export
default
{
export
default
{
components
:
{
components
:
{
// Goods,
// Goods,
CouponCard
//
CouponCard
},
},
extends
:
goUrlExtends
,
extends
:
goUrlExtends
,
data
()
{
data
()
{
...
...
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