From 76254dc3943390af46642fc2d1eb37008e6629f5 Mon Sep 17 00:00:00 2001 From: tensent Date: Mon, 27 Apr 2020 08:52:07 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8D=E6=A0=8F=E7=9B=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=86=85=E7=94=9F=E6=88=90=E5=AF=BC=E8=88=AA?= =?UTF-8?q?bug=202=E3=80=81=E4=BF=AE=E5=A4=8Dapi=E6=8E=A5=E5=8F=A3bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controller/admin/Category.php | 57 ++++++------- runtime/sql/install.sql | 10 +++ view/admin/category/edit_channel.html | 110 -------------------------- view/admin/category/index.html | 2 +- 4 files changed, 37 insertions(+), 142 deletions(-) delete mode 100644 view/admin/category/edit_channel.html diff --git a/app/controller/admin/Category.php b/app/controller/admin/Category.php index d4ae5c74..5e134597 100644 --- a/app/controller/admin/Category.php +++ b/app/controller/admin/Category.php @@ -12,6 +12,7 @@ namespace app\controller\admin; use app\model\Category as CategoryM; use app\model\Attribute; use app\model\Model; +use app\model\Channel; /** * @title 栏目管理 @@ -269,40 +270,34 @@ class Category extends Base { * @author huajie */ public function add_channel() { - if ($this->request->isPost()) { - $Channel = model('Channel'); - $data = $this->request->param(); - if ($data) { - $id = $Channel->save($data); - if ($id) { - $map['id'] = array('IN', $data['mid']); - $result = db('Category')->where($map)->setField('ismenu',$Channel->id); - return $this->success('生成成功',url('index')); - //记录行为 - action_log('update_channel', 'channel', $id, session('user_auth.uid')); - } else { - return $this->error('生成失败'); - } + if ($this->request->isPost()) { + $data = $this->request->param(); + if ($data) { + $mid = $data['id']; + $data['status'] = 1; + unset($data['id']); + $channel = Channel::create($data); + if ($channel->id) { + $result = CategoryM::update(['ismenu'=>$channel->id], ['id' => $mid]); + return $this->success('生成成功',url('/admin/category/index')); } else { - $this->error($Channel->getError()); + return $this->error('生成失败'); } } else { - $data = $this->request->param(); - $modelname = db('Model')->where( array('id' => $data['model_id']) )->field('id,name')->find(); - $data['url'] = $modelname['name'].'/list/'.$data['mid']; - $pid = input('pid', 0); - //获取父导航 - if (!empty($pid)) { - $parent = db('Channel')->where(array('id' => $pid))->field('title')->find(); - $this->assign('parent', $parent); - } - $pnav = db('Channel')->where(array('pid' => '0'))->select(); - $this->assign('pnav', $pnav); - $this->assign('pid', $pid); - $this->assign('info', $data); - $this->assign('data',null ); - $this->setMeta('生成导航'); - return $this->fetch('edit_channel'); + $this->error($Channel->getError()); } + } else { + $data = $this->request->param(); + $info = CategoryM::where('id', $data['id'])->field('id, title,model_id,pid')->find()->toArray(); + $modelname = Model::where('id', $data['model_id'])->value('name'); + $info['url'] = '/' . $modelname.'/list/'.$data['id']; + $data['pid'] = CategoryM::where('id', $info['pid'])->value('ismenu'); + $data['pid'] = isset($data['pid']) ? $data['pid'] : 0; + + $this->data = [ + 'info' => $info + ]; + return $this->fetch('admin/channel/edit'); + } } } \ No newline at end of file diff --git a/runtime/sql/install.sql b/runtime/sql/install.sql index acf2bba3..c4825d02 100644 --- a/runtime/sql/install.sql +++ b/runtime/sql/install.sql @@ -159,6 +159,8 @@ DROP TABLE IF EXISTS `sent_auth_group_access`; CREATE TABLE `sent_auth_group_access` ( `uid` int(10) unsigned NOT NULL COMMENT '用户id', `group_id` mediumint(8) unsigned NOT NULL COMMENT '用户组id', + `data_auth` text COMMENT '数据权限', + `api_auth` text COMMENT '接口权限', UNIQUE KEY `uid_group_id` (`uid`,`group_id`), KEY `uid` (`uid`), KEY `group_id` (`group_id`) @@ -524,6 +526,14 @@ CREATE TABLE `sent_member_extend_setting` ( DROP TABLE IF EXISTS `sent_member_log`; CREATE TABLE `sent_member_log` ( `id` int(11) NOT NULL AUTO_INCREMENT, + `uid` int(11) DEFAULT '0' COMMENT '操作用户', + `title` varchar(100) NOT NULL DEFAULT '' COMMENT '操作名称', + `method` varchar(20) NOT NULL DEFAULT 'GET' COMMENT '操作类型', + `url` varchar(150) NOT NULL DEFAULT '' COMMENT '操作地址', + `param` varchar(150) NOT NULL DEFAULT '' COMMENT '操作参数', + `client_ip` varchar(30) NOT NULL DEFAULT '' COMMENT '客户端IP', + `visite_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '访问时间', + `create_time` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户日志表'; diff --git a/view/admin/category/edit_channel.html b/view/admin/category/edit_channel.html deleted file mode 100644 index 51395acc..00000000 --- a/view/admin/category/edit_channel.html +++ /dev/null @@ -1,110 +0,0 @@ -{extend name="admin/public/base"/} -{block name="body"} - -
-
-

{$meta_title}

-
-
-
-
- -
- - （用于显示的文字） -
-
-
- -
- - （当前标识） -
-
-
- -
- - （用于调转的URL，支持带http://的URL或U函数参数格式） -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- - （是否新窗口打开链接） -
-
-
- -
- - 输入图标英文 -
-
-
- -
- - （导航显示顺序） -
-
-
- -
- - （右上角的标志点颜色，支持各类css表示方式） -
-
-
- -
- - （右上角的标志点颜色，支持各类css表示方式） -
-
-
- -
- - （右上角的标志点文字，不要太长，没有自动隐藏） -
-
- -
-
- - - -
-
-
-
-
-{/block} \ No newline at end of file diff --git a/view/admin/category/index.html b/view/admin/category/index.html index 95cc6c0f..e30b6c20 100644 --- a/view/admin/category/index.html +++ b/view/admin/category/index.html @@ -62,7 +62,7 @@ {if $list['ismenu']} 已生成 {else/} - 未生成 + 未生成 {/if}