fe / YOHOOD · Commits

Go to a project

Authored by 2586703@qq.com
Commit 6a4007a4c3f25d9fca625b04f5a12972d98fd142 2 parents e14fd736 7428aeb5

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

Inline Side-by-side
Showing 8 changed files with 16 additions and 9 deletions
... ... @@ -9,6 +9,7 @@ define('mobile', function(require, exports) {
swipe = require("plugins/swipe"),
share = require("plugins/share"),
common = require("common"),
store = require("lib/util/store"),
swiper = require("plugins/idangerous.swiper"),
mlellipsis = require("plugins/mlellipsis");
require("plugins/imgZoom");
... ... @@ -30,10 +31,15 @@ define('mobile', function(require, exports) {
}
}
});
if(store.get('download_state')) {
$('.header-download-wrap').remove();
} else {
$('.header-download-wrap').show();
}
//关闭下载
$('.header-download-wrap').on('click', '.tip-close', function() {
$('.header-download-wrap').remove();
store.set('download_state',1);
});
}
};
... ...
[mysql]
yohood.username = yohodb
yohood.password = yohonj_9646_mysql
yohood.writers = 127.0.0.1:3310
... ...
... ... @@ -43,7 +43,9 @@
$action_name = $_ctx->action_name;
?>
<div class="header">
<h1 class="logo"></h1>
<a href="<?php echo SITE_MAIN;?>">
<h1 class="logo"></h1>
</a>
<div class="nav">
<ul class="clearfix">
<li <?php echo ($controller_name == 'default') ? 'class="current"':''; ?>>
... ...
... ... @@ -14,7 +14,7 @@
<body>
<div class="mobile-wrap">
<div class="hd">
<div class="header-download-wrap">
<div class="header-download-wrap" style="display:none">
<div class="header-download clearfix">
<div class="tip-pic"></div>
<div class="tip-info">
... ...
... ... @@ -14,7 +14,7 @@
<ul>
<?php foreach($this->view->news as $val):?>
<li>
<a class="clearfix" href="<?php echo url('news/detail',array('id' => $val['id']))?>" target="_blank">
<a class="clearfix" href="<?php echo url('news/detail',array('id' => $val['id']))?>">
<div class="image-box">
<img src="<?php echo Lib_Images::getImageUrl($val['thumb'],'source','fragmentimg');?>" alt="">
</div>
... ...
... ... @@ -55,7 +55,7 @@
<ul>
<?php foreach($this->view->news as $news):?>
<li>
<a class="clearfix" href="/news/detail/id/<?php echo $news['id'];?>" target="_blank">
<a class="clearfix" href="/news/detail/id/<?php echo $news['id'];?>">
<div class="image-box">
<img src="<?php echo Lib_Images::getImageUrl($news['thumb'], 'source','fragmentimg');?>" alt="">
</div>
... ...
... ... @@ -17,9 +17,9 @@
</ul>
</div>
<div class="news-main">
<div class="news-content content-main">
<div class="news-content content-main <?php echo $this->view->current_tag == '视频' ? 'video-wrap':'';?>">
<div class="main-layout fluid-list-inner clearfix" id="img_flow">
<?php $this->_widget('news_list', array('list'=> $this->view->list));?>
<?php $this->_widget('news_list', array('list'=> $this->view->list, 'video' => $this->view->current_tag == '视频' ? 1:0 ));?>
</div>
<div id="pageContent" style="text-align: center;" class="pagination">
<?php $this->_component('Common_Pagination',array(
... ...
... ... @@ -21,7 +21,7 @@ else
?>
<div class="layout-item tiled">
<div class="image-box">
<a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" title="<?php echo $news['title'];?>" target="_blank">
<a href="<?php echo url('news/detail' ,array('id' => $news['id']))?>" title="<?php echo $news['title'];?>">
<img src="<?php echo $thumb;?>" alt="" style="">
<?php if(trim($news['tag']) == '视频'):?>
<i class="play-icon"></i>
... ...