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

@@ -1599,7 +1599,7 @@ define('yohood', function(require, exports) {
                                         setTimeout(function() {
                                         setTimeout(function() {
                                             $('.dialog-w').fadeOut();
                                             $('.dialog-w').fadeOut();
                                             window.location.reload();
                                             window.location.reload();
-                                        }, 2000);
+                                        }, 5000);
                                     } else {
                                     } else {
                                         alert(d.message);
                                         alert(d.message);
                                     }
                                     }

@@ -232,6 +232,7 @@ EOT;
         $info['thumb'] = Lib_Images::getImageUrl($info['thumb'], 'source','fragmentimg');
         $info['thumb'] = Lib_Images::getImageUrl($info['thumb'], 'source','fragmentimg');
         //增加浏览量
         //增加浏览量
         Facade_News::updateHits($id);
         Facade_News::updateHits($id);
+        $info = str_replace('<embed align="middle"','<embed align="middle" allowfullscreen="true" ' , $info);
         $this->_view['info'] = $info;
         $this->_view['info'] = $info;
         $this->_view['banners'] = Facade_Index::getIndex(4);
         $this->_view['banners'] = Facade_Index::getIndex(4);
         $this->_view['news'] = $news;
         $this->_view['news'] = $news;

 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <sqlMap namespace="news">
 <sqlMap namespace="news">
 	<select id="getList">
 	<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>
 	<select id="getOneById">
 	<select id="getOneById">
 		SELECT * FROM `tbl_news`  where `id`=:id
 		SELECT * FROM `tbl_news`  where `id`=:id

@@ -30,20 +30,20 @@ $width = 342;
      </div>
      </div>
     <div class="item-info">
     <div class="item-info">
         <a class="fluid-tag item-tag <?php
         <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']?>">
         ?>" href="/news/index/tag/<?php echo $news['tag']?>">
             <?php
             <?php
             $newtag=array("品牌资讯","活动介绍","亮点活动","限量商品");
             $newtag=array("品牌资讯","活动介绍","亮点活动","限量商品");