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
94ec61e6
Commit
94ec61e6
authored
Oct 24, 2019
by
zhanghaozhe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
登录传redirect地址,统计用
parent
5c1747e2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
src/App.js
+2
-3
src/components/passport/login/index.js
+1
-1
src/store/userAction.js
+1
-1
No files found.
src/App.js
View file @
94ec61e6
...
...
@@ -154,7 +154,7 @@ class App extends Component {
if
(
code
&&
!
oid
)
{
http
.
get
(
`
${
API
[
'home'
]}
/m/wx_loginInfo/code/
${
code
}
`
)
http
.
get
(
`
${
API
[
'home'
]}
/m/wx_loginInfo/code/
${
code
}
?redirect=
${
encodeURIComponent
(
window
.
location
.
href
)}
`
)
.
then
(
res
=>
{
let
data
=
res
.
data
if
(
data
.
errno
==
200
)
{
...
...
@@ -269,4 +269,4 @@ export default compose(
{
setCurrentUser
,
startFetchUser
}
),
withRouter
)(
App
)
\ No newline at end of file
)(
App
)
src/components/passport/login/index.js
View file @
94ec61e6
...
...
@@ -135,7 +135,7 @@ const FormikConfig = {
phone_num
:
values
.
tel
,
phone_code
:
values
.
veriCode
,
area_code
:
'00'
+
props
.
country
.
num
,
redirect
:
from
&&
window
.
location
.
origin
+
from
.
pathname
+
from
.
search
+
from
.
hash
redirect
:
from
&&
encodeURIComponent
(
window
.
location
.
origin
+
from
.
pathname
+
from
.
search
+
from
.
hash
)
}).
then
(
res
=>
{
if
(
res
.
hasError
)
{
Toast
.
info
(
res
.
msg
);
...
...
src/store/userAction.js
View file @
94ec61e6
...
...
@@ -8,7 +8,7 @@ const accountLogin = user => dispatch => {
user_name
:
user
.
username
,
password
:
encrypt
(
user
.
password
),
is_encrypt
:
1
,
redirect
:
user
.
redirect
redirect
:
encodeURIComponent
(
user
.
redirect
)
}).
then
(
res
=>
{
return
storeUser
(
res
,
dispatch
)
})
...
...
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