|
|
@@ -617,17 +617,19 @@
|
|
|
var desc=r.description||(r.function||'');
|
|
|
if(desc.length>120)desc=desc.substring(0,120)+'...';
|
|
|
var url=r.jump_url||'';
|
|
|
+ // 有跳转链接直接跳转,无链接点击查看详情
|
|
|
if(url){
|
|
|
h+='<a class="brand-card" href="'+escAttr(url)+'" target="_blank" rel="noopener">';
|
|
|
h+='<span class="brand-card-arrow">→ 跳转</span>';
|
|
|
- h+='<div class="brand-card-name">'+esc(name)+'</div>';
|
|
|
- h+='<div class="brand-card-desc">'+esc(desc)+'</div>';
|
|
|
- h+='</a>';
|
|
|
} else {
|
|
|
h+='<div class="brand-card" onclick="showBrandDetail('+JSON.stringify(r)+')" style="cursor:pointer">';
|
|
|
h+='<span class="brand-card-arrow" style="font-size:11px">查看详情 →</span>';
|
|
|
- h+='<div class="brand-card-name">'+esc(name)+'</div>';
|
|
|
- h+='<div class="brand-card-desc">'+esc(desc)+'</div>';
|
|
|
+ }
|
|
|
+ h+='<div class="brand-card-name">'+esc(name)+'</div>';
|
|
|
+ h+='<div class="brand-card-desc">'+esc(desc)+'</div>';
|
|
|
+ if(url){
|
|
|
+ h+='</a>';
|
|
|
+ } else {
|
|
|
h+='</div>';
|
|
|
}
|
|
|
}
|
|
|
@@ -643,18 +645,18 @@
|
|
|
if(eurl){
|
|
|
h+='<a class="brand-card" href="'+escAttr(eurl)+'" target="_blank" rel="noopener">';
|
|
|
h+='<span class="brand-card-arrow">→ 跳转</span>';
|
|
|
- h+='<div class="brand-card-name">'+esc(ename)+'</div>';
|
|
|
- h+='<div class="brand-card-desc">'+esc(edesc)+'</div>';
|
|
|
- h+='</a>';
|
|
|
} else {
|
|
|
h+='<div class="brand-card" onclick="showBrandDetail('+JSON.stringify(er)+')" style="cursor:pointer">';
|
|
|
h+='<span class="brand-card-arrow" style="font-size:11px">查看详情 →</span>';
|
|
|
- h+='<div class="brand-card-name">'+esc(ename)+'</div>';
|
|
|
- h+='<div class="brand-card-desc">'+esc(edesc)+'</div>';
|
|
|
+ }
|
|
|
+ h+='<div class="brand-card-name">'+esc(ename)+'</div>';
|
|
|
+ h+='<div class="brand-card-desc">'+esc(edesc)+'</div>';
|
|
|
+ if(eurl){
|
|
|
+ h+='</a>';
|
|
|
+ } else {
|
|
|
h+='</div>';
|
|
|
}
|
|
|
}
|
|
|
- h+='</div>';
|
|
|
h+='<button class="brand-more-btn" onclick="var d=document.getElementById(\''+moreId+'\');var t=this;if(d.style.display===\'none\'){d.style.display=\'block\';t.textContent=\'▲ 收起 '+extraRecs.length+' 条推荐\'}else{d.style.display=\'none\';t.textContent=\'▼ 展开 '+extraRecs.length+' 条推荐\'}">▼ 展开 '+extraRecs.length+' 条推荐</button>';
|
|
|
}
|
|
|
h+='</div>';
|