Authored by xiaowei

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

@@ -168,7 +168,7 @@ class DetailModel @@ -168,7 +168,7 @@ class DetailModel
168 foreach ($baseInfo['goodsList'] as $value) { 168 foreach ($baseInfo['goodsList'] as $value) {
169 $sizeList = array(); 169 $sizeList = array();
170 $colorStorageNum = 0; 170 $colorStorageNum = 0;
171 - $sizeStorageStr = ''; // clear to empty 171 + $sizeStorageStr = '';
172 172
173 // 商品分组 173 // 商品分组
174 if (isset($value['goodsImagesList'])) { 174 if (isset($value['goodsImagesList'])) {
@@ -210,7 +210,7 @@ class DetailModel @@ -210,7 +210,7 @@ class DetailModel
210 // 缩略图 210 // 缩略图
211 $thumbImageList[] = array('img' => Helpers::getImageUrl($value['colorImage'], 60, 60) ); 211 $thumbImageList[] = array('img' => Helpers::getImageUrl($value['colorImage'], 60, 60) );
212 212
213 - // 统计每个尺码对应的各个颜色的库存量 213 + // 统计尺码对应的各个颜色的库存量
214 foreach ($sizeList as &$sizeArr) { 214 foreach ($sizeList as &$sizeArr) {
215 $sizeArr['colorNumStr'] = implode('/', array_values($colorStorageGroup[ $sizeArr['name'] ]) ); 215 $sizeArr['colorNumStr'] = implode('/', array_values($colorStorageGroup[ $sizeArr['name'] ]) );
216 } 216 }