gulp ge 文件

@@ -8490,7 +8490,8 @@ 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();
+    appVersion = $('input[name="app_version"]').val(),
+    brand = $('input[name="brand"]').val();
 
 
 var winH = $(window).height(),
 var winH = $(window).height(),
     noResult = '<p class="no-result">未找到相关搜索结果</p>';
     noResult = '<p class="no-result">未找到相关搜索结果</p>';
@@ -8602,6 +8603,16 @@ function getPageGoods(info) {
     });
     });
 }
 }
 
 
+function getParam(req) {
+    if (shopId) {
+        req.data.shop_id = shopId;
+    }
+
+    if (brand) {
+        req.data.brand = brand;
+    }
+}
+
 function newData(callback) {
 function newData(callback) {
     var req = {};
     var req = {};
 
 
@@ -8609,9 +8620,11 @@ function newData(callback) {
     req.data = {
     req.data = {
         type: 'newest',
         type: 'newest',
         order: '1',
         order: '1',
-        page: navInfo.new.page,
-        shop_id: shopId
+        page: navInfo.new.page
     };
     };
+
+    getParam(req);
+
     req.callBack = function(data) {
     req.callBack = function(data) {
         $('#new-arrival').append(data);
         $('#new-arrival').append(data);
         navInfo.new.page++;
         navInfo.new.page++;
@@ -8631,9 +8644,11 @@ function hotData(callback) {
     req.data = {
     req.data = {
         type: 'hot',
         type: 'hot',
         order: '1',
         order: '1',
-        page: navInfo.hot.page,
-        shop_id: shopId
+        page: navInfo.hot.page
     };
     };
+
+    getParam(req);
+
     req.callBack = function(data) {
     req.callBack = function(data) {
         $('#popularity').append(data);
         $('#popularity').append(data);
         navInfo.hot.page++;
         navInfo.hot.page++;
@@ -8773,15 +8788,15 @@ myScroll.on('scroll', function() {
         }
         }
 
 
         if (sTop < scH) {
         if (sTop < scH) {
-            if (!$nav2.hasClass('fixed-top')) {
-                $nav2.addClass('fixed-top')
-                    .removeClass('absolute')
-                    .css({
+            if (!$nav2.hasClass('absolute')) {
+                $nav2.addClass('absolute')
+                    .removeClass('fixed-top');
+            }
+            $nav2.css({
                 transform: 'translate(0, ' + (-scH) + 'px)'
                 transform: 'translate(0, ' + (-scH) + 'px)'
             });
             });
         }
         }
     }
     }
-    }
     $('#scroller').trigger('scroll');
     $('#scroller').trigger('scroll');
 });
 });
 
 
@@ -8904,6 +8919,7 @@ function search(opt) {
         page: page
         page: page
     });
     });
 
 
+
     searching = true;
     searching = true;
     loading.showLoadingMask();
     loading.showLoadingMask();
 
 
@@ -8971,7 +8987,8 @@ $.ajax({
     type: 'GET',
     type: 'GET',
     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);
@@ -9117,6 +9134,7 @@ $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
             });
             });
@@ -9137,6 +9155,7 @@ 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
             });
             });
@@ -9154,6 +9173,7 @@ $(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
 });
 });