Merge branch 'test' into develop

+{{> layout/header_fan}}
+{{> channel/banner_top}}
+{{> channel/content}}
+{{> channel/pager}}
+{{> layout/footer_fan}}
\ No newline at end of file

 {{> layout/header_fan}}
 {{> channel/banner_top}}
-{{> channel/content}}
+<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
+    {{^ trialTop}}
+    {{# contentWithNothing}}
+    {{# topItems}}
+    {{> channel/item}}
+    {{/ topItems}}
+    {{/ contentWithNothing}}
+
+    {{# contentWithAdvert}}
+    {{# topItems}}
+    {{> channel/item}}
+    {{/ topItems}}
+    {{> channel/banner_right}}
+    {{# bottomItems}}
+    {{> channel/item}}
+    {{/ bottomItems}}
+    {{/ contentWithAdvert}}
+
+    {{# contentWithCenterBanner}}
+    {{# topItems}}
+    {{> channel/item}}
+    {{/ topItems}}
+    {{> channel/banner_center}}
+    {{# bottomItems}}
+    {{> channel/item}}
+    {{/ bottomItems}}
+    {{/ contentWithCenterBanner}}
+
+    {{# contentWithAll}}
+    {{# topItems1}}
+    {{> channel/item}}
+    {{/ topItems1}}
+    {{> channel/banner_right}}
+    {{# topItems2}}
+    {{> channel/item}}
+    {{/ topItems2}}
+    {{> channel/banner_center}}
+    {{# bottomItems}}
+    {{> channel/item}}
+    {{/ bottomItems}}
+    {{/ contentWithAll}}
+
+    {{> channel/follow_us}}
+
+    {{/ trialTop}}
+
+    {{# trialTop}}
+    {{# contentWithNothing}}
+    <div class="content-items-group-left">
+        {{# topItemsLeft}}
+        {{> channel/item}}
+        {{/ topItemsLeft}}
+    </div>
+    <div class="trial-top trial-has-bottom-border">
+        {{# topTen}}
+        <span class="content-item-detail-a-img">
+            <a href="{{link}}" target="_blank" class="link" title="{{title}}"
+               onclick="YOHODCLICK('channel','web','content')">
+                <img class="lazy pic"
+                     src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
+                     data-original="{{img}}" alt="{{title}}" style="display: inline;">
+            </a>
+        </span>
+
+        <h2 class="beauty-top-h2">本周试用排行榜</h2>
+        {{# top}}
+        <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
+            <span class="top-leading"></span>
+
+            <div class="top-content">
+                <h2>{{title}}</h2>
+
+                <h3>{{subTitle}}</h3>
+            </div>
+            <span class="top-like-num {{bestLike}}">{{likeNum}}</span>
+        </a>
+        {{/ top}}
+        {{/ topTen}}
+    </div>
+    <div class="content-items-group-right">
+        {{# topItemsRight}}
+        {{> channel/item}}
+        {{/ topItemsRight}}
+    </div>
+    <div class="content-items-group-bottom">
+        {{# topItemsBottom}}
+        {{> channel/item}}
+        {{/ topItemsBottom}}
+        {{> channel/follow_us}}
+
+    </div>
+    {{/ contentWithNothing}}
+
+    {{# contentWithAdvert}}
+    <div class="content-items-group-left">
+        {{# topItemsLeft}}
+        {{> channel/item}}
+        {{/ topItemsLeft}}
+    </div>
+    <div class="trial-top trial-has-bottom-border">
+        {{# topTen}}
+        <span class="content-item-detail-a-img">
+            <a href="{{link}}" target="_blank" class="link" title="{{title}}"
+               onclick="YOHODCLICK('channel','web','content')">
+                <img class="lazy pic"
+                     src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
+                     data-original="{{img}}" alt="{{title}}" style="display: inline;">
+            </a>
+        </span>
+
+        <h2 class="beauty-top-h2">本周试用排行榜</h2>
+        {{# top}}
+        <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
+            <span class="top-leading"></span>
+
+            <div class="top-content">
+                <h2>{{title}}</h2>
+
+                <h3>{{subTitle}}</h3>
+            </div>
+            <span class="top-like-num {{bestLike}}">{{likeNum}}</span>
+        </a>
+        {{/ top}}
+        {{/ topTen}}
+    </div>
+    <div class="content-items-group-right">
+        {{> channel/banner_right}}
+        {{# topItemsRight}}
+        {{> channel/item}}
+        {{/ topItemsRight}}
+    </div>
+    <div class="content-items-group-bottom">
+        {{# topItemsBottom}}
+        {{> channel/item}}
+        {{/ topItemsBottom}}
+        {{> channel/follow_us}}
+
+    </div>
+    {{/ contentWithAdvert}}
+
+    {{# contentWithCenterBanner}}
+    <div class="content-items-group-left">
+        {{# topItemsLeft}}
+        {{> channel/item}}
+        {{/ topItemsLeft}}
+    </div>
+    <div class="trial-top">
+        {{# topTen}}
+        <span class="content-item-detail-a-img">
+            <a href="{{link}}" target="_blank" class="link" title="{{title}}"
+               onclick="YOHODCLICK('channel','web','content')">
+                <img class="lazy pic"
+                     src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
+                     data-original="{{img}}" alt="{{title}}" style="display: inline;">
+            </a>
+        </span>
+
+        <h2 class="beauty-top-h2">本周试用排行榜</h2>
+        {{# top}}
+        <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
+            <span class="top-leading"></span>
+
+            <div class="top-content">
+                <h2>{{title}}</h2>
+
+                <h3>{{subTitle}}</h3>
+            </div>
+            <span class="top-like-num {{bestLike}}">{{likeNum}}</span>
+        </a>
+        {{/ top}}
+        {{/ topTen}}
+    </div>
+    <div class="content-items-group-right">
+        {{# topItemsRight}}
+        {{> channel/item}}
+        {{/ topItemsRight}}
+    </div>
+    {{> channel/banner_center}}
+    <div class="content-items-group-bottom">
+        {{# topItemsBottom}}
+        {{> channel/item}}
+        {{/ topItemsBottom}}
+        {{> channel/follow_us}}
+
+    </div>
+    {{/ contentWithCenterBanner}}
+
+    {{# contentWithAll}}
+    <div class="content-items-group-left">
+        {{# topItemsLeft}}
+        {{> channel/item}}
+        {{/ topItemsLeft}}
+    </div>
+    <div class="trial-top">
+        {{# topTen}}
+        <span class="content-item-detail-a-img">
+            <a href="{{link}}" target="_blank" class="link" title="{{title}}"
+               onclick="YOHODCLICK('channel','web','content')">
+                <img class="lazy pic"
+                     src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
+                     data-original="{{img}}" alt="{{title}}" style="display: inline;">
+            </a>
+        </span>
+
+        <h2 class="beauty-top-h2">本周试用排行榜</h2>
+        {{# top}}
+        <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
+            <span class="top-leading"></span>
+
+            <div class="top-content">
+                <h2>{{title}}</h2>
+
+                <h3>{{subTitle}}</h3>
+            </div>
+            <span class="top-like-num {{bestLike}}">{{likeNum}}</span>
+        </a>
+        {{/ top}}
+        {{/ topTen}}
+    </div>
+    <div class="content-items-group-right">
+        {{> channel/banner_right}}
+        {{# topItemsRight}}
+        {{> channel/item}}
+        {{/ topItemsRight}}
+    </div>
+    {{> channel/banner_center}}
+    <div class="content-items-group-bottom">
+        {{# topItemsBottom}}
+        {{> channel/item}}
+        {{/ topItemsBottom}}
+        {{> channel/follow_us}}
+
+    </div>
+    {{/ contentWithAll}}
+    {{/ trialTop}}
+</div>
+
 {{> channel/pager}}
 {{> layout/footer_fan}}
\ No newline at end of file

@@ -2,7 +2,88 @@
 {{> channel/banner320}}
 <div class="home-content">
     <ul>
-        {{> channel/content320}}
+        {{#content}}
+        <li class="content-item channel-{{channelType}}">
+            <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
+                <img class="lazy" data-original="{{img}}"
+                     src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
+                     alt=""/>
+            </a>
+
+            <h2>
+                <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
+            </h2>
+
+            <h3>
+                <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
+            </h3>
+            <time>
+                {{# channel}}<a href="{{link}}" onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a>&nbsp;|&nbsp;{{/
+                channel}}
+                {{# subChannel}}<a href="{{link}}"
+                                   onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a>&nbsp;|&nbsp;{{/
+                subChannel}}
+                <span time="{{time}}" class="time-format"></span>
+            </time>
+            <p>
+                <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{content}}</a>
+            </p>
+        </li>
+        {{/content}}
+
+        {{# topTen}}
+        <li class="content-item channel-{{channelType}} channel-beauty-top">
+            <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
+                <img class="lazy" data-original="{{img}}"
+                     src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
+                     alt=""/>
+            </a>
+
+            <h2 class="beauty-top-h2">本周试用排行榜</h2>
+            {{# top}}
+            <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
+                <span class="top-leading"></span>
+
+                <div class="top-content">
+                    <h2>{{title}}</h2>
+
+                    <h3>{{subTitle}}</h3>
+                </div>
+                <span class="top-like-num {{bestLike}}">{{likeNum}}</span>
+            </a>
+            {{/ top}}
+        </li>
+        {{/ topTen}}
+
+        {{#contentTwo}}
+        <li class="content-item channel-{{channelType}}">
+            <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">
+                <img class="lazy" data-original="{{img}}"
+                     src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
+                     alt=""/>
+            </a>
+
+            <h2>
+                <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{title}}</a>
+            </h2>
+
+            <h3>
+                <a href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{subTitle}}</a>
+            </h3>
+            <time>
+                {{# channel}}<a href="{{link}}" onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a>&nbsp;|&nbsp;{{/
+                channel}}
+                {{# subChannel}}<a href="{{link}}"
+                                   onclick="YOHODCLICK('channel','mobile','contentChannel')">{{name}}</a>&nbsp;|&nbsp;{{/
+                subChannel}}
+                <span time="{{time}}" class="time-format"></span>
+            </time>
+            <p>
+                <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('channel','mobile','content')">{{content}}</a>
+            </p>
+        </li>
+        {{/contentTwo}}
+
     </ul>
     {{> channel/follow_us_hk320}}
     {{> channel/page320}}

@@ -29,13 +29,13 @@
             <span class="trial-user-pic">
                 <img src="{{userPic}}" alt=""/>
             </span>
-                <span>我的試用</span>
+                <span>我的试用</span>
             </div>
 
-            <h2 class="beauty-top-h2">本周試用排行榜</h2>
+            <h2 class="beauty-top-h2">本周试用排行榜</h2>
             {{# top}}
             <a class="top-list top-list-{{ranking}}" href="{{link}}" target="_blank">
-                <span class="loginAvatar" class="top-leading"></span>
+                <span class="top-leading"></span>
 
                 <div class="top-content">
                     <h2>{{title}}</h2>