Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pro-blocks
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
duanledexianxianxian
pro-blocks
Commits
f87d7371
Commit
f87d7371
authored
Mar 12, 2018
by
ddcat1115
Committed by
jim
Mar 19, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
better url #1072
parent
ed0b743c
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
29 additions
and
25 deletions
+29
-25
src/common/menu.js
src/common/menu.js
+3
-3
src/common/router.js
src/common/router.js
+12
-12
src/routes/Account/Center.js
src/routes/Account/Center.js
+2
-2
src/routes/Account/Center.less
src/routes/Account/Center.less
+0
-0
src/routes/Account/Settings/BaseView.js
src/routes/Account/Settings/BaseView.js
+0
-0
src/routes/Account/Settings/BaseView.less
src/routes/Account/Settings/BaseView.less
+0
-0
src/routes/Account/Settings/BindingView.js
src/routes/Account/Settings/BindingView.js
+1
-1
src/routes/Account/Settings/GeographicView.js
src/routes/Account/Settings/GeographicView.js
+0
-0
src/routes/Account/Settings/GeographicView.less
src/routes/Account/Settings/GeographicView.less
+0
-0
src/routes/Account/Settings/Info.js
src/routes/Account/Settings/Info.js
+9
-5
src/routes/Account/Settings/Info.less
src/routes/Account/Settings/Info.less
+0
-0
src/routes/Account/Settings/NotificationView.js
src/routes/Account/Settings/NotificationView.js
+1
-1
src/routes/Account/Settings/PhoneView.js
src/routes/Account/Settings/PhoneView.js
+0
-0
src/routes/Account/Settings/PhoneView.less
src/routes/Account/Settings/PhoneView.less
+0
-0
src/routes/Account/Settings/SecurityView.js
src/routes/Account/Settings/SecurityView.js
+1
-1
No files found.
src/common/menu.js
View file @
f87d7371
...
@@ -116,13 +116,13 @@ const menuData = [{
...
@@ -116,13 +116,13 @@ const menuData = [{
},
{
},
{
name
:
'
个人页
'
,
name
:
'
个人页
'
,
icon
:
'
user
'
,
icon
:
'
user
'
,
path
:
'
user-profile
'
,
path
:
'
account
'
,
children
:
[{
children
:
[{
name
:
'
个人中心
'
,
name
:
'
个人中心
'
,
path
:
'
user-
center
'
,
path
:
'
center
'
,
},
{
},
{
name
:
'
个人设置
'
,
name
:
'
个人设置
'
,
path
:
'
userinfo/base
'
,
path
:
'
settings
'
,
}],
}],
}];
}];
...
...
src/common/router.js
View file @
f87d7371
...
@@ -163,23 +163,23 @@ export const getRouterData = (app) => {
...
@@ -163,23 +163,23 @@ export const getRouterData = (app) => {
'
/user/register-result
'
:
{
'
/user/register-result
'
:
{
component
:
dynamicWrapper
(
app
,
[],
()
=>
import
(
'
../routes/User/RegisterResult
'
)),
component
:
dynamicWrapper
(
app
,
[],
()
=>
import
(
'
../routes/User/RegisterResult
'
)),
},
},
'
/
user-profile/user-
center
'
:
{
'
/
account/
center
'
:
{
component
:
dynamicWrapper
(
app
,
[
'
list
'
,
'
user
'
,
'
project
'
],
()
=>
import
(
'
../routes/
UserProfile/User
Center
'
)),
component
:
dynamicWrapper
(
app
,
[
'
list
'
,
'
user
'
,
'
project
'
],
()
=>
import
(
'
../routes/
Account/
Center
'
)),
},
},
'
/
user-profile/userinfo
'
:
{
'
/
account/settings
'
:
{
component
:
dynamicWrapper
(
app
,
[
'
geographic
'
],
()
=>
import
(
'
../routes/
UserProfile/Userinfo
/Info
'
)),
component
:
dynamicWrapper
(
app
,
[
'
geographic
'
],
()
=>
import
(
'
../routes/
Account/Settings
/Info
'
)),
},
},
'
/
user-profile/userinfo
/base
'
:
{
'
/
account/settings
/base
'
:
{
component
:
dynamicWrapper
(
app
,
[
'
geographic
'
],
()
=>
import
(
'
../routes/
UserProfile/Userinfo
/BaseView
'
)),
component
:
dynamicWrapper
(
app
,
[
'
geographic
'
],
()
=>
import
(
'
../routes/
Account/Settings
/BaseView
'
)),
},
},
'
/
user-profile/userinfo/safe
'
:
{
'
/
account/settings/security
'
:
{
component
:
dynamicWrapper
(
app
,
[
'
geographic
'
],
()
=>
import
(
'
../routes/
UserProfile/Userinfo/Safe
View
'
)),
component
:
dynamicWrapper
(
app
,
[
'
geographic
'
],
()
=>
import
(
'
../routes/
Account/Settings/Security
View
'
)),
},
},
'
/
user-profile/userinfo/account
'
:
{
'
/
account/settings/binding
'
:
{
component
:
dynamicWrapper
(
app
,
[
'
geographic
'
],
()
=>
import
(
'
../routes/
UserProfile/Userinfo/Account
View
'
)),
component
:
dynamicWrapper
(
app
,
[
'
geographic
'
],
()
=>
import
(
'
../routes/
Account/Settings/Binding
View
'
)),
},
},
'
/
user-profile/userinfo/message
'
:
{
'
/
account/settings/notification
'
:
{
component
:
dynamicWrapper
(
app
,
[
'
geographic
'
],
()
=>
import
(
'
../routes/
UserProfile/Userinfo/Message
View
'
)),
component
:
dynamicWrapper
(
app
,
[
'
geographic
'
],
()
=>
import
(
'
../routes/
Account/Settings/Notification
View
'
)),
},
},
// '/user/:id': {
// '/user/:id': {
// component: dynamicWrapper(app, [], () => import('../routes/User/SomeComponent')),
// component: dynamicWrapper(app, [], () => import('../routes/User/SomeComponent')),
...
...
src/routes/
UserProfile/User
Center.js
→
src/routes/
Account/
Center.js
View file @
f87d7371
...
@@ -20,8 +20,8 @@ import {
...
@@ -20,8 +20,8 @@ import {
}
from
'
antd
'
;
}
from
'
antd
'
;
import
AvatarList
from
'
../../components/AvatarList
'
;
import
AvatarList
from
'
../../components/AvatarList
'
;
import
{
formatWan
}
from
'
../../utils/utils
'
;
import
{
formatWan
}
from
'
../../utils/utils
'
;
import
styles
from
'
./UserCenter.less
'
;
import
stylesProjects
from
'
../List/Projects.less
'
;
import
stylesProjects
from
'
../List/Projects.less
'
;
import
styles
from
'
./Center.less
'
;
import
stylesArticles
from
'
../List/Articles.less
'
;
import
stylesArticles
from
'
../List/Articles.less
'
;
import
stylesApplications
from
'
../List/Applications.less
'
;
import
stylesApplications
from
'
../List/Applications.less
'
;
import
GridContent
from
'
../../layouts/GridContent
'
;
import
GridContent
from
'
../../layouts/GridContent
'
;
...
@@ -34,7 +34,7 @@ import GridContent from '../../layouts/GridContent';
...
@@ -34,7 +34,7 @@ import GridContent from '../../layouts/GridContent';
project
,
project
,
projectLoading
:
loading
.
effects
[
'
project/fetchNotice
'
],
projectLoading
:
loading
.
effects
[
'
project/fetchNotice
'
],
}))
}))
export
default
class
User
Center
extends
PureComponent
{
export
default
class
Center
extends
PureComponent
{
state
=
{
state
=
{
key
:
'
article
'
,
key
:
'
article
'
,
newTags
:
[],
newTags
:
[],
...
...
src/routes/
UserProfile/User
Center.less
→
src/routes/
Account/
Center.less
View file @
f87d7371
File moved
src/routes/
UserProfile/Userinfo
/BaseView.js
→
src/routes/
Account/Settings
/BaseView.js
View file @
f87d7371
File moved
src/routes/
UserProfile/Userinfo
/BaseView.less
→
src/routes/
Account/Settings
/BaseView.less
View file @
f87d7371
File moved
src/routes/
UserProfile/Userinfo/Account
View.js
→
src/routes/
Account/Settings/Binding
View.js
View file @
f87d7371
import
React
,
{
Component
,
Fragment
}
from
'
react
'
;
import
React
,
{
Component
,
Fragment
}
from
'
react
'
;
import
{
Icon
,
List
}
from
'
antd
'
;
import
{
Icon
,
List
}
from
'
antd
'
;
export
default
class
Account
View
extends
Component
{
export
default
class
Binding
View
extends
Component
{
getData
=
()
=>
{
getData
=
()
=>
{
return
[
return
[
{
{
...
...
src/routes/
UserProfile/Userinfo
/GeographicView.js
→
src/routes/
Account/Settings
/GeographicView.js
View file @
f87d7371
File moved
src/routes/
UserProfile/Userinfo
/GeographicView.less
→
src/routes/
Account/Settings
/GeographicView.less
View file @
f87d7371
File moved
src/routes/
UserProfile/Userinfo
/Info.js
→
src/routes/
Account/Settings
/Info.js
View file @
f87d7371
...
@@ -10,9 +10,9 @@ const { Item } = Menu;
...
@@ -10,9 +10,9 @@ const { Item } = Menu;
const
menuMap
=
{
const
menuMap
=
{
base
:
'
基本设置
'
,
base
:
'
基本设置
'
,
s
afe
:
'
安全设置
'
,
s
ecurity
:
'
安全设置
'
,
account
:
'
账号绑定
'
,
binding
:
'
账号绑定
'
,
message
:
'
新消息通知
'
,
notification
:
'
新消息通知
'
,
};
};
@
connect
(({
user
})
=>
({
@
connect
(({
user
})
=>
({
...
@@ -45,7 +45,7 @@ export default class Info extends Component {
...
@@ -45,7 +45,7 @@ export default class Info extends Component {
return
menuMap
[
this
.
state
.
selectKey
];
return
menuMap
[
this
.
state
.
selectKey
];
};
};
selectKey
=
({
key
})
=>
{
selectKey
=
({
key
})
=>
{
this
.
props
.
dispatch
(
routerRedux
.
push
(
`/
user-profile/userinfo
/
${
key
}
`
));
this
.
props
.
dispatch
(
routerRedux
.
push
(
`/
account/settings
/
${
key
}
`
));
this
.
setState
({
this
.
setState
({
selectKey
:
key
,
selectKey
:
key
,
});
});
...
@@ -101,7 +101,11 @@ export default class Info extends Component {
...
@@ -101,7 +101,11 @@ export default class Info extends Component {
exact
=
{
item
.
exact
}
exact
=
{
item
.
exact
}
/
>
/
>
))}
))}
<
Redirect
exact
from
=
"
/userinfo
"
to
=
"
/userinfo/base
"
/>
<
Redirect
exact
from
=
"
/account/settings
"
to
=
"
/account/settings/base
"
/>
<
Redirect
to
=
"
/exception/404
"
/>
<
Redirect
to
=
"
/exception/404
"
/>
<
/Switch
>
<
/Switch
>
<
/div
>
<
/div
>
...
...
src/routes/
UserProfile/Userinfo
/Info.less
→
src/routes/
Account/Settings
/Info.less
View file @
f87d7371
File moved
src/routes/
UserProfile/Userinfo/Message
View.js
→
src/routes/
Account/Settings/Notification
View.js
View file @
f87d7371
...
@@ -3,7 +3,7 @@ import { Switch, List } from 'antd';
...
@@ -3,7 +3,7 @@ import { Switch, List } from 'antd';
const
Action
=
<
Switch
checkedChildren
=
"
开
"
unCheckedChildren
=
"
关
"
defaultChecked
/>
;
const
Action
=
<
Switch
checkedChildren
=
"
开
"
unCheckedChildren
=
"
关
"
defaultChecked
/>
;
export
default
class
Message
View
extends
Component
{
export
default
class
Notification
View
extends
Component
{
getData
=
()
=>
{
getData
=
()
=>
{
return
[
return
[
{
{
...
...
src/routes/
UserProfile/Userinfo
/PhoneView.js
→
src/routes/
Account/Settings
/PhoneView.js
View file @
f87d7371
File moved
src/routes/
UserProfile/Userinfo
/PhoneView.less
→
src/routes/
Account/Settings
/PhoneView.less
View file @
f87d7371
File moved
src/routes/
UserProfile/Userinfo/Safe
View.js
→
src/routes/
Account/Settings/Security
View.js
View file @
f87d7371
...
@@ -7,7 +7,7 @@ const passwordStrength = {
...
@@ -7,7 +7,7 @@ const passwordStrength = {
weak
:
<
font
className
=
"
weak
"
>
弱
<
/font>
,
weak
:
<
font
className
=
"
weak
"
>
弱
<
/font>
,
};
};
export
default
class
S
afe
View
extends
Component
{
export
default
class
S
ecurity
View
extends
Component
{
getData
=
()
=>
{
getData
=
()
=>
{
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