shop remove brandid

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

@@ -31,8 +31,7 @@ var $subNav = $('.home-sub-nav'),
     $pgc = $($goodsChildren.get(1)),
     $pgc = $($goodsChildren.get(1)),
     $dgc = $($goodsChildren.get(2)),
     $dgc = $($goodsChildren.get(2)),
     shopId = $('input[name="shop_id"]').val(),
     shopId = $('input[name="shop_id"]').val(),
-    appVersion = $('input[name="app_version"]').val(),
-    brand = $('input[name="brand"]').val();
+    appVersion = $('input[name="app_version"]').val();
 
 
 var winH = $(window).height(),
 var winH = $(window).height(),
     noResult = '<p class="no-result">未找到相关搜索结果</p>';
     noResult = '<p class="no-result">未找到相关搜索结果</p>';
@@ -153,7 +152,6 @@ function newData(callback) {
         order: '1',
         order: '1',
         page: navInfo.new.page,
         page: navInfo.new.page,
         shop_id: shopId,
         shop_id: shopId,
-        brand: brand
     };
     };
     req.callBack = function(data) {
     req.callBack = function(data) {
         $('#new-arrival').append(data);
         $('#new-arrival').append(data);
@@ -176,7 +174,6 @@ function hotData(callback) {
         order: '1',
         order: '1',
         page: navInfo.hot.page,
         page: navInfo.hot.page,
         shop_id: shopId,
         shop_id: shopId,
-        brand: brand
     };
     };
     req.callBack = function(data) {
     req.callBack = function(data) {
         $('#popularity').append(data);
         $('#popularity').append(data);
@@ -421,7 +418,6 @@ function search(opt) {
                 };
                 };
                 break;
                 break;
         }
         }
-        ext.brand = opt.brand;
         $.extend(defaultOpt, ext); //扩展筛选项
         $.extend(defaultOpt, ext); //扩展筛选项
     }
     }
 
 
@@ -517,7 +513,6 @@ $.ajax({
     url: '/search/filter',
     url: '/search/filter',
     data: {
     data: {
         shop_id: shopId,
         shop_id: shopId,
-        brand: brand
     },
     },
     success: function(data) {
     success: function(data) {
         $goodsContainer.append(data);
         $goodsContainer.append(data);
@@ -646,7 +641,6 @@ $subNav.on('touchend touchcancel', function(e) {
             search({
             search({
                 type: 'shop_id',
                 type: 'shop_id',
                 id: shopId,
                 id: shopId,
-                brand: brand,
                 url: '/index/search/search',
                 url: '/index/search/search',
                 nextPage: false
                 nextPage: false
             });
             });
@@ -667,7 +661,6 @@ function scrollHandler() {
             search({
             search({
                 type: 'shop_id',
                 type: 'shop_id',
                 id: shopId,
                 id: shopId,
-                brand: brand,
                 url: '/index/search/search',
                 url: '/index/search/search',
                 nextPage: true
                 nextPage: true
             });
             });
@@ -685,7 +678,6 @@ $(window).scroll(function() {
 search({
 search({
     type: 'shop_id',
     type: 'shop_id',
     id: shopId,
     id: shopId,
-    brand: brand,
     url: '/index/search/search',
     url: '/index/search/search',
     nextPage: false
     nextPage: false
 });
 });

@@ -7,7 +7,6 @@
                 {{#if appVersion}}
                 {{#if appVersion}}
                 <input type="hidden" name="app_version" value="{{appVersion}}">
                 <input type="hidden" name="app_version" value="{{appVersion}}">
                 <input type="hidden" name="shop_id" value="{{shopId}}">
                 <input type="hidden" name="shop_id" value="{{shopId}}">
-                <input type="hidden" name="brand" value="{{brand}}">
                 {{else}}
                 {{else}}
                 <div class="search-area">
                 <div class="search-area">
                         <div id="search-input" class="search-input">
                         <div id="search-input" class="search-input">
@@ -16,7 +15,6 @@
                                 <input type="text" placeholder="搜索店铺内潮品" name="query" class="buriedpoint">
                                 <input type="text" placeholder="搜索店铺内潮品" name="query" class="buriedpoint">
                                 <input type="hidden" name="shop_id" value="{{shopId}}">
                                 <input type="hidden" name="shop_id" value="{{shopId}}">
                                 <input type="hidden" name="app_version" value="{{appVersion}}">
                                 <input type="hidden" name="app_version" value="{{appVersion}}">
-                                <input type="hidden" name="brand" value="{{brand}}">
                                 <i class="clear-input iconfont hide">&#xe626;</i>
                                 <i class="clear-input iconfont hide">&#xe626;</i>
                                 <button id="search" class="search buriedpoint" type="submit">搜索</button>
                                 <button id="search" class="search buriedpoint" type="submit">搜索</button>
                             </form>
                             </form>