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

@@ -9,7 +9,7 @@ use Plugin\Helpers;
  */
 class FloorProcess
 {
-
+    private static $guangUrl = 'http://guang.m.yohobuy.com';
     /**
      * 频道参数
      * 
@@ -218,19 +218,28 @@ class FloorProcess
     {
         $result = array();
 
-        foreach ($data['article'] as &$one) {
-            if (isset($one['url'])) {
-                $one['url'] = Helpers::getFilterUrl($one['url']);
+        foreach($data as $key=>&$value){
+            if($key == 'title'){
+                $value['more_url'] = self::$guangUrl.'?id=2&gender='.self::$channel[$type];
             }
-            $one['img'] = Helpers::getImageUrl($one['src'], 400, 400);
-            unset($one['src']);
-        }
-        foreach ($data['recommend_collocation'] as &$one) {
-            if (isset($one['url'])) {
-                $one['url'] = Helpers::getFilterUrl($one['url']);
+            if($key == 'article'){
+                foreach($value as &$one){
+                    if (isset($one['url'])) {
+                        $one['url'] = Helpers::getFilterUrl($one['url']);
+                    }
+                    $one['img'] = Helpers::getImageUrl($one['src'], 400, 400);
+                    unset($one['src']);
+                }
+            }
+            if($key == 'recommend_collocation'){
+                foreach($value as &$one){
+                    if (isset($one['url'])) {
+                        $one['url'] = Helpers::getFilterUrl($one['url']);
+                    }
+                    $one['img'] = Helpers::getImageUrl($one['src'], 140, 140);
+                    unset($one['src']);
+                }
             }
-            $one['img'] = Helpers::getImageUrl($one['src'], 140, 140);
-            unset($one['src']);
         }
         $result['trendColloaction'] = $data;
 
@@ -247,12 +256,19 @@ class FloorProcess
     {
         $result = array();
 
-        foreach ($data['list'] as &$one) {
-            if (isset($one['url'])) {
-                $one['url'] = Helpers::getFilterUrl($one['url']);
+        foreach($data as $key=>&$value){
+            if($key == 'title'){
+                $value['more_url'] = self::$guangUrl.'?id=1&gender='.self::$channel[$type];
+            }
+            if($key == 'list'){
+                foreach ($value as &$one) {
+                    if (isset($one['url'])) {
+                        $one['url'] = Helpers::getFilterUrl($one['url']);
+                    }
+                    $one['img'] = Helpers::getImageUrl($one['src'], 580, 360);
+                    unset($one['src']);
+                }
             }
-            $one['img'] = Helpers::getImageUrl($one['src'], 580, 360);
-            unset($one['src']);
         }
         $result['trendTopics'] = $data;