Authored by hf

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

... ... @@ -46,7 +46,7 @@ class ClassModel
$oneClass = array();
$item = array();
foreach ($data['data'] as $k => $v) {
$oneClass = array('name' => ucfirst($k), 'ca' => array());
$oneClass = array('name' => ucfirst(rtrim($k, 's')), 'ca' => array());
foreach ($v as $val) {
$item = array();
... ...
... ... @@ -89,7 +89,7 @@ class ListModel
// 获取品牌banner的数据, 有缓存1小时
$bannerData = BrandData::getBrandBanner($id);
if (isset($bannerData['data']['banner'])) {
$result['banner'] = Helpers::getImageUrl($bannerData['data']['banner'], 640, 75);
$result['banner'] = Helpers::getImageUrl($bannerData['data']['banner'], 640, 150);
}
return $result;
... ...