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

@@ -339,35 +339,34 @@ class HomeModel
         }
 
         $data = IndexData::channelData();
-        
         if (!empty($data['data']['list'])) {
             $build = array();
             foreach ($data['data']['list'] as $value) {
                 $build = array();
                 switch (intval($value['channel_id'])) {
                     case 1:
-                        $build['href'] = '/boys';
+                        $build['href'] = Helpers::getFilterUrl($value['url']);
                         $build['title'] = '男生';
                         $build['entitle'] = 'BOYS';
                         break;
                     case 2:
-                        $build['href'] = '/girls';
+                        $build['href'] = Helpers::getFilterUrl($value['url']);
                         $build['title'] = '女生';
                         $build['entitle'] = 'GIRLS';
                         break;
                     case 3:
-                        $build['href'] = '/kids';
+                        $build['href'] = Helpers::getFilterUrl($value['url']);
                         $build['title'] = '潮童';
                         $build['entitle'] = 'KIDS';
                         break;
                     case 4:
-                        $build['href'] = '/lifestyle';
+                        $build['href'] = Helpers::getFilterUrl($value['url']);
                         $build['title'] = '创意生活';
                         $build['entitle'] = 'LIFESTYLE';
                         break;
                     case 5:
                         $result['showYohood'] = true;
-                        $result['yohoodHref'] = 'http://yohood.cn';
+                        $result['yohoodHref'] = Helpers::getFilterUrl($value['url']);
                         break;
                     default:
                         continue;

@@ -81,7 +81,7 @@ class BrandsModel
         $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']);
 
         // 组合搜索分类url
-        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']);
+        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['sortCondition']);
 
         //组合搜索品牌url
         $urlList['brand'] = HelperSearch::getBrandUrl($customOptions);

@@ -18,12 +18,11 @@ class IndexModel
     {
         $urlList = array();
         $searchCondition = SearchModel::searchCondition($customCondition, $customOptions);
-        
         // 组合搜索商品url
         $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']);
         
         // 组合搜索分类url
-        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']);
+        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['sortCondition']);
         
         //用户浏览记录
         //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']);

@@ -20,7 +20,7 @@ class NewModel
         // 组合搜索商品url
         $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']);
         // 组合搜索分类url
-        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']);
+        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['sortCondition']);
         // 组合搜索最新上架url
         $urlList['recent'] = HelperSearch::getRecentShelveUrl($searchCondition['condition']);
         //用户浏览记录

@@ -23,7 +23,7 @@ class SaleModel
         $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']);
         
         // 组合搜索分类url
-        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']);
+        $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['sortCondition']);
         
         //组合用户浏览记录url
         //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']);