Authored by 毕凯

Merge remote-tracking branch 'origin/hotfix/shopUI2'

@@ -380,7 +380,7 @@ class ListModel @@ -380,7 +380,7 @@ class ListModel
380 $item = array( 380 $item = array(
381 'category_name' => '全部' . $categorys['category_name'], 381 'category_name' => '全部' . $categorys['category_name'],
382 'url' => Helpers::url('/search/list', array( 382 'url' => Helpers::url('/search/list', array(
383 - 'shop' => $shop_id, 383 + 'shop_id' => $shop_id,
384 'sort' => $categorys['relation_parameter']['sort'], 384 'sort' => $categorys['relation_parameter']['sort'],
385 'title' => '全部' . $categorys['category_name'] 385 'title' => '全部' . $categorys['category_name']
386 )), 386 )),
@@ -389,7 +389,7 @@ class ListModel @@ -389,7 +389,7 @@ class ListModel
389 389
390 foreach ($categorys['sub'] as &$sub) { 390 foreach ($categorys['sub'] as &$sub) {
391 $sub['url'] = Helpers::url('/search/list', array( 391 $sub['url'] = Helpers::url('/search/list', array(
392 - 'shop' => $shop_id, 392 + 'shop_id' => $shop_id,
393 'sort' => $sub['relation_parameter']['sort'], 393 'sort' => $sub['relation_parameter']['sort'],
394 'title' => $sub['category_name'] 394 'title' => $sub['category_name']
395 )); 395 ));