ued / yohogirls_mustache · Commits

Go to a project

Authored by 2586703@qq.com
Commit 053935959ac0d91801f12f464b040cad0b4d89bf 2 parents 66318b36 264683c5

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

Inline Side-by-side
Showing 10 changed files with 14 additions and 4 deletions
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 {{# tvs}} 5 {{# tvs}}
6 <span class="tv"> 6 <span class="tv">
7 {{# link}} 7 {{# link}}
8 - <a class="tv-a" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','web','homeTv')"></a> 8 + <a class="tv-a" href="{{.}}" target="_blank" onclick="YOHODCLICK('home','web','homeTv')"></a>
9 {{/ link}} 9 {{/ link}}
10 {{^ link}} 10 {{^ link}}
11 <span class="tv-a"></span> 11 <span class="tv-a"></span>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 {{# tvs}} 4 {{# tvs}}
5 <span class="tv"> 5 <span class="tv">
6 {{# link}} 6 {{# link}}
7 - <a class="tv-a" href="{{link}}" target="_blank" onclick="YOHODCLICK('home','web','homeTv')"></a> 7 + <a class="tv-a" href="{{.}}" target="_blank" onclick="YOHODCLICK('home','web','homeTv')"></a>
8 {{/ link}} 8 {{/ link}}
9 {{^ link}} 9 {{^ link}}
10 <span class="tv-a"></span> 10 <span class="tv-a"></span>
  1 +{{#if pop}}
1 <div class="pop-container" style="position:relative;"> 2 <div class="pop-container" style="position:relative;">
2 <span class="pop-text">#POP</span> 3 <span class="pop-text">#POP</span>
3 <div class="swiper-container3"> 4 <div class="swiper-container3">
@@ -20,4 +21,5 @@ @@ -20,4 +21,5 @@
20 <span class="button prev-button"></span> 21 <span class="button prev-button"></span>
21 <span class="button next-button"></span> 22 <span class="button next-button"></span>
22 </span> 23 </span>
23 -</div>  
  24 +</div>
  25 +{{/if}}
  1 +{{#if pop}}
1 <div class="pop-container" style="position:relative;"> 2 <div class="pop-container" style="position:relative;">
2 <span class="pop-text">#POP</span> 3 <span class="pop-text">#POP</span>
3 <div class="swiper-container3"> 4 <div class="swiper-container3">
@@ -20,4 +21,5 @@ @@ -20,4 +21,5 @@
20 <span class="button prev-button"></span> 21 <span class="button prev-button"></span>
21 <span class="button next-button"></span> 22 <span class="button next-button"></span>
22 </span> 23 </span>
23 -</div>  
  24 +</div>
  25 +{{/if}}
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 <meta name="googlebot" content="index, follow"/> 15 <meta name="googlebot" content="index, follow"/>
16 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" /> 16 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
17 <meta property="wb:webmaster" content="5ffc4cd75e724a17" /> 17 <meta property="wb:webmaster" content="5ffc4cd75e724a17" />
  18 + <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>
18 {{# isDetail}} 19 {{# isDetail}}
19 <meta property="fb:app_id" content="{{app_id}}"/> 20 <meta property="fb:app_id" content="{{app_id}}"/>
20 <meta property="og:site_name" content="{{site_name}}"/> 21 <meta property="og:site_name" content="{{site_name}}"/>
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 <meta name="googlebot" content="index, follow"/> 15 <meta name="googlebot" content="index, follow"/>
16 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" /> 16 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
17 <meta property="wb:webmaster" content="5ffc4cd75e724a17" /> 17 <meta property="wb:webmaster" content="5ffc4cd75e724a17" />
  18 + <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>
18 {{# isDetail}} 19 {{# isDetail}}
19 <meta property="fb:app_id" content="{{app_id}}"/> 20 <meta property="fb:app_id" content="{{app_id}}"/>
20 <meta property="og:site_name" content="{{site_name}}"/> 21 <meta property="og:site_name" content="{{site_name}}"/>
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 <meta name="googlebot" content="index,follow" /> 15 <meta name="googlebot" content="index,follow" />
16 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" /> 16 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
17 <meta property="wb:webmaster" content="5ffc4cd75e724a17" /> 17 <meta property="wb:webmaster" content="5ffc4cd75e724a17" />
  18 + <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>
18 {{# isDetail}} 19 {{# isDetail}}
19 <meta property="fb:app_id" content="{{app_id}}"/> 20 <meta property="fb:app_id" content="{{app_id}}"/>
20 <meta property="og:site_name" content="{{site_name}}"/> 21 <meta property="og:site_name" content="{{site_name}}"/>
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 <link rel="dns-prefetch" href="//img01.yohoboys.com" /> 15 <link rel="dns-prefetch" href="//img01.yohoboys.com" />
16 <link rel="dns-prefetch" href="//img02.yohoboys.com" /> 16 <link rel="dns-prefetch" href="//img02.yohoboys.com" />
17 <link rel="dns-prefetch" href="//video.yohoboys.com" /> 17 <link rel="dns-prefetch" href="//video.yohoboys.com" />
  18 + <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>
18 {{# isDetail}} 19 {{# isDetail}}
19 <meta property="fb:app_id" content="{{app_id}}"/> 20 <meta property="fb:app_id" content="{{app_id}}"/>
20 <meta property="og:site_name" content="{{site_name}}"/> 21 <meta property="og:site_name" content="{{site_name}}"/>
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 <meta name="googlebot" content="index, follow"/> 15 <meta name="googlebot" content="index, follow"/>
16 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" /> 16 <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
17 <meta property="wb:webmaster" content="5ffc4cd75e724a17" /> 17 <meta property="wb:webmaster" content="5ffc4cd75e724a17" />
  18 + <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>
18 {{# isDetail}} 19 {{# isDetail}}
19 <meta property="fb:app_id" content="{{app_id}}"/> 20 <meta property="fb:app_id" content="{{app_id}}"/>
20 <meta property="og:site_name" content="{{site_name}}"/> 21 <meta property="og:site_name" content="{{site_name}}"/>
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 <link rel="dns-prefetch" href="//img01.yohoboys.com" /> 15 <link rel="dns-prefetch" href="//img01.yohoboys.com" />
16 <link rel="dns-prefetch" href="//img02.yohoboys.com" /> 16 <link rel="dns-prefetch" href="//img02.yohoboys.com" />
17 <link rel="dns-prefetch" href="//video.yohoboys.com" /> 17 <link rel="dns-prefetch" href="//video.yohoboys.com" />
  18 + <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>
18 {{# isDetail}} 19 {{# isDetail}}
19 <meta property="fb:app_id" content="{{app_id}}"/> 20 <meta property="fb:app_id" content="{{app_id}}"/>
20 <meta property="og:site_name" content="{{site_name}}"/> 21 <meta property="og:site_name" content="{{site_name}}"/>