fe / YOHOOD · Commits

Go to a project

Authored by 2586703@qq.com
Commit 366f69c31a8df6a025e73c64bac979b848dcaea9 2 parents b6f38895 9db7170c

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

Inline Side-by-side
Showing 3 changed files with 9 additions and 8 deletions
... ... @@ -372,7 +372,7 @@ define('yohood', function(require, exports) {
});
$(".brand-content").html(template.replace('{li}', html));
} else {
$(".brand-content").html(noSearchTemplate.replace('{brand}', brand));
$(".brand-content").html(noSearchTemplate.replace('{brand}', decodeURIComponent(brand)));
}
}
});
... ... @@ -599,16 +599,17 @@ define('yohood', function(require, exports) {
var template = function(topic, img, url, isVideo, isTitleStyle, title, imgStyle) {
var playIcon = '';
var titleStyle = '';
var title = $('<p>'+title+'</p>').text();
var html = '<div class="layout-item clearfix">' +
'<div class="image-box">' +
'<a href="' + url + '" target="_blank" title="' + $('<p>'+title+'</p>').text() + '">' +
'<a href="' + url + '" target="_blank" title="' + title + '">' +
'<img src="' + img + '" alt="" style="' + imgStyle + '">' +
'{playIcon}' +
'</a>' +
'</div>' +
'<div class="content">' +
'<h2 {titleStyle}>' +
'<a href="' + url + '" title="' + $('<p>'+title+'</p>').text() + '" target="_blank">' + topic + '</a>' +
'<a href="' + url + '" title="' + title + '" target="_blank">' + topic + '</a>' +
'</h2>' +
'</div>' +
'</div>';
... ...
[mysql]
yohood.username = yohodb
yohood.password = yohonj_9646_mysql
yohood.writers = 127.0.0.1:3310
yohood.readers = 127.0.0.1:3310
pre_yohood.username = yohodb
pre_yohood.password = yohonj_9646_mysql
pre_yohood.writers = 10.170.183.158:5510
pre_yohood.readers = 10.170.183.158:5510
... ...
... ... @@ -19,7 +19,7 @@
<div class="post-list main-layout">
<div class="layout-item tiled">
<div class="image-box">
<a href="<?php echo url('news/detail',array('id' => $val['id']))?>" title="<?php echo $val['title']?>" target="_blank">
<a href="<?php echo url('news/detail',array('id' => $val['id']))?>" title="<?php echo Lib_Utils_StringHelper::stripTags($val['title']);?>" target="_blank">
<img src="<?php echo Lib_Images::getImageUrl($val['thumb'],'0230x0130','fragmentimg', 'thumbnail');?>" alt="">
<?php if(trim($val['tag']) == '视频'):?>
<i class="play-icon"></i>
... ...