ued / yohogirls_mustache · Commits

Go to a project

Authored by lore-w
Commit e38d018983f94e3f4789f2ec21a8bdbc58c87313 2 parents 5beed6b4 65e09541

跟新首页时间显示格式，详情页变脸、翻转效果

Inline Side-by-side
Showing 13 changed files with 263 additions and 201 deletions
1 {{> layout/writer_header320}} 1 {{> layout/writer_header320}}
2 -{{#detail}} 2 +{{#detailData}}
3 <div class="detail"> 3 <div class="detail">
4 <h2 class="share-h2">{{title}}</h2> 4 <h2 class="share-h2">{{title}}</h2>
5 5
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 </li> 22 </li>
23 {{/banner}} 23 {{/banner}}
24 </ul> 24 </ul>
25 - <div class="detail-switch">3/5</div> 25 + <div class="detail-switch"></div>
26 </div> 26 </div>
27 {{/ coverSwiper}} 27 {{/ coverSwiper}}
28 <!--只有一张封面图--> 28 <!--只有一张封面图-->
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 {{{detailStr}}} 42 {{{detailStr}}}
43 </div> 43 </div>
44 </div> 44 </div>
45 -{{/detail}} 45 +{{/detailData}}
46 46
47 <!--标签--> 47 <!--标签-->
48 <div class="tags"> 48 <div class="tags">
@@ -91,27 +91,9 @@ @@ -91,27 +91,9 @@
91 </div> 91 </div>
92 </li> 92 </li>
93 </ul> 93 </ul>
94 - {{# comment}}  
95 - <div class="comments-box" data-id="{{id}}" data-type="{{type}}" data-c="{{c}}" data-twoc="{{twoc}}">  
96 - <ul class="comments-list"></ul>  
97 - <div class="comment-textarea"><textarea placeholder="说点什么..."></textarea>  
98 -  
99 - <div class="login-status clearfix">  
100 - <div class="userimg">  
101 - <img src="{{userImg}}" alt="">  
102 - <i></i>  
103 - </div>  
104 - <div class="userinfo" style="display: none;">  
105 - <span></span>  
106 - <a class="exit-btn" href="javascript:;">退出</a>  
107 - </div>  
108 - <div class="publish">  
109 - <a class="publish-btn" href="javascript:;">Publish</a>  
110 - </div>  
111 - </div>  
112 - </div>  
113 - </div>  
114 - {{/ comment}} 94 + {{# commentPartials}}
  95 + <div class="comments-box" data-id="{{id}}" data-type="{{type}}" data-c="{{c}}" data-twoc="{{twoc}}"></div>
  96 + {{/ commentPartials}}
115 </div> 97 </div>
116 98
117 99
@@ -149,4 +131,52 @@ @@ -149,4 +131,52 @@
149 </a> 131 </a>
150 </li> 132 </li>
151 \{{/relatedPost}} 133 \{{/relatedPost}}
  134 +
  135 +</script>
  136 +<script id="comment-textarea-tpl" type="x-tmpl-mustache">
  137 + <div class="comment-textarea">
  138 + <textarea placeholder="说点什么..."></textarea>
  139 + <div class="login-status clearfix">
  140 + <div class="userimg">
  141 + <img src="http://cmsres.test.yoho.cn/res/new/boys/images/detail/user-img.png" alt="">
  142 + <i></i>
  143 + </div>
  144 + <div class="userinfo" style="display: none;">
  145 + <span></span>
  146 + <a class="exit-btn" href="javascript:;">退出</a>
  147 + </div>
  148 + <div class="publish">
  149 + <a class="publish-btn" href="javascript:;">Publish</a>
  150 + </div>
  151 + </div>
  152 + </div>
  153 +</script>
  154 +
  155 +<script id="comment-tpl" type="x-tmpl-mustache">
  156 + <ul class="comments-list">
  157 + \{{# comment}}
  158 + <li class="clearfix">
  159 + <div class="userimg">
  160 + <img src="\{{userimg}}" alt="">
  161 + <i class="\{{partnerType}}"></i>
  162 + </div>
  163 + <div class="userinfo">
  164 + <h6>\{{username}}</h6>
  165 + <p class="comment-text">\{{content}}</p>
  166 + \{{# isSelf}}
  167 + <a class="delete-comment" href="javascript:;" pid="{{id}}"></a>
  168 + \{{/ isSelf}}
  169 + </div>
  170 + </li>
  171 + \{{/ comment}}
  172 + </ul>
  173 + \{{# more}}
  174 + <div class="view-more"><a href="javascript:;">View&nbsp;<span>\{{moreNum}}</span>&nbsp;more</a></div>
  175 + \{{/ more}}
  176 + \{{# page}}
  177 + <div class="comment-pager-content pager-content-default" style="display:none">
  178 + <div class="channel-index-pager">\{{> html}}</div>
  179 + </div>
  180 + \{{/ page}}
  181 +
152 </script> 182 </script>
@@ -18,10 +18,10 @@ @@ -18,10 +18,10 @@
18 <a href="{{link}}" target="_blank">{{subTitle}}</a> 18 <a href="{{link}}" target="_blank">{{subTitle}}</a>
19 </h3> 19 </h3>
20 <time> 20 <time>
21 - <a href="{{subChannelLink}}" target="_blank">{{subChannel}}</a>&nbsp;|&nbsp;{{time}} 21 + <a href="{{channelLink}}" target="_blank">{{channel}}</a>&nbsp;|&nbsp;<span time="{{time}}" class="time-format"></span>
22 </time> 22 </time>
23 <p> 23 <p>
24 - <a href="{{link}}" target="_blank">{{content}}</a> 24 + <a class="a-detail" href="{{link}}" target="_blank">{{content}}</a>
25 </p> 25 </p>
26 </li> 26 </li>
27 {{/content}} 27 {{/content}}
@@ -25,10 +25,10 @@ @@ -25,10 +25,10 @@
25 <a href="{{link}}" target="_blank">{{subTitle}}</a> 25 <a href="{{link}}" target="_blank">{{subTitle}}</a>
26 </h3> 26 </h3>
27 <time> 27 <time>
28 - <a href="{{channelLink}}" target="_blank">{{channel}}</a>&nbsp;|&nbsp;{{time}} 28 + <a href="{{channelLink}}" target="_blank">{{channel}}</a>&nbsp;|&nbsp;<span time="{{time}}" class="time-format"></span>
29 </time> 29 </time>
30 <p> 30 <p>
31 - <a href="{{link}}" target="_blank">{{content}}</a> 31 + <a class="a-detail" href="{{link}}" target="_blank">{{content}}</a>
32 </p> 32 </p>
33 </li> 33 </li>
34 {{/content}} 34 {{/content}}
@@ -13,10 +13,10 @@ @@ -13,10 +13,10 @@
13 <a href="{{link}}" target="_blank">{{subTitle}}</a> 13 <a href="{{link}}" target="_blank">{{subTitle}}</a>
14 </h3> 14 </h3>
15 <time> 15 <time>
16 - <a href="{{subChannelLink}}" target="_blank">{{subChannel}}</a>&nbsp;|&nbsp;{{time}} 16 + <a href="{{channelLink}}" target="_blank">{{channel}}</a>&nbsp;|&nbsp;<span time="{{time}}" class="time-format"></span>
17 </time> 17 </time>
18 <p> 18 <p>
19 - <a href="{{link}}" target="_blank">{{content}}</a> 19 + <a class="a-detail" href="{{link}}" target="_blank">{{content}}</a>
20 </p> 20 </p>
21 </li> 21 </li>
22 {{/content}} 22 {{/content}}
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <a href="{{subChannelLink}}"> 10 <a href="{{subChannelLink}}">
11 {{subChannel}} 11 {{subChannel}}
12 </a> 12 </a>
13 - &nbsp;/&nbsp;&nbsp;<span>{{date}}</span> 13 + &nbsp;/&nbsp;&nbsp;<span></span>
14 </span> 14 </span>
15 <a href="{{link}}" target="_blank" class="content-item-title content-item-detail-title-style content-item-detail-title{{# channelClass}}-{{.}}{{/ channelClass}}" _title="{{title}}">{{title}}</a> 15 <a href="{{link}}" target="_blank" class="content-item-title content-item-detail-title-style content-item-detail-title{{# channelClass}}-{{.}}{{/ channelClass}}" _title="{{title}}">{{title}}</a>
16 <a href="{{link}}" target="_blank" class="content-item-subtitle content-item-detail-title-style content-item-detail-subtitle{{# channelClass}}-{{.}} content-item-detail-subtitle-style{{/ channelClass}}" _title="{{subtitle}}">{{subtitle}}</a> 16 <a href="{{link}}" target="_blank" class="content-item-subtitle content-item-detail-title-style content-item-detail-subtitle{{# channelClass}}-{{.}} content-item-detail-subtitle-style{{/ channelClass}}" _title="{{subtitle}}">{{subtitle}}</a>
1 <div class="pager-content"> 1 <div class="pager-content">
2 <div class="channel-index-pager pager-channel-{{channel}}"> 2 <div class="channel-index-pager pager-channel-{{channel}}">
3 - <a class="pager-item pager-item-choosen">1</a>  
4 - <a class="pager-item" href="http://newboys.test.yoho.cn/index-2.html">2</a>  
5 - <a class="pager-item" href="http://newboys.test.yoho.cn/index-3.html">3</a>  
6 - <a class="pager-item" href="http://newboys.test.yoho.cn/index-4.html">4</a>  
7 - <a class="pager-item" href="http://newboys.test.yoho.cn/index-5.html">5</a>  
8 - <a class="pager-item" href="http://newboys.test.yoho.cn/index-6.html">6</a>  
9 - <a class="pager-item" href="http://newboys.test.yoho.cn/index-7.html">7</a>  
10 - <a class="ellipsis">...</a><a class="pager-item" href="http://newboys.test.yoho.cn/index-78.html">78</a>  
11 - <a class="pager-item" href="http://newboys.test.yoho.cn/index-2.html">&gt;</a> 3 + {{# pager}}
  4 + <a class="pager-item {{# isChoosen}} pager-item-choosen{{/ isChoosen}}" href="{{link}}">{{text}}</a>
  5 + {{/ pager}}
12 </div> 6 </div>
13 </div> 7 </div>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <span class="arrow-bottom girl-channel-arrow"></span> 4 <span class="arrow-bottom girl-channel-arrow"></span>
5 </a> 5 </a>
6 <div class="item-text-area"> 6 <div class="item-text-area">
7 - <span class="item-date" _time="{{time}}"><a class="channel" href="{{channelURL}}" target="_blank">{{channelClass}}</a> / {{date}}</span> 7 + <span class="item-date" _time="{{time}}"><a class="channel" href="{{channelURL}}" target="_blank">{{channelClass}}</a> / </span>
8 <a class="item-title" href="{{link}}" target="_blank" _title="{{title}}">{{title}}</a> 8 <a class="item-title" href="{{link}}" target="_blank" _title="{{title}}">{{title}}</a>
9 <a class="item-title" href="{{link}}" target="_blank" _title="{{subtitle}}">{{subtitle}}</a> 9 <a class="item-title" href="{{link}}" target="_blank" _title="{{subtitle}}">{{subtitle}}</a>
10 <a class="item-detail" href="{{link}}" target="_blank" _title="{{content}}" len="{{contentLength}}">{{content}}</a> 10 <a class="item-detail" href="{{link}}" target="_blank" _title="{{content}}" len="{{contentLength}}">{{content}}</a>
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/qr.png" alt=""> 4 <img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/qr.png" alt="">
5 </div> 5 </div>
6 <div class="app-main"> 6 <div class="app-main">
7 - <h6>Yoho!Boys</h6> 7 + <h6>Yoho!Girls</h6>
8 <p>We love to Play & Learn</p> 8 <p>We love to Play & Learn</p>
9 <div class="download-btn clearfix"> 9 <div class="download-btn clearfix">
10 <a href="{{iosUrl}}"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/ios-download-1024.png" alt=""></a> 10 <a href="{{iosUrl}}"><img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/ios-download-1024.png" alt=""></a>
1 -  
2 - <div class="return-to-top" style="opacity: 0.7;"></div>  
3 - <div class="bottom-content"> 1 +<div class="return-to-top" style="opacity: 0.7;"></div>
  2 +<div class="bottom-content">
4 <div class="boys"> 3 <div class="boys">
5 <span class="boybitmap"></span> 4 <span class="boybitmap"></span>
6 <span class="icon"><a href="{{boyDownloadUrl}}" target="_blank"></a></span> 5 <span class="icon"><a href="{{boyDownloadUrl}}" target="_blank"></a></span>
@@ -20,8 +19,8 @@ @@ -20,8 +19,8 @@
20 <a class="detail" target="_blank" href="{{girlDownloadUrl}}">線上週刊，帶你覽遍世界仙蹤</a> 19 <a class="detail" target="_blank" href="{{girlDownloadUrl}}">線上週刊，帶你覽遍世界仙蹤</a>
21 </span> 20 </span>
22 </div> 21 </div>
23 - </div>  
24 - <div class="bottom-right"> 22 +</div>
  23 +<div class="bottom-right">
25 <div class="div-right"> 24 <div class="div-right">
26 <span class="span-links"> 25 <span class="span-links">
27 <a class="links" href="{{aboutUsUrl}}">關於我們</a><a class="line"></a> 26 <a class="links" href="{{aboutUsUrl}}">關於我們</a><a class="line"></a>
@@ -35,13 +34,11 @@ @@ -35,13 +34,11 @@
35 CopyRight © 2015 南京新與力文化傳播有限公司 蘇ICP備09011225號 34 CopyRight © 2015 南京新與力文化傳播有限公司 蘇ICP備09011225號
36 </span> 35 </span>
37 </div> 36 </div>
38 - </div>  
39 - </body>  
40 -  
41 - {{> common/menu}}  
42 - {{> common/menu_withleft}}  
43 - <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>  
44 - <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>  
45 - {{> common/script}} 37 +</div>
  38 +{{> common/menu}}
  39 +{{> common/menu_withleft}}
  40 +<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
  41 +{{> common/script}}
  42 +</body>
46 43
47 </html> 44 </html>
1 -  
2 -  
3 - <div class="return-to-top" style="opacity: 0.7;"></div>  
4 - <div class="bottom-content"> 1 +<div class="return-to-top" style="opacity: 0.7;"></div>
  2 +<div class="bottom-content">
5 <div class="boys"> 3 <div class="boys">
6 <span class="boybitmap"></span> 4 <span class="boybitmap"></span>
7 <span class="icon"><a href="{{boyDownloadUrl}}" target="_blank"></a></span> 5 <span class="icon"><a href="{{boyDownloadUrl}}" target="_blank"></a></span>
@@ -21,8 +19,8 @@ @@ -21,8 +19,8 @@
21 <a class="detail" target="_blank" href="{{girlDownloadUrl}}">线上周刊，带你览遍世界仙踪</a> 19 <a class="detail" target="_blank" href="{{girlDownloadUrl}}">线上周刊，带你览遍世界仙踪</a>
22 </span> 20 </span>
23 </div> 21 </div>
24 - </div>  
25 - <div class="bottom-right"> 22 +</div>
  23 +<div class="bottom-right">
26 <div class="div-right"> 24 <div class="div-right">
27 <span class="span-links"> 25 <span class="span-links">
28 <a class="links" href="{{aboutUsUrl}}">关于我们</a><a class="line"></a> 26 <a class="links" href="{{aboutUsUrl}}">关于我们</a><a class="line"></a>
@@ -36,19 +34,10 @@ @@ -36,19 +34,10 @@
36 CopyRight © 2015 南京新与力文化传播有限公司 苏ICP备09011225号 34 CopyRight © 2015 南京新与力文化传播有限公司 苏ICP备09011225号
37 </span> 35 </span>
38 </div> 36 </div>
39 - </div>  
40 -  
41 - </body>  
42 - {{> common/menu}}  
43 - {{> common/menu_withleft}}  
44 -  
45 -  
46 - <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>  
47 - <script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>  
48 - <script type="text/javascript">  
49 - seajs.use("index");  
50 - </script>  
51 - {{> common/script}} 37 +</div>
  38 +{{> common/menu}}
  39 +{{> common/menu_withleft}}
  40 +<script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script>
  41 +{{> common/script}}
  42 +</body>
52 </html> 43 </html>
53 -  
54 -  
1 -{{^ fan}} 1 +{{^ fanti}}
2 {{> layout/header_jian}} 2 {{> layout/header_jian}}
3 -{{/ fan}}  
4 -{{# fan}} 3 +{{/ fanti}}
  4 +{{# fanti}}
5 {{> layout/header_fan}} 5 {{> layout/header_fan}}
6 -{{/ fan}}  
  6 +{{/ fanti}}
1 -<!doctype html>  
2 -<html> 1 +
  2 +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
  3 +"http://www.w3.org/TR/html4/loose.dtd">
  4 +<html xmlns="http://www.w3.org/1999/xhtml">
3 <head> 5 <head>
4 - <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />  
5 - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />  
6 - <title>{{title}}</title>  
7 - <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0 user-scalable=no" />  
8 - <meta content="yes" name="apple-mobile-web-app-capable" />  
9 - <meta content="telephone=no" name="format-detection" />  
10 - <meta content="black" name="apple-mobile-web-app-status-bar-style" />  
11 - <meta name="keywords" content="{{keywords}}" />  
12 - <meta name="description" content="{{description}}" />  
13 - <meta name="author" content="yohogirls.com" />  
14 - <meta name="robots" content="index, follow"/>  
15 - <meta name="googlebot" content="index, follow"/>  
16 - <meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />  
17 - <meta property="wb:webmaster" content="5ffc4cd75e724a17" />  
18 - <link rel="dns-prefetch" href="//img01.yohoboys.com" />  
19 - <link rel="dns-prefetch" href="//img02.yohoboys.com" />  
20 - <link rel="dns-prefetch" href="//video.yohoboys.com" />  
21 - <link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/girls.css" /> 6 + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
  7 + <title>Yoho!Girls | No Fashion, No Life!</title>
  8 + <link rel="stylesheet" type="text/css" href="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/girls.css" />
22 </head> 9 </head>
23 <body> 10 <body>
24 <!--开头的集团导航--> 11 <!--开头的集团导航-->
@@ -30,13 +17,13 @@ @@ -30,13 +17,13 @@
30 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li> 17 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
31 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li> 18 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
32 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li> 19 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li>
33 - <li class="jianfan"><a class="choosen" href="javascript:;">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="http://newboys.test.yoho.cn/go/location">繁</a></li> 20 + <li class="jianfan"><a class="unchoosen" href="/go/location">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="choosen" href="#">繁</a></li>
34 </ul> 21 </ul>
35 </div> 22 </div>
36 23
37 <!--高的集团导航--> 24 <!--高的集团导航-->
38 <div class="enterprise" id="maxEnterprise"> 25 <div class="enterprise" id="maxEnterprise">
39 - <div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="{{defaultUrl}}"></a></div> 26 + <div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="../index.html"></a></div>
40 <div class='menubar-header menubar-header-{{channel}}'> 27 <div class='menubar-header menubar-header-{{channel}}'>
41 <div class="menubar"> 28 <div class="menubar">
42 <div class="menu-item menu-item-fashion"> 29 <div class="menu-item menu-item-fashion">
@@ -45,26 +32,9 @@ @@ -45,26 +32,9 @@
45 <a class="hover-text">時尚</a> 32 <a class="hover-text">時尚</a>
46 <a class="menu" href="/fashion/index.html"></a> 33 <a class="menu" href="/fashion/index.html"></a>
47 <div class="submenu submenu-fashion"> 34 <div class="submenu submenu-fashion">
  35 +
48 <!--<span class="arrow"></span>--> 36 <!--<span class="arrow"></span>-->
49 - <div class="content-item-menu">  
50 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>  
51 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
52 - <span class="text">测试添加热播资讯</span>  
53 - <span class="text detail">热播资讯添加</span>  
54 - </div>  
55 - <div class="content-item-menu">  
56 - <a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>  
57 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
58 - <span class="text">再次发布一条新资讯</span>  
59 - <span class="text detail">测试发布资讯</span>  
60 - </div>  
61 - <div class="content-item-menu">  
62 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>  
63 - <span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>  
64 - <span class="text">测试封面图片添加测试封面图片添加</span>  
65 - <span class="text detail">测试封面测试封面测试</span>  
66 - </div>  
67 - <div class='more-content'><a class='more-content' href="{{fashionUrl}}">More ></a></div> 37 + <div class='more-content'><a class='more-content' href="/fashion/index.html">More ></a></div>
68 </div> 38 </div>
69 </span> 39 </span>
70 40
@@ -78,54 +48,18 @@ @@ -78,54 +48,18 @@
78 <a class="menu" href="/beauty/index.html"></a> 48 <a class="menu" href="/beauty/index.html"></a>
79 <div class="submenu submenu-beauty"> 49 <div class="submenu submenu-beauty">
80 <!--<span class="arrow"></span>--> 50 <!--<span class="arrow"></span>-->
81 - <div class="content-item-menu">  
82 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>  
83 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
84 - <span class="text">测试添加热播资讯</span>  
85 - <span class="text detail">热播资讯添加</span>  
86 - </div>  
87 - <div class="content-item-menu">  
88 - <a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>  
89 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
90 - <span class="text">再次发布一条新资讯</span>  
91 - <span class="text detail">测试发布资讯</span>  
92 - </div>  
93 - <div class="content-item-menu">  
94 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>  
95 - <span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>  
96 - <span class="text">测试封面图片添加测试封面图片添加</span>  
97 - <span class="text detail">测试封面测试封面测试</span>  
98 - </div>  
99 - <div class='more-content'><a class='more-content' href="{{beautyUrl}}">More ></a></div> 51 + <div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div>
100 </div> 52 </div>
101 </span> 53 </span>
102 </div> 54 </div>
103 <div class="menu-item menu-item-lifestyle"> 55 <div class="menu-item menu-item-lifestyle">
104 - <span class="menu-link-channel menu-link-sports sports-choosen"> 56 + <span class="menu-link-channel menu-link-sport sports-choosen">
105 <a class="text">sports</a> 57 <a class="text">sports</a>
106 <a class="hover-text">運動</a> 58 <a class="hover-text">運動</a>
107 <a class="menu" href="/sports/index.html"></a> 59 <a class="menu" href="/sports/index.html"></a>
108 - <div class="submenu submenu-sports"> 60 + <div class="submenu submenu-sport">
109 <!--<span class="arrow"></span>--> 61 <!--<span class="arrow"></span>-->
110 - <div class="content-item-menu">  
111 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>  
112 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
113 - <span class="text">测试添加热播资讯</span>  
114 - <span class="text detail">热播资讯添加</span>  
115 - </div>  
116 - <div class="content-item-menu">  
117 - <a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>  
118 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
119 - <span class="text">再次发布一条新资讯</span>  
120 - <span class="text detail">测试发布资讯</span>  
121 - </div>  
122 - <div class="content-item-menu">  
123 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>  
124 - <span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>  
125 - <span class="text">测试封面图片添加测试封面图片添加</span>  
126 - <span class="text detail">测试封面测试封面测试</span>  
127 - </div>  
128 - <div class='more-content'><a class='more-content' href="{{sportsUrl}}">More ></a></div> 62 + <div class='more-content'><a class='more-content' href="/sport/index.html">More ></a></div>
129 </div> 63 </div>
130 </span> 64 </span>
131 </div> 65 </div>
@@ -136,25 +70,130 @@ @@ -136,25 +70,130 @@
136 <a class="menu" href="/lifestyle/index.html"></a> 70 <a class="menu" href="/lifestyle/index.html"></a>
137 <div class="submenu submenu-lifestyle"> 71 <div class="submenu submenu-lifestyle">
138 <!--<span class="arrow"></span>--> 72 <!--<span class="arrow"></span>-->
139 - <div class="content-item-menu">  
140 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>  
141 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
142 - <span class="text">测试添加热播资讯</span>  
143 - <span class="text detail">热播资讯添加</span> 73 + <div class='more-content'><a class='more-content' href="/lifestyle/index.html">More ></a></div>
144 </div> 74 </div>
145 - <div class="content-item-menu">  
146 - <a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>  
147 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
148 - <span class="text">再次发布一条新资讯</span>  
149 - <span class="text detail">测试发布资讯</span> 75 + </span>
150 </div> 76 </div>
151 - <div class="content-item-menu">  
152 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>  
153 - <span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>  
154 - <span class="text">测试封面图片添加测试封面图片添加</span>  
155 - <span class="text detail">测试封面测试封面测试</span> 77 + <div class="menu-item menu-item-map">
  78 + <span class="menu-link-channel menu-link-video video-choosen">
  79 + <a class="text">video</a>
  80 + <a class="hover-text">視頻</a>
  81 + <a class="menu" href="/video/index.html"></a>
  82 + <div class="submenu submenu-video">
  83 + <div class="left-menu">
  84 + {{# videoSubmenu}}
  85 + <a class=" menu-text"{{# isChoosen}}style="color:#c9caca;"{{/ isChoosen}} target="_blank" href="{{link}}">{{text}}</a>
  86 + {{/ videoSubmenu}}
156 </div> 87 </div>
157 - <div class='more-content'><a class='more-content' href="{{lifestyleUrl}}">More ></a></div> 88 + <div class="right-content">
  89 + </div>
  90 + <div class='right-more'><a class='more-content-right' href="/video/index.html">More ></a></div>
  91 + </div>
  92 + </span>
  93 + </div>
  94 + <div class="menu-item menu-item-map">
  95 + <span class="menu-link-channel menu-link-magazine magazine-choosen ">
  96 + <a class="text" style="text-align:left;">magazine</a>
  97 + <a class="hover-text">雜誌</a>
  98 + <a class="menu" href="/magazine/index.html"></a>
  99 + </span>
  100 + </div>
  101 + <span class="right iconfont search-area">
  102 + <span class="search-loading-icon" style="display: none;"></span>
  103 + <a class="search-icon" href="../search"></a>
  104 +
  105 +
  106 + <span class="search-text search-text-big" style="display: inline;">
  107 + <span class="search-text-content">search...</span>
  108 +
  109 + <input name="q" class="search-input-box search-input-box-big ac_input" autocomplete="off" style="display: none;"/>
  110 + <a searchURL="..\search" class="home-search-button" id="search-button" style="display: none;" value=""></a>
  111 + </span>
  112 + <span class="splitline"></span>
  113 + </span>
  114 + </div>
  115 + </div>
  116 + </div>
  117 +
  118 +
  119 +
  120 +
  121 +
  122 +
  123 +
  124 +
  125 +
  126 +
  127 +
  128 +
  129 +
  130 +
  131 +
  132 +
  133 +
  134 + <div class="enterprise-header-content enterprise-header-fixed">
  135 + <ul class="enterprise-header">
  136 + <li class="item first enterprise-yoho"><span>YOHO!</span><a href="http://www.yoho.cn" target="_blank">集團官網</a></li>
  137 + <li class="item enterprise-youhuo"><span>YOHO!有貨</span><a href="http://www.yohobuy.com" target="_blank">潮流購物</a></li>
  138 + <li class="item enterprise-boys"><span>YOHO!BOYS</span><a href="http://www.yohoboys.com">男生潮流</a></li>
  139 + <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
  140 + <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
  141 + <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年華</a></li>
  142 + <li class="jianfan"><a class="unchoosen" href="/go/location">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="choosen" href="#">繁</a></li>
  143 +
  144 + </ul>
  145 + </div>
  146 +
  147 +
  148 +
  149 + <div class="minEnterprise" id="minEnterprise" style="display:none;">
  150 + <div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="../index.html"></a></div>
  151 + <div class='menubar-header menubar-header-{{channel}}'>
  152 + <div class="menubar">
  153 + <div class="menu-item menu-item-fashion">
  154 + <span class=" menu-link-fashion fashion-choosen menu-link-channel ">
  155 + <a class="text">fashion</a>
  156 + <a class="hover-text">時尚</a>
  157 + <a class="menu" href="/fashion/index.html"></a>
  158 + <div class="submenu submenu-fashion">
  159 + <!--<span class="arrow"></span>-->
  160 + <div class='more-content'><a class='more-content' href="/fashion/index.html">More ></a></div>
  161 + </div>
  162 + </span>
  163 +
  164 + </div>
  165 +
  166 + <div class="menu-item menu-item-sports">
  167 + <span class="menu-link-channel menu-link-beauty beauty-choosen">
  168 +
  169 + <a class="text">beauty</a>
  170 + <a class="hover-text">美麗</a>
  171 + <a class="menu" href="/beauty/index.html"></a>
  172 + <div class="submenu submenu-beauty">
  173 + <!--<span class="arrow"></span>-->
  174 + <div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div>
  175 + </div>
  176 + </span>
  177 + </div>
  178 + <div class="menu-item menu-item-lifestyle">
  179 + <span class="menu-link-channel menu-link-sport sports-choosen">
  180 + <a class="text">sports</a>
  181 + <a class="hover-text">運動</a>
  182 + <a class="menu" href="/sports/index.html"></a>
  183 + <div class="submenu submenu-sport">
  184 + <!--<span class="arrow"></span>-->
  185 + <div class='more-content'><a class='more-content' href="/sports/index.html">More ></a></div>
  186 + </div>
  187 + </span>
  188 + </div>
  189 + <div class="menu-item menu-item-map">
  190 + <span class="menu-link-channel menu-link-lifestyle lifestyle-choosen">
  191 + <a class="text">lifestyle</a>
  192 + <a class="hover-text">生活</a>
  193 + <a class="menu" href="/lifestyle/index.html"></a>
  194 + <div class="submenu submenu-lifestyle">
  195 + <!--<span class="arrow"></span>-->
  196 + <div class='more-content'><a class='more-content' href="/lifestyle/index.html">More ></a></div>
158 </div> 197 </div>
159 </span> 198 </span>
160 </div> 199 </div>
@@ -164,31 +203,19 @@ @@ -164,31 +203,19 @@
164 <a class="hover-text">視頻</a> 203 <a class="hover-text">視頻</a>
165 <a class="menu" href="/video/index.html"></a> 204 <a class="menu" href="/video/index.html"></a>
166 <div class="submenu submenu-video"> 205 <div class="submenu submenu-video">
167 - <!--<span class="arrow"></span>-->  
168 - <div class="content-item-menu">  
169 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>  
170 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/0128539fea8836d625986d3a75f5b7bb6e.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
171 - <span class="text">测试添加热播资讯</span>  
172 - <span class="text detail">热播资讯添加</span>  
173 - </div>  
174 - <div class="content-item-menu">  
175 - <a class="link" href="http://newboys.test.yoho.cn/news/index-1296-0-0.html" target="_blank"></a>  
176 - <a class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/26/17/01ae44f5d73cbc9038aed9c3aa0484608b.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></a>  
177 - <span class="text">再次发布一条新资讯</span>  
178 - <span class="text detail">测试发布资讯</span> 206 + <div class="left-menu">
  207 + {{# videoSubmenu}}
  208 + <a class=" menu-text"{{# isChoosen}}style="color:#c9caca;"{{/ isChoosen}} target="_blank" href="{{link}}">{{text}}</a>
  209 + {{/ videoSubmenu}}
179 </div> 210 </div>
180 - <div class="content-item-menu">  
181 - <span class="link" href="http://newboys.test.yoho.cn/news/index-1291-0-0.html" target="_blank"></span>  
182 - <span class="a-img"><img src="http://img01.yohoboys.com/contentimg/2015/02/11/16/01bc844da0e5c12e77cfe17e82e4d35435.jpg?imageMogr2/thumbnail/!0342x0218r/crop/0342x0218"></span>  
183 - <span class="text">测试封面图片添加测试封面图片添加</span>  
184 - <span class="text detail">测试封面测试封面测试</span> 211 + <div class="right-content">
185 </div> 212 </div>
186 - <div class='more-content'><a class='more-content' href="{{videoUrl}}">More ></a></div> 213 + <div class='more-content'><a class='more-content' href="/video/index.html">More ></a></div>
187 </div> 214 </div>
188 </span> 215 </span>
189 </div> 216 </div>
190 <div class="menu-item menu-item-map"> 217 <div class="menu-item menu-item-map">
191 - <span class="menu-link-channel menu-link-magazine"> 218 + <span class="menu-link-channel menu-link-magazine magazine-choosen ">
192 <a class="text" style="text-align:left;">magazine</a> 219 <a class="text" style="text-align:left;">magazine</a>
193 <a class="hover-text">雜誌</a> 220 <a class="hover-text">雜誌</a>
194 <a class="menu" href="/magazine/index.html"></a> 221 <a class="menu" href="/magazine/index.html"></a>
@@ -197,8 +224,6 @@ @@ -197,8 +224,6 @@
197 <span class="right iconfont search-area"> 224 <span class="right iconfont search-area">
198 <span class="search-loading-icon" style="display: none;"></span> 225 <span class="search-loading-icon" style="display: none;"></span>
199 <a class="search-icon" href="/search"></a> 226 <a class="search-icon" href="/search"></a>
200 -  
201 -  
202 <span class="search-text search-text-big" style="display: inline;"> 227 <span class="search-text search-text-big" style="display: inline;">
203 <span class="search-text-content">search...</span> 228 <span class="search-text-content">search...</span>
204 229
@@ -211,4 +236,17 @@ @@ -211,4 +236,17 @@
211 </div> 236 </div>
212 </div> 237 </div>
213 238
  239 +<<<<<<< HEAD
  240 +
  241 +=======
  242 + {{# scrollToContent}}
  243 + <input type="hidden" id="scrollToContent"/>
  244 + {{/ scrollToContent}}
  245 +
  246 +
  247 +
  248 +
  249 +
  250 +
214 251
  252 +>>>>>>> 65e095413b9461edae5df8f4c33a342188216925
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li> 17 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
18 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li> 18 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
19 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li> 19 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li>
20 - <li class="jianfan"><a class="choosen" href="javascript:;">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="http://newgirls.test.yoho.cn/go/location">繁</a></li> 20 + <li class="jianfan"><a class="choosen" href="#">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="/go/location">繁</a></li>
21 </ul> 21 </ul>
22 </div> 22 </div>
23 23
@@ -54,7 +54,7 @@ @@ -54,7 +54,7 @@
54 </div> 54 </div>
55 55
56 <div class="menu-item menu-item-lifestyle"> 56 <div class="menu-item menu-item-lifestyle">
57 - <span class="menu-link-channel menu-link-sport sport-choosen"> 57 + <span class="menu-link-channel menu-link-sport sports-choosen">
58 <a class="text">sports</a> 58 <a class="text">sports</a>
59 <a class="hover-text">运动</a> 59 <a class="hover-text">运动</a>
60 <a class="menu" href="/sports/index.html"></a> 60 <a class="menu" href="/sports/index.html"></a>
@@ -140,7 +140,7 @@ @@ -140,7 +140,7 @@
140 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li> 140 <li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
141 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li> 141 <li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
142 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li> 142 <li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li>
143 - <li class="jianfan"><a class="choosen" href="javascript:;">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="http://newboys.test.yoho.cn/go/location">繁</a></li> 143 + <li class="jianfan"><a class="choosen" href="#">简</a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="/go/location">繁</a></li>
144 </ul> 144 </ul>
145 </div> 145 </div>
146 146
@@ -235,3 +235,17 @@ @@ -235,3 +235,17 @@
235 </div> 235 </div>
236 </div> 236 </div>
237 </div> 237 </div>
  238 +<<<<<<< HEAD
  239 +=======
  240 +
  241 + {{# scrollToContent}}
  242 + <input type="hidden" id="scrollToContent"/>
  243 + {{/ scrollToContent}}
  244 +
  245 +
  246 +
  247 +
  248 +
  249 +
  250 +
  251 +>>>>>>> 65e095413b9461edae5df8f4c33a342188216925