...
|
...
|
@@ -127,16 +127,18 @@ const ShopService = { |
|
|
brandId: domainInfo.id,
|
|
|
shopId: ''
|
|
|
};
|
|
|
let brandId = domainInfo.id;
|
|
|
|
|
|
if (domainInfo.shopId) {
|
|
|
let shopId = domainInfo.shopId;
|
|
|
let shopIntro = yield ShopService.getShopIntro(shopId, uid);
|
|
|
let brandInfo = yield BrandService.getBrandInfo(brandId, uid);
|
|
|
|
|
|
info.shopId = shopId;
|
|
|
info.name = shopIntro.shopName;
|
|
|
info.info = shopIntro.shopIntro;
|
|
|
info.info = shopIntro.shopIntro;
|
|
|
info.btnName = '品牌介绍';
|
|
|
info.isFavorite = shopIntro.isFavorite === 'Y';
|
|
|
info.isFavorite = brandInfo.isFavorite === 'Y';
|
|
|
|
|
|
let shopData = yield Promise.all([ShopService.getShopDecorator(shopId),
|
|
|
ShopService.getShopSecondSorts(domainInfo.id, shopId)]);
|
...
|
...
|
@@ -152,7 +154,6 @@ const ShopService = { |
|
|
info.resources = resources;
|
|
|
info.menus = shopMenu(domain, resources.navigationBar);
|
|
|
} else {
|
|
|
let brandId = domainInfo.id;
|
|
|
let brandInfo = yield BrandService.getBrandInfo(brandId, uid);
|
|
|
|
|
|
info.name = brandInfo.brandName;
|
...
|
...
|
|