From 77472090bf4a1149df715653cca525d5eb0f459f Mon Sep 17 00:00:00 2001
From: devil_gong <devil_gong@wochacha.com>
Date: Mon, 20 Aug 2018 17:38:47 +0800
Subject: [PATCH] artice

---
 .../Home/Controller/IndexController.class.php        |  2 +-
 service/Public/Home/Default/Css/Index.css            | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/service/Application/Home/Controller/IndexController.class.php b/service/Application/Home/Controller/IndexController.class.php
index 1abd981d6..217301176 100755
--- a/service/Application/Home/Controller/IndexController.class.php
+++ b/service/Application/Home/Controller/IndexController.class.php
@@ -44,7 +44,7 @@ class IndexController extends CommonController
 		$this->assign('goods_floor_list', $this->GetHomeFloorList($goods_category));
 
 		// 新闻
-		$this->assign('article_list', $this->GetCommonArticleList(['where'=>['a.is_enable'=>1, 'is_home_recommended'=>1], 'field'=>'a.id,a.title,a.title_color,ac.name AS category_name', 'm'=>0, 'n'=>8]));
+		$this->assign('article_list', $this->GetCommonArticleList(['where'=>['a.is_enable'=>1, 'is_home_recommended'=>1], 'field'=>'a.id,a.title,a.title_color,ac.name AS category_name', 'm'=>0, 'n'=>9]));
 
 		$this->display('Index');
 	}
diff --git a/service/Public/Home/Default/Css/Index.css b/service/Public/Home/Default/Css/Index.css
index c3d5e0266..958393022 100755
--- a/service/Public/Home/Default/Css/Index.css
+++ b/service/Public/Home/Default/Css/Index.css
@@ -123,8 +123,8 @@ text-align: center;float:none}
 .flood .text-two{border-top: 1px solid #eee;border-left: 1px solid #eee;}
 .flood .text-two img{width:50%;margin:1% 3% 1% 47%;}
 .flood .text-three{border-top: 1px solid #eee;border-left: 1px solid #eee;}
-.flood .text-three img{width:96%;margin:45% 2% 2% 2%;}
-.flood .outer-con {padding-top:7%;padding-left:3% ;}
+.flood .text-three img{width:96%;margin:2% 2% 45% 2%;}
+.flood .outer-con {padding: 0% 3% 3% 3%; bottom: 0px;}
 .flood .text-two .outer-con {width:40%;}
 .list .outer-con .describe {
     color: #fff;
@@ -222,7 +222,7 @@ text-align: center;float:none}
     /*楼层*/
     .flood .text-one img{width:90%;margin:37% 5% 0% 5%;}
     .flood .text-two img{width:60%;margin:1% 3% 1% 37%;}
-    .flood .text-three img{width:96%;margin:40% 2% 2% 2%;}
+    .flood .text-three img{width:96%;margin:2% 2% 40% 2%;}
     .flood .text-two .outer-con {top:7%;left:2% ;width:35%;}
 }
 
@@ -340,7 +340,7 @@ text-align: center;float:none}
 
      /*改写的公告*/
     .marqueen{ position:absolute;top:80px;right:0px;width:170px;height:300px ; background:#FFF; opacity:1;z-index: 11;border:none;}
-    .marqueen .banner-news li {float: none;width: 100%;padding:0px 5px;border:none ;height: 30px;line-height:30px ;}
+    .marqueen .banner-news li {float: none;width: 100%;padding:0px 5px;border:none ;height: 28px;line-height:28px ;}
 
     /*推荐*/
     .recommendation{margin:0px auto ;}
@@ -387,7 +387,7 @@ text-align: center;float:none}
     .flood .text-one,.flood .text-two,.flood .text-three{width:20%;text-align: center;margin: 0px 0px;height:200px ;}
     .flood .text-two.sug{position: absolute;top:200px;left:20%;}
     .flood .text-three.sug{position: absolute;top:200px;right:20%;}
-    .flood .text-one img,.flood .text-two img,.flood .text-three img{position: absolute;margin:0px 0px;width: 120px;top: 10px;right: 50%;margin-right: -60px;}
+    .flood .text-one img,.flood .text-two img,.flood .text-three img{position: absolute;margin:0px 0px;width: 120px;right: 50%;margin-right: -60px;}
 
     .flood .list img{position: absolute;top:auto;margin:0px 0px;bottom:0;right:50%;width:200px;margin-right: -100px;}
 
@@ -437,7 +437,7 @@ text-align: center;float:none}
     .marqueen {width:220px;height: 404px;text-align: left;top:60px;padding: 10px;}
     .banner-news{padding-top: 5px;}
     .banner-news li {height: 26px;line-height: 26px;}
-    .marqueen-title{display: block;margin-left:5px ;margin-top: 10px;}
+    .marqueen-title{display: block;margin-left:5px ;margin-top: 5px;}
     .mod-vip{display: block; padding-bottom: 10px; border-bottom: 1px solid #eee;}
     .m-baseinfo{position: relative;margin-bottom: 10px;}
     .m-baseinfo a img{display: block;width: 50px;height: 50px;border-radius: 50px;}