fe / YOHOBUYPC · Commits

Go to a project

Authored by 梁志锋
Commit 289988d4abb6cbc90eb90cff81035866aa5dfc19 2 parents 310b8ff9 78f45e92

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

Inline Side-by-side
Showing 8 changed files with 107 additions and 232 deletions
1 -{{> layout/header}}  
2 -<div class="product-list-page product-page yoho-page">  
3 - {{# list}}  
4 - {{# brandBanner}}  
5 - <div class="brand-banner">  
6 - <div class="banner-img" style="height: {{bannerHeight}}px;background: url({{banner}})"></div>  
7 - <div class="opt-wrap">  
8 - <p class="opt center-content">  
9 - <a href="{{brandHome}}">  
10 - <i class="iconfont">&#xe617;</i>  
11 - 品牌首页  
12 - </a>  
13 - <a href="{{brandIntro}}">  
14 - <i class="iconfont">&#xe618;</i>  
15 - 品牌介绍  
16 - </a>  
17 - <span id="brand-favor" class="brand-favor">  
18 - <i class="iconfont{{#if coled}} coled{{/if}}">&#xe616;</i>  
19 - </span>  
20 - </p>  
21 - </div>  
22 - </div>  
23 - {{/ brandBanner}}  
24 -  
25 - <div class="center-content clearfix">  
26 - {{> layout/path-nav}}  
27 -  
28 - {{# brandAbout}}  
29 - <div class="brand-about">  
30 - {{{brandIntro}}}  
31 - </div>  
32 - {{^}}  
33 - <div class="list-left pull-left">  
34 - {{> product/left-content}}  
35 - </div>  
36 - <div class="list-right pull-right">  
37 - {{# shopEntry}}  
38 - <div class="shop-entry clearfix">  
39 - <a class="pull-left" href="{{home}}">  
40 - <img class="logo" src="{{logo}}">  
41 - </a>  
42 -  
43 - <div class="name pull-left">  
44 - <a class="shop-name" href="{{home}}">{{shopName}}</a>  
45 - <p class="sorts">  
46 - {{#each sort}}  
47 - <a href="{{href}}">{{name}}</a>  
48 -  
49 - {{#unless @last}}  
50 - /  
51 - {{/unless}}  
52 - {{/each}}  
53 - </p>  
54 - </div>  
55 -  
56 - <a class="entry-btn pull-right" href="{{home}}">  
57 - 进入品牌店铺  
58 - <span class="iconfont">&#xe601;</span>  
59 - </a>  
60 - </div>  
61 - {{/ shopEntry}}  
62 -  
63 - {{> product/standard-content}}  
64 -  
65 - {{> product/latest-walk}}  
66 - </div>  
67 - {{/ brandAbout}}  
68 - </div>  
69 - {{/ list}}  
70 -</div>  
71 -{{> layout/footer}}  
  1 +{{> product/list}}
1 -{{> layout/header}}  
2 -<div class="product-list-page product-page yoho-page">  
3 - {{# list}}  
4 - {{# brandBanner}}  
5 - <div class="brand-banner">  
6 - <div class="banner-img" style="height: {{bannerHeight}}px;background: url({{banner}})"></div>  
7 - <div class="opt-wrap">  
8 - <p class="opt center-content">  
9 - <a href="{{brandHome}}">  
10 - <i class="iconfont">&#xe617;</i>  
11 - 品牌首页  
12 - </a>  
13 - <a href="{{brandIntro}}">  
14 - <i class="iconfont">&#xe618;</i>  
15 - 品牌介绍  
16 - </a>  
17 - <span id="brand-favor" class="brand-favor">  
18 - <i class="iconfont{{#if coled}} coled{{/if}}">&#xe616;</i>  
19 - </span>  
20 - </p>  
21 - </div>  
22 - </div>  
23 - {{/ brandBanner}}  
24 -  
25 - <div class="center-content clearfix">  
26 - {{> layout/path-nav}}  
27 -  
28 - {{# brandAbout}}  
29 - <div class="brand-about">  
30 - {{{brandIntro}}}  
31 - </div>  
32 - {{^}}  
33 - <div class="list-left pull-left">  
34 - {{> product/left-content}}  
35 - </div>  
36 - <div class="list-right pull-right">  
37 - {{> product/standard-content}}  
38 -  
39 - {{> product/latest-walk}}  
40 - </div>  
41 - {{/ brandAbout}}  
42 - </div>  
43 - {{/ list}}  
44 -</div>  
45 -{{> layout/footer}}  
  1 +{{> product/list}}
1 -{{> layout/header}}  
2 -<div class="new-sale-page product-page yoho-page">  
3 - {{# newSale}}  
4 - {{# saleBanner}}  
5 - <div class="banner-img" style="height: {{bannerHeight}}px;background:url({{img}}) no-repeat top center;"></div>  
6 - {{/ saleBanner}}  
7 -  
8 - <div class="center-content clearfix">  
9 - {{> layout/path-nav}}  
10 -  
11 - {{# saleTitle}}  
12 - <div class="header-title">  
13 - {{name}}  
14 - <p class="line-through"></p>  
15 - <p class="count-wrap">  
16 - <span class="count">共{{count}}个结果</span>  
17 - </p>  
18 - </div>  
19 - {{/ saleTitle}}  
20 -  
21 - <div class="list-left pull-left">  
22 - {{> product/left-content}}  
23 - </div>  
24 -  
25 - <div class="list-right pull-right">  
26 - {{# newMain}}  
27 - <div class="new-banner">  
28 - <a href="{{bannerHref}}">  
29 - <img src="{{banner}}">  
30 - </a>  
31 - </div>  
32 - <div class="new-brands clearfix">  
33 - <span class="iconfont pre">&#xe607;</span>  
34 - <div class="brands-wrap">  
35 - <ul class="brands">  
36 - {{# brands}}  
37 - <li>  
38 - <a href="{{href}}">  
39 - <img src="{{logo}}">  
40 - </a>  
41 - </li>  
42 - {{/ brands}}  
43 - </ul>  
44 - </div>  
45 - <span class="iconfont next">&#xe608;</span>  
46 - </div>  
47 - <div class="new-floor-title">  
48 - <span class="date">{{date}}</span>  
49 - <span class="title">{{title}}</span>  
50 - </div>  
51 - {{/ newMain}}  
52 -  
53 - {{> product/standard-content}}  
54 - </div>  
55 - </div>  
56 - {{/ newSale}}  
57 -</div>  
58 -{{> layout/footer}}  
  1 +{{> product/new-sale}}
1 -{{> layout/header}}  
2 -<div class="new-sale-page product-page yoho-page">  
3 - {{# newSale}}  
4 - {{# saleBanner}}  
5 - <div class="banner-img" style="height: {{bannerHeight}}px;background:url({{img}}) no-repeat top center;"></div>  
6 - {{/ saleBanner}}  
7 -  
8 - <div class="center-content clearfix">  
9 - {{> layout/path-nav}}  
10 -  
11 - {{# saleTitle}}  
12 - <div class="header-title">  
13 - {{name}}  
14 - <p class="line-through"></p>  
15 - <p class="count-wrap">  
16 - <span class="count">共{{count}}个结果</span>  
17 - </p>  
18 - </div>  
19 - {{/ saleTitle}}  
20 -  
21 - <div class="list-left pull-left">  
22 - {{> product/left-content}}  
23 - </div>  
24 -  
25 - <div class="list-right pull-right">  
26 - {{# newMain}}  
27 - <div class="new-banner">  
28 - <a href="{{bannerHref}}">  
29 - <img src="{{banner}}">  
30 - </a>  
31 - </div>  
32 - <div class="new-brands clearfix">  
33 - <span class="iconfont pre">&#xe607;</span>  
34 - <div class="brands-wrap">  
35 - <ul class="brands">  
36 - {{# brands}}  
37 - <li>  
38 - <a href="{{href}}">  
39 - <img src="{{logo}}">  
40 - </a>  
41 - </li>  
42 - {{/ brands}}  
43 - </ul>  
44 - </div>  
45 - <span class="iconfont next">&#xe608;</span>  
46 - </div>  
47 - <div class="new-floor-title">  
48 - <span class="date">{{date}}</span>  
49 - <span class="title">{{title}}</span>  
50 - </div>  
51 - {{/ newMain}}  
52 -  
53 - {{> product/standard-content}}  
54 - </div>  
55 - </div>  
56 - {{/ newSale}}  
57 -</div>  
58 -{{> layout/footer}}  
  1 +{{> product/new-sale}}
  1 +{{> layout/header}}
  2 +<div class="product-list-page product-page yoho-page">
  3 + {{# list}}
  4 + {{# brandBanner}}
  5 + <div class="brand-banner">
  6 + <div class="banner-img" style="height: {{bannerHeight}}px;background: url({{banner}})"></div>
  7 + <div class="opt-wrap">
  8 + <p class="opt center-content">
  9 + <a href="{{brandHome}}">
  10 + <i class="iconfont">&#xe617;</i>
  11 + 品牌首页
  12 + </a>
  13 + <a href="{{brandIntro}}">
  14 + <i class="iconfont">&#xe618;</i>
  15 + 品牌介绍
  16 + </a>
  17 + <span id="brand-favor" class="brand-favor">
  18 + <i class="iconfont{{#if coled}} coled{{/if}}">&#xe616;</i>
  19 + </span>
  20 + </p>
  21 + </div>
  22 + </div>
  23 + {{/ brandBanner}}
  24 +
  25 + <div class="center-content clearfix">
  26 + {{> layout/path-nav}}
  27 +
  28 + {{# brandAbout}}
  29 + <div class="brand-about">
  30 + {{{brandIntro}}}
  31 + </div>
  32 + {{^}}
  33 + <div class="list-left pull-left">
  34 + {{> product/left-content}}
  35 + </div>
  36 + <div class="list-right pull-right">
  37 + {{> product/standard-content}}
  38 +
  39 + {{> product/latest-walk}}
  40 + </div>
  41 + {{/ brandAbout}}
  42 + </div>
  43 + {{/ list}}
  44 +</div>
  45 +{{> layout/footer}}
  1 +{{> layout/header}}
  2 +<div class="new-sale-page product-page yoho-page">
  3 + {{# newSale}}
  4 + {{# saleBanner}}
  5 + <div class="banner-img" style="height: {{bannerHeight}}px;background:url({{img}}) no-repeat top center;"></div>
  6 + {{/ saleBanner}}
  7 +
  8 + <div class="center-content clearfix">
  9 + {{> layout/path-nav}}
  10 +
  11 + {{# saleTitle}}
  12 + <div class="header-title">
  13 + {{name}}
  14 + <p class="line-through"></p>
  15 + <p class="count-wrap">
  16 + <span class="count">共{{count}}个结果</span>
  17 + </p>
  18 + </div>
  19 + {{/ saleTitle}}
  20 +
  21 + <div class="list-left pull-left">
  22 + {{> product/left-content}}
  23 + </div>
  24 +
  25 + <div class="list-right pull-right">
  26 + {{# newMain}}
  27 + <div class="new-banner">
  28 + <a href="{{bannerHref}}">
  29 + <img src="{{banner}}">
  30 + </a>
  31 + </div>
  32 + <div class="new-brands clearfix">
  33 + <span class="iconfont pre">&#xe607;</span>
  34 + <div class="brands-wrap">
  35 + <ul class="brands">
  36 + {{# brands}}
  37 + <li>
  38 + <a href="{{href}}">
  39 + <img src="{{logo}}">
  40 + </a>
  41 + </li>
  42 + {{/ brands}}
  43 + </ul>
  44 + </div>
  45 + <span class="iconfont next">&#xe608;</span>
  46 + </div>
  47 + <div class="new-floor-title">
  48 + <span class="date">{{date}}</span>
  49 + <span class="title">{{title}}</span>
  50 + </div>
  51 + {{/ newMain}}
  52 +
  53 + {{> product/standard-content}}
  54 + </div>
  55 + </div>
  56 + {{/ newSale}}
  57 +</div>
  58 +{{> layout/footer}}