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

@@ -68,7 +68,7 @@ class InfoModel
      */
      */
     public static function formatInfo($article, $data, $channel, $limit)
     public static function formatInfo($article, $data, $channel, $limit)
     {
     {
-        $result = array();
+        $result['content'] = $other = array();
         //推荐商品列表
         //推荐商品列表
         $goods = $goodsGroup =  array();
         $goods = $goodsGroup =  array();
         $result['pathNav'] = self::getCenterCrumb($article['article_title'], $channel);
         $result['pathNav'] = self::getCenterCrumb($article['article_title'], $channel);
@@ -93,13 +93,14 @@ class InfoModel
                     } elseif ($type === 'goodsGroup') {
                     } elseif ($type === 'goodsGroup') {
                         $goodsGroup = array_merge_recursive($goodsGroup, self::goodsGroup($con['data']));
                         $goodsGroup = array_merge_recursive($goodsGroup, self::goodsGroup($con['data']));
                     } else {
                     } else {
-                        $result['content'] = is_callable("self::$type") ? self::$type($con['data']) : '';
+                        $other = is_callable("self::$type") ? self::$type($con['data']) : '';
+                        $result['content'] = array_merge_recursive($result['content'], $other);
                     }
                     }
                 }
                 }
             }
             }
         }
         }
         if (!empty($goods)) {
         if (!empty($goods)) {
-            $result['content'][] = array('relatedReco'=>array('recos'=>$goods));
+            $result['content']['relatedReco'] = array('recos'=>$goods);
         }
         }
         if (!empty($goodsGroup)) {
         if (!empty($goodsGroup)) {
             $result['content']['relatedReco'] = $goodsGroup;
             $result['content']['relatedReco'] = $goodsGroup;