fe / YOHOOD · Commits

Go to a project

Authored by whb
Commit 13a9f20e7e7f4bdefbb6d092eb6333aa5864dbc4 2 parents 7b00df6b 319b199b

bug

Inline Side-by-side
Showing 7 changed files with 11 additions and 10 deletions
@@ -113,7 +113,7 @@ class Config_Defines @@ -113,7 +113,7 @@ class Config_Defines
113 // 静态资源目录 113 // 静态资源目录
114 define('SITE_RES', 'http://res.yohood.test.yoho.cn'); 114 define('SITE_RES', 'http://res.yohood.test.yoho.cn');
115 // 主站 115 // 主站
116 - define('SITE_MAIN', 'http://yohood.test.yoho.cn'); 116 + define('SITE_MAIN', 'http://yohood.dev.test.yoho.cn');
117 define('QINIU_UPLOAD_STATE', true); 117 define('QINIU_UPLOAD_STATE', true);
118 define('QINIU_UPLOAD_CLASS', 'Lib_Utils_QiniuUpload'); 118 define('QINIU_UPLOAD_CLASS', 'Lib_Utils_QiniuUpload');
119 define('QINIU_UPLOAD_ACCESSKEY', 'cY9B5ZgON_7McTS5zV5nTeRyQ98MOcVD7W4eGVbE'); 119 define('QINIU_UPLOAD_ACCESSKEY', 'cY9B5ZgON_7McTS5zV5nTeRyQ98MOcVD7W4eGVbE');
1 [mysql] 1 [mysql]
2 -  
3 -yohood.username = yohodb  
4 -yohood.password = yohonj_9646_mysql  
5 -yohood.writers = 127.0.0.1:3310  
6 -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
@@ -43,7 +43,9 @@ @@ -43,7 +43,9 @@
43 $action_name = $_ctx->action_name; 43 $action_name = $_ctx->action_name;
44 ?> 44 ?>
45 <div class="header"> 45 <div class="header">
  46 + <a href="<?php echo SITE_MAIN;?>">
46 <h1 class="logo"></h1> 47 <h1 class="logo"></h1>
  48 + </a>
47 <div class="nav"> 49 <div class="nav">
48 <ul class="clearfix"> 50 <ul class="clearfix">
49 <li <?php echo ($controller_name == 'default') ? 'class="current"':''; ?>> 51 <li <?php echo ($controller_name == 'default') ? 'class="current"':''; ?>>
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 <ul> 14 <ul>
15 <?php foreach($this->view->news as $val):?> 15 <?php foreach($this->view->news as $val):?>
16 <li> 16 <li>
17 - <a class="clearfix" href="<?php echo url('news/detail',array('id' => $val['id']))?>" target="_blank"> 17 + <a class="clearfix" href="<?php echo url('news/detail',array('id' => $val['id']))?>">
18 <div class="image-box"> 18 <div class="image-box">
19 <img src="<?php echo Lib_Images::getImageUrl($val['thumb'],'source','fragmentimg');?>" alt=""> 19 <img src="<?php echo Lib_Images::getImageUrl($val['thumb'],'source','fragmentimg');?>" alt="">
20 </div> 20 </div>
@@ -55,7 +55,7 @@ @@ -55,7 +55,7 @@
55 <ul> 55 <ul>
56 <?php foreach($this->view->news as $news):?> 56 <?php foreach($this->view->news as $news):?>
57 <li> 57 <li>
58 - <a class="clearfix" href="/news/detail/id/<?php echo $news['id'];?>" target="_blank"> 58 + <a class="clearfix" href="/news/detail/id/<?php echo $news['id'];?>">
59 <div class="image-box"> 59 <div class="image-box">
60 <img src="<?php echo Lib_Images::getImageUrl($news['thumb'], 'source','fragmentimg');?>" alt=""> 60 <img src="<?php echo Lib_Images::getImageUrl($news['thumb'], 'source','fragmentimg');?>" alt="">
61 </div> 61 </div>
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 </ul> 17 </ul>
18 </div> 18 </div>
19 <div class="news-main"> 19 <div class="news-main">
20 - <div class="news-content content-main"> 20 + <div class="news-content content-main <?php echo $this->view->current_tag == '视频' ? 'video-wrap':'';?>">
21 <div class="main-layout fluid-list-inner clearfix" id="img_flow"> 21 <div class="main-layout fluid-list-inner clearfix" id="img_flow">
22 <?php $this->_widget('news_list', array('list'=> $this->view->list));?> 22 <?php $this->_widget('news_list', array('list'=> $this->view->list));?>
23 </div> 23 </div>
@@ -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'];?>" target="_blank"> 24 + <a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" title="<?php echo $news['title'];?>">
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>