Authored by 郭成尧

Merge branch 'release/newSearch'

... ... @@ -49,9 +49,9 @@ const _baseShop = (req, res, shopInfo, shopId) => {
goodList: result,
showDownloadApp: true,
pageFooter: true,
title: shopInfo.shopName + '|' + shopInfo.shopName + '潮流服装服饰-Yoho!Buy有货',
keywords: shopInfo.shopName + ',' + shopInfo.shopName + '服装服饰,' + shopInfo.shopName + '潮流服装服饰',
description: shopInfo.shopName + '|Yoho!Buy有货' + shopInfo.shopName + '潮流服饰官方授权店!100%品牌正品保证,支持货到付款。',
title: shopInfo.shop_name + '|' + shopInfo.shop_name + '潮流服装服饰-Yoho!Buy有货',
keywords: shopInfo.shop_name + ',' + shopInfo.shop_name + '服装服饰,' + shopInfo.shop_name + '潮流服装服饰',
description: shopInfo.shop_name + '|Yoho!Buy有货' + shopInfo.shop_name + '潮流服饰官方授权店!100%品牌正品保证,支持货到付款。',
shopId: shopId,
shopPage: true
});
... ...
... ... @@ -451,7 +451,7 @@ const getBaseShopData = (params, shopInfo) => {
cartUrl: helpers.urlFormat('/cart/index/index')
};
let shopId = params.shop_id || shopInfo.shopsId;
let shopId = params.shop_id || shopInfo.shops_id;
return api.all([
_getShopDecorator(shopId),
... ...