diff --git a/app/admin/controller/Api.php b/app/admin/controller/Api.php index 4e6b65e..3383e29 100644 --- a/app/admin/controller/Api.php +++ b/app/admin/controller/Api.php @@ -273,7 +273,7 @@ class Api extends BaseController ->limit(10) ->select()->toArray(); foreach ($list as $key => $val) { - $list[$key]['last_login_time'] = date('Y-m-d :H:i:s', $val['last_login_time']); + $list[$key]['last_login_time'] = date('Y-m-d H:i:s', $val['last_login_time']); } $res['data'] = $list; return table_assign(0, '', $res); @@ -283,7 +283,7 @@ class Api extends BaseController public function get_article_list() { $list = Db::name('Article') - ->field('a.*,c.title as cate_title') + ->field('a.id,a.title,a.read,a.status,a.create_time,c.title as cate_title') ->alias('a') ->join('article_cate c', 'a.article_cate_id = c.id') ->where(['a.status' => 1]) @@ -291,7 +291,7 @@ class Api extends BaseController ->limit(10) ->select()->toArray(); foreach ($list as $key => $val) { - $list[$key]['create_time'] = date('Y-m-d :H:i', $val['create_time']); + $list[$key]['create_time'] = date('Y-m-d H:i', $val['create_time']); } $res['data'] = $list; return table_assign(0, '', $res); diff --git a/app/install/data/gougucms.sql b/app/install/data/gougucms.sql index 055a6a4..a2907f4 100644 --- a/app/install/data/gougucms.sql +++ b/app/install/data/gougucms.sql @@ -96,7 +96,7 @@ INSERT INTO `cms_admin_rule` VALUES (2, 0, '', '基础数据', '基础数据', ' INSERT INTO `cms_admin_rule` VALUES (3, 0, '', '平台用户', '平台用户', 'bi-people', 1, 3, 1, 0, 0); INSERT INTO `cms_admin_rule` VALUES (4, 0, '', '资讯中心', '资讯中心', 'bi-journal-text', 1, 4, 1, 0, 0); INSERT INTO `cms_admin_rule` VALUES (5, 0, '', '商品中心', '商品中心', 'bi-cart', 1, 5, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (6, 0, '', '单 页 面', '单页面管理', 'bi-bookmarks', 1, 6, 1, 0, 0); +INSERT INTO `cms_admin_rule` VALUES (6, 0, '', '单 页 面', '单页面管理', 'bi-stickies', 1, 6, 1, 0, 0); INSERT INTO `cms_admin_rule` VALUES (7, 1, 'admin/conf/index', '系统配置', '系统配置', '', 1, 1, 1, 0, 0); INSERT INTO `cms_admin_rule` VALUES (8, 7, 'admin/conf/add', '新建/编辑', '配置项', '', 2, 1, 1, 0, 0);