diff --git a/app/home/controller/Conf.php b/app/home/controller/Conf.php index 7317e09..b62b2b1 100644 --- a/app/home/controller/Conf.php +++ b/app/home/controller/Conf.php @@ -23,7 +23,7 @@ class Conf extends BaseController $param = get_params(); $where = array(); $where[] = ['status', '>=', 0]; - $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; $content = Db::name('Config') ->where($where) ->paginate($rows, false, ['query' => $param]); diff --git a/app/home/controller/Keywords.php b/app/home/controller/Keywords.php index 71683d9..4c73011 100644 --- a/app/home/controller/Keywords.php +++ b/app/home/controller/Keywords.php @@ -26,7 +26,7 @@ class Keywords extends BaseController $where[] = ['title', 'like', '%' . $param['keywords'] . '%']; } $where[] = ['status', '>=', 0]; - $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; $content = Db::name('Keywords') ->order('create_time desc') ->where($where) diff --git a/app/home/controller/Role.php b/app/home/controller/Role.php index 1838fd9..5be6f16 100644 --- a/app/home/controller/Role.php +++ b/app/home/controller/Role.php @@ -26,7 +26,7 @@ class Role extends BaseController if (!empty($param['keywords'])) { $where[] = ['id|title|desc', 'like', '%' . $param['keywords'] . '%']; } - $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; $group = AdminGroup::where($where) ->order('create_time asc') ->paginate($rows, false, ['query' => $param]); diff --git a/app/install/view/index/step3.html b/app/install/view/index/step3.html index 2805dc6..e2d5104 100644 --- a/app/install/view/index/step3.html +++ b/app/install/view/index/step3.html @@ -194,7 +194,7 @@ $.ajax({ url:"https://www.gougucms.com/index.php?s=home/login/install_ajax", dataType:'jsonp', - data:'', + data:{'name':'勾股OA'}, jsonp:'callback', success:function(result) { console.log(result); diff --git a/app/user/controller/User.php b/app/user/controller/User.php index 80502b1..75c7320 100644 --- a/app/user/controller/User.php +++ b/app/user/controller/User.php @@ -39,7 +39,7 @@ class User extends BaseController $department_array = get_department_son($param['did']); $where[] = ['did', 'in', $department_array]; } - $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; $admin = AdminList::where($where) ->order('id desc') ->paginate($rows, false, ['query' => $param]) @@ -267,7 +267,7 @@ class User extends BaseController if (!empty($param['rule_menu'])) { $where['rule_menu'] = $param['rule_menu']; } - $rows = empty($param['limit']) ? get_config(app . page_size) : $param['limit']; + $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; $content = DB::name('AdminLog') ->field("id,uid,name,action,title,content,rule_menu,ip,param_id,param,FROM_UNIXTIME(create_time,'%Y-%m-%d %H:%i:%s') create_time") ->order('create_time desc') diff --git a/public/static/home/css/common.css b/public/static/home/css/common.css index e4de4cb..5f3dd49 100644 --- a/public/static/home/css/common.css +++ b/public/static/home/css/common.css @@ -66,7 +66,7 @@ .layui-td-gray3{color:#999; width:120px; text-align:right; background-color:#f8f8f8;} .layui-td-gray4{color:#999; width:150px; text-align:right; background-color:#f8f8f8;} .layui-td-gray font,.layui-td-gray2 font,.layui-td-gray3 font{color:#FF6347; margin-left: 3px;} - .main-body{padding:15px;padding-bottom: 0; min-width: 868px;} + .main-body{padding:12px;padding-bottom: 0; min-width: 868px;} .body-content{background-color:#fff; padding:10px 15px;} .body-table{background-color:#fff; margin-bottom:15px} .h3-title{font-size:18px; height:39px; font-weight:800}