Authored by hf

Merge branch 'test' of http://git.dev.yoho.cn/web/yohobuy into test

@@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
3 use Action\AbstractAction; 3 use Action\AbstractAction;
4 use LibModels\Wap\Guang\PlusstarData; 4 use LibModels\Wap\Guang\PlusstarData;
5 use Plugin\Helpers; 5 use Plugin\Helpers;
  6 +use Plugin\Images;
6 7
7 /** 8 /**
8 * 明星品牌和原创品牌 9 * 明星品牌和原创品牌
@@ -131,7 +132,7 @@ class PlusstarController extends AbstractAction @@ -131,7 +132,7 @@ class PlusstarController extends AbstractAction
131 $data['psDetail'] = true; 132 $data['psDetail'] = true;
132 $data['ps']['id'] = $brandId; 133 $data['ps']['id'] = $brandId;
133 $data['ps']['banner'] = Helpers::getImageUrl($brandInfo['getBrandInfo']['data']['cover_img'], 640, 309); 134 $data['ps']['banner'] = Helpers::getImageUrl($brandInfo['getBrandInfo']['data']['cover_img'], 640, 309);
134 - $data['ps']['logo'] = Helpers::getImageUrl($brandInfo['getBrandInfo']['data']['brand_ico'], 160, 160); 135 + $data['ps']['logo'] = Images::getSourceUrl($brandInfo['getBrandInfo']['data']['brand_ico'],'brandLogo');;
135 $data['ps']['name'] = $brandInfo['getBrandInfo']['data']['brand_name']; 136 $data['ps']['name'] = $brandInfo['getBrandInfo']['data']['brand_name'];
136 $data['ps']['isLike'] = $brandInfo['getUidBrandFav']; 137 $data['ps']['isLike'] = $brandInfo['getUidBrandFav'];
137 $data['ps']['intro'] = empty($brandInfo['getBrandInfo']['data']['brand_intro']) ? false : strtr(strip_tags($brandInfo['getBrandInfo']['data']['brand_intro']), array(' ' => ' ')); 138 $data['ps']['intro'] = empty($brandInfo['getBrandInfo']['data']['brand_intro']) ? false : strtr(strip_tags($brandInfo['getBrandInfo']['data']['brand_intro']), array(' ' => ' '));