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

@@ -19,7 +19,7 @@ class PlusstarModel
 {
 
     /**
-     * 获取国际优先的品牌列表
+     * 获取国际优选的品牌列表
      * 
      * @param string $gender "1,3"表示男, "2,3"表示女
      * @return array

@@ -55,6 +55,7 @@ class DetailController extends AbstractAction
             $good = array();
             $skns = array();
             $product = array();
+
             foreach ($detail['getArticleContent'] as $value) {
                 $build = array();
                 // 文字
@@ -65,6 +66,17 @@ class DetailController extends AbstractAction
                 elseif (isset($value['singleImage'])) {
                     $build['bigImage'] = Helpers::getImageUrl($value['singleImage']['data'][0]['src'], 640, 640);
                 }
+                elseif (isset($value['smallPic'])) {
+                    $imgs = $value['smallPic']['data'];
+                    $build['smallImage'] = array(
+                        array(
+                            'src' => Helpers::getImageUrl($imgs[0]['src'], 315, 420)
+                        ),
+                        array(
+                            'src' => Helpers::getImageUrl($imgs[1]['src'], 315, 420)
+                        )
+                    );
+                }
                 // 相关推荐
                 elseif (isset($value['goods']['data'])) {
                     $good = array();