Authored by happyhour7

Merge branch 'develop' into test

Conflicts:
	partials/layout/footer_jian.html
	partials/layout/header_jian.html
{{> layout/header }}
<div id="search-content">
<div class="search-content">
<div class="search-input-content">
<input id="input-search-search" type="text" value="safsadfas" autocomplete="off" class="ac_input"><span class="searchbutton" id="search-button-search"></span>
</div>
</div>
{{^ Items}}
<p style="margin: 0 auto;text-align: center;font-size:20px;"><strong>Sorry,Nothing Found!</strong></p>
{{/ Items}}
{{# resultCount}}
<p style="margin: 0 auto;text-align: center;font-size:20px;"><strong>{{.}}&nbsp;Result</strong></p>
{{/ resultCount}}
<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
{{# Items}}
{{> channel/item}}
{{/ Items}}
</div>
</div>
{{> channel/pager}}
{{> layout/footer }}
{{> layout/header }}
<div id="search-content">
<div class="search-content">
<div class="search-input-content">
<input id="input-search-search" type="text" value="{{searchText}}" autocomplete="off" class="ac_input"><span class="searchbutton" id="search-button-search"></span>
</div>
</div>
{{^ Items}}
<p style="margin: 0 auto;text-align: center;font-size:20px;"><strong>Sorry,Nothing Found!</strong></p>
{{/ Items}}
{{# resultCount}}
<p style="margin: 0 auto;text-align: center;font-size:20px;"><strong>{{.}}&nbsp;Result</strong></p>
{{/ resultCount}}
<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
{{# Items}}
{{> channel/item}}
{{/ Items}}
</div>
</div>
{{> channel/pager}}
{{> layout/footer }}
... ...
{{> layout/writer_header320}}
<div class="search">
<div class="search_input">
<input type="text" placeholder="" autocomplete="off" class="ac_input">
<span class="search_btn"></span>
</div>
<div class="result"></div>
</div>
<!--content-->
<div class="home-content">
<ul>
{{#content}}
<li id="{{#pop}}pop{{/pop}}" class="content-item channel-{{channel}}">
<a class="img-link" href="{{link}}" target="_blank">
<img src="{{img}}" alt=""/>
</a>
<h2>
<a href="{{link}}" target="_blank">{{title}}</a>
</h2>
<h3>
<a href="{{link}}" target="_blank">{{subTitle}}</a>
</h3>
<time>
<a href="{{channelLink}}" target="_blank">{{channel}}</a>&nbsp;|&nbsp;{{time}}
</time>
<p>
<a href="{{link}}" target="_blank">{{content}}</a>
</p>
</li>
{{/content}}
</ul>
</div>
{{> default/download320}}
{{> layout/writer_header320}}
<div class="search">
<div class="search_input">
<input type="text" placeholder="" autocomplete="off" class="ac_input">
<span class="search_btn"></span>
</div>
<div class="result"></div>
</div>
<!--content-->
<div class="home-content">
<ul>
{{#content}}
<li id="{{#pop}}pop{{/pop}}" class="content-item channel-{{channel}}">
<a class="img-link" href="{{link}}" target="_blank">
<img src="{{img}}" alt=""/>
</a>
<h2>
<a href="{{link}}" target="_blank">{{title}}</a>
</h2>
<h3>
<a href="{{link}}" target="_blank">{{subTitle}}</a>
</h3>
<time>
<a href="{{channelLink}}" target="_blank">{{channel}}</a>&nbsp;|&nbsp;{{time}}
</time>
<p>
<a href="{{link}}" target="_blank">{{content}}</a>
</p>
</li>
{{/content}}
</ul>
</div>
{{> default/download320}}
{{> layout/footer320}}
\ No newline at end of file
... ...
<div class="return-to-top" style="opacity: 0.7;"></div>
<div class="bottom-content">
<div class="boys">
... ... @@ -36,7 +37,9 @@
</span>
</div>
</div>
{{> common/menu}}
</body>
{{> common/menu}}
{{> common/menu_withleft}}
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
... ... @@ -44,7 +47,6 @@
<script type="text/javascript">
seajs.use("index");
</script>
{{> common/script}}
</body>
</html>
\ No newline at end of file
{{> common/script}}
</html>
... ...
<!doctype html>
<html>
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>{{title}}</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0 user-scalable=no" />
<meta content="yes" name="apple-mobile-web-app-capable" />
<meta content="telephone=no" name="format-detection" />
<meta content="black" name="apple-mobile-web-app-status-bar-style" />
<meta name="keywords" content="{{keywords}}" />
<meta name="description" content="{{description}}" />
<meta name="author" content="yohogirls.com" />
<meta name="robots" content="index, follow"/>
<meta name="googlebot" content="index, follow"/>
<meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
<meta property="wb:webmaster" content="5ffc4cd75e724a17" />
<link rel="dns-prefetch" href="//img01.yohoboys.com" />
<link rel="dns-prefetch" href="//img02.yohoboys.com" />
<link rel="dns-prefetch" href="//video.yohoboys.com" />
<link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/girls.css" />
</head>
<body>
<!--开头的集团导航-->
<div class="enterprise-header-content">
<ul class="enterprise-header">
<li class="item first enterprise-yoho"><span>YOHO!</span><a href="http://www.yoho.cn" target="_blank">集团官网</a></li>
<li class="item enterprise-youhuo"><span>YOHO!有货</span><a href="http://www.yohobuy.com" target="_blank">潮流购物</a></li>
<li class="item enterprise-boys"><span>YOHO!BOYS</span><a href="http://www.yohoboys.com">男生潮流</a></li>
<li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
<li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
<li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li>
<li class="jianfan"><a class="choosen" href="javascript:;"></a>&nbsp;<a class="unchoosen">/</a>&nbsp;<a class="unchoosen" href="/go/location"></a></li>
</ul>
</div>
<!--高的集团导航-->
<div class="enterprise" id="maxEnterprise">
<div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="{{defaultUrl}}"></a></div>
<div class='menubar-header menubar-header-{{channel}}'>
<div class="menubar">
<div class="menu-item menu-item-fashion">
<span class=" menu-link-fashion fashion-choosen menu-link-channel ">
<a class="text">fashion</a>
<a class="hover-text">时尚</a>
<a class="menu" href="/fashion/index.html"></a>
<div class="submenu submenu-fashion">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{fashionUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-sports">
<span class="menu-link-channel menu-link-beauty beauty-choosen">
<a class="text">beauty</a>
<a class="hover-text">美丽</a>
<a class="menu" href="/beauty/index.html"></a>
<div class="submenu submenu-beauty">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{beautyUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-lifestyle">
<span class="menu-link-channel menu-link-sports sports-choosen">
<a class="text">sports</a>
<a class="hover-text">运动</a>
<a class="menu" href="/sports/index.html"></a>
<div class="submenu submenu-sports">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{sportsUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-lifestyle lifestyle-choosen">
<a class="text">lifestyle</a>
<a class="hover-text">生活</a>
<a class="menu" href="/lifestyle/index.html"></a>
<div class="submenu submenu-lifestyle">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{lifestyleUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-video video-choosen">
<a class="text">video</a>
<a class="hover-text">视频</a>
<a class="menu" href="/video/index.html"></a>
<div class="submenu submenu-video">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{videoUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-magazine">
<a class="text" style="text-align:left;">magazine</a>
<a class="hover-text">杂志</a>
<a class="menu" href="/magazine/index.html"></a>
</span>
</div>
<span class="right iconfont search-area">
<span class="search-loading-icon" style="display: none;"></span>
<a class="search-icon" href="/search"></a>
<span class="search-text search-text-big" style="display: inline;">
<span class="search-text-content">search...</span>
<input name="q" class="search-input-box search-input-box-big ac_input" autocomplete="off" style="display: none;"/>
<a searchURL="{{searchUrl}}" class="home-search-button" id="search-button" style="display: none;" value=""></a>
</span>
<span class="splitline"></span>
</span>
</div>
</div>
</div>
<div class="enterprise-header-content enterprise-header-fixed">
<ul class="enterprise-header">
<li class="item first enterprise-yoho"><span>YOHO!</span><a href="http://www.yoho.cn" target="_blank">集团官网</a></li>
<li class="item enterprise-youhuo"><span>YOHO!有货</span><a href="http://www.yohobuy.com" target="_blank">潮流购物</a></li>
<li class="item enterprise-boys"><span>YOHO!BOYS</span><a href="http://www.yohoboys.com">男生潮流</a></li>
<li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
<li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
<li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li>
<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>
</ul>
</div>
<div class="minEnterprise" id="minEnterprise" style="display:none;">
<div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="{{defaultUrl}}"></a></div>
<div class='menubar-header menubar-header-{{channel}}'>
<div class="menubar">
<div class="menu-item menu-item-fashion">
<span class=" menu-link-fashion fashion-choosen menu-link-channel ">
<a class="text">fashion</a>
<a class="hover-text">时尚</a>
<a class="menu" href="{{fashionUrl}}"></a>
<div class="submenu submenu-fashion">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{fashionUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-sports">
<span class="menu-link-channel menu-link-beauty beauty-choosen">
<a class="text">beauty</a>
<a class="hover-text">美丽</a>
<a class="menu" href="{{beautyUrl}}"></a>
<div class="submenu submenu-beauty">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{beautyUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-lifestyle">
<span class="menu-link-channel menu-link-sports sports-choosen">
<a class="text">sports</a>
<a class="hover-text">运动</a>
<a class="menu" href="{{sportsUrl}}"></a>
<div class="submenu submenu-sports">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{sportsUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-lifestyle lifestyle-choosen">
<a class="text">lifestyle</a>
<a class="hover-text">生活</a>
<a class="menu" href="{{lifestyleUrl}}"></a>
<div class="submenu submenu-lifestyle">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{lifestyleUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-video video-choosen">
<a class="text">video</a>
<a class="hover-text">视频</a>
<a class="menu" href="/video/index.html"></a>
<div class="submenu submenu-video">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{videoUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-magazine">
<a class="text" style="text-align:left;">magazine</a>
<a class="hover-text">杂志</a>
<a class="menu" href="/magazine/index.html"></a>
</span>
</div>
<span class="right iconfont search-area">
<span class="search-loading-icon" style="display: none;"></span>
<a class="search-icon" href="/search"></a>
<span class="search-text search-text-big" style="display: inline;">
<span class="search-text-content">search...</span>
<input name="q" class="search-input-box search-input-box-big ac_input" autocomplete="off" style="display: none;"/>
<a searchURL="{{searchUrl}}" class="home-search-button" id="search-button" style="display: none;" value=""></a>
</span>
<span class="splitline"></span>
</span>
</div>
</div>
</div>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Yoho!Girls | No Fashion, No Life!</title>
<link rel="stylesheet" type="text/css" href="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/girls.css" />
</head>
<body>
<!--开头的集团导航-->
<div class="enterprise-header-content">
<ul class="enterprise-header">
<li class="item first enterprise-yoho"><span>YOHO!</span><a href="http://www.yoho.cn" target="_blank">集团官网</a></li>
<li class="item enterprise-youhuo"><span>YOHO!有货</span><a href="http://www.yohobuy.com" target="_blank">潮流购物</a></li>
<li class="item enterprise-boys"><span>YOHO!BOYS</span><a href="http://www.yohoboys.com">男生潮流</a></li>
<li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
<li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
<li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li>
<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>
</ul>
</div>
<!--高的集团导航-->
<div class="enterprise" id="maxEnterprise">
<div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="{{defaultUrl}}"></a></div>
<div class='menubar-header menubar-header-{{channel}}'>
<div class="menubar">
<div class="menu-item menu-item-fashion">
<span class=" menu-link-fashion fashion-choosen menu-link-channel ">
<a class="text">fashion</a>
<a class="hover-text">时尚</a>
<a class="menu" href="{{fashionUrl}}"></a>
<div class="submenu submenu-fashion">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{fashionUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-sports">
<span class="menu-link-channel menu-link-beauty beauty-choosen">
<a class="text">beauty</a>
<a class="hover-text">美丽</a>
<a class="menu" href="{{beautyUrl}}"></a>
<div class="submenu submenu-beauty">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{beautyUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-lifestyle">
<span class="menu-link-channel menu-link-sports sports-choosen">
<a class="text">sports</a>
<a class="hover-text">运动</a>
<a class="menu" href="{{sportsUrl}}"></a>
<div class="submenu submenu-sports">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{sportsUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-lifestyle lifestyle-choosen">
<a class="text">lifestyle</a>
<a class="hover-text">生活</a>
<a class="menu" href="{{lifestyleUrl}}"></a>
<div class="submenu submenu-lifestyle">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{lifestyleUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-video video-choosen">
<a class="text">video</a>
<a class="hover-text">视频</a>
<a class="menu" href="{{videoUrl}}"></a>
<div class="submenu submenu-video">
<div class="left-menu">
{{# videoSubmenu}}
<a class=" menu-text"{{# isChoosen}}style="color:#c9caca;"{{/ isChoosen}} target="_blank" href="{{link}}">{{text}}</a>
{{/ videoSubmenu}}
</div>
<div class="right-content">
</div>
<div class='right-more'><a class='more-content-right' href="{{videoUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-magazine">
<a class="text" style="text-align:left;">magazine</a>
<a class="hover-text">杂志</a>
<a class="menu" href="{{magazineUrl}}"></a>
</span>
</div>
<span class="right iconfont search-area">
<span class="search-loading-icon" style="display: none;"></span>
<a class="search-icon" href="/search"></a>
<span class="search-text search-text-big" style="display: inline;">
<span class="search-text-content">search...</span>
<input name="q" class="search-input-box search-input-box-big ac_input" autocomplete="off" style="display: none;"/>
<a searchURL="{{searchUrl}}" class="home-search-button" id="search-button" style="display: none;" value=""></a>
</span>
<span class="splitline"></span>
</span>
</div>
</div>
</div>
<div class="enterprise-header-content enterprise-header-fixed">
<ul class="enterprise-header">
<li class="item first enterprise-yoho"><span>YOHO!</span><a href="http://www.yoho.cn" target="_blank">集团官网</a></li>
<li class="item enterprise-youhuo"><span>YOHO!有货</span><a href="http://www.yohobuy.com" target="_blank">潮流购物</a></li>
<li class="item enterprise-boys"><span>YOHO!BOYS</span><a href="http://www.yohoboys.com">男生潮流</a></li>
<li class="item enterprise-girls item-choosen"><span>YOHO!GIRLS</span><a href="http://www.yohogirls.com" target="_blank">女生潮流</a></li>
<li class="item enterprise-show"><span>YOHO!SHOW</span><a href="http://www.yohoshow.com" target="_blank">物趣分享</a></li>
<li class="item enterprise-yohood"><span>YOHOOD</span><a href="http://www.yohood.cn" target="_blank">潮流嘉年华</a></li>
<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>
</ul>
</div>
<div class="minEnterprise" id="minEnterprise" style="display:none;">
<div class="menu-item logo {{# channel}} black_logo{{/ channel}}"><a href="{{defaultUrl}}"></a></div>
<div class='menubar-header menubar-header-{{channel}}'>
<div class="menubar">
<div class="menu-item menu-item-fashion">
<span class=" menu-link-fashion fashion-choosen menu-link-channel ">
<a class="text">fashion</a>
<a class="hover-text">时尚</a>
<a class="menu" href="/fashion/index.html"></a>
<div class="submenu submenu-fashion">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{fashionUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-sports">
<span class="menu-link-channel menu-link-beauty beauty-choosen">
<a class="text">beauty</a>
<a class="hover-text">美丽</a>
<a class="menu" href="/beauty/index.html"></a>
<div class="submenu submenu-beauty">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{beautyUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-lifestyle">
<span class="menu-link-channel menu-link-sports sports-choosen">
<a class="text">sports</a>
<a class="hover-text">运动</a>
<a class="menu" href="/sports/index.html"></a>
<div class="submenu submenu-sports">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{sportsUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-lifestyle lifestyle-choosen">
<a class="text">lifestyle</a>
<a class="hover-text">生活</a>
<a class="menu" href="/lifestyle/index.html"></a>
<div class="submenu submenu-lifestyle">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="{{lifestyleUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-video video-choosen">
<a class="text">video</a>
<a class="hover-text">视频</a>
<a class="menu" href="/video/index.html"></a>
<div class="submenu submenu-video">
<div class="left-menu">
{{# videoSubmenu}}
<a class=" menu-text"{{# isChoosen}}style="color:#c9caca;"{{/ isChoosen}} target="_blank" href="{{link}}">{{text}}</a>
{{/ videoSubmenu}}
</div>
<div class="right-content">
</div>
<div class='more-content'><a class='more-content' href="{{videoUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-magazine">
<a class="text" style="text-align:left;">magazine</a>
<a class="hover-text">杂志</a>
<a class="menu" href="/magazine/index.html"></a>
</span>
</div>
<span class="right iconfont search-area">
<span class="search-loading-icon" style="display: none;"></span>
<a class="search-icon" href="/search"></a>
<span class="search-text search-text-big" style="display: inline;">
<span class="search-text-content">search...</span>
<input name="q" class="search-input-box search-input-box-big ac_input" autocomplete="off" style="display: none;"/>
<a searchURL="{{searchUrl}}" class="home-search-button" id="search-button" style="display: none;" value=""></a>
</span>
<span class="splitline"></span>
</span>
</div>
</div>
</div>
\ No newline at end of file
... ...