fe / yohobuy-portal-fe · Commits

Go to a project

Authored by weiqingting
Commit 9e91cfafef8b7015c92a9ac085a8a6f717f67b42 1 parent b669eeaa

提交

Inline Side-by-side
Showing 5 changed files with 33 additions and 104 deletions
... ... @@ -14,13 +14,13 @@ var config = {
apiKey: 'sd4H1ecAqlp',
//http: //192.168.102.214:8088/platform
// domain: 'http://172.16.6.240:8088/platform',
domain:'http://172.16.6.240:8088/platform',//王书生
// domain:'http://172.16.6.240:8088/platform',//王书生
// domain: 'http://172.16.6.124:8088/platform',//陈超
//http://172.16.6.124:8088/platform/product/queryAllProductAttr
//domain: 'http://172.16.6.227:8088/platform', //玛丽
// domain: 'http://192.168.102.202:8088/platform',
//domain:'http://172.16.9.8:8080/yohobuy-platform-web',//葛超
// domain: 'http://192.168.102.202:8088/platform',
domain: 'http://192.168.102.202:8088/platform',
//domain: 'http://172.16.6.239:8080', //孙杰翔
loggers: {
api: {
... ...
... ... @@ -3,7 +3,7 @@
* @type {Object}
*/
module.exports = {
url:'http://admin.yohobuy.com',//'http://admin.portal.yohobuy.com',
url:'http://admin.portal.yohobuy.com',
sessionKeep:'/account/profile/display',
timeout:30000
};
\ No newline at end of file
... ...
... ... @@ -190,57 +190,12 @@ exports.res = [
{name:'productStandardRelationStr',type:'String'}
]
},
// {
// route:'/base/goods/ajax/update2',
// method:'POST',
// url:'/product/batchAuditRejectBaseProduct',
// params:[
// {name:'productSkn',type:'Number'},
// {name:'ageLevel',type:'String'},
// {name: 'attribute',type: 'Number'},
// {name:'factoryCode',type:'String'},
// {name:'gender',type:'String'},
// {name:'goodsSeason',type:'Number'},
// {name:'goodsYears',type:'Number'},
// {name:'grade',type:'Number'},
// {name:'isLimitbuy',type:'String'},
// {name:'isLimited',type:'String'},
// {name:'isPromotionalGifts',type:'String'},
// {name:'productName',type:'String'},
// {name:'productTag',type:'Number'},
// {name:'retailPriceStr',type:'String'},
// {name:'salesPriceStr',type:'String'},
// {name:'expectShelfTimeStr',type:'String'},
// {name:'expectArrivalTimeStr',type:'String'},
// {name: 'baseGoodInfoStr',type: 'String'},
// {name:'shopId',type:'Number'},
// {name:'brandId',type:'Number'},
// {name:'supplierId',type:'Number'},
// {name:'maxSortId',type:'Number'},
// {name:'middleSortId',type:'Number'},
// {name:'smallSortId',type:'Number'},
// {name:'seasons',type:'String'},
// {name:'isOutLets',type:'String'},
// {name:'outletsSetting',type:'String'},
// {name:'isAdvance',type:'String'},
// {name:'isVip',type:'String'},
// {name:'vipSetting',type:'String'},
// {name:'stock',type:'Number'}
// ]
// },
{//基础商品详情空页面
route:'/base/goods/info/:productSkn',
method:'GET',
view:'pages/basegoods/info',
src:'/basegoods/goodsInfo'
},
{
// 获取商品详情数据
route:'/base/goods/getData',
... ... @@ -281,7 +236,7 @@ exports.res = [
// 1：基础商品-非销售属性 2:网销信息-上架后补全信息 3：网销信息-商品参数
{name:'displayPosition',type:'Number'}
]
},{
},{//品类
route:'/goods/query/querySortBySmallSort',
method:'POST',
url:'/product/querySortBySmallSort',
... ... @@ -312,5 +267,5 @@ exports.res = [
secondTitle:"基础商品",
domain: exports.domain
}
},
}
];
\ No newline at end of file
... ...
... ... @@ -25,7 +25,11 @@ var errorMessage = {
util.setLogger(res.app.logger);
var options = {
url:oldService.login,
form:'['+user+','+password+',1]'
form:{
account:user,
password:password,
website:WEBSITE
}
}
//调用登陆
... ... @@ -34,9 +38,8 @@ var errorMessage = {
res.json(errorMessage);
return;
} else {
console.log(ret);
//调用菜单
_callGetMenu(ret.data.pid,ret.data.role_id,function(err,data){
_callGetMenu(ret.data.pid,function(err,data){
if(err) {
res.json(errorMessage);
} else {
... ... @@ -63,18 +66,21 @@ var errorMessage = {
* @param {Number} pid 操作员ID
* @param {Function} callback 回调
*/
function _callGetMenu(pid,roleid,callback) {
function _callGetMenu(pid,callback) {
var options = {
url:oldService.getResourceByPid,
form:'['+pid+','+roleid+',1]'
form:{
pid:pid,
website:WEBSITE
}
}
console.log(options);
util.httpCall(options,function(err,ret){
if(err) {
callback(err);
} else {
var menuData = {menu:[],right:{}};
if(ret.data) {
if(ret.data && ret.data.length>0) {
menuData = _makeMenu(ret.data);
}
_getAllMenu(function(ret){
... ... @@ -97,9 +103,9 @@ function filterRight(ret,menuData) {
var noRight = {};
//匹配没有权限
_.forEach(ret,function(v,k){
if(v.menu_url!=='') {
if(!menuData.right[v.menu_url]) {
noRight[v.menu_url] = true;
if(v.module_url!=='') {
if(!menuData.right[v.module_url]) {
noRight[v.module_url] = true;
}
}
});
... ... @@ -134,51 +140,27 @@ function _getAllMenu (callback) {
function _makeMenu (data) {
var menu = [];
var right = {};
for(var key in data){
var v=data[key];
var item = {
title:v.menu_name,
_.forEach(data,function(v){
var item = {
title:v.resource_name,
}
if(v.parent_id === "0") {
item.parent = 'menu-template';
var itemSubs = [];
_.forEach(v.sub,function(val) {
var sub = {
title:val.menu_name,
href:val.menu_url,
title:val.resource_name,
href:val.module_url,
icon: 'list-alt'
}
right[val.menu_url] = true;
right[val.module_url] = true;
itemSubs.push(sub);
});
item.menu = itemSubs;
}
menu.push(item);
}
// _.forEach(data,function(v){
// var item = {
// title:v.menu_name,
// }
// if(v.parent_id === "0") {
// item.parent = 'menu-template';
// var itemSubs = [];
// _.forEach(v.sub,function(val) {
// console.log(v.sub);
// var sub = {
// title:val.menu_name,
// href:val.menu_url,
// icon: 'list-alt'
// }
// right[val.menu_url] = true;
// itemSubs.push(sub);
// });
// item.menu = itemSubs;
// }
// menu.push(item);
// });
});
return {
menu:menu,
... ...
// var oldSerDomain = 'http://service.api.yohobuy.com';
// module.exports = {
// login: oldSerDomain + '/account/api/v1/profile/login',
// getResourceByPid: oldSerDomain + '/account/api/v1/profile/getResourceByPid',
// getAllResByWebsite: oldSerDomain + '/account/api/v1/resources/getAllResByWebsite'
// };
var oldSerDomain = 'http://lserve.yohobuy.com';
var oldSerDomain = 'http://service.api.yohobuy.com';
module.exports = {
login: oldSerDomain + '/service/account/v1/Profile/login',
getResourceByPid: oldSerDomain + '/service/account/v1/Profile/getMenuByPid',
getAllResByWebsite: oldSerDomain + '/service/setting/v1/menu/getAllMenu'
};
login: oldSerDomain + '/account/api/v1/profile/login',
getResourceByPid: oldSerDomain + '/account/api/v1/profile/getResourceByPid',
getAllResByWebsite: oldSerDomain + '/account/api/v1/resources/getAllResByWebsite'
};
\ No newline at end of file
... ...