Authored by lore-w

Merge branch 'test' into develop

  1 +{{> layout/header_fan}}
  2 +{{> channel/banner_top}}
  3 +{{> channel/content}}
  4 +{{> channel/pager}}
  5 +{{> layout/footer_fan}}
1 {{> layout/header_fan}} 1 {{> layout/header_fan}}
2 {{> channel/banner_top}} 2 {{> channel/banner_top}}
3 -{{> channel/content}} 3 +<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
  4 + {{^ trialTop}}
  5 + {{# contentWithNothing}}
  6 + {{# topItems}}
  7 + {{> channel/item}}
  8 + {{/ topItems}}
  9 + {{/ contentWithNothing}}
  10 +
  11 + {{# contentWithAdvert}}
  12 + {{# topItems}}
  13 + {{> channel/item}}
  14 + {{/ topItems}}
  15 + {{> channel/banner_right}}
  16 + {{# bottomItems}}
  17 + {{> channel/item}}
  18 + {{/ bottomItems}}
  19 + {{/ contentWithAdvert}}
  20 +
  21 + {{# contentWithCenterBanner}}
  22 + {{# topItems}}
  23 + {{> channel/item}}
  24 + {{/ topItems}}
  25 + {{> channel/banner_center}}
  26 + {{# bottomItems}}
  27 + {{> channel/item}}
  28 + {{/ bottomItems}}
  29 + {{/ contentWithCenterBanner}}
  30 +
  31 + {{# contentWithAll}}
  32 + {{# topItems1}}
  33 + {{> channel/item}}
  34 + {{/ topItems1}}
  35 + {{> channel/banner_right}}
  36 + {{# topItems2}}
  37 + {{> channel/item}}
  38 + {{/ topItems2}}
  39 + {{> channel/banner_center}}
  40 + {{# bottomItems}}
  41 + {{> channel/item}}
  42 + {{/ bottomItems}}
  43 + {{/ contentWithAll}}
  44 +
  45 + {{> channel/follow_us}}
  46 +
  47 + {{/ trialTop}}
  48 +
  49 + {{# trialTop}}
  50 + {{# contentWithNothing}}
  51 + <div class="content-items-group-left">
  52 + {{# topItemsLeft}}
  53 + {{> channel/item}}
  54 + {{/ topItemsLeft}}
  55 + </div>
  56 + <div class="trial-top trial-has-bottom-border">
  57 + {{# topTen}}
  58 + <span class="content-item-detail-a-img">
  59 + <a href="{{link}}" target="_blank" class="link" title="{{title}}"
  60 + onclick="YOHODCLICK('channel','web','content')">
  61 + <img class="lazy pic"
  62 + src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
  63 + data-original="{{img}}" alt="{{title}}" style="display: inline;">
  64 + </a>
  65 + </span>
  66 +
  67 + <h2 class="beauty-top-h2">本周试用排行榜</h2>
  68 + {{# top}}
  69 + <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
  70 + <span class="top-leading"></span>
  71 +
  72 + <div class="top-content">
  73 + <h2>{{title}}</h2>
  74 +
  75 + <h3>{{subTitle}}</h3>
  76 + </div>
  77 + <span class="top-like-num {{bestLike}}">{{likeNum}}</span>
  78 + </a>
  79 + {{/ top}}
  80 + {{/ topTen}}
  81 + </div>
  82 + <div class="content-items-group-right">
  83 + {{# topItemsRight}}
  84 + {{> channel/item}}
  85 + {{/ topItemsRight}}
  86 + </div>
  87 + <div class="content-items-group-bottom">
  88 + {{# topItemsBottom}}
  89 + {{> channel/item}}
  90 + {{/ topItemsBottom}}
  91 + {{> channel/follow_us}}
  92 +
  93 + </div>
  94 + {{/ contentWithNothing}}
  95 +
  96 + {{# contentWithAdvert}}
  97 + <div class="content-items-group-left">
  98 + {{# topItemsLeft}}
  99 + {{> channel/item}}
  100 + {{/ topItemsLeft}}
  101 + </div>
  102 + <div class="trial-top trial-has-bottom-border">
  103 + {{# topTen}}
  104 + <span class="content-item-detail-a-img">
  105 + <a href="{{link}}" target="_blank" class="link" title="{{title}}"
  106 + onclick="YOHODCLICK('channel','web','content')">
  107 + <img class="lazy pic"
  108 + src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
  109 + data-original="{{img}}" alt="{{title}}" style="display: inline;">
  110 + </a>
  111 + </span>
  112 +
  113 + <h2 class="beauty-top-h2">本周试用排行榜</h2>
  114 + {{# top}}
  115 + <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
  116 + <span class="top-leading"></span>
  117 +
  118 + <div class="top-content">
  119 + <h2>{{title}}</h2>
  120 +
  121 + <h3>{{subTitle}}</h3>
  122 + </div>
  123 + <span class="top-like-num {{bestLike}}">{{likeNum}}</span>
  124 + </a>
  125 + {{/ top}}
  126 + {{/ topTen}}
  127 + </div>
  128 + <div class="content-items-group-right">
  129 + {{> channel/banner_right}}
  130 + {{# topItemsRight}}
  131 + {{> channel/item}}
  132 + {{/ topItemsRight}}
  133 + </div>
  134 + <div class="content-items-group-bottom">
  135 + {{# topItemsBottom}}
  136 + {{> channel/item}}
  137 + {{/ topItemsBottom}}
  138 + {{> channel/follow_us}}
  139 +
  140 + </div>
  141 + {{/ contentWithAdvert}}
  142 +
  143 + {{# contentWithCenterBanner}}
  144 + <div class="content-items-group-left">
  145 + {{# topItemsLeft}}
  146 + {{> channel/item}}
  147 + {{/ topItemsLeft}}
  148 + </div>
  149 + <div class="trial-top">
  150 + {{# topTen}}
  151 + <span class="content-item-detail-a-img">
  152 + <a href="{{link}}" target="_blank" class="link" title="{{title}}"
  153 + onclick="YOHODCLICK('channel','web','content')">
  154 + <img class="lazy pic"
  155 + src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
  156 + data-original="{{img}}" alt="{{title}}" style="display: inline;">
  157 + </a>
  158 + </span>
  159 +
  160 + <h2 class="beauty-top-h2">本周试用排行榜</h2>
  161 + {{# top}}
  162 + <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
  163 + <span class="top-leading"></span>
  164 +
  165 + <div class="top-content">
  166 + <h2>{{title}}</h2>
  167 +
  168 + <h3>{{subTitle}}</h3>
  169 + </div>
  170 + <span class="top-like-num {{bestLike}}">{{likeNum}}</span>
  171 + </a>
  172 + {{/ top}}
  173 + {{/ topTen}}
  174 + </div>
  175 + <div class="content-items-group-right">
  176 + {{# topItemsRight}}
  177 + {{> channel/item}}
  178 + {{/ topItemsRight}}
  179 + </div>
  180 + {{> channel/banner_center}}
  181 + <div class="content-items-group-bottom">
  182 + {{# topItemsBottom}}
  183 + {{> channel/item}}
  184 + {{/ topItemsBottom}}
  185 + {{> channel/follow_us}}
  186 +
  187 + </div>
  188 + {{/ contentWithCenterBanner}}
  189 +
  190 + {{# contentWithAll}}
  191 + <div class="content-items-group-left">
  192 + {{# topItemsLeft}}
  193 + {{> channel/item}}
  194 + {{/ topItemsLeft}}
  195 + </div>
  196 + <div class="trial-top">
  197 + {{# topTen}}
  198 + <span class="content-item-detail-a-img">
  199 + <a href="{{link}}" target="_blank" class="link" title="{{title}}"
  200 + onclick="YOHODCLICK('channel','web','content')">
  201 + <img class="lazy pic"
  202 + src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
  203 + data-original="{{img}}" alt="{{title}}" style="display: inline;">
  204 + </a>
  205 + </span>
  206 +
  207 + <h2 class="beauty-top-h2">本周试用排行榜</h2>
  208 + {{# top}}
  209 + <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
  210 + <span class="top-leading"></span>
  211 +
  212 + <div class="top-content">
  213 + <h2>{{title}}</h2>
  214 +
  215 + <h3>{{subTitle}}</h3>
  216 + </div>
  217 + <span class="top-like-num {{bestLike}}">{{likeNum}}</span>
  218 + </a>
  219 + {{/ top}}
  220 + {{/ topTen}}
  221 + </div>
  222 + <div class="content-items-group-right">
  223 + {{> channel/banner_right}}
  224 + {{# topItemsRight}}
  225 + {{> channel/item}}
  226 + {{/ topItemsRight}}
  227 + </div>
  228 + {{> channel/banner_center}}
  229 + <div class="content-items-group-bottom">
  230 + {{# topItemsBottom}}
  231 + {{> channel/item}}
  232 + {{/ topItemsBottom}}
  233 + {{> channel/follow_us}}
  234 +
  235 + </div>
  236 + {{/ contentWithAll}}
  237 + {{/ trialTop}}
  238 +</div>
  239 +
4 {{> channel/pager}} 240 {{> channel/pager}}
5 {{> layout/footer_fan}} 241 {{> layout/footer_fan}}
@@ -2,7 +2,88 @@ @@ -2,7 +2,88 @@
2 {{> channel/banner320}} 2 {{> channel/banner320}}
3 <div class="home-content"> 3 <div class="home-content">
4 <ul> 4 <ul>
5 - {{> channel/content320}} 5 + {{#content}}
  6 + <li class="content-item channel-{{channelType}}">
  7 + <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
  8 + <img class="lazy" data-original="{{img}}"
  9 + src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
  10 + alt=""/>
  11 + </a>
  12 +
  13 + <h2>
  14 + <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
  15 + </h2>
  16 +
  17 + <h3>
  18 + <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
  19 + </h3>
  20 + <time>
  21 + {{# channel}}<a href="{{link}}" onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a>&nbsp;|&nbsp;{{/
  22 + channel}}
  23 + {{# subChannel}}<a href="{{link}}"
  24 + onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a>&nbsp;|&nbsp;{{/
  25 + subChannel}}
  26 + <span time="{{time}}" class="time-format"></span>
  27 + </time>
  28 + <p>
  29 + <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{content}}</a>
  30 + </p>
  31 + </li>
  32 + {{/content}}
  33 +
  34 + {{# topTen}}
  35 + <li class="content-item channel-{{channelType}} channel-beauty-top">
  36 + <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
  37 + <img class="lazy" data-original="{{img}}"
  38 + src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
  39 + alt=""/>
  40 + </a>
  41 +
  42 + <h2 class="beauty-top-h2">本周试用排行榜</h2>
  43 + {{# top}}
  44 + <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
  45 + <span class="top-leading"></span>
  46 +
  47 + <div class="top-content">
  48 + <h2>{{title}}</h2>
  49 +
  50 + <h3>{{subTitle}}</h3>
  51 + </div>
  52 + <span class="top-like-num {{bestLike}}">{{likeNum}}</span>
  53 + </a>
  54 + {{/ top}}
  55 + </li>
  56 + {{/ topTen}}
  57 +
  58 + {{#contentTwo}}
  59 + <li class="content-item channel-{{channelType}}">
  60 + <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
  61 + <img class="lazy" data-original="{{img}}"
  62 + src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
  63 + alt=""/>
  64 + </a>
  65 +
  66 + <h2>
  67 + <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
  68 + </h2>
  69 +
  70 + <h3>
  71 + <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
  72 + </h3>
  73 + <time>
  74 + {{# channel}}<a href="{{link}}" onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a>&nbsp;|&nbsp;{{/
  75 + channel}}
  76 + {{# subChannel}}<a href="{{link}}"
  77 + onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a>&nbsp;|&nbsp;{{/
  78 + subChannel}}
  79 + <span time="{{time}}" class="time-format"></span>
  80 + </time>
  81 + <p>
  82 + <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{content}}</a>
  83 + </p>
  84 + </li>
  85 + {{/contentTwo}}
  86 +
6 </ul> 87 </ul>
7 {{> channel/follow_us_hk320}} 88 {{> channel/follow_us_hk320}}
8 {{> channel/page320}} 89 {{> channel/page320}}
@@ -29,13 +29,13 @@ @@ -29,13 +29,13 @@
29 <span class="trial-user-pic"> 29 <span class="trial-user-pic">
30 <img src="{{userPic}}" alt=""/> 30 <img src="{{userPic}}" alt=""/>
31 </span> 31 </span>
32 - <span>我的</span> 32 + <span>我的</span>
33 </div> 33 </div>
34 34
35 - <h2 class="beauty-top-h2">本周用排行榜</h2> 35 + <h2 class="beauty-top-h2">本周用排行榜</h2>
36 {{# top}} 36 {{# top}}
37 <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank"> 37 <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
38 - <span class="loginAvatar" class="top-leading"></span> 38 + <span class="top-leading"></span>
39 39
40 <div class="top-content"> 40 <div class="top-content">
41 <h2>{{title}}</h2> 41 <h2>{{title}}</h2>