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) { @@ -372,7 +372,7 @@ define('yohood', function(require, exports) {
372 }); 372 });
373 $(".brand-content").html(template.replace('{li}', html)); 373 $(".brand-content").html(template.replace('{li}', html));
374 } else { 374 } else {
375 - $(".brand-content").html(noSearchTemplate.replace('{brand}', brand)); 375 + $(".brand-content").html(noSearchTemplate.replace('{brand}', decodeURIComponent(brand)));
376 } 376 }
377 } 377 }
378 }); 378 });
@@ -599,16 +599,17 @@ define('yohood', function(require, exports) { @@ -599,16 +599,17 @@ define('yohood', function(require, exports) {
599 var template = function(topic, img, url, isVideo, isTitleStyle, title, imgStyle) { 599 var template = function(topic, img, url, isVideo, isTitleStyle, title, imgStyle) {
600 var playIcon = ''; 600 var playIcon = '';
601 var titleStyle = ''; 601 var titleStyle = '';
  602 + var title = $('<p>'+title+'</p>').text();
602 var html = '<div class="layout-item clearfix">' + 603 var html = '<div class="layout-item clearfix">' +
603 '<div class="image-box">' + 604 '<div class="image-box">' +
604 - '<a href="' + url + '" target="_blank" title="' + $('<p>'+title+'</p>').text() + '">' + 605 + '<a href="' + url + '" target="_blank" title="' + title + '">' +
605 '<img src="' + img + '" alt="" style="' + imgStyle + '">' + 606 '<img src="' + img + '" alt="" style="' + imgStyle + '">' +
606 '{playIcon}' + 607 '{playIcon}' +
607 '</a>' + 608 '</a>' +
608 '</div>' + 609 '</div>' +
609 '<div class="content">' + 610 '<div class="content">' +
610 '<h2 {titleStyle}>' + 611 '<h2 {titleStyle}>' +
611 - '<a href="' + url + '" title="' + $('<p>'+title+'</p>').text() + '" target="_blank">' + topic + '</a>' + 612 + '<a href="' + url + '" title="' + title + '" target="_blank">' + topic + '</a>' +
612 '</h2>' + 613 '</h2>' +
613 '</div>' + 614 '</div>' +
614 '</div>'; 615 '</div>';
1 [mysql] 1 [mysql]
2 -yohood.username = yohodb  
3 -yohood.password = yohonj_9646_mysql  
4 -yohood.writers = 127.0.0.1:3310  
5 -yohood.readers = 127.0.0.1:3310 2 +pre_yohood.username = yohodb
  3 +pre_yohood.password = yohonj_9646_mysql
  4 +pre_yohood.writers = 10.170.183.158:5510
  5 +pre_yohood.readers = 10.170.183.158:5510
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <div class="post-list main-layout"> 19 <div class="post-list main-layout">
20 <div class="layout-item tiled"> 20 <div class="layout-item tiled">
21 <div class="image-box"> 21 <div class="image-box">
22 - <a href="<?php echo url('news/detail',array('id' => $val['id']))?>" title="<?php echo $val['title']?>" target="_blank"> 22 + <a href="<?php echo url('news/detail',array('id' => $val['id']))?>" title="<?php echo Lib_Utils_StringHelper::stripTags($val['title']);?>" target="_blank">
23 <img src="<?php echo Lib_Images::getImageUrl($val['thumb'],'0230x0130','fragmentimg', 'thumbnail');?>" alt=""> 23 <img src="<?php echo Lib_Images::getImageUrl($val['thumb'],'0230x0130','fragmentimg', 'thumbnail');?>" alt="">
24 <?php if(trim($val['tag']) == '视频'):?> 24 <?php if(trim($val['tag']) == '视频'):?>
25 <i class="play-icon"></i> 25 <i class="play-icon"></i>