fe / YOHOBUYWAP · Commits

Go to a project

Authored by ccbikai
Commit f00009ba8ac4e606c0173bd11daf1796278178e8 2 parents d88524e4 fff57cc7

Merge branch 'bugfix' into develop

Inline Side-by-side
Showing 8 changed files with 23 additions and 15 deletions
@@ -24,6 +24,10 @@ $clothes: sprite-map("guang/clothes/*.png"); @@ -24,6 +24,10 @@ $clothes: sprite-map("guang/clothes/*.png");
24 } 24 }
25 25
26 .guang-detail-page { 26 .guang-detail-page {
  27 + #wrapper {
  28 + background: #f0f0f0;
  29 + }
  30 +
27 #wrapper.ios { 31 #wrapper.ios {
28 position: absolute; 32 position: absolute;
29 top: 0; 33 top: 0;
@@ -73,6 +73,7 @@ @@ -73,6 +73,7 @@
73 73
74 .info-list-container { 74 .info-list-container {
75 overflow-x: hidden; 75 overflow-x: hidden;
  76 + background: #f0f0f0;
76 } 77 }
77 78
78 .info-list.hide { 79 .info-list.hide {
@@ -29,8 +29,8 @@ @@ -29,8 +29,8 @@
29 } 29 }
30 } */ 30 } */
31 .home-header { 31 .home-header {
32 - height: 88rem / $pxConvertRem;  
33 - line-height: 88rem / $pxConvertRem; 32 + height: 90rem / $pxConvertRem;
  33 + line-height: 90rem / $pxConvertRem;
34 @include background-image(linear-gradient(#323232, #414141)); 34 @include background-image(linear-gradient(#323232, #414141));
35 position: relative; 35 position: relative;
36 .iconfont { 36 .iconfont {
@@ -14,16 +14,18 @@ @@ -14,16 +14,18 @@
14 border-right: 1px solid #e0e0e0; 14 border-right: 1px solid #e0e0e0;
15 border-top: 1px solid #e0e0e0; 15 border-top: 1px solid #e0e0e0;
16 overflow: hidden; 16 overflow: hidden;
  17 + background: #fff;
17 18
18 .brand-logo { 19 .brand-logo {
19 - width: 100%; 20 + display: table-cell;
  21 + width: 3.95rem;
20 height: 128rem / $pxConvertRem; 22 height: 128rem / $pxConvertRem;
21 line-height: 128rem / $pxConvertRem; 23 line-height: 128rem / $pxConvertRem;
22 text-align: center; 24 text-align: center;
23 font-size: 0; 25 font-size: 0;
  26 + vertical-align: middle;
24 27
25 img { 28 img {
26 - vertical-align: middle;  
27 max-width: 100%; 29 max-width: 100%;
28 max-height: 100%; 30 max-height: 100%;
29 } 31 }
@@ -52,7 +54,8 @@ @@ -52,7 +54,8 @@
52 width: 317rem / $pxConvertRem; 54 width: 317rem / $pxConvertRem;
53 height: 174rem / $pxConvertRem; 55 height: 174rem / $pxConvertRem;
54 border-top: 1px solid #e0e0e0; 56 border-top: 1px solid #e0e0e0;
55 - 57 + background: #fff;
  58 +
56 a { 59 a {
57 display: block; 60 display: block;
58 width: 100%; 61 width: 100%;
@@ -68,7 +71,7 @@ @@ -68,7 +71,7 @@
68 background: #fff; 71 background: #fff;
69 width: 100%; 72 width: 100%;
70 height: 140rem / $pxConvertRem; 73 height: 140rem / $pxConvertRem;
71 - margin-bottom: 28rem / $pxConvertRem; 74 + // margin-bottom: 28rem / $pxConvertRem;
72 border-top: 1px solid #e0e0e0; 75 border-top: 1px solid #e0e0e0;
73 overflow: hidden; 76 overflow: hidden;
74 77
@@ -30,11 +30,11 @@ @@ -30,11 +30,11 @@
30 30
31 .nav-icon, .nav-img { 31 .nav-icon, .nav-img {
32 position: absolute; 32 position: absolute;
33 - width: 60rem / $pxConvertRem;  
34 - height: 60rem / $pxConvertRem; 33 + width: 48rem / $pxConvertRem;
  34 + height: 48rem / $pxConvertRem;
35 top: 50%; 35 top: 50%;
36 - margin-top: -30rem / $pxConvertRem;  
37 - left: 24rem / $pxConvertRem; 36 + margin-top: -24rem / $pxConvertRem;
  37 + left: 30rem / $pxConvertRem;
38 } 38 }
39 39
40 .enter-subnav { 40 .enter-subnav {
@@ -4,8 +4,8 @@ @@ -4,8 +4,8 @@
4 color: #fff; 4 color: #fff;
5 width: 100%; 5 width: 100%;
6 overflow: hidden; 6 overflow: hidden;
7 - height: 88rem / $pxConvertRem;  
8 - line-height: 88rem / $pxConvertRem; 7 + height: 90rem / $pxConvertRem;
  8 + line-height: 90rem / $pxConvertRem;
9 9
10 &.boys { 10 &.boys {
11 @include background-image(linear-gradient(#323232, #414141)); 11 @include background-image(linear-gradient(#323232, #414141));
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 3
4 .swiper-container { 4 .swiper-container {
5 width: 100%; 5 width: 100%;
6 - height: 240rem / $pxConvertRem; 6 + height: 200rem / $pxConvertRem;
7 7
8 img { 8 img {
9 height: 100%; 9 height: 100%;
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 23
24 .banner-top-single{ 24 .banner-top-single{
25 width: 100%; 25 width: 100%;
26 - height: 240rem / $pxConvertRem; 26 + height: 200rem / $pxConvertRem;
27 img { 27 img {
28 display: block; 28 display: block;
29 height: 100%; 29 height: 100%;
@@ -48,7 +48,7 @@ class SideModel @@ -48,7 +48,7 @@ class SideModel
48 $result[$key]['textEn'] = $value['sort_name_en']; 48 $result[$key]['textEn'] = $value['sort_name_en'];
49 $result[$key]['styleClass'] = strtolower($value['sort_name_en']); 49 $result[$key]['styleClass'] = strtolower($value['sort_name_en']);
50 $result[$key]['url'] = Helpers::getFilterUrl($value['sort_url']); 50 $result[$key]['url'] = Helpers::getFilterUrl($value['sort_url']);
51 - $result[$key]['img'] = Helpers::getImageUrl($value['sort_ico'], 60, 60); 51 + $result[$key]['img'] = Helpers::getImageUrl($value['sort_ico'], 60, 60, 1);
52 } 52 }
53 } 53 }
54 54