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

@@ -5,7 +5,7 @@
     {{# tvs}}
     <span class="tv"> 
         {{# link}}
-        <a class="tv-a" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','web','homeTv')"></a>
+        <a class="tv-a" href="{{.}}" target="_blank" onclick="YOHODCLICK('home','web','homeTv')"></a>
         {{/ link}}
         {{^ link}}
             <span class="tv-a"></span>

@@ -4,7 +4,7 @@
     {{# tvs}}
     <span class="tv"> 
         {{# link}}
-            <a class="tv-a" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','web','homeTv')"></a>
+            <a class="tv-a" href="{{.}}" target="_blank" onclick="YOHODCLICK('home','web','homeTv')"></a>
         {{/ link}}
         {{^ link}}
             <span class="tv-a"></span>

+{{#if pop}}
 <div class="pop-container" style="position:relative;">
     <span class="pop-text">#POP</span>
     <div class="swiper-container3">
@@ -20,4 +21,5 @@
         <span class="button prev-button"></span>
         <span class="button next-button"></span>
     </span>
-</div>
\ No newline at end of file
+</div>
+{{/if}}
\ No newline at end of file

+{{#if pop}}
 <div class="pop-container" style="position:relative;">
     <span class="pop-text">#POP</span>
     <div class="swiper-container3">
@@ -20,4 +21,5 @@
         <span class="button prev-button"></span>
         <span class="button next-button"></span>
     </span>
-</div>
\ No newline at end of file
+</div>
+{{/if}}
\ No newline at end of file

@@ -15,6 +15,7 @@
     <meta name="googlebot" content="index, follow"/>
     <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
     <meta property="wb:webmaster" content="5ffc4cd75e724a17" />
+    <script type="text/javascript">if(window.location.href.indexOf(".html")!==-1){var ua=navigator.userAgent;var ipad=ua.match(/(iPad).*OS\s([\d_]+)/),isIphone=!ipad && ua.match(/(iPhone\sOS)\s([\d_]+)/),isAndroid=ua.match(/(Android)\s+([\d.]+)/),isPc=!ipad&&!isIphone&&!isAndroid;if(isPc){window.location.href=window.location.href.replace("mobile","index");}}</script>
     {{# isDetail}}
     <meta property="fb:app_id" content="{{app_id}}"/>
     <meta property="og:site_name" content="{{site_name}}"/>

@@ -15,6 +15,7 @@
     <meta name="googlebot" content="index, follow"/>
     <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
     <meta property="wb:webmaster" content="5ffc4cd75e724a17" />
+    <script type="text/javascript">if(window.location.href.indexOf(".html")!==-1){var ua=navigator.userAgent;var ipad=ua.match(/(iPad).*OS\s([\d_]+)/),isIphone=!ipad && ua.match(/(iPhone\sOS)\s([\d_]+)/),isAndroid=ua.match(/(Android)\s+([\d.]+)/),isPc=!ipad&&!isIphone&&!isAndroid;if(isPc){window.location.href=window.location.href.replace("mobile","index");}}</script>
     {{# isDetail}}
     <meta property="fb:app_id" content="{{app_id}}"/>
     <meta property="og:site_name" content="{{site_name}}"/>

@@ -15,6 +15,7 @@
     <meta name="googlebot" content="index,follow" />
     <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
     <meta property="wb:webmaster" content="5ffc4cd75e724a17" />
+    <script type="text/javascript">if(window.location.href.indexOf(".html")!==-1){var ua=navigator.userAgent;var ipad=ua.match(/(iPad).*OS\s([\d_]+)/),isIphone=!ipad && ua.match(/(iPhone\sOS)\s([\d_]+)/),isAndroid=ua.match(/(Android)\s+([\d.]+)/),isPc=!ipad&&!isIphone&&!isAndroid;if(isPc){window.location.href=window.location.href.replace("mobile","index");}}</script>
     {{# isDetail}}
     <meta property="fb:app_id" content="{{app_id}}"/>
     <meta property="og:site_name" content="{{site_name}}"/>

@@ -15,6 +15,7 @@
     <link rel="dns-prefetch" href="//img01.yohoboys.com" />
     <link rel="dns-prefetch" href="//img02.yohoboys.com" />
     <link rel="dns-prefetch" href="//video.yohoboys.com" />
+    <script type="text/javascript">if(window.location.href.indexOf(".html")!==-1){var ua=navigator.userAgent;var ipad=ua.match(/(iPad).*OS\s([\d_]+)/),isIphone=!ipad && ua.match(/(iPhone\sOS)\s([\d_]+)/),isAndroid=ua.match(/(Android)\s+([\d.]+)/),isMobile=isIphone||isAndroid;if(isMobile){window.location.href=window.location.href.replace("index","mobile");}}</script>
     {{# isDetail}}
     <meta property="fb:app_id" content="{{app_id}}"/>
     <meta property="og:site_name" content="{{site_name}}"/>

@@ -15,6 +15,7 @@
     <meta name="googlebot" content="index, follow"/>
     <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
     <meta property="wb:webmaster" content="5ffc4cd75e724a17" />
+    <script type="text/javascript">if(window.location.href.indexOf(".html")!==-1){var ua=navigator.userAgent;var ipad=ua.match(/(iPad).*OS\s([\d_]+)/),isIphone=!ipad && ua.match(/(iPhone\sOS)\s([\d_]+)/),isAndroid=ua.match(/(Android)\s+([\d.]+)/),isPc=!ipad&&!isIphone&&!isAndroid;if(isPc){window.location.href=window.location.href.replace("mobile","index");}}</script>
     {{# isDetail}}
     <meta property="fb:app_id" content="{{app_id}}"/>
     <meta property="og:site_name" content="{{site_name}}"/>

@@ -15,6 +15,7 @@
     <link rel="dns-prefetch" href="//img01.yohoboys.com" />
     <link rel="dns-prefetch" href="//img02.yohoboys.com" />
     <link rel="dns-prefetch" href="//video.yohoboys.com" />
+    <script type="text/javascript">if(window.location.href.indexOf(".html")!==-1){var ua=navigator.userAgent;var ipad=ua.match(/(iPad).*OS\s([\d_]+)/),isIphone=!ipad && ua.match(/(iPhone\sOS)\s([\d_]+)/),isAndroid=ua.match(/(Android)\s+([\d.]+)/),isMobile=isIphone||isAndroid;if(isMobile){window.location.href=window.location.href.replace("index","mobile");}}</script>
     {{# isDetail}}
     <meta property="fb:app_id" content="{{app_id}}"/>
     <meta property="og:site_name" content="{{site_name}}"/>