diff --git a/client/components/Header/Header.js b/client/components/Header/Header.js index 9055657c..6dafc198 100644 --- a/client/components/Header/Header.js +++ b/client/components/Header/Header.js @@ -16,10 +16,10 @@ const MenuUser = (props) => ( "boxShadow":"0 1px 6px rgba(0, 0, 0, 0.3)" }} > - + 个人中心 - + 退出 diff --git a/package.json b/package.json index 25eee71b..a881dd70 100644 --- a/package.json +++ b/package.json @@ -62,9 +62,7 @@ "url": "^0.11.0", "wangeditor": "^3.0.4", "ykit-config-antd": "^0.1.3", - "ykit-config-react": "^0.4.4" - }, - "devDependencies": { + "ykit-config-react": "^0.4.4", "axios": "^0.16.2", "babel": "^6.5.2", "babel-cli": "^6.24.1", @@ -89,12 +87,11 @@ "extract-text-webpack-plugin": "^1.0.1", "fast-sass-loader": "^1.2.5", "fs-extra": "^3.0.1", - "ghooks": "^2.0.0", "gulp": "^3.9.1", "gulp-babel": "^6.1.2", "gulp-watch": "^4.3.11", "node-sass": "^4.5.3", - "nodemon": "^1.11.0", + "ora": "^1.3.0", "prop-types": "^15.5.10", "react": "^15.6.1", @@ -106,9 +103,13 @@ "sass-loader": "^6.0.6", "scss-loader": "0.0.1", "style-loader": "^0.18.2", - "validate-commit-msg": "^2.12.2", + "validate-commit-msg": "^2.12.2" + }, + "devDependencies": { + "nodemon": "^1.11.0", "webpack": "^2.0.0", - "webpack-node-externals": "^1.6.0" + "webpack-node-externals": "^1.6.0", + "ghooks": "^2.0.0" }, "config": { "ghooks": { diff --git a/server_dist/controllers/base.js b/server_dist/controllers/base.js index 16423ac4..9b0c96bc 100644 --- a/server_dist/controllers/base.js +++ b/server_dist/controllers/base.js @@ -85,7 +85,7 @@ var baseController = function () { }() }, { key: 'getUid', - value: function getUid(ctx) { + value: function getUid() { return parseInt(this.$uid, 10); } }, { diff --git a/server_dist/controllers/group.js b/server_dist/controllers/group.js index 1b1f3e79..39c95071 100644 --- a/server_dist/controllers/group.js +++ b/server_dist/controllers/group.js @@ -50,7 +50,6 @@ var _project2 = _interopRequireDefault(_project); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } -// var groupController = function (_baseController) { (0, _inherits3.default)(groupController, _baseController); @@ -83,6 +82,7 @@ var groupController = function (_baseController) { case 0: params = ctx.request.body; + params = _yapi2.default.commons.handleParams(params, { group_name: 'string', group_desc: 'string' @@ -133,6 +133,7 @@ var groupController = function (_baseController) { case 16: result = _context.sent; + result = _yapi2.default.commons.fieldSelect(result, ['_id', 'group_name', 'group_desc', 'uid']); ctx.body = _yapi2.default.commons.resReturn(result); _context.next = 24; @@ -280,7 +281,7 @@ var groupController = function (_baseController) { _context3.prev = 19; _context3.t0 = _context3['catch'](2); - ctx.body = _yapi2.default.commons.resReturn(null, 402, e.message); + ctx.body = _yapi2.default.commons.resReturn(null, 402, _context3.t0.message); case 22: case 'end': @@ -358,7 +359,7 @@ var groupController = function (_baseController) { _context4.prev = 16; _context4.t0 = _context4['catch'](2); - ctx.body = _yapi2.default.commons.resReturn(null, 402, e.message); + ctx.body = _yapi2.default.commons.resReturn(null, 402, _context4.t0.message); case 19: case 'end':