diff --git a/client/containers/User/Profile.js b/client/containers/User/Profile.js index b8de8a2e..3a256867 100644 --- a/client/containers/User/Profile.js +++ b/client/containers/User/Profile.js @@ -138,8 +138,8 @@ class Profile extends Component { userNameEditHtml =
- - + +
} @@ -154,8 +154,8 @@ class Profile extends Component { emailEditHtml =
- - + +
} @@ -175,15 +175,15 @@ class Profile extends Component { } if (this.state.secureEdit === false) { - secureEditHtml = + secureEditHtml = } else { secureEditHtml =
- - + +
} @@ -228,7 +228,7 @@ class Profile extends Component { - 安全 + 密码 {secureEditHtml} diff --git a/client/containers/User/index.scss b/client/containers/User/index.scss index 56dca065..75cbbb3b 100644 --- a/client/containers/User/index.scss +++ b/client/containers/User/index.scss @@ -21,15 +21,22 @@ border-radius:5px; margin-top: 15px; .search{ - margin: 5px; + padding: 5px; + background-color: #eee; } ul{border:none} + .ant-menu-item{ + font-size: 14px; + } } .user-name{ - padding: 10px 0px; + padding: 24px 0px; text-align: center; background-color: #34495e; color: white; + font-size: 16px; + border-top-left-radius:5px; + border-top-right-radius: 5px; span{ margin-right: 10px; } @@ -59,17 +66,27 @@ -webkit-box-flex: 1; margin-top: 15px; margin-left: 15px; - padding: 10px 30px; + padding: 24px; box-shadow: 0 2px 4px 0 rgba(0,0,0,0.20); background: #FFF; border-radius:5px; + .ant-btn-group{ + margin-top: 12px; + } .user-item { min-height:35px; line-height:35px; margin: 5px; + margin-left: 0px; margin-bottom:10px; border-bottom: 1px solid #f1f3f6; padding-bottom: 10px; + #old_password,#password,#verify_pass{ + margin-top: 20px; + } + #old_password{ + margin-top: 0px; + } .ant-col-4{ color: black; padding: 0px 10px; @@ -87,13 +104,13 @@ cursor: pointer } - .edit-buttons{ - margin:10px; - } + // .edit-buttons{ + // margin:10px; + // } - .edit-button{ - margin: 5px; - } + // .edit-button{ + // margin: 5px; + // } } } diff --git a/server/config.js b/server/config.js index c83346d6..ed9b761b 100644 --- a/server/config.js +++ b/server/config.js @@ -1,11 +1,9 @@ -import path from 'path' /** * config.js是用来第一次安装初始化网站配置,如果不用默认的runtime_path,可以直接修改runtime_path路径 */ -let runtime_path = path.join(path.resolve(__dirname, '../'), 'runtime') let config = { "port": 80, - "runtime_path": runtime_path, + "runtime_path": '', "webhost": "yapi.local.qunar.com", "adminAccount": "admin@admin.com", "db": { diff --git a/server/yapi.js b/server/yapi.js index dc5e0198..e201b643 100644 --- a/server/yapi.js +++ b/server/yapi.js @@ -6,6 +6,10 @@ import config from '../runtime/config.json'; let insts = new Map(); let mail; +if(!config.runtime_path){ + config.runtime_path = path.join(path.resolve(__dirname, '../'), 'runtime') +} + const WEBROOT = path.resolve(__dirname, '..'); //路径 const WEBROOT_SERVER = __dirname; const WEBROOT_RUNTIME = config.runtime_path; diff --git a/server_dist/config.js b/server_dist/config.js index 3121f802..44a2d110 100644 --- a/server_dist/config.js +++ b/server_dist/config.js @@ -1,18 +1,11 @@ -'use strict'; - -var _path = require('path'); - -var _path2 = _interopRequireDefault(_path); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +"use strict"; /** * config.js是用来第一次安装初始化网站配置,如果不用默认的runtime_path,可以直接修改runtime_path路径 */ -var runtime_path = _path2.default.join(_path2.default.resolve(__dirname, '../'), 'runtime'); var config = { "port": 80, - "runtime_path": runtime_path, + "runtime_path": '', "webhost": "yapi.local.qunar.com", "adminAccount": "admin@admin.com", "db": { diff --git a/server_dist/yapi.js b/server_dist/yapi.js index 135a58df..0308ff03 100644 --- a/server_dist/yapi.js +++ b/server_dist/yapi.js @@ -25,6 +25,10 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de var insts = new _map2.default(); var mail = void 0; +if (!_config2.default.runtime_path) { + _config2.default.runtime_path = _path2.default.join(_path2.default.resolve(__dirname, '../'), 'runtime'); +} + var WEBROOT = _path2.default.resolve(__dirname, '..'); //路径 var WEBROOT_SERVER = __dirname; var WEBROOT_RUNTIME = _config2.default.runtime_path;