Authored by happyhour7

Merge branch 'develop' of http://git.dev.yoho.cn/ued/newgirlviews into develop

... ... @@ -103,6 +103,12 @@
"name": "Kangol"
}
]
},
"commentParam": {
"cid": "4288",
"ctype": "1",
"cc": "101",
"ctwoc": "101004"
}
},
"relatedPost": {
... ...
... ... @@ -2,10 +2,10 @@
"defaultActionName": "index",
"layout": {
"default-layout": "new_layout",
"detail": "common_layout",
"magazine": "common_layout",
"about/*": "common_layout",
"error": "common_layout",
"detail": "new_layout",
"magazine": "new_layout",
"about/*": "new_layout",
"error": "new_layout",
"default/index320": "new_layout320"
},
"renderOptions": {
... ...
... ... @@ -12,7 +12,11 @@
{{/ content}}
{{> detail/detail_tag}}
{{> detail/detail_status}}
<div class="comments-box"></div>
{{# commentParam}}
<div class="comments-box" cid="{{cid}}" cc="{{cc}}" ctype="{{ctype}}" ctwoc="{{ctwoc}}">
{{> common/comment}}
</div>
{{/ commentParam}}
{{> detail/detail_prev_next}}
{{/ article}}
{{> detail/detail_related_post}}
... ...
<!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="http://newboys.test.yoho.cn/index.html"></a></div>
<div class='menubar-header menubar-header-{{channel}}'>
<div class="menubar">
<div class="menu-item video menu-item-video">
<a class="menu-link" href="http://newboys.test.yoho.cn/video/index.html"></a>
<div class="submenu-withleft submenu-video">
<div class="left">
<a href="http://newboys.test.yoho.cn/video/list-people-index-1.html" class="left-item" sub="video-people">人物</a>
<a href="http://newboys.test.yoho.cn/video/list-viral-index-1.html" class="left-item" sub="video-viral">网络疯传</a>
<a href="http://newboys.test.yoho.cn/video/list-ahum-index-1.html" class="left-item" sub="video-ahum">嗯哼</a>
<a href="http://newboys.test.yoho.cn/video/list-playboy-index-1.html" class="left-item" sub="video-playboy">公子游</a>
<a href="http://newboys.test.yoho.cn/video/list-sneakerfile-index-1.html" class="left-item" sub="video-sneakerfile">球鞋档案</a>
</div>
</div>
</div>
<div class="menu-item menu-item-fashion">
<a class="menu-link-channel menu-link-fashion fashion-choosen" href="http://localhost:3000/fashion">fashion</a>
<!--高的集团导航-->
</div>
<div class="menu-item menu-item-sports">
<a class="menu-link-channel menu-link-beauty beauty-choosen" href="http://localhost:3000/beauty">beauty</a>
</div>
<div class="menu-item menu-item-lifestyle">
<a class="menu-link-channel menu-link-sports sports-choosen" href="http://localhost:3000/sports">sports</a>
</div>
<div class="menu-item menu-item-map">
<a class="menu-link-channel menu-link-lifestyle lifestyle-choosen" href="http://localhost:3000/lifestyle">lifestyle</a>
</div>
<div class="menu-item menu-item-map">
<a class="menu-link-channel menu-link-video video-choosen" href="http://localhost:3000/video">video</a>
</div>
<div class="menu-item menu-item-map">
<a class="menu-link-channel menu-link-magazine magazine-choosen" href="http://localhost:3000/magazine">magazine</a>
</div>
<span class="right iconfont search-area">
<!--<span class="icons"></span>
<span class="getapp">get our app!
<span class="bitmap" style="display: none;">
<a class="a-link" href="https://itunes.apple.com/cn/app/yoho!-boys-da-ren-zhi-ren/id914331635?mt=8&amp;down.myapp.com" target="_blank"></a>
<a class="a-img"></a>
<a class="a-text">DOWNLOAD <br>YOHO!BOYS</a>
</span>
</span>-->
<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 class="search-input-box search-input-box-big ac_input" autocomplete="off" style="display: none;"><span class="home-search-button" id="search-button" style="display: none;"></span></span>
<span class="splitline"></span>
</span>
</div>
</div>
</div>
<!--矮的集团导航-->
<div class="enterprise" id="minEnterprise" style="margin-top: 0px; position: fixed; padding-top: 10px; top: 0px; z-index: 99999; background: rgb(255, 255, 255);display:none;">
<div class="menubar menubar-move">
<div class="menu-item-logo"><a href="http://www.yohogirls.com"></a></div>
<div class="menu-item video menu-item-video">
<a class="menu-link" href="http://www.yohogirls.com"></a>
<div class="submenu-withleft submenu-video">
<div class="left">
<a href="http://newboys.test.yoho.cn/video/list-people-index-1.html" class="left-item" sub="video-people">人物</a>
<a href="http://newboys.test.yoho.cn/video/list-viral-index-1.html" class="left-item" sub="video-viral">网络疯传</a>
<a href="http://newboys.test.yoho.cn/video/list-ahum-index-1.html" class="left-item" sub="video-ahum">嗯哼</a>
<a href="http://newboys.test.yoho.cn/video/list-playboy-index-1.html" class="left-item" sub="video-playboy">公子游</a>
<a href="http://newboys.test.yoho.cn/video/list-sneakerfile-index-1.html" class="left-item" sub="video-sneakerfile">球鞋档案</a>
</div>
</div>
</div>
<div class="menu-item fashion menu-item-fashion">
<a class="menu-link" href="http://newboys.test.yoho.cn/fashion/index.html"></a>
<div class="submenu submenu-fashion"></div>
</div>
<div class="menu-item sports menu-item-sports">
<a class="menu-link" href="http://newboys.test.yoho.cn/sports/index.html"></a>
<div class="submenu submenu-sports"></div>
</div>
<div class="menu-item lifestyle menu-item-lifestyle">
<a class="menu-link" href="http://newboys.test.yoho.cn/lifestyle/index.html"></a>
<div class="submenu submenu-lifestyle"></div>
</div>
<div class="menu-item magazine menu-item-magazine">
<a class="menu-link" href="http://newboys.test.yoho.cn/magazine/index.html"></a>
</div>
<div class="menu-item map menu-item-map">
<a class="menu-link" href="http://newboys.test.yoho.cn/map/index.html"></a>
</div>
<span class="right iconfont search-area">
<span class="icons"></span>
<span class="getapp">get our app!
<span class="bitmap" style="display: none;">
<a class="a-link" href="https://itunes.apple.com/cn/app/yoho!-boys-da-ren-zhi-ren/id914331635?mt=8&amp;down.myapp.com" target="_blank"></a>
<a class="a-img"></a>
<a class="a-text">DOWNLOAD <br>YOHO!BOYS</a>
</span>
</span>
<span class="splitline"></span>
<span class="search-loading-icon" style="display: none;"></span>
<a class="search-icon" href="/search"></a>
<span class="search-text search-text-small" style="display: inline; width: 73px;"><span class="search-text-content">Search...</span><input class="search-input-box search-input-box-small ac_input" autocomplete="off" style="display: none;"><span class="home-search-button" id="search-button" style="display: none;"></span></span>
</span>
</div>
</div>
{{{body}}}
</body>
<script type="text/javascript" src="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/all-debug.js?nowrap"></script>
<script type="text/javascript">
seajs.use(['yohogirls-frontend-web/0.0.1/js/channel/detail-debug'], function(detail) {
if (detail) {
detail.init();
}
});
</script>
</html>
\ No newline at end of file
... ... @@ -271,5 +271,12 @@
</body>
<script type="text/javascript" src="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/seajs.js?nowrap"></script>
<script type="text/javascript" src="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/all-debug.js?nowrap"></script>
<script type="text/javascript">
seajs.use(['yohogirls-frontend-web/0.0.1/js/channel/detail-debug'], function(detail) {
if (detail) {
detail.init();
}
});
</script>
</html>
\ No newline at end of file
... ...
{{# hasComment}}
<ul class="comments-list">
{{# comment}}
<li class="clearfix">
<div class="userimg">
<img src="{{userimg}}" alt="">
<i class="yoho"></i>
</div>
<div class="userinfo">
<h6>{{username}}</h6>
<p class="comment-text">{{content}}</p>
{{# isSelf}}
<a class="delete-comment" href="javascript:;" pid="{{id}}"></a>
{{/ isSelf}}
</div>
</li>
{{/ comment}}
</ul>
{{/ hasComment}}
{{# more}}
<div class="view-more"><a href="javascript:;">View&nbsp;<span>{{moreNum}}</span>&nbsp;more</a></div>
{{/ more}}
{{# page}}
<div style="display:none" class="pager-content comment-pager-content">
<div class="channel-index-pager"></div>
</div>
{{/ page}}
{{# textarea}}
<div class="comment-textarea">
<textarea placeholder="说点什么..." cid="4288"></textarea>
<div class="login-status clearfix">
<div class="userimg">
<img src="http://res.yohoboys.comboysweb/assets/images/detail/user-img.png" alt="">
<i></i>
</div>
<div class="userinfo" style="display: none;">
<span></span>
<a class="exit-btn" href="javascript:;">退出</a>
</div>
<div class="publish">
<a class="publish-btn" href="javascript:;">Publish</a>
</div>
</div>
</div>
{{/ textarea}}
... ...