Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mr-julyedu
Overview
Overview
Details
Activity
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
baiguangyao
mr-julyedu
Commits
94363531
Commit
94363531
authored
Aug 22, 2019
by
xuzhenghua
Browse files
Options
Browse Files
Download
Plain Diff
bug
parents
b7919efb
a0b4e63a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
src/components/order/index.js
+2
-1
src/components/order/payOrder/PayOrder.js
+12
-2
No files found.
src/components/order/index.js
View file @
94363531
...
@@ -130,7 +130,8 @@ class Order extends Component {
...
@@ -130,7 +130,8 @@ class Order extends Component {
this
.
props
.
history
.
push
(
`/togroup?id=
${
res
.
data
.
data
.
oid
}
`
);
this
.
props
.
history
.
push
(
`/togroup?id=
${
res
.
data
.
data
.
oid
}
`
);
return
;
return
;
}
}
this
.
props
.
history
.
replace
(
`/payorder?oid=
${
res
.
data
.
data
.
oid
}
`
);
this
.
props
.
history
.
push
(
`/payorder?oid=
${
res
.
data
.
data
.
oid
}
`
,
{
group
:
1
});
}
else
{
}
else
{
Toast
.
info
(
res
.
data
.
msg
,
2
);
Toast
.
info
(
res
.
data
.
msg
,
2
);
return
;
return
;
...
...
src/components/order/payOrder/PayOrder.js
View file @
94363531
...
@@ -262,8 +262,18 @@ export default class PayOrder extends Component {
...
@@ -262,8 +262,18 @@ export default class PayOrder extends Component {
componentDidMount
()
{
componentDidMount
()
{
this
.
redirectAfterPay
()
this
.
redirectAfterPay
()
http
.
post
(
`
${
API
[
'base-api'
]}
/m/order/detail`
,
{
order_id
:
this
.
state
.
orderId
}).
then
((
res
)
=>
{
let
data
=
{}
console
.
log
(
res
);
if
(
this
.
props
.
location
.
state
&&
this
.
props
.
location
.
state
.
group
){
data
=
{
order_id
:
this
.
state
.
orderId
,
type
:
2
}
}
else
{
data
=
{
order_id
:
this
.
state
.
orderId
,
}
}
http
.
post
(
`
${
API
[
'base-api'
]}
/m/order/detail`
,
data
).
then
((
res
)
=>
{
if
(
res
.
data
.
errno
!==
200
)
{
if
(
res
.
data
.
errno
!==
200
)
{
Toast
.
info
(
res
.
data
.
msg
,
2
);
Toast
.
info
(
res
.
data
.
msg
,
2
);
return
;
return
;
...
...
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