fe / YOHOBUYWAP · Commits

Go to a project

Authored by 梁志锋
Commit 9a7c47e5f76894aafb9559c327419bc2ae8cb034 1 parent 06b9afd7

update files

Inline Side-by-side
Showing 9 changed files with 108 additions and 152 deletions
@@ -65,35 +65,38 @@ @@ -65,35 +65,38 @@
65 } 65 }
66 66
67 67
68 -.hot-brands.girls {  
69 - background: transparent;  
70 -}  
71 -  
72 .brands-swiper { 68 .brands-swiper {
73 background: #fff; 69 background: #fff;
74 width: 100%; 70 width: 100%;
75 height: 140rem / $pxConvertRem; 71 height: 140rem / $pxConvertRem;
  72 + margin-bottom: 28rem / $pxConvertRem;
76 overflow: hidden; 73 overflow: hidden;
  74 +
77 .brands-list { 75 .brands-list {
78 position: relative; 76 position: relative;
79 - padding-bottom: 29rem / $pxConvertRem;  
80 - border-bottom: 1px solid #e0e0e0; 77 + height: 140rem / $pxConvertRem;
  78 +
81 li { 79 li {
82 float: left; 80 float: left;
83 - padding-left: 30rem / $pxConvertRem;  
84 - width: 140rem / $pxConvertRem; 81 + padding-left: 5%;
  82 + width: 21.875%;
85 height: 140rem / $pxConvertRem; 83 height: 140rem / $pxConvertRem;
  84 +
86 a { 85 a {
87 position: relative; 86 position: relative;
88 display: block; 87 display: block;
89 width: 100%; 88 width: 100%;
90 height: 100%; 89 height: 100%;
  90 + line-height: 140rem / $pxConvertRem;
  91 + font-size: 0;
91 } 92 }
  93 +
92 img { 94 img {
93 - display: block;  
94 - width: 100%;  
95 - height: 100%; 95 + max-width: 100%;
  96 + max-height: 100%;
  97 + vertical-align: middle;
96 } 98 }
  99 +
97 .brands-title { 100 .brands-title {
98 position: absolute; 101 position: absolute;
99 left: 8rem / $pxConvertRem; 102 left: 8rem / $pxConvertRem;
@@ -105,6 +108,10 @@ @@ -105,6 +108,10 @@
105 font-size: 18rem / $pxConvertRem; 108 font-size: 18rem / $pxConvertRem;
106 color: #444; 109 color: #444;
107 background: rgba(255, 255, 255, 0.5); 110 background: rgba(255, 255, 255, 0.5);
  111 + overflow: hidden;
  112 + text-overflow: ellipsis;
  113 + -o-text-overflow: ellipsis;
  114 + white-space: nowrap;
108 } 115 }
109 } 116 }
110 } 117 }
@@ -11,8 +11,7 @@ @@ -11,8 +11,7 @@
11 {{/ homeHeader}} 11 {{/ homeHeader}}
12 12
13 {{> common/content}} 13 {{> common/content}}
14 -  
15 - 14 +
16 {{! 商品列表}} 15 {{! 商品列表}}
17 {{# twoColumnGoods}} 16 {{# twoColumnGoods}}
18 {{> common/two_column_goods}} 17 {{> common/two_column_goods}}
1 {{> layout/header}} 1 {{> layout/header}}
2 -<div class="mobile-container"> 2 +
3 <div class="mobile-wrap kids-wrap"> 3 <div class="mobile-wrap kids-wrap">
  4 + {{! app下载}}
  5 + {{# headerDownload}}
  6 + {{> common/header_download}}
  7 + {{/ headerDownload}}
  8 +
4 {{! 首页header}} 9 {{! 首页header}}
5 {{# homeHeader}} 10 {{# homeHeader}}
6 {{> home_header}} 11 {{> home_header}}
7 {{/ homeHeader}} 12 {{/ homeHeader}}
8 - {{# content}}  
9 - {{! 头部banner}}  
10 - {{# bannerTop}}  
11 - {{> common/banner_top}}  
12 - {{/ bannerTop}}  
13 -  
14 - {{! 图标入口}}  
15 - {{# iconsEnter}}  
16 - {{> common/icons_enter}}  
17 - {{/ iconsEnter}}  
18 -  
19 - {{! 潮流搭配}}  
20 - {{# trendColloaction}}  
21 - {{> common/trendsetter_collocation}}  
22 - {{/trendColloaction}}  
23 -  
24 - {{! 潮流话题}}  
25 - {{# trendTopics}}  
26 - {{> common/trend_topics}}  
27 - {{/ trendTopics}}  
28 -  
29 -  
30 - {{! 潮流上装}}  
31 - {{# goodsCategory}}  
32 - {{> common/goods_category}}  
33 - {{/ goodsCategory}}  
34 -  
35 - {{! 热门品牌}}  
36 - {{# hotBrands}}  
37 - {{> common/hot_brands}}  
38 - {{/ hotBrands}}  
39 -  
40 - {{! 优选品牌}}  
41 - {{# fineBrands}}  
42 - {{> common/fine_brands}}  
43 - {{/ fineBrands}}  
44 -  
45 - {{! 热门分类}}  
46 - {{# hotCategory}}  
47 - {{> girls/hot_category}}  
48 - {{/ hotCategory}}  
49 -  
50 -  
51 - {{! 热门品牌可滑动}}  
52 - {{# hotBrandsScroll}}  
53 - {{> girls/hot_brands}}  
54 - {{/ hotBrandsScroll}}  
55 -  
56 - {{! 中间banner}}  
57 - {{# bannerCenter}}  
58 - {{> common/banner_center}}  
59 - {{/ bannerCenter}}  
60 -  
61 - {{! 创意生活}}  
62 - {{# creativeLife}}  
63 - {{> common/creative_life}}  
64 - {{/ creativeLife}}  
65 -  
66 - {{! PLUS}}  
67 - {{# plusStar}}  
68 - {{> common/plus_star}}  
69 - {{/ plusStar}}  
70 - {{/ content}} 13 +
  14 + {{> common/content}}
71 15
72 {{! 商品列表}} 16 {{! 商品列表}}
73 {{# twoColumnGoods}} 17 {{# twoColumnGoods}}
@@ -78,13 +22,8 @@ @@ -78,13 +22,8 @@
78 {{# bannerBottom}} 22 {{# bannerBottom}}
79 {{> common/banner_bottom}} 23 {{> common/banner_bottom}}
80 {{/ bannerBottom}} 24 {{/ bannerBottom}}
81 -  
82 - {{! footer}}  
83 - {{# footer}}  
84 - {{> footer}}  
85 - {{/ footer}} 25 +
86 <div class="overlay"></div> 26 <div class="overlay"></div>
87 </div> 27 </div>
88 -  
89 -</div> 28 +
90 {{> layout/footer}} 29 {{> layout/footer}}
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="mobile-wrap lifestyle-wrap"> 2 <div class="mobile-wrap lifestyle-wrap">
3 - 3 + {{! app下载}}
4 {{# headerDownload}} 4 {{# headerDownload}}
5 {{> common/header_download}} 5 {{> common/header_download}}
6 {{/ headerDownload}} 6 {{/ headerDownload}}
@@ -10,6 +10,11 @@ @@ -10,6 +10,11 @@
10 {{> common/icons_enter}} 10 {{> common/icons_enter}}
11 {{/ iconsEnter}} 11 {{/ iconsEnter}}
12 12
  13 + {{! 中间banner}}
  14 + {{# bannerCenter}}
  15 + {{> common/banner_center}}
  16 + {{/ bannerCenter}}
  17 +
13 {{! 热门品类}} 18 {{! 热门品类}}
14 {{# hotCategory}} 19 {{# hotCategory}}
15 {{> girls/hot_category}} 20 {{> girls/hot_category}}
@@ -20,6 +25,11 @@ @@ -20,6 +25,11 @@
20 {{> common/hot_brands_list}} 25 {{> common/hot_brands_list}}
21 {{/ hotBrands}} 26 {{/ hotBrands}}
22 27
  28 + {{! 热门品牌可滑动}}
  29 + {{# hotBrandsScroll}}
  30 + {{> common/hot_brands_swipe}}
  31 + {{/ hotBrandsScroll}}
  32 +
23 {{! 潮人搭配}} 33 {{! 潮人搭配}}
24 {{# trendColloaction}} 34 {{# trendColloaction}}
25 {{> common/trendsetter_collocation}} 35 {{> common/trendsetter_collocation}}
@@ -30,12 +40,22 @@ @@ -30,12 +40,22 @@
30 {{> common/trend_topics}} 40 {{> common/trend_topics}}
31 {{/ trendTopics}} 41 {{/ trendTopics}}
32 42
33 - {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰}} 43 + {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}}
34 {{# goodsCategory}} 44 {{# goodsCategory}}
35 {{> common/goods_category}} 45 {{> common/goods_category}}
36 {{/ goodsCategory}} 46 {{/ goodsCategory}}
37 47
38 - 48 + {{! 新入住品牌/品味生活/创意生活}}
  49 + {{# creativeLife}}
  50 + {{> common/creative_life}}
  51 + {{/ creativeLife}}
  52 +
  53 + {{! PLUS}}
  54 + {{# plusStar}}
  55 + {{> common/plus_star}}
  56 + {{/ plusStar}}
  57 +
  58 +
39 {{! 可能喜欢}} 59 {{! 可能喜欢}}
40 {{# maybeLike}} 60 {{# maybeLike}}
41 {{> common/maybe_like}} 61 {{> common/maybe_like}}
1 <ul class="hot-brands clearfix"> 1 <ul class="hot-brands clearfix">
2 - {{> common/floor_header}} 2 +{{> common/floor_header}}
3 {{# list}} 3 {{# list}}
4 <li class="brand"> 4 <li class="brand">
5 <a href="{{url}}"> 5 <a href="{{url}}">
@@ -13,4 +13,4 @@ @@ -13,4 +13,4 @@
13 <li class="more"> 13 <li class="more">
14 <a href="{{more}}"></a> 14 <a href="{{more}}"></a>
15 </li> 15 </li>
16 -</ul> 16 +</ul>
1 -<div class="hot-brands girls"> 1 +<div class="hot-brands">
2 {{> common/floor_header}} 2 {{> common/floor_header}}
3 <div class="brands-swiper"> 3 <div class="brands-swiper">
4 <ul class="brands-list swiper-wrapper clearfix"> 4 <ul class="brands-list swiper-wrapper clearfix">
1 -{{> common/floor_header}} 1 +
2 <div class="plus-star"> 2 <div class="plus-star">
  3 + {{> common/floor_header}}
3 <a href="{{url}}"> 4 <a href="{{url}}">
4 <img class="lazy" data-original="{{img}}"> 5 <img class="lazy" data-original="{{img}}">
5 </a> 6 </a>
@@ -175,6 +175,11 @@ class GirlsController extends AbstractAction @@ -175,6 +175,11 @@ class GirlsController extends AbstractAction
175 ) 175 )
176 ) 176 )
177 ), 177 ),
  178 + 'bannerCenter' => array(
  179 + 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg',
  180 + 'url' => ''
  181 + ),
  182 +
178 'hotCategory' => array( 183 'hotCategory' => array(
179 'title' => array( 184 'title' => array(
180 'name' => '热门品类' 185 'name' => '热门品类'
@@ -369,71 +374,56 @@ class GirlsController extends AbstractAction @@ -369,71 +374,56 @@ class GirlsController extends AbstractAction
369 ) 374 )
370 ) 375 )
371 ), 376 ),
  377 + 'creativeLife' => array(
  378 + 'title' => array(
  379 + 'title' => '新入住品牌',
  380 + 'more_name' => '...',
  381 + 'more_url' => 'http://www.yohobuy.com?openby:yohobuy={"action":"go.guangchannel","params":{"id":3,"name":"\u6f6e\u4eba"}}'
  382 + ),
  383 + 'banner' => 'http://img10.static.yhbimg.com/yhb-img01/2015/07/09/18/0119ffceddb0819d36d74b408bd743b4a9.jpg?imageView/2/w/640/h/640',
  384 + 'classify' => array(
  385 + array(
  386 + 'url' => '',
  387 + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/04/10/05/029bef1041343ea2e31dc0423f2f176589.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  388 + 'name' => '手表'
  389 + ), array(
  390 + 'url' => '',
  391 + 'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/07/07/09/02271a775d17649860abec4387b4559e26.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  392 + 'name' => '烛台'
  393 + ), array(
  394 + 'url' => '',
  395 + 'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/05/19/07/02a269d20ed44803eee33e255fe88d7873.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  396 + 'name' => '围巾'
  397 + ), array(
  398 + 'url' => '',
  399 + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/06/01/07/02fe94083352435ce53b5d90812cc5bdbd.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  400 + 'name' => '盘子'
  401 + ), array(
  402 + 'url' => '',
  403 + 'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/07/08/07/028db8a2afbe4ecbf37bebc7e98e8e1e80.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  404 + 'name' => '耳机'
  405 + ), array(
  406 + 'url' => '',
  407 + 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/04/22/02/02a1b688b6dafd786f391e0624aea1e93b.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',
  408 + 'name' => '生活'
  409 + )
  410 + )
  411 + ),
372 412
373 413
374 -  
375 - 'bannerCenter' => array(  
376 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg',  
377 - 'url' => ''  
378 - ),  
379 -  
380 - 'creativeLife' => array(  
381 - 'name' => '创意生活',  
382 - 'more' => '',  
383 - 'url' => '',  
384 - 'banner' => 'http://img10.static.yhbimg.com/yhb-img01/2015/07/09/18/0119ffceddb0819d36d74b408bd743b4a9.jpg?imageView/2/w/640/h/640',  
385 - 'classify' => array(  
386 - array(  
387 - 'url' => '',  
388 - 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/04/10/05/029bef1041343ea2e31dc0423f2f176589.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
389 - 'name' => '手表'  
390 - ), array(  
391 - 'url' => '',  
392 - 'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/07/07/09/02271a775d17649860abec4387b4559e26.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
393 - 'name' => '烛台'  
394 - ), array(  
395 - 'url' => '',  
396 - 'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/05/19/07/02a269d20ed44803eee33e255fe88d7873.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
397 - 'name' => '围巾'  
398 - ), array(  
399 - 'url' => '',  
400 - 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/06/01/07/02fe94083352435ce53b5d90812cc5bdbd.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
401 - 'name' => '盘子'  
402 - ), array(  
403 - 'url' => '',  
404 - 'img' => 'http://img12.static.yhbimg.com/goodsimg/2015/07/08/07/028db8a2afbe4ecbf37bebc7e98e8e1e80.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
405 - 'name' => '耳机'  
406 - ), array(  
407 - 'url' => '',  
408 - 'img' => 'http://img13.static.yhbimg.com/goodsimg/2015/04/22/02/02a1b688b6dafd786f391e0624aea1e93b.jpg?imageMogr2/thumbnail/235x314/extent/235x314/background/d2hpdGU=/position/center/quality/90',  
409 - 'name' => '生活'  
410 - )  
411 - )  
412 - ),  
413 -  
414 -  
415 'plusStar' => array( 414 'plusStar' => array(
416 - 'name' => 'PLUS 全球优选',  
417 - 'url' => '',  
418 - 'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/07/13/15/014f7ba48071160053ac3b8f045b9fc264.jpg?imageView/2/w/640/h/640'  
419 - ),  
420 -  
421 - 'bannerCenter' => array(  
422 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg',  
423 - 'url' => ''  
424 - ),  
425 -  
426 - 'plusStar' => array(  
427 - 'name' => 'STAR 明星潮牌',  
428 - 'url' => '',  
429 - 'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/07/13/15/014f7ba48071160053ac3b8f045b9fc264.jpg?imageView/2/w/640/h/640'  
430 -  
431 - ),  
432 - 'bannerCenter' => array(  
433 - 'img' => 'http://img02.yohoboys.com/staticimg/2015/06/24/16/02ee02f1dd11c9103f7cf7995eafdaa605.jpg',  
434 - 'url' => '' 415 + array(
  416 + 'name' => 'PLUS 全球优选',
  417 + 'url' => '',
  418 + 'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/07/13/15/014f7ba48071160053ac3b8f045b9fc264.jpg?imageView/2/w/640/h/640'
  419 + ),
  420 + array(
  421 + 'name' => 'PLUS 全球优选',
  422 + 'url' => '',
  423 + 'img' => 'http://img11.static.yhbimg.com/yhb-img01/2015/07/13/15/014f7ba48071160053ac3b8f045b9fc264.jpg?imageView/2/w/640/h/640'
  424 + )
435 ), 425 ),
436 - 426 +
437 'maybeLike' => array( 427 'maybeLike' => array(
438 'goods' => array( 428 'goods' => array(
439 array( 429 array(