Showing
3 changed files
with
29 additions
and
6 deletions
@@ -37,6 +37,9 @@ const index = (req, res, next) => { | @@ -37,6 +37,9 @@ const index = (req, res, next) => { | ||
37 | module: 'guang', | 37 | module: 'guang', |
38 | page: 'brand-list', | 38 | page: 'brand-list', |
39 | width750: true, | 39 | width750: true, |
40 | + pageHeader: headerModel.setNav({ | ||
41 | + navTitle: '' | ||
42 | + }), | ||
40 | categoryTab: isCate, | 43 | categoryTab: isCate, |
41 | channel: result.channel ? result.channel : '', | 44 | channel: result.channel ? result.channel : '', |
42 | brandList: result.brandList, | 45 | brandList: result.brandList, |
@@ -98,9 +101,7 @@ const cateAll = (req, res, next) => { | @@ -98,9 +101,7 @@ const cateAll = (req, res, next) => { | ||
98 | category: { | 101 | category: { |
99 | nav: result.nav, | 102 | nav: result.nav, |
100 | list: result.list | 103 | list: result.list |
101 | - // searchUrl: helpers.urlFormat('/search', null, 'search') | ||
102 | } | 104 | } |
103 | - // showFooterTab: footerModel.getUrlData('category') | ||
104 | }); | 105 | }); |
105 | }).catch(next); | 106 | }).catch(next); |
106 | }; | 107 | }; |
@@ -9,6 +9,8 @@ var $intercept = $('.no-intercept'), | @@ -9,6 +9,8 @@ var $intercept = $('.no-intercept'), | ||
9 | $list = $('.brand-list-box'), | 9 | $list = $('.brand-list-box'), |
10 | $listBox = $('.list-box'); | 10 | $listBox = $('.list-box'); |
11 | 11 | ||
12 | +require('../common'); | ||
13 | + | ||
12 | function channels(key) { | 14 | function channels(key) { |
13 | var channel = { | 15 | var channel = { |
14 | men: 1, | 16 | men: 1, |
@@ -103,6 +105,20 @@ if ($listBox.find('li').length <= 0) { | @@ -103,6 +105,20 @@ if ($listBox.find('li').length <= 0) { | ||
103 | $listBox.hide(); | 105 | $listBox.hide(); |
104 | } | 106 | } |
105 | 107 | ||
108 | +$(window).scroll(function() { | ||
109 | + var totalHeight = $('#yoho-header').height() + $('.tab-box').height(); | ||
110 | + | ||
111 | + if ($(this).scrollTop() >= $('#yoho-header').height()) { | ||
112 | + $('.tab-box').addClass('fastening'); | ||
113 | + $('.content-index').addClass('distance'); | ||
114 | + $('.list-box').css('top', $('.tab-box').height()); | ||
115 | + } else { | ||
116 | + $('.tab-box').removeClass('fastening'); | ||
117 | + $('.content-index').removeClass('distance'); | ||
118 | + $('.list-box').css('top', totalHeight - $(this).scrollTop()); | ||
119 | + } | ||
120 | +}); | ||
121 | + | ||
106 | $(function() { | 122 | $(function() { |
107 | $('.banner-swiper').each(function() { | 123 | $('.banner-swiper').each(function() { |
108 | if (!$(this).parents('.content').hasClass('hide') && $(this).hasClass('swiper-container-horizontal') === false && $(this).find('li').length > 1) { | 124 | if (!$(this).parents('.content').hasClass('hide') && $(this).hasClass('swiper-container-horizontal') === false && $(this).find('li').length > 1) { |
1 | .brand-blk-page { | 1 | .brand-blk-page { |
2 | .tab-box { | 2 | .tab-box { |
3 | - position: fixed; | ||
4 | top: 0; | 3 | top: 0; |
5 | z-index: 9; | 4 | z-index: 9; |
6 | width: 100%; | 5 | width: 100%; |
7 | } | 6 | } |
8 | 7 | ||
8 | + .fastening { | ||
9 | + position: fixed; | ||
10 | + } | ||
11 | + | ||
12 | + .distance { | ||
13 | + margin-top: 170px; | ||
14 | + } | ||
15 | + | ||
9 | .brand-tab { | 16 | .brand-tab { |
10 | max-width: inherit; | 17 | max-width: inherit; |
11 | height: 80px; | 18 | height: 80px; |
@@ -63,7 +70,6 @@ | @@ -63,7 +70,6 @@ | ||
63 | } | 70 | } |
64 | 71 | ||
65 | .content-index { | 72 | .content-index { |
66 | - margin-top: 170px; | ||
67 | 73 | ||
68 | .search { | 74 | .search { |
69 | width: 100%; | 75 | width: 100%; |
@@ -190,7 +196,7 @@ | @@ -190,7 +196,7 @@ | ||
190 | right: 0; | 196 | right: 0; |
191 | background: #fff; | 197 | background: #fff; |
192 | opacity: 0.8; | 198 | opacity: 0.8; |
193 | - top: 170px; | 199 | + top: 270px; |
194 | overflow-y: auto; | 200 | overflow-y: auto; |
195 | z-index: 10; | 201 | z-index: 10; |
196 | 202 | ||
@@ -333,9 +339,9 @@ | @@ -333,9 +339,9 @@ | ||
333 | .recommend-content-five { | 339 | .recommend-content-five { |
334 | margin-top: -1px; | 340 | margin-top: -1px; |
335 | width: 100%; | 341 | width: 100%; |
342 | + overflow: hidden; | ||
336 | 343 | ||
337 | a { | 344 | a { |
338 | - height: 218px; | ||
339 | width: 50%; | 345 | width: 50%; |
340 | outline: none; | 346 | outline: none; |
341 | color: #000; | 347 | color: #000; |
-
Please register or login to post a comment