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

@@ -238,6 +238,7 @@ class DetailModel
                     $colorArr['colorNum'] = isset($colorStorageGroup[ $colorArr['skcId'] ][$sizeName]) ? $colorStorageGroup[ $colorArr['skcId'] ][$sizeName] : 0;
                     $colorArr['colorNum'] = isset($colorStorageGroup[ $colorArr['skcId'] ][$sizeName]) ? $colorStorageGroup[ $colorArr['skcId'] ][$sizeName] : 0;
                     $colorGroup[$i]['color'][] = $colorArr;
                     $colorGroup[$i]['color'][] = $colorArr;
                 }
                 }
+                $colorGroup[$i]['sizeName'] = $sizeName;
                 
                 
                 ++ $i;
                 ++ $i;
             }
             }
@@ -246,6 +247,7 @@ class DetailModel
             foreach ($colorList as $value) {
             foreach ($colorList as $value) {
                 // 各个尺码的颜色，每行显示一个颜色的对应尺码
                 // 各个尺码的颜色，每行显示一个颜色的对应尺码
                 $sizeGroup[$i]['size'] = $sizeList[ $value['skcId'] ];
                 $sizeGroup[$i]['size'] = $sizeList[ $value['skcId'] ];
+                $sizeGroup[$i]['colorId'] = $value['skcId'];
                 // 默认颜色
                 // 默认颜色
                 $colorGroup[0]['color'][] = $value;
                 $colorGroup[0]['color'][] = $value;