From 6014f8b5246aedaedf9ca6f11e2baf56fbe664de Mon Sep 17 00:00:00 2001 From: lwg Date: Tue, 11 Jul 2017 10:17:44 +0800 Subject: [PATCH 1/3] user --- package.json | 1 + server/controllers/user.js | 2 +- server/models/user.js | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index be2d3825..fbc4d378 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "mongoose": "4.10.8", "mongoose-auto-increment": "^5.0.1", "node-sass-china": "^4.5.0", + "sha1": "^1.1.1", "redux": "^3.7.1", "ykit-config-antd": "^0.1.3", "ykit-config-react": "^0.4.4" diff --git a/server/controllers/user.js b/server/controllers/user.js index 3b9a0742..b3c55538 100644 --- a/server/controllers/user.js +++ b/server/controllers/user.js @@ -61,7 +61,7 @@ class userController extends baseController{ async reg(ctx){ //注册 var userInst = yapi.getInst(userModel); let params = ctx.request.body; //获取请求的参数,检查是否存在用户名和密码 - let result = await userInst.findByName(params.username); + //let result = await userInst.findByName(params.username); if(!params.username){ return ctx.body = yapi.commons.resReturn(null,400,'用户名不能为空'); } diff --git a/server/models/user.js b/server/models/user.js index bf527d3f..08cea1c9 100644 --- a/server/models/user.js +++ b/server/models/user.js @@ -50,12 +50,12 @@ class userModel extends baseModel{ } del (id) { return this.model.deleteOne({ - _id: id + _id: id }) } update(id,data){ return this.model.update({ - _id: id, + _id: id },{ username: data.username, password: data.password, From dd8caa3409bc5c5b2568c6cbf607b4dd92af749b Mon Sep 17 00:00:00 2001 From: "wenbo.dong" Date: Tue, 11 Jul 2017 10:54:10 +0800 Subject: [PATCH 2/3] =?UTF-8?q?add:=20=E7=99=BB=E5=BD=95=E9=A1=B5=E5=B8=83?= =?UTF-8?q?=E5=B1=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/containers/Login/Login.js | 81 +++++++++++++++++------------- client/containers/Login/Login.scss | 44 ++-------------- 2 files changed, 50 insertions(+), 75 deletions(-) diff --git a/client/containers/Login/Login.js b/client/containers/Login/Login.js index 17306e55..10a7ba67 100644 --- a/client/containers/Login/Login.js +++ b/client/containers/Login/Login.js @@ -1,41 +1,54 @@ -// import { React, Component } from '../../base.js' -import './Login.scss' -import React, { Component } from 'react' -import { Button, Input, Icon, Checkbox } from 'antd' -import { BrowserRouter as Router, Route, Link } from 'react-router-dom' +import './Login.scss'; +import React, { Component } from 'react'; +import { Form, Button, Input, Icon, Checkbox } from 'antd'; +import { BrowserRouter as Router, Route, Link } from 'react-router-dom'; +const FormItem = Form.Item; class Login extends Component { - constructor(props) { - super(props) + handleSubmit = (e) => { + e.preventDefault(); + const form = this.props.form; + + // 获取全部组件的值 + // console.log(form.getFieldsValue()); + form.validateFields((err, values) => { + if (!err) { + console.log('Received values of form: ', values); + } + }); } - - render () { - console.log(this.props) + render() { + const { getFieldDecorator } = this.props.form; return ( - - {this.props.value}{this.props.per} -
-
- } /> - - } /> - -
- 记住密码 - -
-
-
- - ) +
+ + {getFieldDecorator('userName', { + rules: [{ required: true, message: '请输入用户名!' }], + })( + } placeholder="Username" /> + )} + + + {getFieldDecorator('password', { + rules: [{ required: true, message: '请输入密码!' }], + })( + } type="password" placeholder="Password" /> + )} + + + {getFieldDecorator('remember', { + valuePropName: 'checked', + initialValue: true, + })( + 记住密码 + )} + + +
+ ); } } -export default Login +const LoginWrap = Form.create()(Login); + +export default LoginWrap; diff --git a/client/containers/Login/Login.scss b/client/containers/Login/Login.scss index 25ddd363..23812370 100644 --- a/client/containers/Login/Login.scss +++ b/client/containers/Login/Login.scss @@ -1,45 +1,7 @@ @import '../../styles/common.scss'; /* .login-main.css */ -.login-main { - display: -webkit-box; - -webkit-box-orient: vertical; - height: 100%; - -webkit-box-flex: 1; +.login-form { + width: 4rem; + margin: 1rem auto; } - -/* .login-box.css */ -.login-box { - font-size: 0.14rem; - display: -webkit-box; - -webkit-box-align: center; - -webkit-box-pack: center; - -webkit-box-flex: 1; - - .content { - max-width: 5rem; - min-width: 3rem; - zoom: 1; - overflow: hidden; - margin: -70px 0 0 0; - } - - h3 { - font-size: 0.2rem; - } - - a { - font-size: 0.14rem; - } - - // ant 元素样式 - .ant-input-affix-wrapper { - margin: 0 0 20px 0; - height: 35px; - } - - .login { - float: right; - } -} - From 68828ebd3b3ac60015757711625048cef4b44165 Mon Sep 17 00:00:00 2001 From: "wenbo.dong" Date: Tue, 11 Jul 2017 11:03:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?add:=20=E5=A4=84=E7=90=86sonar=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E8=AF=AD=E6=B3=95=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/containers/Login/Login.js | 6 +++--- client/containers/Login/Login_container.js | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/client/containers/Login/Login.js b/client/containers/Login/Login.js index 10a7ba67..fa7b596b 100644 --- a/client/containers/Login/Login.js +++ b/client/containers/Login/Login.js @@ -23,14 +23,14 @@ class Login extends Component {
{getFieldDecorator('userName', { - rules: [{ required: true, message: '请输入用户名!' }], + rules: [{ required: true, message: '请输入用户名!' }] })( } placeholder="Username" /> )} {getFieldDecorator('password', { - rules: [{ required: true, message: '请输入密码!' }], + rules: [{ required: true, message: '请输入密码!' }] })( } type="password" placeholder="Password" /> )} @@ -38,7 +38,7 @@ class Login extends Component { {getFieldDecorator('remember', { valuePropName: 'checked', - initialValue: true, + initialValue: true })( 记住密码 )} diff --git a/client/containers/Login/Login_container.js b/client/containers/Login/Login_container.js index 0a78386b..3b59a401 100644 --- a/client/containers/Login/Login_container.js +++ b/client/containers/Login/Login_container.js @@ -8,7 +8,7 @@ const increaseAction = { type: 'increase' } function mapStateToProps(state) { return { - per: '测试数据', + per: '测试数据' } } @@ -24,4 +24,3 @@ const App = connect( )(Login) export default App -