fe / YOHOOD · Commits

Go to a project

Authored by 2586703@qq.com
Commit 8aec6936b23a649793eca4008f6c476f071fd9c6 2 parents daf6b1b6 775a986f

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

Inline Side-by-side
Showing 2 changed files with 5 additions and 3 deletions
@@ -67,7 +67,9 @@ @@ -67,7 +67,9 @@
67 </div> 67 </div>
68 <br/> 68 <br/>
69 <br/> 69 <br/>
70 -<div id="share" class="share" cover-url="<?php echo Lib_Images::getImageUrl($this->view->info['thumb'], 'source','fragmentimg');?>" 70 +<div id="share" class="share" cover-url="<?php
  71 + $thumb = empty($this->view->info['client_thumb']) ? $this->view->info['thumb'] : $this->view->info['client_thumb'];
  72 + echo Lib_Images::getImageUrl($thumb, 'source','fragmentimg');?>"
71 data-link="<?php echo SITE_MAIN.'/news/detail/id/'.$this->view->info['id'];?>"> 73 data-link="<?php echo SITE_MAIN.'/news/detail/id/'.$this->view->info['id'];?>">
72 <ul class="clearfix"> 74 <ul class="clearfix">
73 <li class="yohoo-share-button-sina"><a href="javascript:;"></a></li> 75 <li class="yohoo-share-button-sina"><a href="javascript:;"></a></li>
@@ -21,7 +21,7 @@ else @@ -21,7 +21,7 @@ else
21 ?> 21 ?>
22 <div class="layout-item tiled"> 22 <div class="layout-item tiled">
23 <div class="image-box"> 23 <div class="image-box">
24 - <a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" title="<?php echo $news['title'];?>"> 24 + <a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" title="<?php echo $news['title'];?>" target="_blank">
25 <img src="<?php echo $thumb;?>" alt="" style=""> 25 <img src="<?php echo $thumb;?>" alt="" style="">
26 <?php if(trim($news['tag']) == '视频'):?> 26 <?php if(trim($news['tag']) == '视频'):?>
27 <i class="play-icon"></i> 27 <i class="play-icon"></i>
@@ -31,7 +31,7 @@ else @@ -31,7 +31,7 @@ else
31 </div> 31 </div>
32 <div class="content"> 32 <div class="content">
33 <h2 <?php echo $news['main_title_type'] == 1 ? 'class="volupia"':'';?>> 33 <h2 <?php echo $news['main_title_type'] == 1 ? 'class="volupia"':'';?>>
34 - <a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>"><?php echo $news['title'];?></a> 34 + <a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" target="_blank"><?php echo $news['title'];?></a>
35 </h2> 35 </h2>
36 <p class="text-content"><?php echo $description;?></p> 36 <p class="text-content"><?php echo $description;?></p>
37 <p class="time"><?php echo date('Y.m.d', $news['create_time'])?></p> 37 <p class="time"><?php echo date('Y.m.d', $news['create_time'])?></p>