Authored by 2586703@qq.com

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

... ... @@ -237,14 +237,17 @@ define('yohood', function(require, exports) {
});
//标签设置
if (/(iPad)/i.test(navigator.userAgent)) { //ipad处理
$(".show-wrap .image-box").bind("click", function() {
var timer = setInterval(function() {
if ($(".show").size() > 0) {
showLabel($(".show"), 480, 480, 0, 0);
clearInterval(timer);
return true;
}
}, 1);
$("#bigpic").live("click", function() {
if($(this).attr("isopen") == 1){
showNone($(this).parent());
$(this).attr("isopen",0);
}
else
{
showLabel($(this).parent(), 480, 480, 0, 0);
$(this).attr("isopen", 1);
}
});
} else {
$(".show-wrap .image-box").bind("click", function() {
... ... @@ -631,13 +634,13 @@ define('yohood', function(require, exports) {
//热门视频
$.each(data.data.hotVideo, function(i, v) {
isTitleStyle = (v.main_title_type == 1) ? 1 : 0;
hotVideo += template(v.title, common.getImages(v.thumb, '0230x0230', 'blogimg', '1'),
hotVideo += template(tools.limitWords(v.title, 52), common.getImages(v.thumb, '0230x0230', 'blogimg', '1'),
'/news/detail/id/' + v.id, 2, isTitleStyle, v.title, '');
});
//最新视频
$.each(data.data.lastVideo, function(i, v) {
isTitleStyle = (v.main_title_type == 1) ? 1 : 0;
lastVideo += template(v.title, common.getImages(v.thumb, '0230x0230', 'blogimg', '1'),
lastVideo += template(tools.limitWords(v.title, 52), common.getImages(v.thumb, '0230x0230', 'blogimg', '1'),
'/news/detail/id/' + v.id, 2, isTitleStyle, v.title, '');
});
$(".post-list").html(recom);
... ...
... ... @@ -49,7 +49,7 @@
</a>
</li>
<li>
<a href="javascript:;">
<a href="/default/other?callback=/default/index">
<div class="channel-pic recmmend"></div>
<h2 class="channel-name">RECMMEND</h2>
<p class="channel-name-cn">限量推荐</p>
... ... @@ -70,7 +70,7 @@
</a>
</li>
<li>
<a href="javascript:;">
<a href="/default/other?callback=/default/index">
<div class="channel-pic ticket iconfont"></div>
<h2 class="channel-name">TICKET</h2>
<p class="channel-name-cn">购票通道</p>
... ...
<?php $this->_extends('layout/default_layout_mobile');?>
<?php $this->_block('main');?>
<img src="<?php echo SITE_RES.'/images/yohood/comingsoon.jpg';?>" style="width: 100%"/>
<?php $this->_endblock();?>
\ No newline at end of file
... ...