Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mongo-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
mongo-ui
Commits
7026863c
Commit
7026863c
authored
Aug 26, 2020
by
郝聪敏
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/fix_pay' into 'master'
fix: 支付默认payOrderType改为动态化 See merge request
!88
parents
13354185
eba57ffe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
main.js
src/main.js
+1
-1
detailPay.mixin.js
src/views/Goods/Detail/modules/detailPay.mixin.js
+2
-2
No files found.
src/main.js
View file @
7026863c
...
@@ -22,7 +22,7 @@ new Vue({
...
@@ -22,7 +22,7 @@ new Vue({
}).
$mount
(
"
#app
"
);
}).
$mount
(
"
#app
"
);
// 初始化sentry
// 初始化sentry
Raven
.
config
(
"
https://1dc603dd7c09468793aa003ab0bf9480@sentry.q
uantgroups
.com/57
"
,
{
Raven
.
config
(
"
https://1dc603dd7c09468793aa003ab0bf9480@sentry.q
-gp
.com/57
"
,
{
release
,
release
,
environment
:
process
.
env
.
NODE_ENV
environment
:
process
.
env
.
NODE_ENV
})
})
...
...
src/views/Goods/Detail/modules/detailPay.mixin.js
View file @
7026863c
...
@@ -81,8 +81,8 @@ export default {
...
@@ -81,8 +81,8 @@ export default {
}
}
},
},
getPayResult
()
{
getPayResult
()
{
const
{
payOrderNo
,
orderNo
}
=
this
.
orderInfo
;
const
{
payOrderNo
,
payType
,
orderNo
}
=
this
.
orderInfo
;
placeOrder
.
polling
({
payOrderNo
,
payOrderType
:
1
}).
then
(
async
payRes
=>
{
placeOrder
.
polling
({
payOrderNo
,
payOrderType
:
payType
||
1
}).
then
(
async
payRes
=>
{
if
(
!
payRes
.
result
&&
payRes
.
payState
===
2
)
{
if
(
!
payRes
.
result
&&
payRes
.
payState
===
2
)
{
this
.
payTimer
=
setTimeout
(()
=>
{
this
.
payTimer
=
setTimeout
(()
=>
{
this
.
getPayResult
();
this
.
getPayResult
();
...
...
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