diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php index 5dbe83932..0145fa2d0 100644 --- a/Application/Home/Controller/PromoteController.class.php +++ b/Application/Home/Controller/PromoteController.class.php @@ -494,7 +494,7 @@ class PromoteController extends BaseController } elseif ($type == 50) { $data_list = null; $count = 0; - } else if($type == 0) { + } /*else if($type == 0) { $field = 'id,game_name,server_name,user_account,nickname,promote_account,detail,create_time as update_time'; $data_list = M("protect_log","tab_")->field($field)->limit('0,5')->order("create_time desc")->select(); @@ -503,7 +503,7 @@ class PromoteController extends BaseController } $count = M("protect_log","tab_")->field($field)->count(); - } else { + }*/ else { $data_list = M("document", "sys_")->limit('0,50')->where("category_id=56 and status=1")->order("update_time desc")->page($page, $row)->select(); //游戏公告 $count = M("document", "sys_")->where("category_id=56 and status=1")->count(); } diff --git a/Application/Home/View/default/Promote/msg_list.html b/Application/Home/View/default/Promote/msg_list.html index 52230b1d3..3c024cbd9 100644 --- a/Application/Home/View/default/Promote/msg_list.html +++ b/Application/Home/View/default/Promote/msg_list.html @@ -34,12 +34,12 @@ - curr">资源号异常日志 - + curr">资源号异常日志 +
@@ -60,9 +60,11 @@
+
{$_page}
+
diff --git a/Public/Home/css/index/index.new.css b/Public/Home/css/index/index.new.css index e87caec75..90ffc28f2 100644 --- a/Public/Home/css/index/index.new.css +++ b/Public/Home/css/index/index.new.css @@ -40,8 +40,8 @@ .more{display: block;float: right;padding-top: 10px;font-size: 14px;color: #4A90F0} .more:hover{color:#26C7DB} -.fxui-tab {font-size: 14px;} -.fxui-tab-hand{height: 45px;line-height: 35px;margin: 10px;border-bottom: 1px solid #ddd} +.fxui-tab {font-size: 14px;margin-left: 20px;margin-right: 20px;} +.fxui-tab-hand{height: 45px;line-height: 35px;margin: 10px;border-bottom: 1px solid #ddd;} .fxui-tab-tit{display: block;float: left;font-size: 14px;height: 35px;line-height: 35px;cursor: pointer;border: 1px solid #ddd;} .fxui-tab-tit a{display: block;height: 35px;line-height: 35px;padding: 0 20px ;} .fxui-tab-tit:first-child{border-bottom-left-radius:3px;border-top-left-radius: 3px}