@@ -53,6 +53,7 @@
"@types/react": "^16.4.11",
"@types/react-dom": "^16.0.6",
"antd-pro-merge-less": "^0.0.6",
+ "merge-umi-mock-data": "^0.0.2",
"antd-theme-webpack-plugin": "^1.0.8",
"babel-eslint": "^8.2.6",
"babel-runtime": "^6.9.2",
@@ -1,3 +1,4 @@
const generateMock = require('merge-umi-mock-data');
const path = require('path');
+console.log(path.join(__dirname, '../mock'), path.join(__dirname, '../functions/mock/index.js'));
generateMock(path.join(__dirname, '../mock'), path.join(__dirname, '../functions/mock/index.js'));
@@ -73,7 +73,8 @@ export default class GlobalHeaderRight extends PureComponent {
</Menu.Item>
<Menu.Divider />
<Menu.Item key="logout">
- <Icon type="logout" />退出登录
+ <Icon type="logout" />
+ 退出登录
</Menu>
);
@@ -154,6 +155,9 @@ export default class GlobalHeaderRight extends PureComponent {
<Button
size="small"
ghost={theme === 'dark'}
+ style={{
+ margin: '0 8px',
+ }}
onClick={() => {
this.changLang();
}}
@@ -33,7 +33,7 @@
}
.logo {
- width: 160px;
+ width: 165px;
height: 64px;
position: relative;
line-height: 64px;