Authored by Rock Zhang

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

@@ -19,7 +19,7 @@ class PlusstarModel @@ -19,7 +19,7 @@ class PlusstarModel
19 { 19 {
20 20
21 /** 21 /**
22 - * 获取国际优的品牌列表 22 + * 获取国际优的品牌列表
23 * 23 *
24 * @param string $gender "1,3"表示男, "2,3"表示女 24 * @param string $gender "1,3"表示男, "2,3"表示女
25 * @return array 25 * @return array
@@ -55,6 +55,7 @@ class DetailController extends AbstractAction @@ -55,6 +55,7 @@ class DetailController extends AbstractAction
55 $good = array(); 55 $good = array();
56 $skns = array(); 56 $skns = array();
57 $product = array(); 57 $product = array();
  58 +
58 foreach ($detail['getArticleContent'] as $value) { 59 foreach ($detail['getArticleContent'] as $value) {
59 $build = array(); 60 $build = array();
60 // 文字 61 // 文字
@@ -65,6 +66,17 @@ class DetailController extends AbstractAction @@ -65,6 +66,17 @@ class DetailController extends AbstractAction
65 elseif (isset($value['singleImage'])) { 66 elseif (isset($value['singleImage'])) {
66 $build['bigImage'] = Helpers::getImageUrl($value['singleImage']['data'][0]['src'], 640, 640); 67 $build['bigImage'] = Helpers::getImageUrl($value['singleImage']['data'][0]['src'], 640, 640);
67 } 68 }
  69 + elseif (isset($value['smallPic'])) {
  70 + $imgs = $value['smallPic']['data'];
  71 + $build['smallImage'] = array(
  72 + array(
  73 + 'src' => Helpers::getImageUrl($imgs[0]['src'], 315, 420)
  74 + ),
  75 + array(
  76 + 'src' => Helpers::getImageUrl($imgs[1]['src'], 315, 420)
  77 + )
  78 + );
  79 + }
68 // 相关推荐 80 // 相关推荐
69 elseif (isset($value['goods']['data'])) { 81 elseif (isset($value['goods']['data'])) {
70 $good = array(); 82 $good = array();