fe / yohobuy-mobile · Commits

Go to a project

Authored by unknown
Commit 35a9440d0fb39a35aabf3a1250de42d5ed7ada72 1 parent 651bc4f2

h5 边线不对齐

Inline Side-by-side
Showing 2 changed files with 27 additions and 43 deletions
@@ -110,6 +110,7 @@ module.exports = { @@ -110,6 +110,7 @@ module.exports = {
110 }, { 110 }, {
111 hotBrands: { 111 hotBrands: {
112 name: '热门品牌', 112 name: '热门品牌',
  113 + more: 'www.baidu.com',
113 brands: [{ 114 brands: [{
114 url: '', 115 url: '',
115 img: 'http://img11.static.yhbimg.com/brandLogo/2014/12/24/17/010c9d590aa72776d6fa9c7b29c0dbf02e.jpg?imageMogr2/thumbnail/100x100/extent/100x100/background/d2hpdGU=/position/center', 116 img: 'http://img11.static.yhbimg.com/brandLogo/2014/12/24/17/010c9d590aa72776d6fa9c7b29c0dbf02e.jpg?imageMogr2/thumbnail/100x100/extent/100x100/background/d2hpdGU=/position/center',
@@ -134,7 +135,8 @@ module.exports = { @@ -134,7 +135,8 @@ module.exports = {
134 url: '', 135 url: '',
135 img: 'http://img13.static.yhbimg.com/brandLogo/2014/01/10/15/02e40864fc98561c2aac569e4affa3445a.jpg?imageMogr2/thumbnail/100x100/extent/100x100/background/d2hpdGU=/position/center', 136 img: 'http://img13.static.yhbimg.com/brandLogo/2014/01/10/15/02e40864fc98561c2aac569e4affa3445a.jpg?imageMogr2/thumbnail/100x100/extent/100x100/background/d2hpdGU=/position/center',
136 name: 'EVISU' 137 name: 'EVISU'
137 - }] 138 + }],
  139 +
138 } 140 }
139 }, { 141 }, {
140 trendColloaction: { 142 trendColloaction: {
@@ -188,44 +190,6 @@ module.exports = { @@ -188,44 +190,6 @@ module.exports = {
188 } 190 }
189 }, { 191 }, {
190 goodsCategory: { 192 goodsCategory: {
191 - name: '潮流上装',  
192 - more: '',  
193 - banner: {  
194 - list: [{  
195 - img: 'http://img10.static.yhbimg.com/yhb-img01/2015/07/09/18/0119ffceddb0819d36d74b408bd743b4a9.jpg?imageView/2/w/640/h/640',  
196 - url: ''  
197 - }, {  
198 - img: 'http://img10.static.yhbimg.com/yhb-img01/2015/07/09/18/0119ffceddb0819d36d74b408bd743b4a9.jpg?imageView/2/w/640/h/640',  
199 - url: ''  
200 - }, {  
201 - img: 'http://img10.static.yhbimg.com/yhb-img01/2015/07/09/18/0119ffceddb0819d36d74b408bd743b4a9.jpg?imageView/2/w/640/h/640',  
202 - url: ''  
203 - }]  
204 - },  
205 - list: [{  
206 - url: '',  
207 - img: 'http://img13.static.yhbimg.com/goodsimg/2015/04/10/05/029bef1041343ea2e31dc0423f2f176589.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
208 - textCn: '手表'  
209 - }, {  
210 - url: '',  
211 - img: 'http://img12.static.yhbimg.com/goodsimg/2015/07/07/09/02271a775d17649860abec4387b4559e26.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
212 - textCn: '烛台'  
213 - }, {  
214 - url: '',  
215 - img: 'http://img12.static.yhbimg.com/goodsimg/2015/05/19/07/02a269d20ed44803eee33e255fe88d7873.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
216 - textCn: '围巾'  
217 - }, {  
218 - url: '',  
219 - img: 'http://img13.static.yhbimg.com/goodsimg/2015/06/01/07/02fe94083352435ce53b5d90812cc5bdbd.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
220 - textCn: '盘子'  
221 - }, {  
222 - url: '',  
223 - img: 'http://img12.static.yhbimg.com/goodsimg/2015/07/08/07/028db8a2afbe4ecbf37bebc7e98e8e1e80.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
224 - textCn: '耳机'  
225 - }]  
226 - }  
227 - }, {  
228 - goodsCategory: {  
229 name: '经典裤装', 193 name: '经典裤装',
230 more: '', 194 more: '',
231 banner: { 195 banner: {
@@ -2,10 +2,12 @@ @@ -2,10 +2,12 @@
2 position: relative; 2 position: relative;
3 height: 400rem / $pxConvertRem; 3 height: 400rem / $pxConvertRem;
4 overflow: hidden; 4 overflow: hidden;
  5 +
5 ul { 6 ul {
6 li { 7 li {
7 float: left; 8 float: left;
8 width: 100%; 9 width: 100%;
  10 +
9 a, img { 11 a, img {
10 display: block; 12 display: block;
11 width: 100%; 13 width: 100%;
@@ -13,14 +15,17 @@ @@ -13,14 +15,17 @@
13 } 15 }
14 } 16 }
15 } 17 }
  18 +
16 .swiper-pagination { 19 .swiper-pagination {
17 position: absolute; 20 position: absolute;
18 left: 0; 21 left: 0;
19 right: 0; 22 right: 0;
20 bottom: 20rem / $pxConvertRem; 23 bottom: 20rem / $pxConvertRem;
21 text-align: center; 24 text-align: center;
  25 +
22 .pagination-inner { 26 .pagination-inner {
23 display: inline-block; 27 display: inline-block;
  28 +
24 span { 29 span {
25 display: inline-block; 30 display: inline-block;
26 width: 14rem / $pxConvertRem; 31 width: 14rem / $pxConvertRem;
@@ -30,6 +35,7 @@ @@ -30,6 +35,7 @@
30 margin: 0 (9rem / $pxConvertRem); 35 margin: 0 (9rem / $pxConvertRem);
31 border-radius: 50%; 36 border-radius: 50%;
32 } 37 }
  38 +
33 span.swiper-pagination-bullet-active { 39 span.swiper-pagination-bullet-active {
34 opacity: 1; 40 opacity: 1;
35 } 41 }
@@ -37,30 +43,37 @@ @@ -37,30 +43,37 @@
37 } 43 }
38 } 44 }
39 45
40 -.goods-category{ 46 +.goods-category {
41 background: #fff; 47 background: #fff;
42 } 48 }
  49 +
43 .goods-category .category-list { 50 .goods-category .category-list {
44 - height: 383rem / $pxConvertRem; 51 + height: 382rem / $pxConvertRem;
  52 + border-bottom: 1px solid #e0e0e0;
  53 + overflow: hidden;
  54 +
45 li { 55 li {
46 float: left; 56 float: left;
47 width: 191rem / $pxConvertRem; 57 width: 191rem / $pxConvertRem;
48 height: 191rem / $pxConvertRem; 58 height: 191rem / $pxConvertRem;
49 border-left: 1px solid #e0e0e0; 59 border-left: 1px solid #e0e0e0;
50 - border-bottom: 1px solid #e0e0e0; 60 +
51 .first-show { 61 .first-show {
52 display: none; 62 display: none;
53 } 63 }
  64 +
54 .img-box { 65 .img-box {
55 height: 100%; 66 height: 100%;
56 line-height: 100%; 67 line-height: 100%;
57 text-align: center; 68 text-align: center;
  69 +
58 img { 70 img {
59 width: 100%; 71 width: 100%;
60 height: 100%; 72 height: 100%;
61 vertical-align: middle; 73 vertical-align: middle;
62 } 74 }
63 } 75 }
  76 +
64 .category-name { 77 .category-name {
65 line-height: 32rem / $pxConvertRem; 78 line-height: 32rem / $pxConvertRem;
66 font-size: 20rem / $pxConvertRem; 79 font-size: 20rem / $pxConvertRem;
@@ -68,17 +81,24 @@ @@ -68,17 +81,24 @@
68 text-align: center; 81 text-align: center;
69 } 82 }
70 } 83 }
  84 +
71 li:first-child { 85 li:first-child {
72 width: 253rem / $pxConvertRem; 86 width: 253rem / $pxConvertRem;
73 - height: 383rem / $pxConvertRem; 87 + height: 382rem / $pxConvertRem;
74 border-left: none; 88 border-left: none;
  89 +
75 .img-box { 90 .img-box {
76 height: 100%; 91 height: 100%;
77 line-height: 100%; 92 line-height: 100%;
78 } 93 }
  94 +
79 .category-name { 95 .category-name {
80 line-height: 40rem / $pxConvertRem; 96 line-height: 40rem / $pxConvertRem;
81 font-size: 22rem / $pxConvertRem; 97 font-size: 22rem / $pxConvertRem;
82 } 98 }
83 } 99 }
  100 +
  101 + li:nth-child(4), li:nth-child(5) {
  102 + border-top: 1px solid #e0e0e0;
  103 + }
84 } 104 }