Merge branch 'develop' of git.dev.yoho.cn:ued/yohogirls-mustache into develop

@@ -2,73 +2,81 @@
 {{> channel/banner320}}
 <div class="video swiper-container">
     <ul class="swiper-wrapper">
-    {{#tvs}}
+        {{#tvs}}
         <li class="swiper-slide">
             {{# link}}
-                <a class="video-bg" href="{{.}}" target="_blank" onclick="YOHODCLICK('home','mobile','tvCN')"></a>
+            <a class="video-bg" href="{{.}}" target="_blank" onclick="YOHODCLICK('home','mobile','tvCN')"></a>
             {{/ link}}
             {{^ link}}
-                <span class="video-bg"></span>
+            <span class="video-bg"></span>
             {{/ link}}
             <img src="{{img}}" alt="">
         </li>
-    {{/tvs}}
+        {{/tvs}}
     </ul>
 </div>
 <!--content-->
 <div class="home-content">
     <ul>
         {{# content}}
-            <li class="content-item channel-{{channelType}}">
-                <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">
-                    <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/>
-                </a>
-                <h2>
-                    <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{title}}</a>
-                </h2>
-                <h3>
-                    <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{subTitle}}</a>
-                </h3>
-                <time>
-                    {{# channel}}
-                    <a href="{{link}}" onclick="YOHODCLICK('home','mobile','contentChannelCN')">{{name}}</a>&nbsp;|&nbsp;
-                    {{/ channel}}
-                    {{# subChannel}}
-                    <a href="{{link}}" onclick="YOHODCLICK('home','mobile','contentTwoChannelCN')">{{name}}</a>&nbsp;|&nbsp;
-                    {{/ subChannel}}
-                    <span time="{{time}}" class="time-format"></span>
-                </time>
-                <p>
-                    <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{content}}</a>
-                </p>
-            </li>
+        <li class="content-item channel-{{channelType}}">
+            <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">
+                <img class="lazy" data-original="{{img}}"
+                     src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
+                     alt=""/>
+            </a>
+
+            <h2>
+                <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{title}}</a>
+            </h2>
+
+            <h3>
+                <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{subTitle}}</a>
+            </h3>
+            <time>
+                {{# channel}}
+                <a href="{{link}}" onclick="YOHODCLICK('home','mobile','contentChannelCN')">{{name}}</a>&nbsp;|&nbsp;
+                {{/ channel}}
+                {{# subChannel}}
+                <a href="{{link}}" onclick="YOHODCLICK('home','mobile','contentTwoChannelCN')">{{name}}</a>&nbsp;|&nbsp;
+                {{/ subChannel}}
+                <span time="{{time}}" class="time-format"></span>
+            </time>
+            <p>
+                <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{content}}</a>
+            </p>
+        </li>
         {{/ content}}
         {{# pop}}
-            <li id="{{type}}-pop" class="content-item">
-                <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">
-                    <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/>
-                </a>
-                <h2>
-                    <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{title}}</a>
-                </h2>
-                <h3>
-                    <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{subTitle}}</a>
-                </h3>
-                <time>
-                    {{# channel}}
-                    <a href="{{link}}" onclick="YOHODCLICK('home','mobile','popChannelCN')">{{name}}</a>&nbsp;|&nbsp;
-                    {{/ channel}}
-                    {{# subChannel}}
-                    <a href="{{link}}" onclick="YOHODCLICK('home','mobile','popTwoChannelCN')">{{name}}</a>&nbsp;|&nbsp;
-                    {{/ subChannel}}
-                    <span time="{{time}}" class="time-format"></span>
-                </time>
-                {{# hasContent}}
-                <p>
-                    <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{content}}</a>
-                </p>
-                {{/ hasContent}}
-            </li>
+        <li id="{{type}}-pop" class="content-item">
+            <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">
+                <img class="lazy" data-original="{{img}}"
+                     src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
+                     alt=""/>
+            </a>
+
+            <h2>
+                <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{title}}</a>
+            </h2>
+
+            <h3>
+                <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{subTitle}}</a>
+            </h3>
+            <time>
+                {{# channel}}
+                <a href="{{link}}" onclick="YOHODCLICK('home','mobile','popChannelCN')">{{name}}</a>&nbsp;|&nbsp;
+                {{/ channel}}
+                {{# subChannel}}
+                <a href="{{link}}" onclick="YOHODCLICK('home','mobile','popTwoChannelCN')">{{name}}</a>&nbsp;|&nbsp;
+                {{/ subChannel}}
+                <span time="{{time}}" class="time-format"></span>
+            </time>
+            {{# hasContent}}
+            <p>
+                <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{content}}</a>
+            </p>
+            {{/ hasContent}}
+        </li>
         {{/ pop}}
     </ul>
     {{> channel/follow_us320}}

-{{> layout/header320}}
+{{> layout/header_hk320}}
 {{> channel/banner320}}
 <div class="video swiper-container">
     <ul class="swiper-wrapper">
         {{#tvs}}
         <li class="swiper-slide">
             {{# link}}
-            <a class="video-bg" href="{{.}}" target="_blank" onclick="YOHODCLICK('home','mobile','tvCN')"></a>
+            <a class="video-bg" href="{{.}}" target="_blank" onclick="YOHODCLICK('home','mobile','tvHK')"></a>
             {{/ link}}
             {{^ link}}
             <span class="video-bg"></span>
@@ -20,52 +20,60 @@
     <ul>
         {{# content}}
         <li class="content-item channel-{{channelType}}">
-            <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">
-                <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/>
+            <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentHK')">
+                <img class="lazy" data-original="{{img}}"
+                     src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
+                     alt=""/>
             </a>
+
             <h2>
-                <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{title}}</a>
+                <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentHK')">{{title}}</a>
             </h2>
+
             <h3>
-                <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{subTitle}}</a>
+                <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentHK')">{{subTitle}}</a>
             </h3>
             <time>
                 {{# channel}}
-                <a href="{{link}}" onclick="YOHODCLICK('home','mobile','contentChannelCN')">{{name}}</a>&nbsp;|&nbsp;
+                <a href="{{link}}" onclick="YOHODCLICK('home','mobile','contentChannelHK')">{{name}}</a>&nbsp;|&nbsp;
                 {{/ channel}}
                 {{# subChannel}}
-                <a href="{{link}}" onclick="YOHODCLICK('home','mobile','contentTwoChannelCN')">{{name}}</a>&nbsp;|&nbsp;
+                <a href="{{link}}" onclick="YOHODCLICK('home','mobile','contentTwoChannelHK')">{{name}}</a>&nbsp;|&nbsp;
                 {{/ subChannel}}
                 <span time="{{time}}" class="time-format"></span>
             </time>
             <p>
-                <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentCN')">{{content}}</a>
+                <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','contentHK')">{{content}}</a>
             </p>
         </li>
         {{/ content}}
         {{# pop}}
         <li id="{{type}}-pop" class="content-item">
-            <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">
-                <img class="lazy" data-original="{{img}}" src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==" alt=""/>
+            <a class="img-link" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popHK')">
+                <img class="lazy" data-original="{{img}}"
+                     src="data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw=="
+                     alt=""/>
             </a>
+
             <h2>
-                <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{title}}</a>
+                <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popHK')">{{title}}</a>
             </h2>
+
             <h3>
-                <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{subTitle}}</a>
+                <a href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popHK')">{{subTitle}}</a>
             </h3>
             <time>
                 {{# channel}}
-                <a href="{{link}}" onclick="YOHODCLICK('home','mobile','popChannelCN')">{{name}}</a>&nbsp;|&nbsp;
+                <a href="{{link}}" onclick="YOHODCLICK('home','mobile','popChannelHK')">{{name}}</a>&nbsp;|&nbsp;
                 {{/ channel}}
                 {{# subChannel}}
-                <a href="{{link}}" onclick="YOHODCLICK('home','mobile','popTwoChannelCN')">{{name}}</a>&nbsp;|&nbsp;
+                <a href="{{link}}" onclick="YOHODCLICK('home','mobile','popTwoChannelHK')">{{name}}</a>&nbsp;|&nbsp;
                 {{/ subChannel}}
                 <span time="{{time}}" class="time-format"></span>
             </time>
             {{# hasContent}}
             <p>
-                <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popCN')">{{content}}</a>
+                <a class="a-detail" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','mobile','popHK')">{{content}}</a>
             </p>
             {{/ hasContent}}
         </li>
@@ -74,5 +82,5 @@
     {{> channel/follow_us320}}
     {{> channel/page320}}
 </div>
-{{> default/download320}}
-{{> layout/footer320}}
\ No newline at end of file
+{{> default/download_hk320}}
+{{> layout/footer_hk320}}
\ No newline at end of file