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

@@ -292,7 +292,7 @@ class HelperSearch
     {
     {
         $result = array();
         $result = array();
         $options = self::$options;
         $options = self::$options;
-        if (!isset($options['controller']) || $options['controller'] == 'Search') {
+        if (!isset($options['controller']) || $options['controller'] != 'Search') {
             return $result;
             return $result;
         }
         }
         $params = self::$params;
         $params = self::$params;

@@ -162,7 +162,7 @@ $('.logo-brand').logoBrand({
         $.ajax({
         $.ajax({
             type: 'GET',
             type: 'GET',
             dataType: 'json',
             dataType: 'json',
-            url: '/product/index/hotrank/getdata',
+            url: '/product/index/getdata',
             data: param,
             data: param,
             success: function(res) {
             success: function(res) {
                 var data;
                 var data;

@@ -150,7 +150,7 @@ class SearchModel
         // 组合搜索折扣区间url
         // 组合搜索折扣区间url
         $urlList['discount'] = HelperSearch::getDiscountUrl($searchCondition['condition']);
         $urlList['discount'] = HelperSearch::getDiscountUrl($searchCondition['condition']);
         // 组合搜索最新上架url
         // 组合搜索最新上架url
-        $urlList['recent'] = HelperSearch::getRecentShelveUrl($searchCondition['condition']);
+        //$urlList['recent'] = HelperSearch::getRecentShelveUrl($searchCondition['condition']);
         //用户浏览记录
         //用户浏览记录
         //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']);
         //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']);