fe / YOHOBUYPC · Commits

Go to a project

Authored by uedxwg
Commit 0af66d092b16c4fe15a0f2944063bea7f544f934 2 parents 298ab613 2a6c682e

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

Inline Side-by-side
Showing 7 changed files with 27 additions and 15 deletions
@@ -18,6 +18,7 @@ var swiper, @@ -18,6 +18,7 @@ var swiper,
18 var searchH = $('.newbrand-search').outerHeight(), 18 var searchH = $('.newbrand-search').outerHeight(),
19 headerH = $('.yoho-header').outerHeight(), 19 headerH = $('.yoho-header').outerHeight(),
20 brandSwipe = parseInt(searchH) + parseInt(headerH) - 1, 20 brandSwipe = parseInt(searchH) + parseInt(headerH) - 1,
  21 + minBrandListTop,
21 searchArray = []; 22 searchArray = [];
22 23
23 var brandsData, 24 var brandsData,
@@ -42,13 +43,15 @@ $('.yoho-header').css({ @@ -42,13 +43,15 @@ $('.yoho-header').css({
42 }); 43 });
43 44
44 $fixTitleBar = $('<div class="title-bar fixed-title-bar"><h2></h2></div>'); 45 $fixTitleBar = $('<div class="title-bar fixed-title-bar"><h2></h2></div>');
45 -$fixTitleBar.hide(); 46 +$fixTitleBar.css({
  47 + position: 'fixed',
  48 + top: brandSwipe
  49 +}).hide();
  50 +minBrandListTop = brandSwipe + $('.hot-brand').outerHeight() + $('.banner-top').outerHeight();
46 $('.brand-list').last().append($fixTitleBar); 51 $('.brand-list').last().append($fixTitleBar);
47 52
48 $(window).scroll(function() { 53 $(window).scroll(function() {
49 - var scrTop = $(window).scrollTop(),  
50 - minBrandListTop = brandSwipe + $('.hot-brand').outerHeight() +  
51 - $('.banner-top').outerHeight(); 54 + var scrTop = $(window).scrollTop();
52 55
53 if ($brandList.eq(0).offset().top < minBrandListTop) { 56 if ($brandList.eq(0).offset().top < minBrandListTop) {
54 $fixTitleBar.hide(); 57 $fixTitleBar.hide();
@@ -59,9 +62,7 @@ $(window).scroll(function() { @@ -59,9 +62,7 @@ $(window).scroll(function() {
59 62
60 if (scrTop >= offTop) { 63 if (scrTop >= offTop) {
61 $fixTitleBar.css({ 64 $fixTitleBar.css({
62 - display: 'block',  
63 - position: 'fixed',  
64 - top: brandSwipe 65 + display: 'block'
65 }).find('h2').html($(this).find('.title-bar').text()); 66 }).find('h2').html($(this).find('.title-bar').text());
66 } 67 }
67 68
@@ -53,4 +53,5 @@ $('.no-search').on('touchend', function() { @@ -53,4 +53,5 @@ $('.no-search').on('touchend', function() {
53 hideBigSearch(); 53 hideBigSearch();
54 }); 54 });
55 55
56 -window.rePosFooter && window.rePosFooter(); 56 +// 底部计算有误
  57 +// window.rePosFooter && window.rePosFooter();
@@ -55,11 +55,14 @@ @@ -55,11 +55,14 @@
55 right: -74rem / $pxConvertRem; 55 right: -74rem / $pxConvertRem;
56 font-size: 32rem / $pxConvertRem; 56 font-size: 32rem / $pxConvertRem;
57 line-height: 60rem / $pxConvertRem; 57 line-height: 60rem / $pxConvertRem;
58 - color: #666; 58 + color: #bdbdbd;
59 } 59 }
60 60
61 .cancel-btn { 61 .cancel-btn {
62 display: inline; 62 display: inline;
  63 + color: #bdbdbd;
  64 + font-size: 32rem / $pxConvertRem;
  65 + vertical-align: middle;
63 } 66 }
64 67
65 .clear-text { 68 .clear-text {
@@ -86,9 +89,15 @@ @@ -86,9 +89,15 @@
86 .img-box { 89 .img-box {
87 display: table-cell; 90 display: table-cell;
88 vertical-align: middle; 91 vertical-align: middle;
89 - width: 100%; 92 + text-align: center;
  93 + width: 158rem / $pxConvertRem;
90 height: 158rem / $pxConvertRem; 94 height: 158rem / $pxConvertRem;
91 } 95 }
  96 +
  97 + img {
  98 + max-width: 140rem / $pxConvertRem;
  99 + max-height: 140rem / $pxConvertRem;
  100 + }
92 } 101 }
93 } 102 }
94 } 103 }
@@ -36,8 +36,9 @@ @@ -36,8 +36,9 @@
36 height: 44px; 36 height: 44px;
37 text-align: center; 37 text-align: center;
38 color: #fff; 38 color: #fff;
39 - background-image: linear-gradient(#323232, #0f0f0f);  
40 border-radius: 10px; 39 border-radius: 10px;
  40 + @include background(linear-gradient(#323232, #0f0f0f));
  41 + // background-image: linear-gradient(#323232, #0f0f0f);
41 } 42 }
42 } 43 }
43 44
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 .clear-input { 27 .clear-input {
28 position: absolute; 28 position: absolute;
29 top: 24rem / $pxConvertRem; 29 top: 24rem / $pxConvertRem;
30 - right: 110rem / $pxConvertRem; 30 + right: 100rem / $pxConvertRem;
31 font-size: 32rem / $pxConvertRem; 31 font-size: 32rem / $pxConvertRem;
32 color: #b2b2b2; 32 color: #b2b2b2;
33 } 33 }
@@ -35,9 +35,10 @@ @@ -35,9 +35,10 @@
35 .search { 35 .search {
36 position: absolute; 36 position: absolute;
37 top: 20rem / $pxConvertRem; 37 top: 20rem / $pxConvertRem;
38 - right: 0; 38 + right: 12rem / $pxConvertRem;
39 border: none; 39 border: none;
40 background: transparent; 40 background: transparent;
  41 + color: #b2b2b2;
41 font-size: 32rem / $pxConvertRem; 42 font-size: 32rem / $pxConvertRem;
42 } 43 }
43 } 44 }
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <i class="search-icon iconfont">&#xe60f;</i> 6 <i class="search-icon iconfont">&#xe60f;</i>
7 <input type="text" placeholder="搜索商品" name="query"> 7 <input type="text" placeholder="搜索商品" name="query">
8 <i class="clear-input iconfont hide">&#xe626;</i> 8 <i class="clear-input iconfont hide">&#xe626;</i>
9 - <button id="search" class="search" type="submit">搜索</button> 9 + <span id="search" class="search" type="submit">搜索</span>
10 </form> 10 </form>
11 </div> 11 </div>
12 <div class="search-items"> 12 <div class="search-items">
@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
9 <a href="javascript:;"> 9 <a href="javascript:;">
10 {{/ url}} 10 {{/ url}}
11 {{# img}} 11 {{# img}}
12 - <!-- <img class="nav-img" src="{{.}}" alt=""> -->  
13 <span class="nav-img" style="background-image: url({{.}})"></span> 12 <span class="nav-img" style="background-image: url({{.}})"></span>
14 {{/ img}} 13 {{/ img}}
15 {{^ img}} 14 {{^ img}}