diff --git a/res/js/yohood.js b/res/js/yohood.js index f821114..e5b0ffa 100644 --- a/res/js/yohood.js +++ b/res/js/yohood.js @@ -1599,7 +1599,7 @@ define('yohood', function(require, exports) { setTimeout(function() { $('.dialog-w').fadeOut(); window.location.reload(); - }, 2000); + }, 5000); } else { alert(d.message); } diff --git a/res/swf/YohoodPlayer.swf b/res/swf/YohoodPlayer.swf index 3cc6996..2cb966d 100644 Binary files a/res/swf/YohoodPlayer.swf and b/res/swf/YohoodPlayer.swf differ diff --git a/website/controller/News.class.php b/website/controller/News.class.php index e2a3e08..ad689a8 100644 --- a/website/controller/News.class.php +++ b/website/controller/News.class.php @@ -232,6 +232,7 @@ EOT; $info['thumb'] = Lib_Images::getImageUrl($info['thumb'], 'source','fragmentimg'); //增加浏览量 Facade_News::updateHits($id); + $info = str_replace('<embed align="middle"','<embed align="middle" allowfullscreen="true" ' , $info); $this->_view['info'] = $info; $this->_view['banners'] = Facade_Index::getIndex(4); $this->_view['news'] = $news; diff --git a/website/sqlmap/news/sqlmap-news.xml b/website/sqlmap/news/sqlmap-news.xml index a49e86b..1e10dd5 100644 --- a/website/sqlmap/news/sqlmap-news.xml +++ b/website/sqlmap/news/sqlmap-news.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <sqlMap namespace="news"> <select id="getList"> - SELECT * FROM `tbl_news` #where# order by `sort` DESC , create_time desc limit :offset, :limit + SELECT * FROM `tbl_news` #where# order by create_time desc limit :offset, :limit </select> <select id="getOneById"> SELECT * FROM `tbl_news` where `id`=:id diff --git a/website/view/widget/news/list.php b/website/view/widget/news/list.php index 6358bb5..effa078 100644 --- a/website/view/widget/news/list.php +++ b/website/view/widget/news/list.php @@ -30,20 +30,20 @@ $width = 342; </div> <div class="item-info"> <a class="fluid-tag item-tag <?php - switch($news['tag']){ - case "品牌资讯": - echo "brand-info"; - break; - case "活动介绍": - echo "activity-intro"; - break; - case "亮点活动": - echo "spotlight-activity"; - break; - case "限量商品": - echo "limited-edition"; - break; - } + if($news['tag']=="品牌资讯"){ + echo "brand-info"; + } + elseif($news['tag']=="活动介绍"){ + echo "activity-intro"; + } + elseif($news['tag']=="亮点活动"){ + echo "spotlight-activity"; + } + elseif($news['tag']=="限量商品"){ + echo "limited-edition"; + }else{ + echo "brand-info"; + } ?>" href="/news/index/tag/<?php echo $news['tag']?>"> <?php $newtag=array("品牌资讯","活动介绍","亮点活动","限量商品");