fe / yohobuy-shop-fe2 · Commits

Go to a project

Authored by 梁志锋
Commit 9d07e3f9e021ca336bb829958a9663b82e84975e 1 parent b8ed35c8

代码修改

Inline Side-by-side
Showing 2 changed files with 36 additions and 18 deletions
... ... @@ -9,7 +9,6 @@ module.exports=function(app) {
app.post("/login", "common_login", function (login, req, res){
if (login.code == 200) {
//res.myRedirect('/');
return res.json({
code: 200,
message: login.message
... ...
... ... @@ -81,23 +81,21 @@ module.exports = {
},
login: function (req, callback, common) {
var userInfo = {},result = { code: 400, message: "登录失败" },isSuccess=false;
var user = req.body.user||req.query.user;
var password = req.body.password||req.query.password;
var user = req.body.user;
var password = req.body.password;
var errcallback = function (err) {
return callback(null, result);
return callback(err, result);
};
var loginErrcallback = function (err) {
result.needCaptcha = true;
return callback(null, result);
};
//promise.all(Ilogin,allRight,sessionAsync).then(a,b,c);
common.Ilogin(user, password).done(function (IloginRes) {
var userData = IloginRes.data,
userInfo = { auth: userData, uid: userData.pid, name: userData.truename, right: {},shopList:[],brands:[]};
var userData = IloginRes.data;
userInfo = { auth: userData, uid: userData.pid, name: userData.truename, right: {},shopList:[]};
if(userData.data_authority&&userData.data_authority.brand&&userData.data_authority.brand.list){
userInfo.brands=userData.data_authority.brand.is_all?"0":Object.keys(userData.data_authority.brand.list);
}
common.allRight().sessionAsync(user, password).done(function (allRes,sesRes) {
var cookie = sesRes.caseless.dict["set-cookie"];
allRes.data.forEach(function (data) {
... ... @@ -105,19 +103,40 @@ module.exports = {
userInfo.right[data.path] = true;
}
});
common.getResourceByPid(userData.pid, userData.role_id).done(function (getRRes) {
userInfo.menu = Utils.createrMenus(getRRes.data);
req.session.user = userInfo;
if (cookie && cookie.length > 0) {
req.session.gray = cookie[0];
result = { code: 200, message: "登录成功" ,data:req.session.user};
}
return callback(null, result);
},errcallback);
common.getResourceByPid(userData.pid, userData.role_id)
.getShopList({ "@x-user-id": userInfo.uid }).done(function (getRRes, shopRes) {
userInfo.menu = Utils.createrMenus(getRRes.data);
if (shopRes.data) {
shopRes.data.forEach(function (data, index) {
if (!index) {
userInfo.auth.shopName = data.shopName;
userInfo.auth.shopId = data.shopsId;
}
userInfo.shopList.push({
name: data.shopName,
id: data.shopsId
});
});
req.session.user = userInfo;
if (cookie && cookie.length > 0) {
req.session.gray = cookie[0];
result = { code: 200, message: "登录成功" };
}
console.log(result);
} else {
result = { code: 400, message: "该用户没有店铺" };
}
return callback(null, result);
},errcallback);
}, errcallback);
}, loginErrcallback);
},
isUsedMenuAuth:{
title:'检查有没有权限',
url:Iaccount.isUsedMenuAuth,
... ...