diff --git a/AccountCenter/src/index.tsx b/AccountCenter/src/index.tsx index 18a47be6d23cd723151bb672791a4f697d513314..14c4c514d85270d6860de490baf227ce98abbdcf 100644 --- a/AccountCenter/src/index.tsx +++ b/AccountCenter/src/index.tsx @@ -2,6 +2,7 @@ import React, { PureComponent } from 'react'; import { connect } from 'dva'; import { Dispatch } from 'redux'; import Link from 'umi/link'; +import { GridContent } from '@ant-design/pro-layout'; import { RouteChildrenProps } from 'react-router'; import { Card, Row, Col, Icon, Avatar, Tag, Divider, Input } from 'antd'; import styles from './Center.less'; @@ -154,88 +155,91 @@ class PAGE_NAME_UPPER_CAMEL_CASE extends PureComponent< const { currentUser, currentUserLoading } = this.props; const dataLoading = currentUserLoading || !(currentUser && Object.keys(currentUser).length); return ( - - - - {!dataLoading ? ( -
-
- -
{currentUser.name}
-
{currentUser.signature}
+ + + + + {!dataLoading ? ( +
+
+ +
{currentUser.name}
+
{currentUser.signature}
+
+
+

+ + {currentUser.title} +

+

+ + {currentUser.group} +

+

+ + {currentUser.geographic.province.label} + {currentUser.geographic.city.label} +

+
+ +
+
标签
+ {currentUser.tags.concat(newTags).map(item => { + return {item.label}; + })} + {inputVisible && ( + this.saveInputRef(ref)} + type="text" + size="small" + style={{ width: 78 }} + value={inputValue} + onChange={this.handleInputChange} + onBlur={this.handleInputConfirm} + onPressEnter={this.handleInputConfirm} + /> + )} + {!inputVisible && ( + + + + )} +
+ +
+
团队
+ + {currentUser.notice && + currentUser.notice.map(item => ( + + + + {item.member} + + + ))} + +
-
-

- - {currentUser.title} -

-

- - {currentUser.group} -

-

- - {currentUser.geographic.province.label} - {currentUser.geographic.city.label} -

-
- -
-
标签
- {currentUser.tags.concat(newTags).map(item => { - return {item.label}; - })} - {inputVisible && ( - this.saveInputRef(ref)} - type="text" - size="small" - style={{ width: 78 }} - value={inputValue} - onChange={this.handleInputChange} - onBlur={this.handleInputConfirm} - onPressEnter={this.handleInputConfirm} - /> - )} - {!inputVisible && ( - - - - )} -
- -
-
团队
- - {currentUser.notice && currentUser.notice.map(item => ( - - - - {item.member} - - - ))} - -
-
- ) : null} - - - - - {this.renderChildrenByTabKey(tabKey)} - - - + ) : null} + + + + + {this.renderChildrenByTabKey(tabKey)} + + + + ); } } diff --git a/AccountSettings/src/index.tsx b/AccountSettings/src/index.tsx index ca382e6b21cf3afe8aec837a0a1022474cc0cfa1..9968d0602d254f68a148b741f7082b659ae17531 100644 --- a/AccountSettings/src/index.tsx +++ b/AccountSettings/src/index.tsx @@ -2,6 +2,7 @@ import React, { Component } from 'react'; import { connect } from 'dva'; import { Dispatch } from 'redux'; import { FormattedMessage } from 'umi-plugin-react/locale'; +import { GridContent } from '@ant-design/pro-layout'; import { Menu } from 'antd'; import styles from './style.less'; import BaseView from './components/base'; @@ -133,28 +134,30 @@ class PAGE_NAME_UPPER_CAMEL_CASE extends Component< } const { mode, selectKey } = this.state; return ( -
{ - if (ref) { - this.main = ref; - } - }} - > -
- this.selectKey(key as PAGE_NAME_UPPER_CAMEL_CASEStateKeys)} - > - {this.getMenu()} - + +
{ + if (ref) { + this.main = ref; + } + }} + > +
+ this.selectKey(key as PAGE_NAME_UPPER_CAMEL_CASEStateKeys)} + > + {this.getMenu()} + +
+
+
{this.getRightTitle()}
+ {this.renderChildren()} +
-
-
{this.getRightTitle()}
- {this.renderChildren()} -
-
+ ); } } diff --git a/AccountSettings/src/style.less b/AccountSettings/src/style.less index 6a859578cc4cd0694e9b7f54edb206e298200959..f1b69c415417454a75cffcb8c9e3a27dbfb29545 100644 --- a/AccountSettings/src/style.less +++ b/AccountSettings/src/style.less @@ -7,7 +7,7 @@ padding-top: 16px; padding-bottom: 16px; overflow: auto; - background-color: @body-background; + background-color: @menu-bg; .leftMenu { width: 224px; border-right: @border-width-base @border-style-base @border-color-split; diff --git a/package.json b/package.json index b3228ee66c88d7bd3d46a7541ed232b2c9780945..bc2c62883b0906f4993207a8931e77dc67b9d61f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "scripts": { - "dev": "cross-env PAGES_PATH='ResultSuccess/src' umi dev", + "dev": "cross-env PAGES_PATH='AccountSettings/src' umi dev", "lint": "npm run lint:ts && npm run lint:style && npm run lint:prettier", "lint-staged": "lint-staged", "lint-staged:ts": "tslint",