Authored by htoooth

fix

/**
* Created by TaoHuang on 2017/4/18.
*/
const request = require('axios');
const config = require('../../../config/config');
module.exports.login = (username, password) => {
return request.post(config.apiDomains.login, {username, password});
};
\ No newline at end of file
... ... @@ -27,22 +27,26 @@
<script>
const passport = require('./api');
const request = require('axios');
export default {
name: 'login',
methods: {
handleSubmit(name) {
this.$router
this.$refs[name].validate((valid) => {
if (valid) {
this.$Message.success('提交成功!');
passport.login(this.formInline.user, this.formInline.password).then((result) => {
this.$route.push('home.overview');
this.login(this.formInline.user, this.formInline.password).then((result) => {
this.$router.push('/');
});
} else {
this.$Message.error('表单验证失败!');
}
});
},
login(username, password) {
return request.post(this.$api.login, {username, password})
}
},
data() {
... ...
... ... @@ -51,7 +51,7 @@
</div>
</div>
<div class="layout-copy">
2011-2016 &copy; TalkingData
2011-2016 &copy; YOHO集团
</div>
</i-col>
</Row>
... ...
... ... @@ -9,16 +9,24 @@ const Context = require('../common/context');
const UserModel = require('../service/user-model');
const config = global.yoho.config;
class UserController extends Context {
login(req, res, next) {
this.instance(UserModel).login(req.body.username, req.body.password).then(user => {
this.syncSession(req, res, user);
return res.json({
code: 200,
data: user
});
this.instance(UserModel).login(req.body.username, req.body.password).then(result => {
if (result.code === 200) {
this.syncSession(req, res, result.data);
return res.json({
code: 200,
data: {
name: result.data.account
}
});
} else {
return res.json({
code: 400,
message: '登录错误'
});
}
}).catch(next);
}
logout(req, res) {
... ... @@ -34,9 +42,9 @@ class UserController extends Context {
syncSession(req, res, user) {
req.session.USER = user;
req.session.LOGIN_UID = user.uid;
req.session.LOGIN_UID = user.pid; // pid 为用户名
res.cookie('USER_NAME', user.name, {
res.cookie('USER_NAME', user.account, {
domain: config.cookieDomain
});
}
... ...