diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php
index 434e276ca..d17f86828 100644
--- a/Application/Home/Controller/PromoteController.class.php
+++ b/Application/Home/Controller/PromoteController.class.php
@@ -268,20 +268,62 @@ class PromoteController extends BaseController
// 消息列表
- public function msg_list($type=56){
+ public function msg_list($type=56,$p=0){
+ if (isset($_REQUEST['row'])) {
+ $row = $_REQUEST['row'];
+ } else {
+ $row = 10;
+ }
+ $page = $p ? $p : 1; //默认显示第一页数据
if($type==51){
- $data_list = M("document","sys_")->limit('0,50')->where("category_id=51 and status=1")->order("update_time desc")->select(); //游戏咨询
+ $data_list = M("document","sys_")->where("category_id=51 and status=1")->order("update_time desc") ->page($page, $row)->select(); //游戏咨询
+ $count = M("document","sys_")->where("category_id=51 and status=1")->count();
}elseif ($type==50){
$data_list = null;
+ $count = 0;
}else{
- $data_list = M("document","sys_")->limit('0,50')->where("category_id=56 and status=1")->order("update_time desc")->select(); //游戏公告
+ $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();
+ }
+ $parameter['p'] = I('get.p', 1);
+ $parameter['row'] = I('get.row');
+ $page = set_pagination($count, $row, $parameter);
+ if ($page) {
+ $this->assign('_page', $page);
}
+
$this->meta_title = "公告列表";
$this->assign("type", $type);
$this->assign("data_list", $data_list);
$this->display();
}
+ /* public function page_show($model,$map,$p=1)
+ {
+ if (isset($_REQUEST['row'])) {
+ $row = $_REQUEST['row'];
+ } else {
+ $row = 10;
+ }
+ $this->meta_title = "平台币充值";
+ $page = $p ? $p : 1; //默认显示第一页数据
+ $data = M($model, 'tab_')
+ ->where($map)
+ ->order('id DESC')
+ ->page($page, $row)
+ ->select();
+
+ $count = M($model, "tab_")->where($map)->count();
+ $parameter = $map;
+ $parameter['p'] = I('get.p', 1);
+ $parameter['row'] = I('get.row');
+ $page = set_pagination($count, $row, $parameter);
+ if ($page) {
+ $this->assign('_page', $page);
+ }
+ $this->assign("data_list", $data);
+ $this->display();
+ }*/
/**
* 我的基本信息
diff --git a/Application/Home/View/default/Promote/index.html b/Application/Home/View/default/Promote/index.html
index 28e850a6d..d628ae620 100644
--- a/Application/Home/View/default/Promote/index.html
+++ b/Application/Home/View/default/Promote/index.html
@@ -1,6 +1,6 @@
-
+
@@ -42,7 +42,7 @@
-
+
暂无公告
diff --git a/Application/Home/View/default/Promote/msg_list.html b/Application/Home/View/default/Promote/msg_list.html
index 99636880f..33db7955f 100644
--- a/Application/Home/View/default/Promote/msg_list.html
+++ b/Application/Home/View/default/Promote/msg_list.html
@@ -1,6 +1,6 @@
-
+
@@ -10,7 +10,7 @@
当前位置:后台首页> 公告列表
-
+
curr">公告
@@ -30,7 +30,15 @@
+
+ {$_page}
+
+
\ No newline at end of file
diff --git a/Application/Home/View/default/Promote/quick_menu_list.html b/Application/Home/View/default/Promote/quick_menu_list.html
index 097cf441b..dbf9f99c4 100644
--- a/Application/Home/View/default/Promote/quick_menu_list.html
+++ b/Application/Home/View/default/Promote/quick_menu_list.html
@@ -13,28 +13,28 @@
-
-
-
- 图标
- 模块名称
- 是否添加
- 操作
-
-
- 暂无数据
-
-
-
-
- {$data.name}
- 已添加 未添加
- 移除 添加
-
-
-
-
-
+
+
+
+ 图标
+ 模块名称
+ 是否添加
+ 操作
+
+
+ 暂无数据
+
+
+
+
+ {$data.name}
+ 已添加 未添加
+ 移除 添加
+
+
+
+
+
diff --git a/Public/Home/css/index/index.new.css b/Public/Home/css/index/index.new.css
index c6dcaccd1..e87caec75 100644
--- a/Public/Home/css/index/index.new.css
+++ b/Public/Home/css/index/index.new.css
@@ -42,15 +42,19 @@
.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-tit {display: block;float: left;font-size: 14px;height: 28px;line-height: 28px;padding: 2px 20px ;cursor: pointer;border: 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}
.fxui-tab-tit:last-child{border-bottom-right-radius:3px;border-top-right-radius: 3px}
.fxui-tab-hand .curr {background: #26C7DB;color: #fff;border: 1px solid #26C7DB}
.fxui-tab-nav {padding: 15px;height: 280px;margin-top: -10px}
.fxui-tab-nav p{height: 50px;line-height: 50px;border-bottom: 1px solid #ddd}
.fxui-tab-nav p span:first-child{width: 80%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display: inline-block}
-.fxui-tab-nav p span:last-child{float: right;width: 15%;display: inline-block}
+.fxui-tab-nav p span:last-child{float: right;width: 15%;display: inline-block;text-align: right}
+#pagechange{
+ margin-right: 20px;
+}
/*.article-type{vertical-align: middle;padding-right: 10px;}
.article-title{width: 400px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;vertical-align: middle;color: #515974;font-size: 13px;}