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

@@ -380,7 +380,7 @@ class ListModel
             $item = array(
                     'category_name' => '全部' . $categorys['category_name'],
                     'url' => Helpers::url('/search/list', array(
-                        'shop' => $shop_id,
+                        'shop_id' => $shop_id,
                         'sort' => $categorys['relation_parameter']['sort'],
                         'title' => '全部' . $categorys['category_name']
                     )),
@@ -389,7 +389,7 @@ class ListModel
 
             foreach ($categorys['sub'] as &$sub) {
                 $sub['url'] = Helpers::url('/search/list', array(
-                    'shop' => $shop_id,
+                    'shop_id' => $shop_id,
                     'sort' => $sub['relation_parameter']['sort'],
                     'title' => $sub['category_name']
                 ));