Authored by 周少峰

Merge branch 'hotfix/baseshopName'

... ... @@ -173,7 +173,7 @@ const local = {
return `${config.siteUrl}/home`;
}
}());
console.log(user.uid);
AuthHelper.syncUserSession(user.uid, req, res).then(() => {
res.json({
code: 200,
... ...
... ... @@ -56,8 +56,8 @@ const indexAsync = pid => {
marketPrice: cur.product.productPriceBo.formatMarketPrice,
productName: cur.product.productName,
href: helpers.getUrlBySkc(
_.head(goods.goodsImagesList).productId,
_.head(goods.goodsImagesList).goodsId,
_.get(goods, 'goodsImagesList[0].productId', ''),
_.get(goods, 'goodsImagesList[0].goodsId', ''),
cur.product.cnAlphabet
)
};
... ...
... ... @@ -902,6 +902,7 @@ const getBaseShopData = (params, extra, channel, shopId) => {
shopIntro: `/about?shopId=${shopId}`,
coled: _.get(result[2], 'data.is_favorite', 'N') === 'Y'
});
_.set(resData, 'brand.shopBanner', decorator.shopTopBannerBase);
_.unset(resData, 'brand.brandBanner');
... ... @@ -914,6 +915,7 @@ const getBaseShopData = (params, extra, channel, shopId) => {
if (result[2].code === 200) {
let shopName = _.get(result[2], 'data.shop_name', '');
_.set(resData, 'brand.shopBanner.shopName', shopName);
_.set(resData, 'brand.pathNav[2]', {
name: shopName,
pathTitle: shopName
... ...
... ... @@ -72,7 +72,7 @@ const _signboard = data => {
});
return {
title: result[0].title || '',
title: '',
list: result
};
};
... ...
{
"name": "yohobuy-node",
"version": "5.0.8",
"version": "5.0.9",
"private": true,
"description": "A New Yohobuy Project With Express",
"repository": {
... ...
... ... @@ -57,6 +57,13 @@
width: 1150px;
margin: 0 auto;
.shop-name {
margin-left: 60px;
font-size: 32px;
float: left;
border: none;
}
.shop-favor {
margin-right: 60px;
}
... ...