ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7
Commit 6bf1a3e58507d905196576c1a5afd384d183f9bc 2 parents 95be62f1 650b1b9c

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

Conflicts:
	partials/common/script.html
Inline Side-by-side
Showing 10 changed files with 51 additions and 16 deletions
... ... @@ -11,4 +11,6 @@
<div class="comments-box feedback"></div>
</div>
</div>
{{> layout/footer}}
\ No newline at end of file
{{> layout/footer}}
{{> common/comment}}
{{> common/third_login}}
\ No newline at end of file
... ...
... ... @@ -7,12 +7,14 @@
{{# content}}
{{> detail/detail_video}}
{{> detail/detail_slide}}
{{> detail/detail_img}}
{{> detail/detail_text}}
<!--翻转、变脸、视频-->
<!--翻转、变脸、视频-->
{{# coverEffect}}
<div>{{html}}</div>
{{/ coverEffect}}
{{> detail/detail_img}}
{{> detail/detail_text}}
{{/ content}}
{{> detail/detail_tag}}
{{> detail/detail_status}}
... ...
... ... @@ -7,7 +7,7 @@
<p>
<a href="{{channelLink}}">{{channel}}</a>
<a href="{{tagLink}}">{{tag}}</a>
<a href="{{twoChannelLink}}">{{twoChannel}}</a>
{{time}}
</p>
... ... @@ -34,12 +34,12 @@
<!--翻转、变脸、视频-->
{{# coverEffect}}
<div>{{html}}</div>
<div>{{{html}}}</div>
{{/ coverEffect}}
</div>
<!--内容-->
<div class="detail-text" cover-url="{{coverUrl}}">
{{detailStr}}
{{{detailStr}}}
</div>
</div>
{{/detail}}
... ...
... ... @@ -7,7 +7,8 @@
{{#bannerItem}}
<li class="swiper-slide">
<a href="{{href}}">
<img src="{{img}}" alt="banner"/>
<img class="swiper-lazy" data-src="{{img}}" alt=""/>
<div class="swiper-lazy-preloader"></div>
</a>
</li>
{{/bannerItem}}
... ... @@ -31,7 +32,8 @@
{{#magazineSlide}}
<li class="swiper-slide">
<a href="javascript:;">
<img src="{{img}}">
<img class="swiper-lazy" data-src="{{img}}">
<div class="swiper-lazy-preloader"></div>
</a>
<time>{{time}}</time>
</li>
... ... @@ -44,14 +46,14 @@
<div class="swiper-container magazine-slide-style" id="zine-slide">
<ul class="swiper-wrapper zine-wrapper">
{{#zineSlide}}
<!-- {{#zineSlide}}
<li class="swiper-slide">
<a href="javascript:;" title="{{time}}">
<img src="{{img}}" alt="">
</a>
<time>{{time}}</time>
</li>
{{/zineSlide}}
{{/zineSlide}}-->
</ul>
</div>
</div>
... ...
{{> layout/writer_header320}}
<div class="tag-wrap">
<div class="tags">
<ul>
... ... @@ -23,4 +24,5 @@
{{/indexContent}}
</ul>
</div>
{{> default/download320}}
\ No newline at end of file
{{> default/download320}}
{{> layout/footer320}}
\ No newline at end of file
... ...
... ... @@ -6,7 +6,8 @@
{{#bannerItem}}
<li class="swiper-slide">
<a href="{{href}}">
<img src="{{img}}" alt="banner"/>
<img class="swiper-lazy" data-src="{{img}}" alt=""/>
<div class="swiper-lazy-preloader"></div>
</a>
</li>
{{/bannerItem}}
... ...
... ... @@ -51,3 +51,9 @@
{{# magazine}}
{{> script/magazine}}
{{/ magazine}}
{{# feedback}}
{{> script/feedback}}
{{/ feedback}}
... ...
... ... @@ -17,9 +17,9 @@
<p>CopyRight © 2014 南京新与力文化传播有限公司<br />苏ICP备09011225号</p>
</footer>
</div>
<!--<script src="http://localhost:8000/js/lib/sea-debug.js?nowrap"></script>-->
<script src="http://cmsres.dev.yoho.cn/dist/sea-debug.js"></script>
<script src="http://cmsres.dev.yoho.cn/dist/mobile.js"></script>
<script src="http://localhost:8000/js/lib/sea-debug.js?nowrap"></script>
<!--<script src="http://cmsres.dev.yoho.cn/dist/sea-debug.js"></script>
<script src="http://cmsres.dev.yoho.cn/dist/mobile.js"></script>-->
{{> common/script320}}
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -10,6 +10,18 @@
</head>
<body id="{{channel}}">
<div id="mobile-wrap">
<!--下载GIRLS-->
<div class="header-download-wrap">
<div class="header-download">
<span class="tip-pic">YOHO GIRLS</span>
<div class="tip-info">
<h2>YOHO!GIRLS</h2>
<p>No Fashion,No Life!</p>
<a class="yoho-download-app" data-ios="" data-android="" href="" ios-href="" android-href="" onclick="">OPEN</a>
</div>
<span class="tip-c" onclick="">关闭</span>
</div>
</div>
<!--header-->
<header class="girl-header">
<span class="header-logo">Logo</span>
... ...
<script type="text/javascript" charset="utf-8">
//详情页面JS
seajs.use(['js/channel/feedback', 'js/public'], function(feedback) {
if (feedback) {
feedback.init();
}
});
</script>
\ No newline at end of file
... ...