Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
ant-design-pro
Project
Project
Details
Activity
Releases
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thiago Borges
ant-design-pro
Commits
6ecfedde
Commit
6ecfedde
authored
Sep 06, 2017
by
ddcat1115
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix login page
parent
246fd23c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
7 deletions
+25
-7
.roadhogrc.mock.js
.roadhogrc.mock.js
+2
-1
login.js
src/models/login.js
+1
-1
Login.js
src/routes/User/Login.js
+22
-5
No files found.
.roadhogrc.mock.js
View file @
6ecfedde
...
@@ -65,7 +65,8 @@ const proxy = {
...
@@ -65,7 +65,8 @@ const proxy = {
'GET /api/fake_chart_data'
:
getFakeChartData
,
'GET /api/fake_chart_data'
:
getFakeChartData
,
'GET /api/profile'
:
getProfileData
,
'GET /api/profile'
:
getProfileData
,
'POST /api/login/account'
:
(
req
,
res
)
=>
{
'POST /api/login/account'
:
(
req
,
res
)
=>
{
res
.
send
({
status
:
'error'
,
type
:
'account'
});
const
{
password
,
userName
}
=
req
.
body
;
res
.
send
({
status
:
password
===
'888888'
&&
userName
===
'admin'
?
'ok'
:
'error'
,
type
:
'account'
});
},
},
'POST /api/login/mobile'
:
(
req
,
res
)
=>
{
'POST /api/login/mobile'
:
(
req
,
res
)
=>
{
res
.
send
({
status
:
'ok'
,
type
:
'mobile'
});
res
.
send
({
status
:
'ok'
,
type
:
'mobile'
});
...
...
src/models/login.js
View file @
6ecfedde
...
@@ -13,7 +13,7 @@ export default {
...
@@ -13,7 +13,7 @@ export default {
type
:
'changeSubmitting'
,
type
:
'changeSubmitting'
,
payload
:
true
,
payload
:
true
,
});
});
const
response
=
yield
call
(
fakeAccountLogin
);
const
response
=
yield
call
(
fakeAccountLogin
,
payload
);
yield
put
({
yield
put
({
type
:
'loginHandle'
,
type
:
'loginHandle'
,
payload
:
response
,
payload
:
response
,
...
...
src/routes/User/Login.js
View file @
6ecfedde
...
@@ -61,7 +61,14 @@ export default class Login extends Component {
...
@@ -61,7 +61,14 @@ export default class Login extends Component {
}
}
msg
=
(
message
)
=>
{
msg
=
(
message
)
=>
{
return
<
Alert
style
=
{{
marginBottom
:
16
}}
message
=
{
message
}
type
=
"error"
showIcon
closable
/>
;
return
(
<
Alert
key
=
{
new
Date
().
getTime
()}
style
=
{{
marginBottom
:
16
}}
message
=
{
message
}
type
=
"error"
showIcon
closable
/>
);
}
}
render
()
{
render
()
{
...
@@ -73,7 +80,12 @@ export default class Login extends Component {
...
@@ -73,7 +80,12 @@ export default class Login extends Component {
<
Form
onSubmit
=
{
this
.
handleSubmit
}
>
<
Form
onSubmit
=
{
this
.
handleSubmit
}
>
<
Tabs
className
=
{
styles
.
tabs
}
activeKey
=
{
type
}
onChange
=
{
this
.
onSwitch
}
>
<
Tabs
className
=
{
styles
.
tabs
}
activeKey
=
{
type
}
onChange
=
{
this
.
onSwitch
}
>
<
TabPane
tab
=
"账户密码登录"
key
=
"account"
>
<
TabPane
tab
=
"账户密码登录"
key
=
"account"
>
{
login
.
status
===
'error'
&&
login
.
type
===
'account'
&&
this
.
msg
(
'账户或密码错误'
)}
{
login
.
status
===
'error'
&&
login
.
type
===
'account'
&&
login
.
submitting
===
false
&&
this
.
msg
(
'账户或密码错误'
)
}
<
FormItem
>
<
FormItem
>
{
getFieldDecorator
(
'userName'
,
{
{
getFieldDecorator
(
'userName'
,
{
rules
:
[{
rules
:
[{
...
@@ -82,7 +94,7 @@ export default class Login extends Component {
...
@@ -82,7 +94,7 @@ export default class Login extends Component {
})(
})(
<
Input
<
Input
prefix
=
{
<
Icon
type
=
"user"
style
=
{{
fontSize
:
14
,
color
:
'rgba(0, 0, 0, 0.25)'
}}
/>
}
prefix
=
{
<
Icon
type
=
"user"
style
=
{{
fontSize
:
14
,
color
:
'rgba(0, 0, 0, 0.25)'
}}
/>
}
placeholder
=
"
账户
"
placeholder
=
"
admin
"
/>
/>
)}
)}
<
/FormItem
>
<
/FormItem
>
...
@@ -95,13 +107,18 @@ export default class Login extends Component {
...
@@ -95,13 +107,18 @@ export default class Login extends Component {
<
Input
<
Input
prefix
=
{
<
Icon
type
=
"lock"
style
=
{{
fontSize
:
14
,
color
:
'rgba(0, 0, 0, 0.25)'
}}
/>
}
prefix
=
{
<
Icon
type
=
"lock"
style
=
{{
fontSize
:
14
,
color
:
'rgba(0, 0, 0, 0.25)'
}}
/>
}
type
=
"password"
type
=
"password"
placeholder
=
"
密码
"
placeholder
=
"
888888
"
/>
/>
)}
)}
<
/FormItem
>
<
/FormItem
>
<
/TabPane
>
<
/TabPane
>
<
TabPane
tab
=
"手机号登录"
key
=
"mobile"
>
<
TabPane
tab
=
"手机号登录"
key
=
"mobile"
>
{
login
.
status
===
'error'
&&
login
.
type
===
'mobile'
&&
this
.
msg
(
'验证码错误'
)}
{
login
.
status
===
'error'
&&
login
.
type
===
'mobile'
&&
login
.
submitting
===
false
&&
this
.
msg
(
'验证码错误'
)
}
<
FormItem
>
<
FormItem
>
{
getFieldDecorator
(
'mobile'
,
{
{
getFieldDecorator
(
'mobile'
,
{
rules
:
[{
rules
:
[{
...
...
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