fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by 梁志锋
Commit 989c8d33abbeb6693d1bfdea2a1f523db8b93842 2 parents 2dbc4c3e 34276d95

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

Inline Side-by-side
Showing 11 changed files with 70 additions and 48 deletions
@@ -101,5 +101,16 @@ @@ -101,5 +101,16 @@
101 border-bottom: none; 101 border-bottom: none;
102 } 102 }
103 } 103 }
  104 +
  105 + a {
  106 + display: block;
  107 + height: 100%;
  108 + width: 100%;
  109 + color: #000;
  110 +
  111 + &:visisted {
  112 + color: #000;
  113 + }
  114 + }
104 } 115 }
105 } 116 }
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 position: relative; 10 position: relative;
11 z-index: 2; 11 z-index: 2;
12 background: #f0f0f0; 12 background: #f0f0f0;
13 - @include transition(transform .3s ease-out); 13 + @include transition(transform .3s);
14 } 14 }
15 15
16 .mobile-wrap.menu-open { 16 .mobile-wrap.menu-open {
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 bottom: 0; 27 bottom: 0;
28 background: #000; 28 background: #000;
29 opacity: 0; 29 opacity: 0;
30 - z-index: 99; 30 + z-index: 4;
31 @include transition(opacity 1s); 31 @include transition(opacity 1s);
32 } 32 }
33 33
1 .side-nav { 1 .side-nav {
2 - display: block; 2 + display: none;
3 background: #fff; 3 background: #fff;
4 position: fixed; 4 position: fixed;
5 top: 0; 5 top: 0;
6 bottom: 0; 6 bottom: 0;
7 - left: -540rem / $pxConvertRem;  
8 - right: 640rem / $pxConvertRem; 7 + left: 0;
  8 + right: 100rem / $pxConvertRem;
9 width: 540rem / $pxConvertRem; 9 width: 540rem / $pxConvertRem;
10 - z-index: -1; 10 + z-index: 1;
11 overflow: hidden; 11 overflow: hidden;
12 @include transition(all .3s); 12 @include transition(all .3s);
13 13
@@ -107,9 +107,7 @@ @@ -107,9 +107,7 @@
107 } 107 }
108 108
109 .side-nav.on { 109 .side-nav.on {
110 - left: 0;  
111 - right: 100rem / $pxConvertRem;  
112 - z-index: 3; 110 + display: block;
113 } 111 }
114 112
115 .sub-nav { 113 .sub-nav {
@@ -45,13 +45,6 @@ a { @@ -45,13 +45,6 @@ a {
45 text-decoration: none; 45 text-decoration: none;
46 outline: none; 46 outline: none;
47 color: #000; 47 color: #000;
48 -  
49 - &:link,  
50 - &:visted,  
51 - &:hover,  
52 - &:active {  
53 - color: #000;  
54 - }  
55 } 48 }
56 49
57 *:focus { 50 *:focus {
@@ -52,16 +52,22 @@ @@ -52,16 +52,22 @@
52 52
53 li { 53 li {
54 float: left; 54 float: left;
55 - height: 68rem / $pxConvertRem;  
56 - line-height: 68rem / $pxConvertRem;  
57 - font-size: 28rem / $pxConvertRem;  
58 - height: 68rem / $pxConvertRem;  
59 - line-height: 38rem / $pxConvertRem;  
60 margin-right: 20rem / $pxConvertRem; 55 margin-right: 20rem / $pxConvertRem;
61 margin-bottom: 20rem / $pxConvertRem; 56 margin-bottom: 20rem / $pxConvertRem;
  57 + }
  58 +
  59 + a {
  60 + display: block;
  61 + height: 68rem / $pxConvertRem;
  62 + line-height: 68rem / $pxConvertRem;
62 padding: 0 20rem / $pxConvertRem; 63 padding: 0 20rem / $pxConvertRem;
  64 + font-size: 28rem / $pxConvertRem;
63 background: #f8f8f8; 65 background: #f8f8f8;
64 color: #000; 66 color: #000;
  67 +
  68 + &:visited {
  69 + color: #000;
  70 + }
65 } 71 }
66 72
67 .clear-history { 73 .clear-history {
@@ -49,6 +49,11 @@ @@ -49,6 +49,11 @@
49 border-top: 1px solid #e6e6e6; 49 border-top: 1px solid #e6e6e6;
50 font-size: 17px; 50 font-size: 17px;
51 background: #fff; 51 background: #fff;
  52 + color: #000;
  53 +
  54 + &:visisted {
  55 + color: #000;
  56 + }
52 } 57 }
53 58
54 .brand-thumb { 59 .brand-thumb {
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="guang-list-page guang-page yoho-page"> 2 <div class="guang-list-page guang-page yoho-page">
3 {{# guang}} 3 {{# guang}}
4 - <div class="swiper-container">  
5 - <div class="swiper-wrapper">  
6 - {{# swiper}}  
7 - <div class="swiper-slide">  
8 - <a href="{{url}}">  
9 - <img class="swiper-lazy" data-src="{{img}}">  
10 - </a>  
11 - <div class="swiper-lazy-preloader"></div>  
12 - </div>  
13 - {{/ swiper}} 4 + {{#if swiper}}
  5 + <div class="swiper-container">
  6 + <div class="swiper-wrapper">
  7 + {{# swiper}}
  8 + <div class="swiper-slide">
  9 + <a href="{{url}}">
  10 + <img class="swiper-lazy" data-src="{{img}}">
  11 + </a>
  12 + <div class="swiper-lazy-preloader"></div>
  13 + </div>
  14 + {{/ swiper}}
  15 + </div>
  16 + <div class="swiper-pagination"></div>
14 </div> 17 </div>
15 - <div class="swiper-pagination"></div>  
16 - </div> 18 + {{/if}}
17 19
18 <ul id="guang-nav" class="guang-nav clearfix"> 20 <ul id="guang-nav" class="guang-nav clearfix">
19 {{# navs}} 21 {{# navs}}
1 {{> layout/header}} 1 {{> layout/header}}
2 - <div class="mobile-wrap boys-wrap yoho-page">  
3 - {{! 首页header}}  
4 - {{# homeHeader}}  
5 - {{> home/home_header}}  
6 - {{/ homeHeader}} 2 + <div class="mobile-container">
  3 + <div class="mobile-wrap boys-wrap yoho-page">
  4 + {{! 首页header}}
  5 + {{# homeHeader}}
  6 + {{> home/home_header}}
  7 + {{/ homeHeader}}
7 8
8 - {{> home/content}}  
9 -  
10 - {{! 商品列表}}  
11 - {{# twoColumnGoods}}  
12 - {{> home/two_column_goods}}  
13 - {{/ twoColumnGoods}} 9 + {{> home/content}}
  10 +
  11 + {{! 商品列表}}
  12 + {{# twoColumnGoods}}
  13 + {{> home/two_column_goods}}
  14 + {{/ twoColumnGoods}}
14 15
15 - <div class="overlay"></div>  
16 - {{> layout/footer_tab}} 16 + <div class="overlay"></div>
  17 + {{> layout/footer_tab}}
  18 + </div>
  19 + {{> home/side_nav}}
17 </div> 20 </div>
18 - {{> home/side_nav}}  
19 {{> layout/footer}} 21 {{> layout/footer}}
1 {{> layout/header}} 1 {{> layout/header}}
  2 +<div class="mobile-container">
2 <div class="mobile-wrap girls-wrap yoho-page"> 3 <div class="mobile-wrap girls-wrap yoho-page">
3 {{! 首页header}} 4 {{! 首页header}}
4 {{# homeHeader}} 5 {{# homeHeader}}
@@ -11,4 +12,5 @@ @@ -11,4 +12,5 @@
11 {{> layout/footer_tab}} 12 {{> layout/footer_tab}}
12 </div> 13 </div>
13 {{> home/side_nav}} 14 {{> home/side_nav}}
  15 +</div>
14 {{> layout/footer}} 16 {{> layout/footer}}
1 {{> layout/header}} 1 {{> layout/header}}
2 - 2 +<div class="mobile-container">
3 <div class="mobile-wrap kids-wrap yoho-page"> 3 <div class="mobile-wrap kids-wrap yoho-page">
4 {{! 首页header}} 4 {{! 首页header}}
5 {{# homeHeader}} 5 {{# homeHeader}}
@@ -22,4 +22,5 @@ @@ -22,4 +22,5 @@
22 {{> layout/footer_tab}} 22 {{> layout/footer_tab}}
23 </div> 23 </div>
24 {{> home/side_nav}} 24 {{> home/side_nav}}
  25 +</div>
25 {{> layout/footer}} 26 {{> layout/footer}}
1 {{> layout/header}} 1 {{> layout/header}}
  2 +<div class="mobile-container">
2 <div class="mobile-wrap lifestyle-wrap yoho-page"> 3 <div class="mobile-wrap lifestyle-wrap yoho-page">
3 {{! 首页header}} 4 {{! 首页header}}
4 {{# homeHeader}} 5 {{# homeHeader}}
@@ -20,4 +21,5 @@ @@ -20,4 +21,5 @@
20 {{> layout/footer_tab}} 21 {{> layout/footer_tab}}
21 </div> 22 </div>
22 {{> home/side_nav}} 23 {{> home/side_nav}}
  24 +</div>
23 {{> layout/footer}} 25 {{> layout/footer}}