fe / yohoblk-wap · Commits

Go to a project

Authored by 沈志敏
Commit d340e1b4bf0f458ac104a9c6a76f7fa4516116ea 2 parents 5e953b92 e8e6dab4

Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

Inline Side-by-side
Showing 4 changed files with 69 additions and 94 deletions
... ... @@ -29,7 +29,7 @@ module.exports = {
return api.get('', {
method: 'app.brand.newBrandList',
yh_channel: yhChannel[params.channel].channel
});
}, {code: 200, cache: true});
},
/**
... ... @@ -39,6 +39,6 @@ module.exports = {
getCateListData(params) {
return api.get('', Object.assign(params, {
method: 'app.sort.get'
}));
}, {code: 200, cache: true}));
}
};
... ...
... ... @@ -55,10 +55,10 @@ const getBrandListData = params => {
let finalResult = {};
return brandApi.getBrandListOriginData(params).then(result => {
if (result.code === 200 && result.data) {
if (result.data) {
Object.assign(finalResult, handleBrandList(result.data.all_list));
} else {
logger.error('getBrandListOriginData api code no 200 or data is null');
logger.error('getBrandListOriginData api data is null');
}
return finalResult;
... ... @@ -72,11 +72,7 @@ const getBrandListData = params => {
*/
const getCateListData = params => {
return brandApi.getCateListData(params).then(result => {
if (result.code === 200) {
return camelCase(result);
} else {
logger.error('getCateListData api code no 200 or data is null');
}
return camelCase(result);
});
};
... ...
... ... @@ -30,7 +30,7 @@ module.exports = {
return api.get('', {
method: 'web.brand.byDomain',
domain: params.domain
});
}, {code: 200, cache: false});
},
/**
... ... @@ -49,7 +49,7 @@ module.exports = {
});
}
return api.get('', finalParams);
return api.get('', finalParams, {code: 200, cache: false});
},
/**
... ... @@ -61,7 +61,7 @@ module.exports = {
return api.get('', {
method: 'app.shopsdecorator.getList',
shop_id: params.shopId
});
}, {code: 200, cache: false});
},
/**
... ... @@ -93,7 +93,7 @@ module.exports = {
}
});
return api.get('', finalParams);
return api.get('', finalParams, {code: 200, cache: false});
},
/**
... ... @@ -118,6 +118,6 @@ module.exports = {
method: 'app.favorite.add'
});
}
return api.get('', finalParams);
return api.get('', finalParams, {code: 200, cache: false});
}
};
... ...
... ... @@ -22,73 +22,58 @@ const getShopData = params => {
return shopApi.getBrandInfoByDomain({domain: params.domain}).then(result => {
if (result.code === 200) {
/* 品牌名称 */
Object.assign(finalResult, {
brandName: result.data.brand_name
});
/* 品牌名称 */
/* 品牌是否有店铺 */
if (result.data.shop_id) {
/* 是 BLK 的店铺 */
Object.assign(finalResult, {
brandName: result.data.brand_name
isBlkShop: true,
shopId: result.data.shop_id
});
/* 品牌是否有店铺 */
if (result.data.shop_id) {
return shopApi.getShopInfoData({
shopId: result.data.shop_id,
uid: params.uid
// uid: '8050882'
}).then(subResult => {
/* 是 BLK 的店铺 */
/* 取店铺的基本信息 */
Object.assign(finalResult, {
isBlkShop: true,
shopId: result.data.shop_id
shopLogo: subResult.data.shop_logo,
shopName: subResult.data.shop_name,
shopIntro: subResult.data.shop_intro,
isFav: subResult.data.is_favorite === 'Y'
});
return shopApi.getShopInfoData({
shopId: result.data.shop_id,
uid: params.uid
// uid: '8050882'
}).then(subResult => {
if (subResult.code === 200) {
/* 取店铺的基本信息 */
Object.assign(finalResult, {
shopLogo: subResult.data.shop_logo,
shopName: subResult.data.shop_name,
shopIntro: subResult.data.shop_intro,
isFav: subResult.data.is_favorite === 'Y'
});
/* 取资源位店铺背景图 */
return shopApi.getShopsDecoratorList({shopId: result.data.shop_id}).then(thResult => {
if (thResult.code === 200) {
_.forEach(thResult.data.list, value => {
if (value.resource_name === 'shopTopBanner_app') {
Object.assign(finalResult, {
brandBg: JSON.parse(value.resource_data).shopSrc
});
}
});
} else {
logger.info('getShopsDecoratorList api code no 200');
}
return finalResult;
});
} else {
logger.error('getShopInfoData api code no 200');
}
/* 取资源位店铺背景图 */
return shopApi.getShopsDecoratorList({shopId: result.data.shop_id}).then(thResult => {
_.forEach(thResult.data.list, value => {
return finalResult;
});
} else {
if (value.resource_name === 'shopTopBanner_app') {
Object.assign(finalResult, {
shopBg: JSON.parse(value.resource_data).shopSrc
});
}
});
/* 不是 BLK 的店铺 */
Object.assign(finalResult, {
isBlkShop: false
return finalResult;
});
logger.info('brand has no shop');
}
});
} else {
logger.error('getBrandOriginData api code no 200');
/* 不是 BLK 的店铺 */
Object.assign(finalResult, {
isBlkShop: false
});
logger.info('brand has no shop');
}
return finalResult;
... ... @@ -104,33 +89,27 @@ const getBrandShopGoodsData = params => {
let finalResult = {};
return shopApi.getBrandInfoByDomain({ domain: params.domain }).then(result => {
if (result.code === 200) {
return shopApi.getBrandShopGoodsOriginData(Object.assign(params, {
brand: result.data.id,
shopId: result.data.shop_id
})).then(subResult => {
if (subResult.code === 200 && subResult.data) {
prettyFilter(subResult.data.filter);
finalResult = {
data: {
productList: processProductList(subResult.data.product_list),
filter: subResult.data.filter,
page: subResult.data.page,
pageTotal: subResult.data.page_total
},
code: 200
};
} else {
logger.error('getBrandShopGoodsOriginData api code no 200');
}
return camelCase(finalResult);
});
} else {
logger.error('getBrandInfoByDomain api code no 200');
}
return shopApi.getBrandShopGoodsOriginData(Object.assign(params, {
brand: result.data.id,
shopId: result.data.shop_id
})).then(subResult => {
if (subResult.data) {
prettyFilter(subResult.data.filter);
finalResult = {
data: {
productList: processProductList(subResult.data.product_list),
filter: subResult.data.filter,
page: subResult.data.page,
pageTotal: subResult.data.page_total
},
code: 200
};
} else {
logger.error('getBrandShopGoodsOriginData api no data');
}
return camelCase(finalResult);
return camelCase(finalResult);
});
});
};
... ...