shop sort url add branh

@@ -13,6 +13,7 @@ class ShopProcess
     private static $shopData = array();
     private static $shopId = 0;
     private static $appVersion = 0;
+    private static $brandId;
 
     /**
      * 组织店铺页面数据
@@ -144,7 +145,7 @@ class ShopProcess
         if ($brandNumber > 5) {
             self::$shopData['brandList']['url'] = Helpers::url('/product/index/allBrand', array('shop_id' => self::$shopId));
         }
-        self::$shopData['brand'] = rtrim($brandId, ',');
+        self::$brandId = self::$shopData['brand'] = rtrim($brandId, ',');
     }
 
     /**
@@ -214,7 +215,7 @@ class ShopProcess
             }
             foreach ($data['data'] as $key => $val) {
                 self::$shopData['shopCategory']['list'][] = array(
-                    'url' => Helpers::url('', array('shop_id' => self::$shopId, 'sort' => $val['relation_parameter']['sort']), 'search'),
+                    'url' => Helpers::url('', array('shop_id' => self::$shopId, 'brand' => self::$brandId, 'sort' => $val['relation_parameter']['sort']), 'search'),
                     'categoryId' => $val['category_id'],
                     'name' => $val['category_name']
                 );

@@ -416,11 +416,11 @@ class ListModel
         $data = array();
         //店铺信息
         $data['shopInfo'] = ListData::getShopInfo($shopId, $uid);
+        //店铺装修资源数据
+        $data['decorator'] = ListData::getShopDecorator($shopId);
         //店铺分类
         $channel = Helpers::getChannelByCookie();
         $data['shopCategory'] = ListData::getShopCategory($shopId, $channel);
-        //店铺装修资源数据
-        $data['decorator'] = ListData::getShopDecorator($shopId);
         //组织楼层数据
         $result = ShopProcess::formShopData($data, $shopId, $appVersion);
         return $result;