Authored by biao

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

... ... @@ -92,7 +92,7 @@ class BindData
$param['area'] = $area;
if (!empty($password))
{
$param['passport'] = $password;
$param['password'] = $password;
}
$param['client_secret'] = Sign::getSign($param);
... ...
... ... @@ -168,7 +168,7 @@ class DetailModel
foreach ($baseInfo['goodsList'] as $value) {
$sizeList = array();
$colorStorageNum = 0;
$sizeStorageStr = ''; // clear to empty
$sizeStorageStr = '';
// 商品分组
if (isset($value['goodsImagesList'])) {
... ... @@ -210,7 +210,7 @@ class DetailModel
// 缩略图
$thumbImageList[] = array('img' => Helpers::getImageUrl($value['colorImage'], 60, 60) );
// 统计每个尺码对应的各个颜色的库存量
// 统计尺码对应的各个颜色的库存量
foreach ($sizeList as &$sizeArr) {
$sizeArr['colorNumStr'] = implode('/', array_values($colorStorageGroup[ $sizeArr['name'] ]) );
}
... ...