Authored by ccbikai

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

@@ -157,10 +157,10 @@ class IndexModel @@ -157,10 +157,10 @@ class IndexModel
157 } 157 }
158 158
159 // 内容列表 159 // 内容列表
160 - if (!empty($article['data']['list']['artlist'])) { 160 + if (!empty($article['data']['list']['artList'])) {
161 $type = intval($type); 161 $type = intval($type);
162 foreach ($article['data']['list']['artList'] as $value) { 162 foreach ($article['data']['list']['artList'] as $value) {
163 - $data['guang']['infos'][$type]['info'] = Helpers::formatArticle($value, true, false, true); 163 + $data['guang']['infos'][$type]['info'][] = Helpers::formatArticle($value, true, false, true);
164 } 164 }
165 } 165 }
166 166
1 <?php 1 <?php
2 use Action\AbstractAction; 2 use Action\AbstractAction;
3 use Category\ClassModel; 3 use Category\ClassModel;
  4 +use Plugin\Helpers;
4 5
5 /** 6 /**
6 * 品类 7 * 品类