优化知识模块

2021-11-18 00:05:13 +08:00 · 2021-11-18 00:05:13 +08:00 · a7b65c0d5f
commit a7b65c0d5f
parent 56ad54fb6f
11 changed files with 195 additions and 224 deletions
--- a/app/home/controller/Article.php
+++ b/app/home/controller/Article.php
@ -12,7 +12,6 @@ namespace app\home\controller;
 use app\home\BaseController;
 use app\home\model\Article as ArticleList;
 use app\home\model\ArticleCate;
-use app\home\model\Keywords;
 use app\home\validate\ArticleCateCheck;
 use app\home\validate\ArticleCheck;
 use think\exception\ValidateException;
@ -26,23 +25,16 @@ class Article extends BaseController
        if (request()->isAjax()) {
            $cate = Db::name('ArticleCate')->order('create_time asc')->select();
            return to_assign(0, '', $cate);
-        }
-        else{
+        } else {
            return view();
        }
    }

-    //文章分类添加
+    //文章分类添加&编辑
    public function cate_add()
    {
-        return view('', ['pid' => get_params('pid')]);
-    }
-
-    //提交保存文章分类
-    public function cate_post_submit()
-    {
-        if (request()->isAjax()) {
        $param = get_params();
+        if (request()->isAjax()) {
            if (!empty($param['id']) && $param['id'] > 0) {
                $data[$param['field']] = $param['value'];
                $data['id'] = $param['id'];
@ -75,9 +67,14 @@ class Article extends BaseController
                return to_assign();
            }
        }
+        else{
+            $pid = isset($param['pid']) ? $param['pid'] : 0;
+            View::assign('pid', $pid);
+            return view();
+        }
    }

-    //删除文章分配
+    //删除文章分类
    public function cate_delete()
    {
        $id = get_params("id");
@ -117,8 +114,7 @@ class Article extends BaseController
                ->order('a.create_time desc')
                ->paginate($rows, false, ['query' => $param]);
            return table_assign(0, '', $content);
-        }
-        else{
+        } else {
            return view();
        }
    }
@ -126,21 +122,8 @@ class Article extends BaseController
    //文章添加&&编辑
    public function add()
    {
-        $id = empty(get_params('id')) ? 0 : get_params('id');
-        View::assign('id', $id);
-        if ($id > 0) {
-            $article = (new ArticleList())->detail($id);
-            View::assign('article', $article);
-            return view('edit');
-        }
-        return view();
-    }
-
-    //文章内容提交保存
-    public function post_submit()
-    {
-        if (request()->isAjax()) {
        $param = get_params();
+        if (request()->isAjax()) {
            $DbRes = false;
            if (!empty($param['id']) && $param['id'] > 0) {
                try {
@ -160,8 +143,7 @@ class Article extends BaseController
                            Db::name('ArticleKeywords')->where(['aid' => $aid])->delete();
                            $keywordArray = explode(',', $param['keyword_names']);
                            $res_keyword = (new ArticleList())->insertKeyword($keywordArray, $aid);
-						}
-                        else{
+                        } else {
                            $res_keyword == true;
                        }
                        if ($res_keyword !== false) {
@ -172,8 +154,7 @@ class Article extends BaseController
                    } else {
                        Db::rollback();
                    }
-                }
-                catch (\Exception $e) { ##这里参数不能删除($e：错误信息)
+                } catch (\Exception $e) { ##这里参数不能删除($e：错误信息)
                Db::rollback();
                }
            } else {
@ -195,8 +176,7 @@ class Article extends BaseController
                        if (isset($param['keyword_names']) && $param['keyword_names']) {
                            $keywordArray = explode(',', $param['keyword_names']);
                            $res_keyword = (new ArticleList())->insertKeyword($keywordArray, $aid);
-						}
-                        else{
+                        } else {
                            $res_keyword == true;
                        }
                        if ($res_keyword !== false) {
@ -207,18 +187,26 @@ class Article extends BaseController
                    } else {
                        Db::rollback();
                    }
-                }
-                catch (\Exception $e) { ##这里参数不能删除($e：错误信息)
+                } catch (\Exception $e) { ##这里参数不能删除($e：错误信息)
                Db::rollback();
                }
            }
            if ($DbRes) {
                return to_assign();
-			}
-			else{
+            } else {
                return to_assign(1, '操作失败');
            }
        }
+        else{
+            $id = isset($param['id']) ? $param['id'] : 0;
+            View::assign('id', $id);
+            if ($id > 0) {
+                $article = (new ArticleList())->detail($id);
+                View::assign('article', $article);
+                return view('edit');
+            }
+            return view();
+        }
    }

    //删除文章
--- a/app/home/controller/Note.php
+++ b/app/home/controller/Note.php
@ -32,12 +32,6 @@ class Note extends BaseController

    //分类添加
    public function cate_add()
-    {
-        return view('', ['pid' => get_params('pid')]);
-    }
-
-    //提交保存分类
-    public function cate_post_submit()
    {
        if (request()->isAjax()) {
            $param = get_params();
@ -72,6 +66,10 @@ class Note extends BaseController
                }
                return to_assign();
            }
+        } else {
+            $pid = isset($param['pid']) ? $param['pid'] : 0;
+            View::assign('pid', $pid);
+            return view();
        }
    }

@ -124,20 +122,8 @@ class Note extends BaseController
    //添加
    public function add()
    {
-        $id = empty(get_params('id')) ? 0 : get_params('id');
-        if ($id > 0) {
-            $note = Db::name('Note')->where(['id' => $id])->find();
-            View::assign('note', $note);
-        }
-        View::assign('id', $id);
-        return view();
-    }
-
-    //提交添加
-    public function post_submit()
-    {
-        if (request()->isAjax()) {
        $param = get_params();
+        if (request()->isAjax()) {
            $param['start_time'] = isset($param['start_time']) ? strtotime(urldecode($param['start_time'])) : 0;
            $param['end_time'] = isset($param['end_time']) ? strtotime(urldecode($param['end_time'])) : 0;
            if (!empty($param['id']) && $param['id'] > 0) {
@ -169,6 +155,14 @@ class Note extends BaseController

                return to_assign();
            }
+        } else {
+            $id = isset($param['id']) ? $param['id'] : 0;
+            if ($id > 0) {
+                $note = Db::name('Note')->where(['id' => $id])->find();
+                View::assign('note', $note);
+            }
+            View::assign('id', $id);
+            return view();
        }
    }

--- a/app/home/view/article/add.html
+++ b/app/home/view/article/add.html
@ -35,10 +35,10 @@
        <td>
          <input type="text" name="sort" value="0" placeholder="请输入排序，数字" autocomplete="off" class="layui-input">
        </td>
-        <td class="layui-td-gray2">首页显示</td>
+        <td class="layui-td-gray2">是否共享</td>
        <td>
-          <input type="radio" name="is_home" value="1" title="是" checked>
-          <input type="radio" name="is_home" value="0" title="否">
+          <input type="radio" name="is_share" value="1" title="是" checked>
+          <input type="radio" name="is_share" value="0" title="否">
        </td>
        <td class="layui-td-gray2">属性</td>
        <td>
@ -119,7 +119,7 @@
    //封面上传
    var uploadInst = upload.render({
 		elem: '#test1'
-      , url: "{:url('home/api/upload')}",
+		, url: "{:url('home/api/upload')}"
 		, done: function (res) {
 			//如果上传失败
 			if (res.code == 1) {
@ -134,14 +134,13 @@
    //监听提交
    form.on('submit(webform)', function (data) {
 		$.ajax({
-        url: "{:url('home/article/post_submit')}",
+			url: "{:url('home/article/add')}",
 			type: 'post',
 			data: data.field,
 			success: function (e) {
 				if (e.code == 0) {
 					layer.confirm('保存成功,返回列表页吗?', { icon: 3, title: '提示' }, function (index) {
-              history.back(-1);
-              layer.close(index);
+						window.location.href="{:url('home/article/index')}";
 					});
 				} else {
 					layer.msg(e.msg);
@ -159,7 +158,7 @@
  }

 </script>
-{include file="common/layui" base='base' extend="['tagpicker']" callback="init" /}
+{include file="common/layui" base="base" extend="['tagpicker']" callback="init" /}
 {include file="common/ueditor" id="container" name="content" width="776" height="500" toolbar="[]" /}
 {/block}
 <!-- /脚本 -->
--- a/app/home/view/article/cate.html
+++ b/app/home/view/article/cate.html
@ -45,7 +45,6 @@
 					,{field: 'sort', title: '排序', edit: "text", align:'center', style:'cursor: pointer;', width:80}
 					,{field:'title', edit:'text',width:240, title: '分类名称'}
 					,{field:'pid', title: '父级ID', edit:"text",width:80, align:'center'}
-					,{field:'keywords', title: '关键词', edit:"text",width:200,}
 					,{field:'desc', title: '描述', edit:"text"}
 					,{width:100,title: '操作', align:'center'
 						,templet: function(d){
@ -63,15 +62,15 @@
 			treeGrid.on('edit('+tableId+')', function(obj){
 				layer.confirm('确定要提交修改吗?', {icon: 3, title:'提示'}, function(index){
 					$.ajax({
-					  url:"{:url('home/article/cate_post_submit')}",
+					  url:"{:url('home/article/cate_add')}",
 					  type:'post',
 					  data:{id:obj.data.id,field:obj.field,value:obj.value},
 					  success:function(res){
 						layer.msg(res.msg);
-						if(res.code == 1){
+						if(res.code == 0){
 							setTimeout(function(){
 								location.reload()
-							},2000)						  
+							},1200)						  
 						}
 					  }
 					}) 
--- a/app/home/view/article/cate_add.html
+++ b/app/home/view/article/cate_add.html
@ -17,20 +17,14 @@
 			<td>
 				<input type="text" name="title" lay-verify="required" autocomplete="off" placeholder="请输入分类名称" lay-reqText="请输入分类名称" class="layui-input">
 			</td>
-		</tr>
-		<tr>
 			<td class="layui-td-gray2">排序</td>
 			<td>
 				<input type="text" name="sort" placeholder="请输入排序，数字" value="0" autocomplete="off" class="layui-input">
 			</td>
-			<td class="layui-td-gray2">关键词</td>
-			<td>
-				<input type="text" name="keywords" placeholder="请输入关键词，用“,”隔开，可空" autocomplete="off" class="layui-input">
-			</td>
 		</tr>
 		<tr>
 			<td class="layui-td-gray2">描述</td>
-			<td colspan="3"><textarea name="desc" placeholder="请输入描述，可空" class="layui-textarea"></textarea></td>
+			<td colspan="5"><textarea name="desc" placeholder="请输入描述，可空" class="layui-textarea"></textarea></td>
 		</tr>
 	</table>
 	<div style="padding: 10px 0">
@ -52,7 +46,7 @@
 		//监听提交
 		form.on('submit(webform)', function(data){
 			$.ajax({
-			  url:"{:url('home/article/cate_post_submit')}",
+				url:"{:url('home/article/cate_add')}",
 				type:'post',
 				data:data.field,
 				success:function(e){
@ -73,7 +67,6 @@
 			history.back(-1);
 			return false;
 		});
-
 	}
 </script>
 {include file="common/layui" base='base' extend="[]" callback="init" /}
--- a/app/home/view/article/edit.html
+++ b/app/home/view/article/edit.html
@ -37,10 +37,10 @@
          <input type="text" name="sort" placeholder="请输入排序，数字" autocomplete="off" class="layui-input"
            value="{$article.sort}">
        </td>
-        <td class="layui-td-gray2">首页显示</td>
+        <td class="layui-td-gray2">是否共享</td>
        <td>
-          <input type="radio" name="is_home" value="1" title="是" {eq name="$article.is_home" value="1" }checked{/eq}>
-          <input type="radio" name="is_home" value="0" title="否" {eq name="$article.is_home" value="0" }checked{/eq}>
+          <input type="radio" name="is_share" value="1" title="是" {eq name="$article.is_share" value="1" }checked{/eq}>
+          <input type="radio" name="is_share" value="0" title="否" {eq name="$article.is_share" value="0" }checked{/eq}>
        </td>
        <td class="layui-td-gray2">属性</td>
        <td>
@ -125,7 +125,7 @@
    //封面上传
    var uploadInst = upload.render({
 		elem: '#test1'
-      , url: "{:url('home/api/upload')}",
+		, url: "{:url('home/api/upload')}"
 		, done: function (res) {
 			//如果上传失败
 			if (res.code == 1) {
@ -140,14 +140,13 @@
    //监听提交
    form.on('submit(webform)', function (data) {
 		$.ajax({
-        url: "{:url('home/api/post_submit')}",
+			url: "{:url('home/article/add')}",
 			type: 'post',
 			data: data.field,
 			success: function (e) {
 				if (e.code == 0) {
 					layer.confirm('保存成功,返回列表页吗?', { icon: 3, title: '提示' }, function (index) {
-              history.back(-1);
-              layer.close(index);
+						window.location.href="{:url('home/article/index')}";
 					});
 				} else {
 					layer.msg(e.msg);
--- a/app/home/view/article/index.html
+++ b/app/home/view/article/index.html
@ -22,8 +22,8 @@
 <script type="text/html" id="status">
 	<i class="layui-icon {{#  if(d.status == 1){ }}layui-icon-ok{{#  } else { }}layui-icon-close{{#  } }}"></i>
 </script>
-<script type="text/html" id="is_home">
-	<i class="layui-icon {{#  if(d.is_home == 1){ }}layui-icon-ok{{#  } else { }}layui-icon-close{{#  } }}"></i>
+<script type="text/html" id="is_share">
+	<i class="layui-icon {{#  if(d.is_share == 1){ }}layui-icon-ok{{#  } else { }}layui-icon-close{{#  } }}"></i>
 </script>
 <script type="text/html" id="toolbarDemo">
 	<div class="layui-btn-container">
@ -79,8 +79,8 @@
 						width: 66
 					}, {
 						field: 'is_home',
-						title: '首页显示',
-						toolbar: '#is_home',
+						title: '首页共享',
+						toolbar: '#is_share',
 						align: 'center',
 						width: 90
 					}, {
--- a/app/home/view/note/add.html
+++ b/app/home/view/note/add.html
@ -98,7 +98,7 @@ function init(layui) {
    //监听提交
    form.on('submit(webform)', function (data) {
 		$.ajax({
-			url: "{:url('home/note/post_submit')}",
+			url: "{:url('home/note/add')}",
 			type: 'post',
 			data: data.field,
 			success: function (e) {
--- a/app/home/view/note/cate.html
+++ b/app/home/view/note/cate.html
@ -61,7 +61,7 @@
 			treeGrid.on('edit('+tableId+')', function(obj){
 				layer.confirm('确定要提交修改吗?', {icon: 3, title:'提示'}, function(index){
 					$.ajax({
-					  url:"{:url('home/note/cate_post_submit')}",
+					  url:"{:url('home/note/cate_add')}",
 					  type:'post',
 					  data:{id:obj.data.id,field:obj.field,value:obj.value},
 					  success:function(res){
--- a/app/home/view/note/cate_add.html
+++ b/app/home/view/note/cate_add.html
@ -42,7 +42,7 @@
 		  //监听提交
 		  form.on('submit(webform)', function(data){
 			$.ajax({
-			  url:"{:url('home/note/cate_post_submit')}",
+			  url:"{:url('home/note/cate_add')}",
 			  type:'post',
 			  data:data.field,
 			  success:function(e){
--- a/app/install/data/gouguoa.sql
+++ b/app/install/data/gouguoa.sql
@ -361,8 +361,7 @@ CREATE TABLE `oa_article_cate`  (
  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
  `pid` int(11) NOT NULL DEFAULT 0 COMMENT '父类ID',
  `sort` int(5) NOT NULL DEFAULT 0 COMMENT '排序',
-  `title` varchar(255) NOT NULL DEFAULT '' COMMENT '标题',
-  `keywords` varchar(255) NULL DEFAULT '' COMMENT '关键字',
+  `title` varchar(255) NOT NULL DEFAULT '' COMMENT '分类标题',
  `desc` varchar(1000) NULL DEFAULT '' COMMENT '描述',
  `create_time` int(11) NOT NULL DEFAULT 0 COMMENT '添加时间',
  `update_time` int(11) NOT NULL DEFAULT 0 COMMENT '修改时间',