Authored by tmq

Merge branch 'develop' of git.dev.yoho.cn:web/yohood into develop

... ... @@ -149,35 +149,35 @@ define('channel', function(require, exports) {
//使用瀑布流布局
setLayout();
if ($('.share').size() > 0) {
//微信分享鼠标事件
$('.yohoo-share-button-wx').on('mouseover', function() {
$('.wx-qrcode-dialog').show();
}).on('mouseout', function() {
$('.wx-qrcode-dialog').hide();
});
shareUrl = $(".share").attr("data-link");
shareCover = $(".share").attr("cover-url");
detailTitle = $('.detail-title').find('h2');
detailSubtitle = $('.detail-title').find('h3');
//分享
share.init({
shareUrl: shareUrl,
img: shareCover,
sinaText: '【YO’HOOD 2016】' + detailTitle.text() + '\r\n' + detailSubtitle.text() + '@YOHO!潮流志' + shareUrl,
fbTextFunction: function() {
return {
des: '【YO’HOOD 2016】' + detailTitle.text() + '\r\n' + detailSubtitle.text() + '#YO’HOOD 2016',
name: '【YO’HOOD 2016】' + detailTitle.text() + '\r\n' + detailSubtitle.text() + '#YO’HOOD 2016',
caption: '【YO’HOOD 2016】' + detailTitle.text() + '\r\n' + detailSubtitle.text() + '#YO’HOOD 2016',
url: location.href
}
},
tweetText: '【YO’HOOD 2016】' + detailTitle.text() + '\r\n' + detailSubtitle.text(),
qqText: '【YO’HOOD 2016】' + detailTitle.text() + ' ' + detailSubtitle.text() + shareUrl,
});
}
// if ($('.share').size() > 0) {
// //微信分享鼠标事件
// $('.yohoo-share-button-wx').on('mouseover', function() {
// $('.wx-qrcode-dialog').show();
// }).on('mouseout', function() {
// $('.wx-qrcode-dialog').hide();
// });
// shareUrl = $(".share").attr("data-link");
// shareCover = $(".share").attr("cover-url");
// detailTitle = $('.detail-title').find('h2');
// detailSubtitle = $('.detail-title').find('h3');
// //分享
// share.init({
// shareUrl: shareUrl,
// img: shareCover,
// sinaText: '【YO’HOOD 2016】' + detailTitle.text() + '\r\n' + detailSubtitle.text() + '@YOHO!潮流志' + shareUrl,
// fbTextFunction: function() {
// return {
// des: '【YO’HOOD 2016】' + detailTitle.text() + '\r\n' + detailSubtitle.text() + '#YO’HOOD 2016',
// name: '【YO’HOOD 2016】' + detailTitle.text() + '\r\n' + detailSubtitle.text() + '#YO’HOOD 2016',
// caption: '【YO’HOOD 2016】' + detailTitle.text() + '\r\n' + detailSubtitle.text() + '#YO’HOOD 2016',
// url: location.href
// }
// },
// tweetText: '【YO’HOOD 2016】' + detailTitle.text() + '\r\n' + detailSubtitle.text(),
// qqText: '【YO’HOOD 2016】' + detailTitle.text() + ' ' + detailSubtitle.text() + shareUrl,
// });
// }
// 表单验证
if ($('#index-form').length > 0) {
... ... @@ -765,6 +765,7 @@ define('channel', function(require, exports) {
$('.detail-slide-ctrl-tabs').slider();
$('.detail-slide-big-ctrl').on('click', 'a', function() {
console.log(detailSwiper.activeLoopIndex);
$('.detail-slide-ctrl-tabs').slider('slideTo', detailSwiper.activeLoopIndex);
});
$('.detail-slide-ctrl-tabs').on('click', 'li', function() {
... ...
This diff could not be displayed because it is too large.
... ... @@ -180,6 +180,17 @@
</li>
</ul>
</div>
<!-- 点击图片显示大图 start -->
<div class="detial-img-zoom">
<div class="img-zoom ">
<img src="">
<a href="javascript:;" class="close-btn"></a>
<a href="javascript:;" class="img-zoom-ctrl-prev iconfont">&#xe600;</a>
<a href="javascript:;" class="img-zoom-ctrl-next iconfont">&#xe602;</a>
</div>
<div class="overlay"></div>
</div>
<!-- 点击图片显示大图 end -->
<?php $this->_endblock();?>
<?php $this->_block('js');?>
<script type="text/javascript">
... ... @@ -189,7 +200,6 @@
})
seajs.use(['jquery', 'channel'], function($, channel) {
channel.common();
channel.detail();
})
</script>
<?php $this->_endblock();?>
\ No newline at end of file
... ...