Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop
Showing
5 changed files
with
9 additions
and
11 deletions
| @@ -339,35 +339,34 @@ class HomeModel | @@ -339,35 +339,34 @@ class HomeModel | ||
| 339 | } | 339 | } |
| 340 | 340 | ||
| 341 | $data = IndexData::channelData(); | 341 | $data = IndexData::channelData(); |
| 342 | - | ||
| 343 | if (!empty($data['data']['list'])) { | 342 | if (!empty($data['data']['list'])) { |
| 344 | $build = array(); | 343 | $build = array(); |
| 345 | foreach ($data['data']['list'] as $value) { | 344 | foreach ($data['data']['list'] as $value) { |
| 346 | $build = array(); | 345 | $build = array(); |
| 347 | switch (intval($value['channel_id'])) { | 346 | switch (intval($value['channel_id'])) { |
| 348 | case 1: | 347 | case 1: |
| 349 | - $build['href'] = '/boys'; | 348 | + $build['href'] = Helpers::getFilterUrl($value['url']); |
| 350 | $build['title'] = '男生'; | 349 | $build['title'] = '男生'; |
| 351 | $build['entitle'] = 'BOYS'; | 350 | $build['entitle'] = 'BOYS'; |
| 352 | break; | 351 | break; |
| 353 | case 2: | 352 | case 2: |
| 354 | - $build['href'] = '/girls'; | 353 | + $build['href'] = Helpers::getFilterUrl($value['url']); |
| 355 | $build['title'] = '女生'; | 354 | $build['title'] = '女生'; |
| 356 | $build['entitle'] = 'GIRLS'; | 355 | $build['entitle'] = 'GIRLS'; |
| 357 | break; | 356 | break; |
| 358 | case 3: | 357 | case 3: |
| 359 | - $build['href'] = '/kids'; | 358 | + $build['href'] = Helpers::getFilterUrl($value['url']); |
| 360 | $build['title'] = '潮童'; | 359 | $build['title'] = '潮童'; |
| 361 | $build['entitle'] = 'KIDS'; | 360 | $build['entitle'] = 'KIDS'; |
| 362 | break; | 361 | break; |
| 363 | case 4: | 362 | case 4: |
| 364 | - $build['href'] = '/lifestyle'; | 363 | + $build['href'] = Helpers::getFilterUrl($value['url']); |
| 365 | $build['title'] = '创意生活'; | 364 | $build['title'] = '创意生活'; |
| 366 | $build['entitle'] = 'LIFESTYLE'; | 365 | $build['entitle'] = 'LIFESTYLE'; |
| 367 | break; | 366 | break; |
| 368 | case 5: | 367 | case 5: |
| 369 | $result['showYohood'] = true; | 368 | $result['showYohood'] = true; |
| 370 | - $result['yohoodHref'] = 'http://yohood.cn'; | 369 | + $result['yohoodHref'] = Helpers::getFilterUrl($value['url']); |
| 371 | break; | 370 | break; |
| 372 | default: | 371 | default: |
| 373 | continue; | 372 | continue; |
| @@ -81,7 +81,7 @@ class BrandsModel | @@ -81,7 +81,7 @@ class BrandsModel | ||
| 81 | $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']); | 81 | $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']); |
| 82 | 82 | ||
| 83 | // 组合搜索分类url | 83 | // 组合搜索分类url |
| 84 | - $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']); | 84 | + $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['sortCondition']); |
| 85 | 85 | ||
| 86 | //组合搜索品牌url | 86 | //组合搜索品牌url |
| 87 | $urlList['brand'] = HelperSearch::getBrandUrl($customOptions); | 87 | $urlList['brand'] = HelperSearch::getBrandUrl($customOptions); |
| @@ -18,12 +18,11 @@ class IndexModel | @@ -18,12 +18,11 @@ class IndexModel | ||
| 18 | { | 18 | { |
| 19 | $urlList = array(); | 19 | $urlList = array(); |
| 20 | $searchCondition = SearchModel::searchCondition($customCondition, $customOptions); | 20 | $searchCondition = SearchModel::searchCondition($customCondition, $customOptions); |
| 21 | - | ||
| 22 | // 组合搜索商品url | 21 | // 组合搜索商品url |
| 23 | $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']); | 22 | $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']); |
| 24 | 23 | ||
| 25 | // 组合搜索分类url | 24 | // 组合搜索分类url |
| 26 | - $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']); | 25 | + $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['sortCondition']); |
| 27 | 26 | ||
| 28 | //用户浏览记录 | 27 | //用户浏览记录 |
| 29 | //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']); | 28 | //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']); |
| @@ -20,7 +20,7 @@ class NewModel | @@ -20,7 +20,7 @@ class NewModel | ||
| 20 | // 组合搜索商品url | 20 | // 组合搜索商品url |
| 21 | $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']); | 21 | $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']); |
| 22 | // 组合搜索分类url | 22 | // 组合搜索分类url |
| 23 | - $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']); | 23 | + $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['sortCondition']); |
| 24 | // 组合搜索最新上架url | 24 | // 组合搜索最新上架url |
| 25 | $urlList['recent'] = HelperSearch::getRecentShelveUrl($searchCondition['condition']); | 25 | $urlList['recent'] = HelperSearch::getRecentShelveUrl($searchCondition['condition']); |
| 26 | //用户浏览记录 | 26 | //用户浏览记录 |
| @@ -23,7 +23,7 @@ class SaleModel | @@ -23,7 +23,7 @@ class SaleModel | ||
| 23 | $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']); | 23 | $urlList['product'] = HelperSearch::getProductUrl($searchCondition['condition']); |
| 24 | 24 | ||
| 25 | // 组合搜索分类url | 25 | // 组合搜索分类url |
| 26 | - $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['condition']); | 26 | + $urlList['sort'] = HelperSearch::getClassesUrl($searchCondition['sortCondition']); |
| 27 | 27 | ||
| 28 | //组合用户浏览记录url | 28 | //组合用户浏览记录url |
| 29 | //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']); | 29 | //$urlList['reviewUrl'] = HelperSearch::getReviewUrl($searchCondition['condition']); |
-
Please register or login to post a comment