Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
钟摆人-Puppet゜
ant-design-pro
提交
64b5984a
A
ant-design-pro
项目概览
钟摆人-Puppet゜
/
ant-design-pro
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
A
ant-design-pro
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
64b5984a
编写于
7月 07, 2018
作者:
陈小聪-小虎Oni
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add user layout
上级
14bed53b
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
35 addition
and
16 deletion
+35
-16
src/components/Authorized/AuthorizedRoute.js
src/components/Authorized/AuthorizedRoute.js
+1
-0
src/layouts/UserLayout.js
src/layouts/UserLayout.js
+16
-13
src/pages/User/Login.js
src/pages/User/Login.js
+1
-1
src/pages/User/Register.js
src/pages/User/Register.js
+2
-2
src/pages/User/_layout.js
src/pages/User/_layout.js
+15
-0
未找到文件。
src/components/Authorized/AuthorizedRoute.js
浏览文件 @
64b5984a
...
...
@@ -4,6 +4,7 @@ import Authorized from './Authorized';
class
AuthorizedRoute
extends
React
.
Component
{
render
()
{
// TODO: umi只会返回render和rest
const
{
component
:
Component
,
render
,
authority
,
redirectPath
,
...
rest
}
=
this
.
props
;
return
(
<
Authorized
...
...
src/layouts/UserLayout.js
浏览文件 @
64b5984a
import
React
,
{
Fragment
}
from
'
react
'
;
import
{
Link
,
Redirect
,
Switch
,
Route
}
from
'
dva/router
'
;
import
{
Link
}
from
'
dva/router
'
;
import
DocumentTitle
from
'
react-document-title
'
;
import
{
Icon
}
from
'
antd
'
;
import
GlobalFooter
from
'
../components/GlobalFooter
'
;
import
styles
from
'
./UserLayout.less
'
;
import
logo
from
'
../assets/logo.svg
'
;
import
{
getRoutes
,
getPageQuery
,
getQueryPath
}
from
'
../utils/utils
'
;
// TODO:remove
// import { getRoutes, getPageQuery, getQueryPath } from '../utils/utils';
const
links
=
[
{
...
...
@@ -30,14 +32,14 @@ const copyright = (
Copyright
<
Icon
type
=
"
copyright
"
/>
2018
蚂蚁金服体验技术部出品
<
/Fragment
>
);
function
getLoginPathWithRedirectPath
()
{
const
params
=
getPageQuery
();
const
{
redirect
}
=
params
;
return
getQueryPath
(
'
/user/login
'
,
{
redirect
,
});
}
// TODO:remove
//
function getLoginPathWithRedirectPath() {
//
const params = getPageQuery();
//
const { redirect } = params;
//
return getQueryPath('/user/login', {
//
redirect,
//
});
//
}
class
UserLayout
extends
React
.
PureComponent
{
getPageTitle
()
{
...
...
@@ -51,7 +53,7 @@ class UserLayout extends React.PureComponent {
}
render
()
{
const
{
routerData
,
match
}
=
this
.
props
;
const
{
children
}
=
this
.
props
;
return
(
<
DocumentTitle
title
=
{
this
.
getPageTitle
()}
>
<
div
className
=
{
styles
.
container
}
>
...
...
@@ -65,7 +67,8 @@ class UserLayout extends React.PureComponent {
<
/div
>
<
div
className
=
{
styles
.
desc
}
>
Ant
Design
是西湖区最具影响力的
Web
设计规范
<
/div
>
<
/div
>
<
Switch
>
{
children
}
{
/* <Switch>
{getRoutes(match.path, routerData).map(item => (
<Route
key={item.key}
...
...
@@ -75,7 +78,7 @@ class UserLayout extends React.PureComponent {
/>
))}
<Redirect from="/user" to={getLoginPathWithRedirectPath()} />
<
/Switch
>
</Switch>
*/
}
<
/div
>
<
GlobalFooter
links
=
{
links
}
copyright
=
{
copyright
}
/
>
<
/div
>
...
...
src/pages/User/Login.js
浏览文件 @
64b5984a
...
...
@@ -112,7 +112,7 @@ export default class LoginPage extends Component {
<
Icon
className
=
{
styles
.
icon
}
type
=
"
alipay-circle
"
/>
<
Icon
className
=
{
styles
.
icon
}
type
=
"
taobao-circle
"
/>
<
Icon
className
=
{
styles
.
icon
}
type
=
"
weibo-circle
"
/>
<
Link
className
=
{
styles
.
register
}
to
=
"
/
user/r
egister
"
>
<
Link
className
=
{
styles
.
register
}
to
=
"
/
User/R
egister
"
>
注册账户
<
/Link
>
<
/div
>
...
...
src/pages/User/Register.js
浏览文件 @
64b5984a
...
...
@@ -40,7 +40,7 @@ export default class Register extends Component {
if
(
register
.
status
===
'
ok
'
)
{
dispatch
(
routerRedux
.
push
({
pathname
:
'
/
user/register-r
esult
'
,
pathname
:
'
/
User/RegisterR
esult
'
,
state
:
{
account
,
},
...
...
@@ -279,7 +279,7 @@ export default class Register extends Component {
>
注册
<
/Button
>
<
Link
className
=
{
styles
.
login
}
to
=
"
/
user/l
ogin
"
>
<
Link
className
=
{
styles
.
login
}
to
=
"
/
User/L
ogin
"
>
使用已有账户登录
<
/Link
>
<
/FormItem
>
...
...
src/pages/User/_layout.js
0 → 100644
浏览文件 @
64b5984a
import
React
from
'
react
'
;
import
{
getRouterData
}
from
'
common/router
'
;
import
{
getMenuData
}
from
'
common/menu
'
;
import
UserLayout
from
'
../../layouts/UserLayout
'
;
export
default
props
=>
{
const
{
children
,
location
}
=
props
;
const
routerData
=
getRouterData
({});
const
menuData
=
getMenuData
({});
return
(
<
UserLayout
routerData
=
{
routerData
}
menuData
=
{
menuData
}
location
=
{
location
}
{...
props
}
>
{
children
}
<
/UserLayout
>
);
};
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录