Merge branch 'release/4.4' of http://git.dev.yoho.cn/web/yohobuy

@@ -426,7 +426,10 @@ class ShopModel
             }
             }
         }
         }
 
 
-        return $result;
+        return array(
+            'title' => empty($result[0]['title']) ? '' :  $result[0]['title'],
+            'list'=> $result
+        );
     }
     }
 
 
     /**
     /**
@@ -571,13 +574,8 @@ class ShopModel
                     $list = self::$fun(self::getResourceData($list), $parameters);
                     $list = self::$fun(self::getResourceData($list), $parameters);
                     switch ($fun) {
                     switch ($fun) {
                         case 'shopTopBanner':
                         case 'shopTopBanner':
-                            $data[$fun] = $list;
-                            break;
                         case 'signboard':
                         case 'signboard':
-                            $data[$fun] = array(
-                                'title' => isset($list[0]['title']) ? $list[0]['title'] : '',
-                                'list'=> $list
-                            );
+                            $data[$fun] = $list;
                             break;
                             break;
                     }
                     }
                 }
                 }

@@ -95,7 +95,7 @@ class IndexController extends WebAction
 
 
         //调用模型获得品牌页数据
         //调用模型获得品牌页数据
         $data = BrandsModel::getBrandSearchData($condition, $options);
         $data = BrandsModel::getBrandSearchData($condition, $options);
-
+        $data['signboard'] = isset($result['signboard']) ? $result['signboard'] : '';//水牌
         //统计前三个商品
         //统计前三个商品
         $skn=array();
         $skn=array();
         $arr=array();
         $arr=array();