张泽世 / yohobuywap-node · Commits

Go to a project

Authored by 毕凯
Commit 5a14d0e3490d4b67233488f16ea7d2adc9f5dd37 2 parents 319a1783 8bacf885

Merge branch 'feature/channel' of git.dev.yoho.cn:web/yohobuy-node into feature/channel

Inline Side-by-side
Showing 7 changed files with 35 additions and 28 deletions
@@ -32,13 +32,13 @@ @@ -32,13 +32,13 @@
32 {{> channel/hot-brands-swipe}} 32 {{> channel/hot-brands-swipe}}
33 {{/hotBrandsScroll}} 33 {{/hotBrandsScroll}}
34 {{! 潮人搭配}} 34 {{! 潮人搭配}}
35 - {{#trendColloaction}} 35 + {{#trendsetterCollocation}}
36 {{> channel/trendsetter-collocation}} 36 {{> channel/trendsetter-collocation}}
37 - {{/trendColloaction}} 37 + {{/trendsetterCollocation}}
38 {{! 潮流话题}} 38 {{! 潮流话题}}
39 - {{#trendTopics}} 39 + {{#trendgoodsTopic}}
40 {{> channel/trend-topics}} 40 {{> channel/trend-topics}}
41 - {{/trendTopics}} 41 + {{/trendgoodsTopic}}
42 {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}} 42 {{! 潮流时装/经典裤裙/时尚靴履/潮人配饰/潮流上装}}
43 {{#recommendContentOne}} 43 {{#recommendContentOne}}
44 {{> channel/goods-category}} 44 {{> channel/goods-category}}
@@ -48,9 +48,9 @@ @@ -48,9 +48,9 @@
48 {{> channel/creative-life}} 48 {{> channel/creative-life}}
49 {{/recommendContentTwo}} 49 {{/recommendContentTwo}}
50 {{! PLUS}} 50 {{! PLUS}}
51 - {{#plusStar}} 51 + {{#if singleNameImage}}
52 {{> channel/plus-star}} 52 {{> channel/plus-star}}
53 - {{/plusStar}} 53 + {{/if}}
54 {{! 新人专享}} 54 {{! 新人专享}}
55 {{#freshOnly}} 55 {{#freshOnly}}
56 {{> channel/fresh-only}} 56 {{> channel/fresh-only}}
1 {{# title}} 1 {{# title}}
2 <div class="floor-header-more"> 2 <div class="floor-header-more">
3 <h2>{{title}}</h2> 3 <h2>{{title}}</h2>
4 - {{#if more_url}}  
5 - <a class="more-btn iconfont" href="{{more_url}}">&#xe618;</a> 4 + {{#if moreUrl}}
  5 + <a class="more-btn iconfont" href="{{moreUrl}}">&#xe618;</a>
6 {{/if}} 6 {{/if}}
7 </div> 7 </div>
8 {{/ title}} 8 {{/ title}}
1 {{#data}} 1 {{#data}}
  2 + {{log this}}
2 {{> channel/floor-header-more}} 3 {{> channel/floor-header-more}}
3 <div class="goods-category"> 4 <div class="goods-category">
4 {{# bigImage}} 5 {{# bigImage}}
1 -  
2 -<div class="plus-star">  
3 - {{> home/floor_header}} 1 +{{#data}}
  2 + <div class="plus-star">
  3 + {{> channel/floor-header}}
4 <a href="{{url}}"> 4 <a href="{{url}}">
5 - <img class="lazy" data-original="{{img}}"> 5 + <img class="lazy" data-original="{{image src 640 198}}">
6 </a> 6 </a>
7 -</div>  
  7 + </div>
  8 +{{/data}}
1 <div id="thumb-row"> 1 <div id="thumb-row">
2 - {{# list}} 2 + {{# data}}
3 <a href="{{url}}"> 3 <a href="{{url}}">
4 - <div class="thumb-row-box" style="background-image:url({{img}})"></div> 4 + <div class="thumb-row-box" style="background-image:url({{image src 275 160}})"></div>
5 </a> 5 </a>
6 - {{/ list}} 6 + {{/ data}}
7 </div> 7 </div>
1 -<div class="trend-topic-wrapper">  
2 - {{> home/floor_header_more}} 1 +{{#data}}
  2 +{{log this}}
  3 + <div class="trend-topic-wrapper">
  4 + {{> channel/floor-header-more}}
3 <div class="trend-topic-content"> 5 <div class="trend-topic-content">
4 <div class="trend-topic-swiper"> 6 <div class="trend-topic-swiper">
5 <ul class="swiper-wrapper"> 7 <ul class="swiper-wrapper">
@@ -7,13 +9,13 @@ @@ -7,13 +9,13 @@
7 <li class="swiper-slide"> 9 <li class="swiper-slide">
8 <a href="{{url}}"> 10 <a href="{{url}}">
9 <div class="img-box"> 11 <div class="img-box">
10 - <img class="lazy" data-original="{{img}}" src="{{img}}" alt=""> 12 + <img class="lazy" data-original="{{image src 580 360}}" src="{{image src 580 360}}" alt="">
11 </div> 13 </div>
12 <div class="item-content"> 14 <div class="item-content">
13 <p class="title">{{title}}</p> 15 <p class="title">{{title}}</p>
14 <p class="time"> 16 <p class="time">
15 <span class="iconfont time-icon">&#xe603;</span> 17 <span class="iconfont time-icon">&#xe603;</span>
16 - <span>{{publish_time}}</span> 18 + <span>{{publishTime}}</span>
17 </p> 19 </p>
18 </div> 20 </div>
19 </a> 21 </a>
@@ -26,4 +28,5 @@ @@ -26,4 +28,5 @@
26 </div> 28 </div>
27 </div> 29 </div>
28 </div> 30 </div>
29 -</div> 31 + </div>
  32 +{{/data}}
1 -<div class="trend-coll-wrapper">  
2 - {{> home/floor_header_more}} 1 +{{#data}}
  2 + <div class="trend-coll-wrapper">
  3 + {{> channel/floor-header-more}}
3 <div class="trend-coll-content clearfix"> 4 <div class="trend-coll-content clearfix">
4 {{# article}} 5 {{# article}}
5 <div class="lspan"> 6 <div class="lspan">
6 - <a href="{{url}}"><img class="lazy rspanimg" data-original="{{img}}" ></a> 7 + <a href="{{url}}"><img class="lazy rspanimg" data-original="{{image src 400 400}}" ></a>
7 </div> 8 </div>
8 {{/ article}} 9 {{/ article}}
9 </div> 10 </div>
@@ -11,12 +12,13 @@ @@ -11,12 +12,13 @@
11 <h3 class="recommend-title">推荐搭配</h3> 12 <h3 class="recommend-title">推荐搭配</h3>
12 <div class="recommend-swiper"> 13 <div class="recommend-swiper">
13 <ul class="recommend-list swiper-wrapper clearfix"> 14 <ul class="recommend-list swiper-wrapper clearfix">
14 - {{# recommend_collocation}}  
15 - <li class="recommend-item swiper-slide"><a href="{{url}}"><img class="img" src="{{img}}" alt="" /></a></li>  
16 - {{/ recommend_collocation}} 15 + {{# recommendCollocation}}
  16 + <li class="recommend-item swiper-slide"><a href="{{url}}"><img class="img" src="{{image src 140 140}}" alt="" /></a></li>
  17 + {{/ recommendCollocation}}
17 </ul> 18 </ul>
18 </div> 19 </div>
19 </div> 20 </div>
20 -</div> 21 + </div>
  22 +{{/data}}
21 23
22 24