diff --git a/app/admin/common.php b/app/admin/common.php index de46a8e..4571caa 100644 --- a/app/admin/common.php +++ b/app/admin/common.php @@ -162,6 +162,52 @@ function get_admin_group_info($id) return $rules; } +//读取部门列表 +function get_department() +{ + $department = Db::name('Department')->where(['status' => 1])->select()->toArray(); + return $department; +} + +//获取某部门的子部门id.$is_self时候包含自己 +function get_department_son($did = 0, $is_self = 1) +{ + $department = get_department(); + $department_list = get_data_node($department, $did); + $department_array = array_column($department_list, 'id'); + if ($is_self == 1) { + //包括自己在内 + $department_array[] = $did; + } + return $department_array; +} + +//读取员工所在部门的负责人 +function get_department_leader($uid=0,$pid=0) +{ + $did = get_admin($uid)['did']; + if($pid==0){ + $leader = Db::name('Department')->where(['id' => $did])->value('leader_id'); + } + else{ + $pdid = Db::name('Department')->where(['id' => $did])->value('pid'); + if($pdid == 0){ + $leader = 0; + } + else{ + $leader = Db::name('Department')->where(['id' => $pdid])->value('leader_id'); + } + } + return $leader; +} + +//读取职位 +function get_position() +{ + $position = Db::name('Position')->where(['status' => 1])->select()->toArray(); + return $position; +} + //读取导航列表,用于后台 function get_nav($nav_id) { @@ -183,6 +229,13 @@ function get_article_cate() return $cate; } +//读取图集分类列表 +function get_gallery_cate() +{ + $cate = Db::name('GalleryCate')->order('create_time asc')->select()->toArray(); + return $cate; +} + //读取商品分类列表 function get_goods_cate() { @@ -247,7 +300,7 @@ function add_log($type, $param_id = '', $param = []) $data['param_id'] = $param_id; $data['param'] = json_encode($param); $data['module'] = strtolower(app('http')->getName()); - $data['controller'] = strtolower(app('request')->controller()); + $data['controller'] = uncamelize(app('request')->controller()); $data['function'] = strtolower(app('request')->action()); $parameter = $data['module'] . '/' . $data['controller'] . '/' . $data['function']; $rule_menu = Db::name('AdminRule')->where(array('src' => $parameter))->find(); diff --git a/app/admin/controller/Admin.php b/app/admin/controller/Admin.php index 16105b8..6ea21cc 100644 --- a/app/admin/controller/Admin.php +++ b/app/admin/controller/Admin.php @@ -137,10 +137,14 @@ class Admin extends BaseController } else{ $id = empty(get_params('id')) ? 0 : get_params('id'); + $department = set_recursion(get_department()); + $position = Db::name('Position')->where('status', '>=', 0)->order('create_time asc')->select(); if ($id > 0) { $admin = get_admin(get_params('id')); View::assign('admin', $admin); } + View::assign('department', $department); + View::assign('position', $position); View::assign('id', $id); return view(); } @@ -217,7 +221,10 @@ class Admin extends BaseController $rules = array_unique($rules); $role_rule = create_tree_list(0, $rule, $rules); - + $department = get_department(); + $position = Db::name('Position')->where('status', '>=', 0)->order('create_time asc')->select(); + View::assign('department', $department); + View::assign('position', $position); View::assign('role_rule', $role_rule); View::assign('admin', get_admin($id)); add_log('view', get_params('id')); diff --git a/app/admin/controller/Api.php b/app/admin/controller/Api.php index 4765a61..20ce1b4 100644 --- a/app/admin/controller/Api.php +++ b/app/admin/controller/Api.php @@ -231,13 +231,20 @@ class Api extends BaseController public function email_test() { $sender = get_params('email'); - //检查是否邮箱格式 - if (!is_email($sender)) { - return to_assign(1, '测试邮箱码格式有误'); - } - $email_config = \think\facade\Db::name('config') - ->where('name', 'email') - ->find(); + //检查是否邮箱格式 + $validate = \think\facade\Validate::rule([ + 'email' => 'email' + ]); + + $data = [ + 'email' => $sender + ]; + + if (!$validate->check($data)) { + return to_assign(1, $validate->getError()); + } + + $email_config = \think\facade\Db::name('config')->where('name', 'email')->find(); $config = unserialize($email_config['content']); $content = $config['template']; //所有项目必须填写 @@ -286,8 +293,8 @@ class Api extends BaseController $list = Db::name('Article') ->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]) + ->join('article_cate c', 'a.cate_id = c.id') + ->where(['a.delete_time' => 0]) ->order('a.id desc') ->limit(10) ->select()->toArray(); diff --git a/app/admin/controller/Article.php b/app/admin/controller/Article.php index 7eab05b..ef856f0 100644 --- a/app/admin/controller/Article.php +++ b/app/admin/controller/Article.php @@ -10,144 +10,54 @@ declare (strict_types = 1); namespace app\admin\controller; use app\admin\BaseController; -use app\admin\model\Article as ArticleList; -use app\admin\model\ArticleCate; -use app\admin\model\Keywords; -use app\admin\validate\ArticleCateCheck; -use app\admin\validate\ArticleCheck; +use app\admin\model\Article as ArticleModel; +use app\admin\validate\ArticleValidate; use think\exception\ValidateException; use think\facade\Db; use think\facade\View; class Article extends BaseController + { - public function cate() + /** + * 构造函数 + */ + public function __construct() + { + $this->model = new ArticleModel(); + $this->uid = get_login_admin('id'); + } + /** + * 数据列表 + */ + public function datalist() { if (request()->isAjax()) { - $cate = Db::name('ArticleCate')->order('create_time asc')->select(); - return to_assign(0, '', $cate); + $param = get_params(); + $where = []; + if (!empty($param['keywords'])) { + $where[] = ['a.id|a.title|a.keywords|a.desc|a.content|c.title', 'like', '%' . $param['keywords'] . '%']; + } + if (!empty($param['cate_id'])) { + $where[] = ['a.cate_id', '=', $param['cate_id']]; + } + $where[] = ['a.delete_time', '=', 0]; + $ArticleModel = new ArticleModel(); + $list = $ArticleModel->getArticleList($where, $param); + return table_assign(0, '', $list); } else{ return view(); - } - } - - //获取子分类id.$is_self=1包含自己 - public function get_cate_son($id = 0, $is_self = 1) - { - $cates = Db::name('ArticleCate')->order('create_time asc')->select()->toArray(); - $cates_list = get_data_node($cates, $id); - $cates_array = array_column($cates_list, 'id'); - if ($is_self == 1) { - //包括自己在内 - $cates_array[] = $id; - } - return $cates_array; - } - - //文章分类添加 - public function cate_add() - { - $param = get_params(); - if (request()->isAjax()) { - if (!empty($param['id']) && $param['id'] > 0) { - try { - validate(ArticleCateCheck::class)->scene('edit')->check($param); - } catch (ValidateException $e) { - // 验证失败 输出错误信息 - return to_assign(1, $e->getError()); - } - $param['update_time'] = time(); - $department_array = $this->get_cate_son($param['id']); - if (in_array($param['pid'], $department_array)) { - return to_assign(1, '上级分类不能是该分类本身或其子分类'); - } else { - $res = ArticleCate::strict(false)->field(true)->update($param); - if ($res) { - add_log('edit', $param['id'], $param); - } - return to_assign(); - } - } else { - try { - validate(ArticleCateCheck::class)->scene('add')->check($param); - } catch (ValidateException $e) { - // 验证失败 输出错误信息 - return to_assign(1, $e->getError()); - } - $param['create_time'] = time(); - $insertId = ArticleCate::strict(false)->field(true)->insertGetId($param); - if ($insertId) { - add_log('add', $insertId, $param); - } - return to_assign(); - } - } - else{ - $id = isset($param['id']) ? $param['id'] : 0; - $pid = isset($param['pid']) ? $param['pid'] : 0; - if ($id > 0) { - $cate = Db::name('ArticleCate')->where(['id' => $id])->find(); - $pid = $cate['pid']; - View::assign('cate', $cate); - } - View::assign('id', $id); - View::assign('pid', $pid); - return view(); - } - } - - //删除文章分类 - public function cate_delete() - { - $id = get_params("id"); - $cate_count = Db::name('ArticleCate')->where(["pid" => $id])->count(); - if ($cate_count > 0) { - return to_assign(1, "该分类下还有子分类，无法删除"); - } - $content_count = Db::name('Article')->where(["article_cate_id" => $id])->count(); - if ($content_count > 0) { - return to_assign(1, "该分类下还有文章，无法删除"); - } - if (Db::name('ArticleCate')->delete($id) !== false) { - add_log('delete', $id); - return to_assign(0, "删除分类成功"); - } else { - return to_assign(1, "删除失败"); } } - public function index() - { - if (request()->isAjax()) { - $param = get_params(); - $where = array(); - if (!empty($param['keywords'])) { - $where[] = ['a.id|a.title|a.keywords|a.desc|a.content|w.title', 'like', '%' . $param['keywords'] . '%']; - } - if (!empty($param['article_cate_id'])) { - $where[] = ['a.article_cate_id', '=', $param['article_cate_id']]; - } - $where[] = ['a.status', '>=', 0]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; - $content = ArticleList::where($where) - ->field('a.*,w.id as cate_id,a.id as id,w.title as cate_title,a.title as title') - ->alias('a') - ->join('article_cate w', 'a.article_cate_id = w.id') - ->order('a.create_time desc') - ->paginate($rows, false, ['query' => $param]); - return table_assign(0, '', $content); - } - else{ - return view(); - } - } - - //文章添加&&编辑 + /** + * 添加 + */ public function add() { - $param = get_params(); - if (request()->isAjax()) { + if (request()->isAjax()) { + $param = get_params(); if (isset($param['table-align'])) { unset($param['table-align']); } @@ -160,100 +70,121 @@ class Article extends BaseController unset($param['docContent-html-code']); unset($param['docContent-markdown-doc']); } - $DbRes=false; - if (!empty($param['id']) && $param['id'] > 0) { - try { - validate(ArticleCheck::class)->scene('edit')->check($param); - } catch (ValidateException $e) { - // 验证失败 输出错误信息 - return to_assign(1, $e->getError()); - } - $param['update_time'] = time(); - Db::startTrans(); - try { - ArticleList::strict(false)->field(true)->update($param); - $aid = $param['id']; - //关联关键字 - if (isset($param['keyword_names']) && $param['keyword_names']) { - Db::name('ArticleKeywords')->where(['aid'=>$aid])->delete(); - $keywordArray = explode(',', $param['keyword_names']); - $res_keyword = (new ArticleList())->insertKeyword($keywordArray,$aid); - } - add_log('edit', $aid, $param); - Db::commit(); - $DbRes=true; - } - catch (\Exception $e) { - //回滚事务 - $DbRes = false; - Db::rollback(); - return to_assign(1,'捕获到异常'.$e->getMessage()); - } - } else { - try { - validate(ArticleCheck::class)->scene('add')->check($param); - } catch (ValidateException $e) { - // 验证失败 输出错误信息 - return to_assign(1, $e->getError()); - } - $param['create_time'] = time(); - Db::startTrans(); - try { - if(empty($param['desc'])){ - $param['desc'] = getDescriptionFromContent($param['content'], 100); - } - $aid = ArticleList::strict(false)->field(true)->insertGetId($param); - //关联关键字 - if (isset($param['keyword_names']) && $param['keyword_names']) { - $keywordArray = explode(',', $param['keyword_names']); - $res_keyword = (new ArticleList())->insertKeyword($keywordArray,$aid); - } - add_log('add', $aid, $param); - Db::commit(); - $DbRes=true; - } - catch (\Exception $e) { - //回滚事务 - $DbRes = false; - Db::rollback(); - return to_assign(1,'捕获到异常'.$e->getMessage()); - } + $param['admin_id'] = $this->uid; + // 检验完整性 + try { + validate(ArticleValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); } - if($DbRes){ - return to_assign(); - } - else{ - return to_assign(1,'操作失败'); - } - } - else{ - $id = isset($param['id']) ? $param['id'] : 0; - View::assign('id', $id); + + $ArticleModel = new ArticleModel(); + $ArticleModel->addArticle($param); + }else{ View::assign('editor', get_system_config('other','editor')); - if ($id > 0) { - $article = (new ArticleList())->detail($id); - if(empty($article['md_content'])){ - View::assign('editor',1); - } - View::assign('article', $article); - return view('edit'); - } return view(); } } + - //删除文章 - public function delete() + /** + * 编辑 + */ + public function edit() { - $id = get_params("id"); - $data['status'] = '-1'; - $data['id'] = $id; - $data['update_time'] = time(); - if (Db::name('Article')->update($data) !== false) { - add_log('delete', $id); - return to_assign(0, "删除成功"); - } else { - return to_assign(1, "删除失败"); - } + $param = get_params(); + $ArticleModel = new ArticleModel(); + + if (request()->isAjax()) { + if (isset($param['table-align'])) { + unset($param['table-align']); + } + if (isset($param['content'])) { + $param['md_content'] = ''; + } + if (isset($param['docContent-html-code'])) { + $param['content'] = $param['docContent-html-code']; + $param['md_content'] = $param['docContent-markdown-doc']; + unset($param['docContent-html-code']); + unset($param['docContent-markdown-doc']); + } + // 检验完整性 + try { + validate(ArticleValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + $ArticleModel->editArticle($param); + }else{ + $id = isset($param['id']) ? $param['id'] : 0; + $detail = $ArticleModel->getArticleById($id); + View::assign('editor', get_system_config('other','editor')); + if (!empty($detail)) { + if(!empty($article['md_content'])){ + View::assign('editor',1); + } + $keyword_array = Db::name('ArticleKeywords') + ->field('i.aid,i.keywords_id,k.title') + ->alias('i') + ->join('keywords k', 'k.id = i.keywords_id', 'LEFT') + ->order('i.create_time asc') + ->where(array('i.aid' => $id, 'k.status' => 1)) + ->select()->toArray(); + $detail['keyword_ids'] = implode(",", array_column($keyword_array, 'keywords_id')); + $detail['keyword_names'] = implode(',', array_column($keyword_array, 'title')); + $detail['keyword_array'] = $keyword_array; + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } } + + + /** + * 查看信息 + */ + public function read() + { + $param = get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $ArticleModel = new ArticleModel(); + $detail = $ArticleModel->getArticleById($id); + if (!empty($detail)) { + $keyword_array = Db::name('ArticleKeywords') + ->field('i.aid,i.keywords_id,k.title') + ->alias('i') + ->join('keywords k', 'k.id = i.keywords_id', 'LEFT') + ->order('i.create_time asc') + ->where(array('i.aid' => $id, 'k.status' => 1)) + ->select()->toArray(); + $detail['keyword_ids'] = implode(",", array_column($keyword_array, 'keywords_id')); + $detail['keyword_names'] = implode(',', array_column($keyword_array, 'title')); + $detail['keyword_array'] = $keyword_array; + + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + + /** + * 删除 + */ + public function del() + { + $param = get_params(); + $param = get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $type = isset($param['type']) ? $param['type'] : 0; + + $ArticleModel = new ArticleModel(); + $ArticleModel->delArticleById($id,$type); + } } diff --git a/app/admin/controller/ArticleCate.php b/app/admin/controller/ArticleCate.php new file mode 100644 index 0000000..00c54bc --- /dev/null +++ b/app/admin/controller/ArticleCate.php @@ -0,0 +1,149 @@ +model = new ArticleCateModel(); + } + /** + * 数据列表 + */ + public function datalist() + { + if (request()->isAjax()) { + $list = $this->model->where('delete_time',0)->order('sort asc')->select(); + return to_assign(0, '', $list); + } + else{ + return view(); + } + } + + //获取子分类id.$is_self=1包含自己 + public function get_cate_son($id = 0, $is_self = 1) + { + $cates = $this->model->where('delete_time',0)->order('sort asc')->select()->toArray(); + $cates_list = get_data_node($cates, $id); + $cates_array = array_column($cates_list, 'id'); + if ($is_self == 1) { + //包括自己在内 + $cates_array[] = $id; + } + return $cates_array; + } + + /** + * 添加 + */ + public function add() + { + $param = get_params(); + if (request()->isAjax()) { + + // 检验完整性 + try { + validate(ArticleCateValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + $this->model->addArticleCate($param); + }else{ + $pid = isset($param['pid']) ? $param['pid'] : 0; + View::assign('pid', $pid); + return view(); + } + } + + + /** + * 编辑 + */ + public function edit() + { + $param = get_params(); + + if (request()->isAjax()) { + // 检验完整性 + try { + validate(ArticleCateValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + $cate_array = $this->get_cate_son($param['id']); + if (in_array($param['pid'], $cate_array)) { + return to_assign(1, '上级分类不能是该分类本身或其子分类'); + } + $this->model->editArticleCate($param); + }else{ + $id = isset($param['id']) ? $param['id'] : 0; + $detail = $this->model->getArticleCateById($id); + if (!empty($detail)) { + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + } + + + /** + * 查看信息 + */ + public function read() + { + $param = get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $detail = $this->model->getArticleCateById($id); + if (!empty($detail)) { + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + + /** + * 删除 + */ + public function del() + { + $param = get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $type = isset($param['type']) ? $param['type'] : 0; + $count_cate = Db::name('ArticleCate')->where(["pid"=>$id,"delete_time"=>0])->count(); + if ($count_cate > 0) { + return to_assign(1, "该分类下还有子分类，无法删除"); + } + $count_article = Db::name('Article')->where(["cate_id" => $id,"delete_time"=>0])->count(); + if ($count_article > 0) { + return to_assign(1, "该分类下还有文章，无法删除"); + } + $this->model->delArticleCateById($id,$type); + } +} diff --git a/app/admin/controller/Crud.php b/app/admin/controller/Crud.php new file mode 100644 index 0000000..0434ad2 --- /dev/null +++ b/app/admin/controller/Crud.php @@ -0,0 +1,250 @@ +&$val) { + $val['a'] = strpos($val['Comment'],'::crud'); + if(strpos($val['Comment'],'::crud') == false){ + unset($table_info[$k]); + continue; + } + $val['title'] = str_replace($prefix,'',$val['Name']); + $val['crud'] = $this->check($val['title']); + $val['Comment'] = str_replace('::crud','',$val['Comment']); + } + View::assign('prefix',$prefix); + View::assign('table_info',$table_info); + return view(); + } + + public function check($table,$type='c',$path='admin') + { + !defined('DS') && define('DS', DIRECTORY_SEPARATOR); + if($type == 'c'){ + $table = ucfirst(camelize($table)); + $filePath = 'app'. DS . $path . DS . 'controller' . DS . $table . '.php'; + $realPath = base_path() . $path . DS . 'controller' . DS . $table . '.php'; + } + if($type == 'm'){ + $table = ucfirst(camelize($table)); + $filePath = 'app'. DS . $path . DS . 'model' . DS . $table . '.php'; + $realPath = base_path() . $path . DS . 'model' . DS . $table . '.php'; + } + if($type == 'v'){ + $table = ucfirst(camelize($table)) . 'Validate'; + $filePath = 'app'. DS . $path . DS . 'validate' . DS . $table . '.php'; + $realPath = base_path() . $path . DS . 'validate' . DS . $table . '.php'; + } + if($type == 'l'){ + $filePath = 'app'. DS . $path . DS . 'view' . DS . $table . DS . 'datalist.html'; + $realPath = base_path() . $path . DS . 'view' . DS . $table . DS . 'datalist.html'; + } + if($type == 'a'){ + $filePath = 'app'. DS . $path . DS . 'view' . DS . $table . DS . 'add.html'; + $realPath = base_path() . $path . DS . 'view' . DS . $table . DS . 'add.html'; + } + if($type == 'e'){ + $filePath = 'app'. DS . $path . DS . 'view' . DS . $table . DS . 'edit.html'; + $realPath = base_path() . $path . DS . 'view' . DS . $table . DS . 'edit.html'; + } + if($type == 'r'){ + $filePath = 'app'. DS . $path . DS . 'view' . DS . $table . DS . 'read.html'; + $realPath = base_path() . $path . DS . 'view' . DS . $table . DS . 'read.html'; + } + if (file_exists($realPath)) { + return $filePath; + } + else{ + return 0; + } + } + + //crud + public function table() + { + $param = get_params(); + $prefix = config('database.connections.mysql.prefix'); + //查询指定表信息 + $table_info = Db::query('SHOW TABLE STATUS LIKE ' . "'" . $param['name'] . "'"); + $detail = $table_info[0]; + $detail['title'] = str_replace($prefix,'',$detail['Name']); + $detail['Comment'] = str_replace('::crud','',$detail['Comment']); + $table_columns = Db::query("SHOW FULL COLUMNS FROM " . $param['name']); + //var_dump($table_info);exit; + //var_dump($table_columns);exit; + $detail['c'] = $this->check($detail['title'], $type='c'); + $detail['m'] = $this->check($detail['title'], $type='m'); + $detail['v'] = $this->check($detail['title'], $type='v'); + $detail['l'] = $this->check($detail['title'], $type='l'); + $detail['a'] = $this->check($detail['title'], $type='a'); + $detail['e'] = $this->check($detail['title'], $type='e'); + $detail['r'] = $this->check($detail['title'], $type='r'); + View::assign('detail', $detail); + View::assign('columns', $table_columns); + return view(); + } + + //一键crud + public function crud() + { + $uid = get_login_admin('id'); + if($uid!=1){ + return to_assign(1,'只有系统超级管理员才有权限使用一键crud功能！'); + } + $param = get_params(); + set_cache('crud_v_'.$param['field'], $param['crud_v']); + set_cache('crud_a_'.$param['field'], $param['crud_a']); + set_cache('crud_e_'.$param['field'], $param['crud_e']); + set_cache('crud_r_'.$param['field'], $param['crud_r']); + set_cache('crud_l_'.$param['field'], $param['crud_l']); + $t = '-t'.$param['field']; + $c = '-c'.$param['field']; + $m = '-m'.$param['name']; + try { + $output = Console::call('crud', [$t,$c,$m]); + //return $output->fetch(); + } catch(\Exception $e) { + clear_cache('crud_v_'.$param['field']); + clear_cache('crud_a_'.$param['field']); + clear_cache('crud_e_'.$param['field']); + clear_cache('crud_r_'.$param['field']); + clear_cache('crud_l_'.$param['field']); + return to_assign(1, $e->getMessage()); + } + } + + //一键生成菜单 + public function menu($field='',$name='') + { + $uid = get_login_admin('id'); + if($uid!=1){ + return to_assign(1,'只有系统超级管理员才有权限使用一键生成菜单功能！'); + } + if(empty($field) || empty($name)){ + return to_assign(1,'参数错误！'); + } + $rule = [ + [ + 'title' => $name.'管理', + 'name' => $name, + 'src' => '', + 'module' => '', + 'crud' => $field, + 'menu' => '1', + 'icon' => 'bi-folder', + 'son' => [ + [ + 'title' => $name.'列表', + 'name' => $name.'列表', + 'src' => 'admin/'.$field.'/datalist', + 'module' => '', + 'crud' => $field, + 'menu' => '1', + 'icon' => '', + 'son' => [ + [ + 'title' => '新建', + 'name' => $name, + 'src' => 'admin/'.$field.'/add', + 'module' => '', + 'crud' => $field, + 'menu' => '2', + 'icon' => '', + 'son' => [] + ], + [ + 'title' => '编辑', + 'name' => $name, + 'src' => 'admin/'.$field.'/edit', + 'module' => '', + 'crud' => $field, + 'menu' => '2', + 'icon' => '', + 'son' => [] + ], + [ + 'title' => '查看', + 'name' => $name, + 'src' => 'admin/'.$field.'/read', + 'module' => '', + 'crud' => $field, + 'menu' => '2', + 'icon' => '', + 'son' => [] + ], + [ + 'title' => '删除', + 'name' => $name, + 'src' => 'admin/'.$field.'/del', + 'module' => '', + 'crud' => $field, + 'menu' => '2', + 'icon' => '', + 'son' => [] + ] + ] + ] + ] + ] + ]; + //如果安装过该模块，删除原来的菜单信息 + Db::name('AdminRule')->where('crud',$field)->delete(); + $sort = Db::name('AdminRule')->where('pid',0)->max('sort'); + $this->add_rule($rule,0,$sort+1); + //更新超级管理员的权限节点 + $rules = Db::name('AdminRule')->column('id'); + $admin_rules = implode(',',$rules); + $res = Db::name('AdminGroup')->strict(false)->where('id',1)->update(['rules'=>$admin_rules,'update_time'=>time()]); + if($res!==false){ + // 删除后台节点缓存 + clear_cache('adminRules'); + return to_assign(); + } + else{ + return to_assign(1,'操作失败'); + } + } + //递归插入菜单数据 + protected function add_rule($data, $pid=0,$sort=0) + { + foreach($data as $k => $v) + { + $rule=[ + 'title' => $v['title'], + 'name' => $v['name'], + 'src' => $v['src'], + 'module' => $v['module'], + 'menu' => $v['menu'], + 'icon' => $v['icon'], + 'crud' => $v['crud'], + 'pid' => $pid, + 'sort' => $sort, + 'create_time' => time() + ]; + $new_id = Db::name('AdminRule')->strict(false)->field(true)->insertGetId($rule); + if(!empty($v['son'] && $new_id)){ + $this->add_rule($v['son'],$new_id); + } + } + } +} diff --git a/app/admin/controller/Department.php b/app/admin/controller/Department.php new file mode 100644 index 0000000..14c0188 --- /dev/null +++ b/app/admin/controller/Department.php @@ -0,0 +1,103 @@ +isAjax()) { + $list = Db::name('Department') + ->field('d.*,a.nickname as leader') + ->alias('d') + ->join('Admin a', 'a.id = d.leader_id', 'LEFT') + ->order('d.id asc') + ->select(); + return to_assign(0, '', $list); + } else { + return view(); + } + } + + //添加部门 + public function add() + { + $param = get_params(); + if (request()->isAjax()) { + if ($param['id'] > 0) { + try { + validate(DepartmentCheck::class)->scene('edit')->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + $param['update_time'] = time(); + $department_array = get_department_son($param['id']); + if (in_array($param['pid'], $department_array)) { + return to_assign(1, '上级部门不能是该部门本身或其下属部门'); + } else { + Db::name('Department')->strict(false)->field(true)->update($param); + add_log('edit', $param['id'], $param); + return to_assign(); + } + } else { + try { + validate(DepartmentCheck::class)->scene('add')->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + $did = Db::name('Department')->strict(false)->field(true)->insertGetId($param); + add_log('add', $did, $param); + return to_assign(); + } + } else { + $id = isset($param['id']) ? $param['id'] : 0; + $pid = isset($param['pid']) ? $param['pid'] : 0; + $department = set_recursion(get_department()); + if ($id > 0) { + $detail = Db::name('Department')->where(['id' => $id])->find(); + $users = Db::name('Admin')->where(['did' => $id, 'status' => 1])->select(); + View::assign('users', $users); + View::assign('detail', $detail); + } + View::assign('department', $department); + View::assign('pid', $pid); + View::assign('id', $id); + return view(); + } + } + + //删除 + public function delete() + { + $id = get_params("id"); + $count = Db::name('Department')->where([['pid', '=', $id], ['status', '>=', 0]])->count(); + if ($count > 0) { + return to_assign(1, "该部门下还有子部门，无法删除"); + } + $users = Db::name('Admin')->where([['did', '=', $id], ['status', '>=', 0]])->count(); + if ($users > 0) { + return to_assign(1, "该部门下还有员工，无法删除"); + } + if (Db::name('Department')->delete($id) !== false) { + add_log('delete', $id); + return to_assign(0, "删除部门成功"); + } else { + return to_assign(1, "删除失败"); + } + } +} diff --git a/app/admin/controller/Gallery.php b/app/admin/controller/Gallery.php new file mode 100644 index 0000000..424196f --- /dev/null +++ b/app/admin/controller/Gallery.php @@ -0,0 +1,171 @@ +model = new GalleryModel(); + $this->uid = get_login_admin('id'); + } + /** + * 数据列表 + */ + public function datalist() + { + if (request()->isAjax()) { + $param = get_params(); + $where = []; + if (!empty($param['keywords'])) { + $where[] = ['a.id|a.title|a.keywords|a.desc|c.title', 'like', '%' . $param['keywords'] . '%']; + } + if (!empty($param['cate_id'])) { + $where[] = ['a.cate_id', '=', $param['cate_id']]; + } + $where[] = ['a.delete_time', '=', 0]; + $list = $this->model->getGalleryList($where, $param); + return table_assign(0, '', $list); + } + else{ + return view(); + } + } + + /** + * 添加 + */ + public function add() + { + if (request()->isAjax()) { + $param = get_params(); + // 检验完整性 + try { + validate(GalleryValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + $param['admin_id'] = $tis->uid; + $this->model->addGallery($param); + }else{ + return view(); + } + } + + + /** + * 编辑 + */ + public function edit() + { + $param = get_params(); + if (request()->isAjax()) { + // 检验完整性 + try { + validate(GalleryValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + $this->model->editGallery($param); + }else{ + $id = isset($param['id']) ? $param['id'] : 0; + $detail = $this->model->getGalleryById($id); + if (!empty($detail)) { + //关键字 + $keywrod_array = Db::name('GalleryKeywords') + ->field('i.aid,i.keywords_id,k.title') + ->alias('i') + ->join('keywords k', 'k.id = i.keywords_id', 'LEFT') + ->order('i.create_time asc') + ->where(array('i.aid' => $id, 'k.status' => 1)) + ->select()->toArray(); + + $detail['keyword_ids'] = implode(",", array_column($keywrod_array, 'keywords_id')); + $detail['keyword_names'] = implode(',', array_column($keywrod_array, 'title')); + $detail['keyword_array'] = $keywrod_array; + + //图集 + $gallery_array = Db::name('GalleryFile') + ->order('create_time asc') + ->where(array('aid' => $id)) + ->select()->toArray(); + $detail['gallery_array'] = $gallery_array; + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + } + + + /** + * 查看信息 + */ + public function read() + { + $param = get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $detail = $this->model->getGalleryById($id); + if (!empty($detail)) { + //关键字 + $keywrod_array = Db::name('GalleryKeywords') + ->field('i.aid,i.keywords_id,k.title') + ->alias('i') + ->join('keywords k', 'k.id = i.keywords_id', 'LEFT') + ->order('i.create_time asc') + ->where(array('i.aid' => $id, 'k.status' => 1)) + ->select()->toArray(); + + $detail['keyword_ids'] = implode(",", array_column($keywrod_array, 'keywords_id')); + $detail['keyword_names'] = implode(',', array_column($keywrod_array, 'title')); + $detail['keyword_array'] = $keywrod_array; + + //图集 + $gallery_array = Db::name('GalleryFile') + ->order('create_time asc') + ->where(array('aid' => $id)) + ->select()->toArray(); + $detail['gallery_array'] = $gallery_array; + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + + /** + * 删除 + */ + public function del() + { + $param = get_params(); + $param = get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $type = isset($param['type']) ? $param['type'] : 0; + + $this->model->delGalleryById($id,$type); + } +} diff --git a/app/admin/controller/GalleryCate.php b/app/admin/controller/GalleryCate.php new file mode 100644 index 0000000..3fa6c2f --- /dev/null +++ b/app/admin/controller/GalleryCate.php @@ -0,0 +1,150 @@ +model = new GalleryCateModel(); + } + /** + * 数据列表 + */ + public function datalist() + { + if (request()->isAjax()) { + $list = $this->model->where('delete_time',0)->order('sort asc')->select(); + return to_assign(0, '', $list); + } + else{ + return view(); + } + } + + //获取子分类id.$is_self=1包含自己 + public function get_cate_son($id = 0, $is_self = 1) + { + $cates = $this->model->where('delete_time',0)->order('sort asc')->select()->toArray(); + $cates_list = get_data_node($cates, $id); + $cates_array = array_column($cates_list, 'id'); + if ($is_self == 1) { + //包括自己在内 + $cates_array[] = $id; + } + return $cates_array; + } + + /** + * 添加 + */ + public function add() + { + if (request()->isAjax()) { + $param = get_params(); + + // 检验完整性 + try { + validate(GalleryCateValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + + $this->model->addGalleryCate($param); + }else{ + $pid = isset($param['pid']) ? $param['pid'] : 0; + View::assign('pid', $pid); + return view(); + } + } + + + /** + * 编辑 + */ + public function edit() + { + $param = get_params(); + + if (request()->isAjax()) { + // 检验完整性 + try { + validate(GalleryCateValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + $cate_array = $this->get_cate_son($param['id']); + if (in_array($param['pid'], $cate_array)) { + return to_assign(1, '上级分类不能是该分类本身或其子分类'); + } + $this->model->editGalleryCate($param); + }else{ + $id = isset($param['id']) ? $param['id'] : 0; + $detail = $this->model->getGalleryCateById($id); + if (!empty($detail)) { + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + } + + + /** + * 查看信息 + */ + public function read() + { + $param = get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $detail = $this->model->getGalleryCateById($id); + if (!empty($detail)) { + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + + /** + * 删除 + */ + public function del() + { + $param = get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $type = isset($param['type']) ? $param['type'] : 0; + $count_cate = Db::name('GalleryCate')->where(["pid"=>$id,"delete_time"=>0])->count(); + if ($count_cate > 0) { + return to_assign(1, "该分类下还有子分类，无法删除"); + } + $count_gallery = Db::name('Gallery')->where(["cate_id" => $id,"delete_time"=>0])->count(); + if ($count_gallery > 0) { + return to_assign(1, "该分类下还有图集，无法删除"); + } + $this->model->delGalleryCateById($id,$type); + } +} diff --git a/app/admin/controller/Goods.php b/app/admin/controller/Goods.php index cbbef50..cd880f9 100644 --- a/app/admin/controller/Goods.php +++ b/app/admin/controller/Goods.php @@ -10,250 +10,214 @@ declare (strict_types = 1); namespace app\admin\controller; use app\admin\BaseController; -use app\admin\model\Goods as GoodsList; -use app\admin\model\GoodsCate; -use app\admin\model\Keywords; -use app\admin\validate\GoodsCateCheck; -use app\admin\validate\GoodsCheck; +use app\admin\model\Goods as GoodsModel; +use app\admin\validate\GoodsValidate; use think\exception\ValidateException; use think\facade\Db; use think\facade\View; class Goods extends BaseController + { - public function cate() + /** + * 构造函数 + */ + public function __construct() + { + $this->model = new GoodsModel(); + $this->uid = get_login_admin('id'); + } + /** + * 数据列表 + */ + public function datalist() { if (request()->isAjax()) { - $cate = Db::name('GoodsCate')->order('create_time asc')->select(); - return to_assign(0, '', $cate); - } - else{ - return view(); - } - } - - //获取子分类id.$is_self=1包含自己 - public function get_cate_son($id = 0, $is_self = 1) - { - $cates = Db::name('GoodsCate')->order('create_time asc')->select()->toArray(); - $cates_list = get_data_node($cates, $id); - $cates_array = array_column($cates_list, 'id'); - if ($is_self == 1) { - //包括自己在内 - $cates_array[] = $id; - } - return $cates_array; - } - - //商品分类添加 - public function cate_add() - { - $param = get_params(); - if (request()->isAjax()) { - if (!empty($param['id']) && $param['id'] > 0) { - try { - validate(GoodsCateCheck::class)->scene('edit')->check($param); - } catch (ValidateException $e) { - // 验证失败 输出错误信息 - return to_assign(1, $e->getError()); - } - $param['update_time'] = time(); - $department_array = $this->get_cate_son($param['id']); - if (in_array($param['pid'], $department_array)) { - return to_assign(1, '上级分类不能是该分类本身或其子分类'); - } else { - $res = GoodsCate::strict(false)->field(true)->update($param); - if ($res) { - add_log('edit', $param['id'], $param); - } - return to_assign(); - } - } else { - try { - validate(GoodsCateCheck::class)->scene('add')->check($param); - } catch (ValidateException $e) { - // 验证失败 输出错误信息 - return to_assign(1, $e->getError()); - } - $param['create_time'] = time(); - $insertId = GoodsCate::strict(false)->field(true)->insertGetId($param); - if ($insertId) { - add_log('add', $insertId, $param); - } - return to_assign(); - } - } - else{ - $id = isset($param['id']) ? $param['id'] : 0; - $pid = isset($param['pid']) ? $param['pid'] : 0; - if ($id > 0) { - $cate = Db::name('GoodsCate')->where(['id' => $id])->find(); - $pid = $cate['pid']; - View::assign('cate', $cate); - } - View::assign('id', $id); - View::assign('pid', $pid); - return view(); - } - } - - //删除商品分类 - public function cate_delete() - { - $id = get_params("id"); - $cate_count = Db::name('GoodsCate')->where(["pid" => $id])->count(); - if ($cate_count > 0) { - return to_assign(1, "该分类下还有子分类，无法删除"); - } - $content_count = Db::name('Goods')->where(["cate_id" => $id])->count(); - if ($content_count > 0) { - return to_assign(1, "该分类下还有商品，无法删除"); - } - if (Db::name('GoodsCate')->delete($id) !== false) { - add_log('delete', $id); - return to_assign(0, "删除分类成功"); - } else { - return to_assign(1, "删除失败"); - } - } - - public function index() - { - if (request()->isAjax()) { - $param = get_params(); - $where = array(); - if (!empty($param['keywords'])) { - $where[] = ['a.id|a.title|a.keywords|a.desc|a.content|w.title', 'like', '%' . $param['keywords'] . '%']; + $param = get_params(); + $where = []; + if (!empty($param['keywords'])) { + $where[] = ['a.id|a.title|a.keywords|a.desc|a.content|c.title', 'like', '%' . $param['keywords'] . '%']; } if (!empty($param['cate_id'])) { $where[] = ['a.cate_id', '=', $param['cate_id']]; } - $where[] = ['a.status', '>=', 0]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; - $content = GoodsList::where($where) - ->field('a.*,a.id as id,w.title as cate_title,a.title as title') - ->alias('a') - ->join('GoodsCate w', 'a.cate_id = w.id') - ->order('a.create_time desc') - ->paginate($rows, false, ['query' => $param]); - return table_assign(0, '', $content); + $where[] = ['a.delete_time', '=', 0]; + $param['order'] = 'a.sort asc'; + $list = $this->model->getGoodsList($where, $param); + return table_assign(0, '', $list); } else{ return view(); - } + } } - //商品添加&&编辑 + /** + * 添加 + */ public function add() { - $param = get_params(); - if (request()->isAjax()) { - if (isset($param['table-align'])) { - unset($param['table-align']); - } - if (isset($param['content'])) { - $param['md_content'] = ''; - } - if (isset($param['docContent-html-code'])) { - $param['content'] = $param['docContent-html-code']; - $param['md_content'] = $param['docContent-markdown-doc']; - unset($param['docContent-html-code']); - unset($param['docContent-markdown-doc']); - } - $DbRes=false; + if (request()->isAjax()) { + $param = get_params(); + // 检验完整性 + try { + validate(GoodsValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } if (isset($param['tag_values']) && $param['tag_values']) { $param['tag_values'] = implode(',',$param['tag_values']); } - if (!empty($param['id']) && $param['id'] > 0) { - try { - validate(GoodsCheck::class)->scene('edit')->check($param); - } catch (ValidateException $e) { - // 验证失败 输出错误信息 - return to_assign(1, $e->getError()); - } - $param['update_time'] = time(); - Db::startTrans(); - try { - GoodsList::strict(false)->field(true)->update($param); - $aid = $param['id']; - //关联关键字 - if (isset($param['keyword_names']) && $param['keyword_names']) { - Db::name('GoodsKeywords')->where(['aid'=>$aid])->delete(); - $keywordArray = explode(',', $param['keyword_names']); - $res_keyword = (new GoodsList())->insertKeyword($keywordArray,$aid); - } - add_log('edit', $aid, $param); - Db::commit(); - $DbRes=true; - } - catch (\Exception $e) { - //回滚事务 - $DbRes = false; - Db::rollback(); - return to_assign(1,'捕获到异常'.$e->getMessage()); - } - } else { - try { - validate(GoodsCheck::class)->scene('add')->check($param); - } catch (ValidateException $e) { - // 验证失败 输出错误信息 - return to_assign(1, $e->getError()); - } - $param['create_time'] = time(); - if(empty($param['desc'])){ - $param['desc'] = getDescriptionFromContent($param['content'], 100); - } - Db::startTrans(); - try { - $aid = GoodsList::strict(false)->field(true)->insertGetId($param); - //关联关键字 - if (isset($param['keyword_names']) && $param['keyword_names']) { - $keywordArray = explode(',', $param['keyword_names']); - $res_keyword = (new GoodsList())->insertKeyword($keywordArray,$aid); - } - add_log('edit', $aid, $param); - Db::commit(); - $DbRes=true; - } - catch (\Exception $e) { - //回滚事务 - $DbRes = false; - Db::rollback(); - return to_assign(1,'捕获到异常'.$e->getMessage()); - } - } - if($DbRes){ - return to_assign(); - } - else{ - return to_assign(1,'操作失败'); - } - } - else{ - $id = isset($param['id']) ? $param['id'] : 0; - View::assign('id', $id); - View::assign('editor', get_system_config('other','editor')); - if ($id > 0) { - $goods = (new GoodsList())->detail($id); - View::assign('goods', $goods); - return view('edit'); + if(empty($param['desc'])){ + $param['desc'] = getDescriptionFromContent($param['content'], 100); } + $param['admin_id'] = $this->uid; + $this->model->addGoods($param); + }else{ return view(); } } + - //删除商品 - public function delete() + /** + * 编辑 + */ + public function edit() { - $id = get_params("id"); - $data['status'] = '-1'; - $data['id'] = $id; - $data['update_time'] = time(); - if (Db::name('Goods')->update($data) !== false) { - add_log('delete', $id); - return to_assign(0, "删除成功"); - } else { - return to_assign(1, "删除失败"); - } + $param = get_params(); + + if (request()->isAjax()) { + // 检验完整性 + try { + validate(GoodsValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + if (isset($param['tag_values']) && $param['tag_values']) { + $param['tag_values'] = implode(',',$param['tag_values']); + } + $this->model->editGoods($param); + }else{ + $id = isset($param['id']) ? $param['id'] : 0; + $detail = $this->model->getGoodsById($id); + if (!empty($detail)) { + //轮播图 + if(!empty($detail['banner'])) { + $detail['banner_array'] = explode(',',$detail['banner']); + } + //关键字 + $keywrod_array = Db::name('GoodsKeywords') + ->field('i.aid,i.keywords_id,k.title') + ->alias('i') + ->join('keywords k', 'k.id = i.keywords_id', 'LEFT') + ->order('i.create_time asc') + ->where(array('i.aid' => $id, 'k.status' => 1)) + ->select()->toArray(); + + $detail['keyword_ids'] = implode(",", array_column($keywrod_array, 'keywords_id')); + $detail['keyword_names'] = implode(',', array_column($keywrod_array, 'title')); + + //标签设置 + $detail['tag1'] = $detail['tag2'] = $detail['tag3'] = $detail['tag4'] = $detail['tag5'] = $detail['tag6'] =0; + if(!empty($detail['tag_values'])) { + $tag_values_array = explode(',', $detail['tag_values']); + if(in_array('1', $tag_values_array)){ + $detail['tag1'] = 1; + } + if(in_array('2', $tag_values_array)){ + $detail['tag2'] = 1; + } + if(in_array('3', $tag_values_array)){ + $detail['tag3'] = 1; + } + if(in_array('4', $tag_values_array)){ + $detail['tag4'] = 1; + } + if(in_array('5', $tag_values_array)){ + $detail['tag5'] = 1; + } + if(in_array('6', $tag_values_array)){ + $detail['tag6'] = 1; + } + } + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } } + + + /** + * 查看信息 + */ + public function read() + { + $param = get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $detail = $this->model->getGoodsById($id); + if (!empty($detail)) { + //分类名 + $detail['cate_name'] = Db::name('GoodsCate')->where('id',$detail['cate_id'])->value('title'); + //轮播图 + if(!empty($detail['banner'])) { + $detail['banner_array'] = explode(',',$detail['banner']); + } + //关键字 + $keywrod_array = Db::name('GoodsKeywords') + ->field('i.aid,i.keywords_id,k.title') + ->alias('i') + ->join('keywords k', 'k.id = i.keywords_id', 'LEFT') + ->order('i.create_time asc') + ->where(array('i.aid' => $id, 'k.status' => 1)) + ->select()->toArray(); + + $detail['keyword_ids'] = implode(",", array_column($keywrod_array, 'keywords_id')); + $detail['keyword_names'] = implode(',', array_column($keywrod_array, 'title')); + + //标签设置 + $detail['tag1'] = $detail['tag2'] = $detail['tag3'] = $detail['tag4'] = $detail['tag5'] = $detail['tag6'] =0; + if(!empty($detail['tag_values'])) { + $tag_values_array = explode(',', $detail['tag_values']); + if(in_array('1', $tag_values_array)){ + $detail['tag1'] = 1; + } + if(in_array('2', $tag_values_array)){ + $detail['tag2'] = 1; + } + if(in_array('3', $tag_values_array)){ + $detail['tag3'] = 1; + } + if(in_array('4', $tag_values_array)){ + $detail['tag4'] = 1; + } + if(in_array('5', $tag_values_array)){ + $detail['tag5'] = 1; + } + if(in_array('6', $tag_values_array)){ + $detail['tag6'] = 1; + } + } + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + + /** + * 删除 + */ + public function del() + { + $param = get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $type = isset($param['type']) ? $param['type'] : 0; + + $this->model->delGoodsById($id,$type); + } } diff --git a/app/admin/controller/GoodsCate.php b/app/admin/controller/GoodsCate.php new file mode 100644 index 0000000..7d1c34e --- /dev/null +++ b/app/admin/controller/GoodsCate.php @@ -0,0 +1,143 @@ +model = new GoodsCateModel(); + } + /** + * 数据列表 + */ + public function datalist() + { + if (request()->isAjax()) { + $list = $this->model->where('delete_time',0)->order('sort asc')->select(); + return to_assign(0, '', $list); + } + else{ + return view(); + } + } + + //获取子分类id.$is_self=1包含自己 + public function get_cate_son($id = 0, $is_self = 1) + { + $cates = $this->model->where('delete_time',0)->order('sort asc')->select()->toArray(); + $cates_list = get_data_node($cates, $id); + $cates_array = array_column($cates_list, 'id'); + if ($is_self == 1) { + //包括自己在内 + $cates_array[] = $id; + } + return $cates_array; + } + + /** + * 添加 + */ + public function add() + { + if (request()->isAjax()) { + $param = get_params(); + + // 检验完整性 + try { + validate(GoodsCateValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + + $this->model->addGoodsCate($param); + }else{ + $pid = isset($param['pid']) ? $param['pid'] : 0; + View::assign('pid', $pid); + return view(); + } + } + + + /** + * 编辑 + */ + public function edit() + { + $param = get_params(); + + if (request()->isAjax()) { + // 检验完整性 + try { + validate(GoodsCateValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + $cate_array = $this->get_cate_son($param['id']); + if (in_array($param['pid'], $cate_array)) { + return to_assign(1, '上级分类不能是该分类本身或其子分类'); + } + $this->model->editGoodsCate($param); + }else{ + $id = isset($param['id']) ? $param['id'] : 0; + $detail = $this->model->getGoodsCateById($id); + if (!empty($detail)) { + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + } + + + /** + * 查看信息 + */ + public function read() + { + $param = get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $detail = $this->model->getGoodsCateById($id); + if (!empty($detail)) { + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + + /** + * 删除 + */ + public function del() + { + $param = get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $type = isset($param['type']) ? $param['type'] : 0; + + $this->model->delGoodsCateById($id,$type); + } +} diff --git a/app/admin/controller/Pages.php b/app/admin/controller/Pages.php index 5f402a8..04d0790 100644 --- a/app/admin/controller/Pages.php +++ b/app/admin/controller/Pages.php @@ -10,162 +10,160 @@ declare (strict_types = 1); namespace app\admin\controller; use app\admin\BaseController; -use app\admin\model\Pages as PagesList; -use app\admin\model\Keywords; -use app\admin\validate\PagesCheck; +use app\admin\model\Pages as PagesModel; +use app\admin\validate\PagesValidate; use think\exception\ValidateException; use think\facade\Db; use think\facade\View; class Pages extends BaseController + { - public function index() + /** + * 构造函数 + */ + public function __construct() + { + $this->model = new PagesModel(); + $this->uid = get_login_admin('id'); + } + /** + * 数据列表 + */ + public function datalist() { if (request()->isAjax()) { - $param = get_params(); - $where = array(); - if (!empty($param['keywords'])) { - $where[] = ['id|title|keywords|desc|content', 'like', '%' . $param['keywords'] . '%']; + $param = get_params(); + $where = []; + if (!empty($param['keywords'])) { + $where[] = ['a.id|a.title|a.desc|a.content', 'like', '%' . $param['keywords'] . '%']; } - $where[] = ['status', '>=', 0]; - $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; - $content = PagesList::where($where) - ->field('id,title,status,name,read,template,create_time') - ->order('create_time desc') - ->paginate($rows, false, ['query' => $param]); - return table_assign(0, '', $content); + $where[] = ['a.delete_time', '=', 0]; + $list = $this->model->getPagesList($where, $param); + return table_assign(0, '', $list); } else{ return view(); - } + } } - //添加&&编辑 + /** + * 添加 + */ public function add() { - $param = get_params(); - if (request()->isAjax()) { - if (isset($param['table-align'])) { - unset($param['table-align']); - } - if (isset($param['content'])) { - $param['md_content'] = ''; - } - if (isset($param['docContent-html-code'])) { - $param['content'] = $param['docContent-html-code']; - $param['md_content'] = $param['docContent-markdown-doc']; - unset($param['docContent-html-code']); - unset($param['docContent-markdown-doc']); - } - $DbRes=false; - if (!empty($param['id']) && $param['id'] > 0) { - try { - validate(PagesCheck::class)->scene('edit')->check($param); - } catch (ValidateException $e) { - // 验证失败 输出错误信息 - return to_assign(1, $e->getError()); - } - $param['update_time'] = time(); - Db::startTrans(); - try { - $res = PagesList::strict(false)->field(true)->update($param); - $aid = $param['id']; - if ($res) { - //关联关键字 - if (isset($param['keyword_names']) && $param['keyword_names']) { - Db::name('PagesKeywords')->where(['aid'=>$aid])->delete(); - $keywordArray = explode(',', $param['keyword_names']); - $res_keyword = (new PagesList())->insertKeyword($keywordArray,$aid); - } - else{ - $res_keyword == true; - } - if($res_keyword!== false){ - add_log('edit', $param['id'], $param); - Db::commit(); - $DbRes=true; - } - } else { - Db::rollback(); - } - } - catch (\Exception $e) { ##这里参数不能删除($e：错误信息) - Db::rollback(); - } - } else { - try { - validate(PagesCheck::class)->scene('add')->check($param); - } catch (ValidateException $e) { - // 验证失败 输出错误信息 - return to_assign(1, $e->getError()); - } - $param['create_time'] = time(); - Db::startTrans(); - try { - if(empty($param['desc'])){ - $param['desc'] = getDescriptionFromContent($param['content'], 100); - } - $aid = PagesList::strict(false)->field(true)->insertGetId($param); - if ($aid) { - //关联关键字 - if (isset($param['keyword_names']) && $param['keyword_names']) { - Db::name('PagesKeywords')->where(['aid'=>$aid])->delete(); - $keywordArray = explode(',', $param['keyword_names']); - $res_keyword = (new PagesList())->insertKeyword($keywordArray,$aid); - } - else{ - $res_keyword == true; - } - if($res_keyword!== false){ - add_log('add', $aid, $param); - Db::commit(); - $DbRes=true; - } - } else { - Db::rollback(); - } - } - catch (\Exception $e) { ##这里参数不能删除($e：错误信息) - Db::rollback(); - } + if (request()->isAjax()) { + $param = get_params(); + + // 检验完整性 + try { + validate(PagesValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); } - if($DbRes){ - return to_assign(); - } - else{ - return to_assign(1,'操作失败'); - } - } - else{ - $id = isset($param['id']) ? $param['id'] : 0; - View::assign('id', $id); - View::assign('editor', get_system_config('other','editor')); + + $this->model->addPages($param); + }else{ $templates = get_file_list(CMS_ROOT . '/app/home/view/pages/'); View::assign('templates', $templates); - if ($id > 0) { - $detail = (new PagesList())->detail($id); - if(empty($detail['md_content'])){ - View::assign('editor',1); - } - View::assign('detail', $detail); - return view('edit'); - } return view(); } } + - //删除 - public function delete() + /** + * 编辑 + */ + public function edit() { - $id = get_params("id"); - $data['status'] = '-1'; - $data['id'] = $id; - $data['update_time'] = time(); - if (Db::name('Pages')->update($data) !== false) { - add_log('delete', $id); - return to_assign(0, "删除成功"); - } else { - return to_assign(1, "删除失败"); - } + $param = get_params(); + + if (request()->isAjax()) { + // 检验完整性 + try { + validate(PagesValidate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + $this->model->editPages($param); + }else{ + $id = isset($param['id']) ? $param['id'] : 0; + $detail = $this->model->getPagesById($id); + if (!empty($detail)) { + //轮播图 + if(!empty($detail['banner'])) { + $detail['banner_array'] = explode(',',$detail['banner']); + } + //关键字 + $keyword_array = Db::name('PagesKeywords') + ->field('i.aid,i.keywords_id,k.title') + ->alias('i') + ->join('keywords k', 'k.id = i.keywords_id', 'LEFT') + ->order('i.create_time asc') + ->where(array('i.aid' => $id, 'k.status' => 1)) + ->select()->toArray(); + + $detail['keyword_ids'] = implode(",", array_column($keyword_array, 'keywords_id')); + $detail['keyword_names'] = implode(',', array_column($keyword_array, 'title')); + $detail['keyword_array'] = $keyword_array; + + $templates = get_file_list(CMS_ROOT . '/app/home/view/pages/'); + View::assign('templates', $templates); + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } } + + + /** + * 查看信息 + */ + public function read() + { + $param = get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $detail = $this->model->getPagesById($id); + if (!empty($detail)) { + //轮播图 + if(!empty($detail['banner'])) { + $detail['banner_array'] = explode(',',$detail['banner']); + } + //关键字 + $keyword_array = Db::name('PagesKeywords') + ->field('i.aid,i.keywords_id,k.title') + ->alias('i') + ->join('keywords k', 'k.id = i.keywords_id', 'LEFT') + ->order('i.create_time asc') + ->where(array('i.aid' => $id, 'k.status' => 1)) + ->select()->toArray(); + + $detail['keyword_ids'] = implode(",", array_column($keyword_array, 'keywords_id')); + $detail['keyword_names'] = implode(',', array_column($keyword_array, 'title')); + $detail['keyword_array'] = $keyword_array; + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + + /** + * 删除 + */ + public function del() + { + $param = get_params(); + $param = get_params(); + $id = isset($param['id']) ? $param['id'] : 0; + $type = isset($param['type']) ? $param['type'] : 0; + + $this->model->delPagesById($id,$type); + } } diff --git a/app/admin/controller/Position.php b/app/admin/controller/Position.php new file mode 100644 index 0000000..24affa0 --- /dev/null +++ b/app/admin/controller/Position.php @@ -0,0 +1,97 @@ +isAjax()) { + $list = Db::name('Position')->where('status', '>=', 0)->order('create_time asc')->select()->toArray(); + $res['data'] = $list; + return table_assign(0, '', $res); + } else { + return view(); + } + } + + //添加&编辑 + public function add() + { + $param = get_params(); + if (request()->isAjax()) { + if (!empty($param['id']) && $param['id'] > 0) { + try { + validate(PositionCheck::class)->scene('edit')->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + $res = Db::name('Position')->where(['id' => $param['id']])->strict(false)->field(true)->update($param); + if($res!==false){ + add_log('edit', $param['id'], $param); + return to_assign(); + } + else{ + return to_assign(1, '提交失败'); + } + } else { + try { + validate(PositionCheck::class)->scene('add')->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + + $pid = Db::name('Position')->strict(false)->field(true)->insertGetId($param); + if($pid>0){ + add_log('add', $pid, $param); + return to_assign(); + } + else{ + return to_assign(1, '提交失败'); + } + } + } + else{ + $id = isset($param['id']) ? $param['id'] : 0; + if ($id > 0) { + $detail = Db::name('Position')->where(['id' => $id])->find(); + View::assign('detail', $detail); + } + View::assign('id', $id); + return view(); + } + } + + //删除 + public function delete() + { + $id = get_params("id"); + if ($id == 1) { + return to_assign(0, "超级岗位，不能删除"); + } + $data['status'] = '-1'; + $data['id'] = $id; + $data['update_time'] = time(); + if (Db::name('Position')->update($data) !== false) { + add_log('delete', $id); + return to_assign(0, "删除岗位成功"); + } else { + return to_assign(1, "删除失败"); + } + } +} diff --git a/app/admin/controller/User.php b/app/admin/controller/User.php index 8674a56..da94568 100644 --- a/app/admin/controller/User.php +++ b/app/admin/controller/User.php @@ -11,6 +11,7 @@ namespace app\admin\controller; use app\admin\BaseController; use app\admin\model\User as UserList; +use dateset\Dateset; use think\facade\Db; use think\facade\View; @@ -161,13 +162,14 @@ class User extends BaseController $where[] = ['nickname|title', 'like', '%' . $param['keywords'] . '%']; } $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; - $content = DB::name('UserLog') + $content = Db::name('UserLog') ->field("id,uid,nickname,title,content,ip,param,create_time") ->order('create_time desc') ->where($where) ->paginate($rows, false, ['query' => $param]); $content->toArray(); + $date_set = new Dateset(); foreach ($content as $k => $v) { $data = $v; $param_array = json_decode($v['param'], true); @@ -179,7 +181,7 @@ class User extends BaseController $name = '：' . $param_array['title']; } $data['content'] = $v['content'] . $name; - $data['times'] = time_trans($v['create_time']); + $data['times'] = $date_set->time_trans($v['create_time']); $content->offsetSet($k, $data); } return table_assign(0, '', $content); diff --git a/app/admin/model/AdminLog.php b/app/admin/model/AdminLog.php index 5a960d4..10c03c1 100644 --- a/app/admin/model/AdminLog.php +++ b/app/admin/model/AdminLog.php @@ -7,7 +7,7 @@ declare (strict_types = 1); namespace app\admin\model; - +use dateset\Dateset; use think\Model; class AdminLog extends Model @@ -31,8 +31,9 @@ class AdminLog extends Model ->order('create_time desc') ->where($where) ->paginate($rows, false, ['query' => $param]); - - $content->toArray(); + + $content->toArray(); + $date_set = new Dateset(); foreach ($content as $k => $v) { $data = $v; $param_array = json_decode($v['param'], true); @@ -44,7 +45,7 @@ class AdminLog extends Model $name = '：' . $param_array['title']; } $data['content'] = $v['content'] . $name; - $data['times'] = time_trans($v['create_time']); + $data['times'] = $date_set->time_trans($v['create_time']); $content->offsetSet($k, $data); } return $content; diff --git a/app/admin/model/Article.php b/app/admin/model/Article.php index 9a8144b..d14e708 100644 --- a/app/admin/model/Article.php +++ b/app/admin/model/Article.php @@ -4,34 +4,15 @@ * @license https://opensource.org/licenses/Apache-2.0 * @link https://www.gougucms.com */ - namespace app\admin\model; - +use think\model; use app\admin\model\Keywords; -use think\Model; - +use think\facade\Db; class Article extends Model { - // 获取文章详情 - public function detail($id) - { - $detail = \think\facade\Db::name('Article')->where(['id' => $id])->find(); - if (!empty($detail)) { - $keyword_array = \think\facade\Db::name('ArticleKeywords') - ->field('i.aid,i.keywords_id,k.title') - ->alias('i') - ->join('keywords k', 'k.id = i.keywords_id', 'LEFT') - ->order('i.create_time asc') - ->where(array('i.aid' => $id, 'k.status' => 1)) - ->select()->toArray(); - - $detail['keyword_ids'] = implode(",", array_column($keyword_array, 'keywords_id')); - $detail['keyword_names'] = implode(',', array_column($keyword_array, 'title')); - $detail['keyword_array'] = $keyword_array; - } - return $detail; - } - + + public static $Type = ['普通','精华','热门','推荐']; + //插入关键字 public function insertKeyword($keywordArray = [], $aid = 0) { @@ -47,7 +28,113 @@ class Article extends Model 'create_time' => $time, ]; } - $res = \think\facade\Db::name('ArticleKeywords')->strict(false)->field(true)->insertAll($insert); - return $res; + $res = Db::name('ArticleKeywords')->strict(false)->field(true)->insertAll($insert); + } + /** + * 获取分页列表 + * @param $where + * @param $param + */ + public function getArticleList($where, $param) + { + $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $order = empty($param['order']) ? 'a.id desc' : $param['order']; + $list = $this->where($where) + ->field('a.*,c.id as cate_id,c.title as cate_title,u.nickname as admin_name') + ->alias('a') + ->join('ArticleCate c', 'a.cate_id = c.id') + ->join('Admin u', 'a.admin_id = u.id') + ->order($order) + ->paginate($rows, false, ['query' => $param]) + ->each(function ($item, $key) { + $type = (int)$item->type; + $item->type_str = self::$Type[$type]; + }); + return $list; + } + + /** + * 添加数据 + * @param $param + */ + public function addArticle($param) + { + $insertId = 0; + try { + $param['create_time'] = time(); + $insertId = $this->strict(false)->field(true)->insertGetId($param); + //关联关键字 + if (isset($param['keyword_names']) && $param['keyword_names']) { + $keywordArray = explode(',', $param['keyword_names']); + $res_keyword = $this->insertKeyword($keywordArray,$insertId); + } + add_log('add', $insertId, $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(0,'操作成功',['aid'=>$insertId]); + } + + /** + * 编辑信息 + * @param $param + */ + public function editArticle($param) + { + try { + $param['update_time'] = time(); + $this->where('id', $param['id'])->strict(false)->field(true)->update($param); + //关联关键字 + if (isset($param['keyword_names']) && $param['keyword_names']) { + \think\facade\Db::name('ArticleKeywords')->where(['aid'=>$param['id']])->delete(); + $keywordArray = explode(',', $param['keyword_names']); + $res_keyword = $this->insertKeyword($keywordArray,$param['id']); + } + add_log('edit', $param['id'], $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(); + } + + + /** + * 根据id获取信息 + * @param $id + */ + public function getArticleById($id) + { + $info = $this->where('id', $id)->find(); + return $info; + } + + /** + * 删除信息 + * @param $id + * @return array + */ + public function delArticleById($id,$type=0) + { + if($type==0){ + //逻辑删除 + try { + $param['delete_time'] = time(); + $this->where('id', $id)->update(['delete_time'=>time()]); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + else{ + //物理删除 + try { + $this->where('id', $id)->delete(); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + return to_assign(); } } + diff --git a/app/admin/model/ArticleCate.php b/app/admin/model/ArticleCate.php index df66f0e..b72b2cd 100644 --- a/app/admin/model/ArticleCate.php +++ b/app/admin/model/ArticleCate.php @@ -4,12 +4,97 @@ * @license https://opensource.org/licenses/Apache-2.0 * @link https://www.gougucms.com */ - namespace app\admin\model; - -use think\Model; - +use think\model; class ArticleCate extends Model { + /** + * 获取分页列表 + * @param $where + * @param $param + */ + public function getArticleCateList($where, $param) + { + $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $order = empty($param['order']) ? 'id desc' : $param['order']; + try { + $list = $this->where($where)->order($order)->paginate($rows, false, ['query' => $param]); + return table_assign(0, '', $list); + } catch(\Exception $e) { + return ['code' => 1, 'data' => [], 'msg' => $e->getMessage()]; + } + } + /** + * 添加数据 + * @param $param + */ + public function addArticleCate($param) + { + $insertId = 0; + try { + $param['create_time'] = time(); + $insertId = $this->insertGetId($param); + add_log('add', $insertId, $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(0,'操作成功',['aid'=>$insertId]); + } + + /** + * 编辑信息 + * @param $param + */ + public function editArticleCate($param) + { + try { + $param['update_time'] = time(); + $this->where('id', $param['id'])->update($param); + add_log('edit', $param['id'], $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(); + } + + + /** + * 根据id获取信息 + * @param $id + */ + public function getArticleCateById($id) + { + $info = $this->where('id', $id)->find(); + return $info; + } + + /** + * 删除信息 + * @param $id + * @param $type + */ + public function delArticleCateById($id,$type=0) + { + if($type==0){ + //逻辑删除 + try { + $this->where('id', $id)->update(['delete_time'=>time()]); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + else{ + //物理删除 + try { + $this->where('id', $id)->delete(); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + return to_assign(); + } } + diff --git a/app/admin/model/Gallery.php b/app/admin/model/Gallery.php new file mode 100644 index 0000000..94584d7 --- /dev/null +++ b/app/admin/model/Gallery.php @@ -0,0 +1,201 @@ + $value) { + if (!$value) { + continue; + } + $keywords_id = (new Keywords())->increase($value); + $insert[] = ['aid' => $aid, + 'keywords_id' => $keywords_id, + 'create_time' => $time, + ]; + } + $res = Db::name('GalleryKeywords')->strict(false)->field(true)->insertAll($insert); + } + /** + * 获取分页列表 + * @param $where + * @param $param + */ + public function getGalleryList($where, $param) + { + $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $order = empty($param['order']) ? 'a.id desc' : $param['order']; + $list = $this->where($where) + ->field('a.*,c.title as cate_title,u.nickname as admin_name') + ->alias('a') + ->join('ArticleCate c', 'a.cate_id = c.id') + ->join('Admin u', 'a.admin_id = u.id') + ->order($order) + ->paginate($rows, false, ['query' => $param]) + ->each(function ($item, $key) { + $type = (int)$item->type; + $item->type_str = self::$Type[$type]; + $item->count = Db::name('GalleryFile')->where(array('aid'=>$item->id))->count(); + }); + return $list; + } + + /** + * 添加数据 + * @param $param + */ + public function addGallery($param) + { + $insertId = 0; + try { + $param['create_time'] = time(); + $insertId = $this->strict(false)->field(true)->insertGetId($param); + //关联关键字 + if (isset($param['keyword_names']) && $param['keyword_names']) { + $keywordArray = explode(',', $param['keyword_names']); + $res_keyword = $this->insertKeyword($keywordArray,$insertId); + } + + //图集数据 + $filepathData = isset($param['img_filepath']) ? $param['img_filepath'] : ''; + $titleData = isset($param['img_title']) ? $param['img_title'] : ''; + $idData = isset($param['img_id']) ? $param['img_id'] : 0; + $nameData = isset($param['img_name']) ? $param['img_name'] : ''; + $descData = isset($param['img_desc']) ? $param['img_desc'] : ''; + $linkData = isset($param['img_link']) ? $param['img_link'] : ''; + $sortData = isset($param['img_sort']) ? $param['img_sort'] : 0; + $fileData = isset($param['img_file']) ? $param['img_file'] : 0; + //插入图集数据 + $insertData = []; + foreach ($filepathData as $key => $value) { + if (!$value) { + continue; + } + $file = []; + $file['aid'] = $insertId; + $file['title'] = $titleData[$key]; + $file['desc'] = $descData[$key]; + $file['link'] = $linkData[$key]; + $file['sort'] = $sortData[$key]; + $file['file_id'] = $fileData[$key]; + $file['filepath'] = $filepathData[$key]; + $file['name'] = $nameData[$key]; + $file['create_time'] = time(); + $insertData[] = $file; + } + Db::name('GalleryFile')->strict(false)->field(true)->insertAll($insertData); + add_log('add', $insertId, $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(0,'操作成功',['aid'=>$insertId]); + } + + /** + * 编辑信息 + * @param $param + */ + public function editGallery($param) + { + try { + $param['update_time'] = time(); + $this->where('id', $param['id'])->strict(false)->field(true)->update($param); + //关联关键字 + if (isset($param['keyword_names']) && $param['keyword_names']) { + Db::name('GalleryKeywords')->where(['aid'=>$param['id']])->delete(); + $keywordArray = explode(',', $param['keyword_names']); + $res_keyword = $this->insertKeyword($keywordArray,$param['id']); + } + + //图集数据 + $filepathData = isset($param['img_filepath']) ? $param['img_filepath'] : ''; + $titleData = isset($param['img_title']) ? $param['img_title'] : ''; + $idData = isset($param['img_id']) ? $param['img_id'] : 0; + $nameData = isset($param['img_name']) ? $param['img_name'] : ''; + $descData = isset($param['img_desc']) ? $param['img_desc'] : ''; + $linkData = isset($param['img_link']) ? $param['img_link'] : 0; + $sortData = isset($param['img_sort']) ? $param['img_sort'] : 0; + $fileData = isset($param['img_file']) ? $param['img_file'] : 0; + //插入图集数据 + if ($filepathData) { + Db::name('GalleryFile')->where(['aid'=>$param['id']])->delete(); + $insertData = []; + foreach ($filepathData as $key => $value) { + if (!$value) { + continue; + } + $file = []; + $file['aid'] = $param['id']; + $file['title'] = $titleData[$key]; + $file['desc'] = $descData[$key]; + $file['link'] = $linkData[$key]; + $file['sort'] = $sortData[$key]; + $file['file_id'] = $fileData[$key]; + $file['filepath'] = $filepathData[$key]; + $file['name'] = $nameData[$key]; + $file['create_time'] = time(); + $insertData[] = $file; + } + $res = Db::name('GalleryFile')->strict(false)->field(true)->insertAll($insertData); + } + add_log('edit', $param['id'], $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(); + } + + + /** + * 根据id获取信息 + * @param $id + */ + public function getGalleryById($id) + { + $info = $this->where('id', $id)->find(); + return $info; + } + + /** + * 删除信息 + * @param $id + * @return array + */ + public function delGalleryById($id,$type=0) + { + if($type==0){ + //逻辑删除 + try { + $param['delete_time'] = time(); + $this->where('id', $id)->update(['delete_time'=>time()]); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + else{ + //物理删除 + try { + $this->where('id', $id)->delete(); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + return to_assign(); + } +} + diff --git a/app/admin/model/GalleryCate.php b/app/admin/model/GalleryCate.php new file mode 100644 index 0000000..0bd595c --- /dev/null +++ b/app/admin/model/GalleryCate.php @@ -0,0 +1,101 @@ +where($where)->order($order)->paginate($rows, false, ['query' => $param]); + return $list; + } catch(\Exception $e) { + return ['code' => 1, 'data' => [], 'msg' => $e->getMessage()]; + } + } + + /** + * 添加数据 + * @param $param + */ + public function addGalleryCate($param) + { + $insertId = 0; + try { + $param['create_time'] = time(); + $insertId = $this->strict(false)->field(true)->insertGetId($param); + add_log('add', $insertId, $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(0,'操作成功',['aid'=>$insertId]); + } + + /** + * 编辑信息 + * @param $param + */ + public function editGalleryCate($param) + { + try { + $param['update_time'] = time(); + $this->where('id', $param['id'])->strict(false)->field(true)->update($param); + add_log('edit', $param['id'], $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(); + } + + + /** + * 根据id获取信息 + * @param $id + */ + public function getGalleryCateById($id) + { + $info = $this->where('id', $id)->find(); + return $info; + } + + /** + * 删除信息 + * @param $id + * @return array + */ + public function delGalleryCateById($id,$type=0) + { + if($type==0){ + //逻辑删除 + try { + $param['delete_time'] = time(); + $this->where('id', $id)->update(['delete_time'=>time()]); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + else{ + //物理删除 + try { + $this->where('id', $id)->delete(); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + return to_assign(); + } +} + diff --git a/app/admin/model/Goods.php b/app/admin/model/Goods.php index 8e6d4f1..92fcba2 100644 --- a/app/admin/model/Goods.php +++ b/app/admin/model/Goods.php @@ -4,64 +4,13 @@ * @license https://opensource.org/licenses/Apache-2.0 * @link https://www.gougucms.com */ - namespace app\admin\model; - -use app\admin\model\Keywords; -use think\Model; - +use think\model; class Goods extends Model { - // 获取商品详情 - public function detail($id) - { - $detail = \think\facade\Db::name('Goods')->where(['id'=>$id])->find(); - if(!empty($detail)) { - //轮播图 - if(!empty($detail['banner'])) { - $detail['banner_array'] = explode(',',$detail['banner']); - } - //关键字 - $keywrod_array = \think\facade\Db::name('GoodsKeywords') - ->field('i.aid,i.keywords_id,k.title') - ->alias('i') - ->join('keywords k', 'k.id = i.keywords_id', 'LEFT') - ->order('i.create_time asc') - ->where(array('i.aid' => $id, 'k.status' => 1)) - ->select()->toArray(); - - $detail['keyword_ids'] = implode(",", array_column($keywrod_array, 'keywords_id')); - $detail['keyword_names'] = implode(',', array_column($keywrod_array, 'title')); - - //标签设置 - $detail['tag1'] = $detail['tag2'] = $detail['tag3'] = $detail['tag4'] = $detail['tag5'] = $detail['tag6'] =0; - if(!empty($detail['tag_values'])) { - $tag_values_array = explode(',', $detail['tag_values']); - if(in_array('1', $tag_values_array)){ - $detail['tag1'] = 1; - } - if(in_array('2', $tag_values_array)){ - $detail['tag2'] = 1; - } - if(in_array('3', $tag_values_array)){ - $detail['tag3'] = 1; - } - if(in_array('4', $tag_values_array)){ - $detail['tag4'] = 1; - } - if(in_array('5', $tag_values_array)){ - $detail['tag5'] = 1; - } - if(in_array('6', $tag_values_array)){ - $detail['tag6'] = 1; - } - } - } - - return $detail; - } - - //插入关键字 + public static $Type = ['普通','精华','热门','推荐']; + + //插入关键字 public function insertKeyword($keywordArray = [], $aid = 0) { $insert = []; @@ -79,4 +28,111 @@ class Goods extends Model $res = \think\facade\Db::name('GoodsKeywords')->strict(false)->field(true)->insertAll($insert); return $res; } + /** + * 获取分页列表 + * @param $where + * @param $param + */ + public function getGoodsList($where, $param) + { + $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $order = empty($param['order']) ? 'a.id desc' : $param['order']; + $list = $this->where($where) + ->field('a.*,c.title as cate_title,u.nickname as admin_name') + ->alias('a') + ->join('GoodsCate c', 'a.cate_id = c.id') + ->join('Admin u', 'a.admin_id = u.id') + ->order($order) + ->paginate($rows, false, ['query' => $param]) + ->each(function ($item, $key) { + $type = (int)$item->type; + $item->type_str = self::$Type[$type]; + }); + return $list; + } + + /** + * 添加数据 + * @param $param + */ + public function addGoods($param) + { + $insertId = 0; + try { + $param['create_time'] = time(); + $insertId = $this->strict(false)->field(true)->insertGetId($param); + //关联关键字 + if (isset($param['keyword_names']) && $param['keyword_names']) { + $keywordArray = explode(',', $param['keyword_names']); + $res_keyword = $this->insertKeyword($keywordArray,$insertId); + } + add_log('add', $insertId, $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(0,'操作成功',['aid'=>$insertId]); + } + + /** + * 编辑信息 + * @param $param + */ + public function editGoods($param) + { + try { + $param['update_time'] = time(); + $this->where('id', $param['id'])->strict(false)->field(true)->update($param); + //关联关键字 + if (isset($param['keyword_names']) && $param['keyword_names']) { + \think\facade\Db::name('GoodsKeywords')->where(['aid'=>$param['id']])->delete(); + $keywordArray = explode(',', $param['keyword_names']); + $res_keyword = $this->insertKeyword($keywordArray,$param['id']); + } + add_log('edit', $param['id'], $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(); + } + + + /** + * 根据id获取信息 + * @param $id + */ + public function getGoodsById($id) + { + $info = $this->where('id', $id)->find(); + return $info; + } + + /** + * 删除信息 + * @param $id + * @return array + */ + public function delGoodsById($id,$type=0) + { + if($type==0){ + //逻辑删除 + try { + $param['delete_time'] = time(); + $this->where('id', $id)->update(['delete_time'=>time()]); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + else{ + //物理删除 + try { + $this->where('id', $id)->delete(); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + return to_assign(); + } } + diff --git a/app/admin/model/GoodsCate.php b/app/admin/model/GoodsCate.php index c6dba29..7501261 100644 --- a/app/admin/model/GoodsCate.php +++ b/app/admin/model/GoodsCate.php @@ -4,12 +4,98 @@ * @license https://opensource.org/licenses/Apache-2.0 * @link https://www.gougucms.com */ - namespace app\admin\model; - -use think\Model; - +use think\model; class GoodsCate extends Model { + /** + * 获取分页列表 + * @param $where + * @param $param + */ + public function getGoodsCateList($where, $param) + { + $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $order = empty($param['order']) ? 'id desc' : $param['order']; + try { + $list = $this->where($where)->order($order)->paginate($rows, false, ['query' => $param]); + return $list; + } catch(\Exception $e) { + return ['code' => 1, 'data' => [], 'msg' => $e->getMessage()]; + } + } + /** + * 添加数据 + * @param $param + */ + public function addGoodsCate($param) + { + $insertId = 0; + try { + $param['create_time'] = time(); + $insertId = $this->strict(false)->field(true)->insertGetId($param); + add_log('add', $insertId, $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(0,'操作成功',['aid'=>$insertId]); + } + + /** + * 编辑信息 + * @param $param + */ + public function editGoodsCate($param) + { + try { + $param['update_time'] = time(); + $this->where('id', $param['id'])->strict(false)->field(true)->update($param); + add_log('edit', $param['id'], $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(); + } + + + /** + * 根据id获取信息 + * @param $id + */ + public function getGoodsCateById($id) + { + $info = $this->where('id', $id)->find(); + return $info; + } + + /** + * 删除信息 + * @param $id + * @return array + */ + public function delGoodsCateById($id,$type=0) + { + if($type==0){ + //逻辑删除 + try { + $param['delete_time'] = time(); + $this->where('id', $id)->update(['delete_time'=>time()]); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + else{ + //物理删除 + try { + $this->where('id', $id)->delete(); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + return to_assign(); + } } + diff --git a/app/admin/model/Pages.php b/app/admin/model/Pages.php index 2d38037..c5fc804 100644 --- a/app/admin/model/Pages.php +++ b/app/admin/model/Pages.php @@ -4,41 +4,11 @@ * @license https://opensource.org/licenses/Apache-2.0 * @link https://www.gougucms.com */ - namespace app\admin\model; - -use app\admin\model\Keywords; -use think\Model; - +use think\model; class Pages extends Model { - // 获取详情 - public function detail($id) - { - $detail = \think\facade\Db::name('Pages')->where(['id'=>$id])->find(); - if(empty($detail)) { - return false; - } - //轮播图 - if(!empty($detail['banner'])) { - $detail['banner_array'] = explode(',',$detail['banner']); - } - //关键字 - $keyword_array = \think\facade\Db::name('PagesKeywords') - ->field('i.aid,i.keywords_id,k.title') - ->alias('i') - ->join('keywords k', 'k.id = i.keywords_id', 'LEFT') - ->order('i.create_time asc') - ->where(array('i.aid' => $id, 'k.status' => 1)) - ->select()->toArray(); - - $detail['keyword_ids'] = implode(",", array_column($keyword_array, 'keywords_id')); - $detail['keyword_names'] = implode(',', array_column($keyword_array, 'title')); - $detail['keyword_array'] = $keyword_array; - return $detail; - } - - //插入关键字 + //插入关键字 public function insertKeyword($keywordArray = [], $aid = 0) { $insert = []; @@ -56,4 +26,106 @@ class Pages extends Model $res = \think\facade\Db::name('PagesKeywords')->strict(false)->field(true)->insertAll($insert); return $res; } + /** + * 获取分页列表 + * @param $where + * @param $param + */ + public function getPagesList($where, $param) + { + $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $order = empty($param['order']) ? 'id desc' : $param['order']; + $list = $this->where($where) + ->field('a.*,u.nickname as admin_name') + ->alias('a') + ->join('Admin u', 'a.admin_id = u.id') + ->order($order) + ->paginate($rows, false, ['query' => $param]); + return $list; + } + + /** + * 添加数据 + * @param $param + */ + public function addPages($param) + { + $insertId = 0; + try { + $param['create_time'] = time(); + $insertId = $this->strict(false)->field(true)->insertGetId($param); + //关联关键字 + if (isset($param['keyword_names']) && $param['keyword_names']) { + $keywordArray = explode(',', $param['keyword_names']); + $res_keyword = $this->insertKeyword($keywordArray,$insertId); + } + add_log('add', $insertId, $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(0,'操作成功',['aid'=>$insertId]); + } + + /** + * 编辑信息 + * @param $param + */ + public function editPages($param) + { + try { + $param['update_time'] = time(); + $this->where('id', $param['id'])->strict(false)->field(true)->update($param); + //关联关键字 + if (isset($param['keyword_names']) && $param['keyword_names']) { + \think\facade\Db::name('PagesKeywords')->where(['aid'=>$param['id']])->delete(); + $keywordArray = explode(',', $param['keyword_names']); + $res_keyword = $this->insertKeyword($keywordArray,$param['id']); + } + add_log('edit', $param['id'], $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(); + } + + + /** + * 根据id获取信息 + * @param $id + */ + public function getPagesById($id) + { + $info = $this->where('id', $id)->find(); + return $info; + } + + /** + * 删除信息 + * @param $id + * @return array + */ + public function delPagesById($id,$type=0) + { + if($type==0){ + //逻辑删除 + try { + $param['delete_time'] = time(); + $this->where('id', $id)->update(['delete_time'=>time()]); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + else{ + //物理删除 + try { + $this->where('id', $id)->delete(); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + return to_assign(); + } } + diff --git a/app/admin/validate/ArticleCateValidate.php b/app/admin/validate/ArticleCateValidate.php new file mode 100644 index 0000000..a617ce4 --- /dev/null +++ b/app/admin/validate/ArticleCateValidate.php @@ -0,0 +1,29 @@ +where([['title','=',$data['title']],['id','<>',$data['id']],['delete_time','=',0]])->count(); + return $count == 0 ? true : false; + } + + protected $rule = [ + 'title' => 'require|checkOne', + ]; + + protected $message = [ + 'title.require' => '分类名称不能为空', + 'title.checkOne' => '同样的分类名称已经存在', + ]; +} \ No newline at end of file diff --git a/app/admin/validate/ArticleCheck.php b/app/admin/validate/ArticleCheck.php deleted file mode 100644 index 65d879d..0000000 --- a/app/admin/validate/ArticleCheck.php +++ /dev/null @@ -1,35 +0,0 @@ - 'require|unique:article', - 'content' => 'require', - 'id' => 'require', - 'article_cate_id' => 'require', - 'status' => 'require', - ]; - - protected $message = [ - 'title.require' => '标题不能为空', - 'title.unique' => '同样的文章标题已经存在', - 'content.require' => '文章内容不能为空', - 'article_cate_id.require' => '所属分类为必选', - 'id.require' => '缺少更新条件', - 'status.require' => '状态为必选', - ]; - - protected $scene = [ - 'add' => ['title', 'article_cate_id', 'content', 'status'], - 'edit' => ['title', 'article_cate_id', 'content', 'id', 'status'], - ]; -} diff --git a/app/admin/validate/ArticleValidate.php b/app/admin/validate/ArticleValidate.php new file mode 100644 index 0000000..1a3141d --- /dev/null +++ b/app/admin/validate/ArticleValidate.php @@ -0,0 +1,26 @@ + 'require', + 'title' => 'require', + 'thumb' => 'require', + 'content' => 'require', +]; + + protected $message = [ + 'cate_id.require' => '所属分类不能为空', + 'title.require' => '文章标题不能为空', + 'thumb.require' => '缩略图不能为空', + 'content.require' => '文章内容不能为空', +]; +} \ No newline at end of file diff --git a/app/admin/validate/ArticleCateCheck.php b/app/admin/validate/DepartmentCheck.php similarity index 60% rename from app/admin/validate/ArticleCateCheck.php rename to app/admin/validate/DepartmentCheck.php index 52f7256..0fe546a 100644 --- a/app/admin/validate/ArticleCateCheck.php +++ b/app/admin/validate/DepartmentCheck.php @@ -1,7 +1,7 @@ 'require|unique:article_cate', + 'title' => 'require|unique:department', 'id' => 'require', ]; protected $message = [ - 'title.require' => '名称不能为空', - 'title.unique' => '同样的名称已经存在', + 'title.require' => '部门名称不能为空', + 'title.unique' => '同样的部门名称已经存在', 'id.require' => '缺少更新条件', ]; @@ -26,4 +26,4 @@ class ArticleCateCheck extends Validate 'add' => ['title'], 'edit' => ['id', 'title'], ]; -} +} \ No newline at end of file diff --git a/app/admin/validate/GalleryCateValidate.php b/app/admin/validate/GalleryCateValidate.php new file mode 100644 index 0000000..12722b2 --- /dev/null +++ b/app/admin/validate/GalleryCateValidate.php @@ -0,0 +1,29 @@ +where([['title','=',$data['title']],['id','<>',$data['id']],['delete_time','=',0]])->count(); + return $count == 0 ? true : false; + } + + protected $rule = [ + 'title' => 'require|checkOne', + ]; + + protected $message = [ + 'title.require' => '分类名称不能为空', + 'title.checkOne' => '同样的分类名称已经存在', + ]; +} \ No newline at end of file diff --git a/app/admin/validate/GalleryValidate.php b/app/admin/validate/GalleryValidate.php new file mode 100644 index 0000000..aeae19a --- /dev/null +++ b/app/admin/validate/GalleryValidate.php @@ -0,0 +1,24 @@ + 'require', + 'title' => 'require', + 'thumb' => 'require', +]; + + protected $message = [ + 'cate_id.require' => '所属分类不能为空', + 'title.require' => '图集名称不能为空', + 'thumb.require' => '缩略图不能为空', +]; +} \ No newline at end of file diff --git a/app/admin/validate/GoodsCateCheck.php b/app/admin/validate/GoodsCateCheck.php deleted file mode 100644 index ba23d46..0000000 --- a/app/admin/validate/GoodsCateCheck.php +++ /dev/null @@ -1,29 +0,0 @@ - 'require|unique:goods_cate', - 'id' => 'require', - ]; - - protected $message = [ - 'title.require' => '名称不能为空', - 'title.unique' => '同样的名称已经存在', - 'id.require' => '缺少更新条件', - ]; - - protected $scene = [ - 'add' => ['title'], - 'edit' => ['id', 'title'], - ]; -} diff --git a/app/admin/validate/GoodsCateValidate.php b/app/admin/validate/GoodsCateValidate.php new file mode 100644 index 0000000..3e49d05 --- /dev/null +++ b/app/admin/validate/GoodsCateValidate.php @@ -0,0 +1,20 @@ + 'require', +]; + + protected $message = [ + 'title.require' => '分类名称不能为空', +]; +} \ No newline at end of file diff --git a/app/admin/validate/GoodsCheck.php b/app/admin/validate/GoodsCheck.php deleted file mode 100644 index 678802f..0000000 --- a/app/admin/validate/GoodsCheck.php +++ /dev/null @@ -1,35 +0,0 @@ - 'require|unique:goods', - 'content' => 'require', - 'id' => 'require', - 'cate_id' => 'require', - 'status' => 'require', - ]; - - protected $message = [ - 'title.require' => '商品标题不能为空', - 'title.unique' => '同样的商品标题已经存在', - 'cate_id.require' => '所属商品分类为必选', - 'content.require' => '商品内容不能为空', - 'id.require' => '缺少更新条件', - 'status.require' => '状态为必选', - ]; - - protected $scene = [ - 'add' => ['title', 'cate_id', 'content', 'status'], - 'edit' => ['title', 'cate_id', 'content', 'id', 'status'], - ]; -} diff --git a/app/admin/validate/GoodsValidate.php b/app/admin/validate/GoodsValidate.php new file mode 100644 index 0000000..f7be889 --- /dev/null +++ b/app/admin/validate/GoodsValidate.php @@ -0,0 +1,32 @@ + 'require', + 'title' => 'require', + 'thumb' => 'require', + 'content' => 'require', + 'base_price' => 'require', + 'price' => 'require', + 'stocks' => 'require', +]; + + protected $message = [ + 'cate_id.require' => '所属分类不能为空', + 'title.require' => '商品名称不能为空', + 'thumb.require' => '缩略图不能为空', + 'content.require' => '商品描述不能为空', + 'base_price.require' => '市场价格不能为空', + 'price.require' => '实际价格不能为空', + 'stocks.require' => '商品库存不能为空', +]; +} \ No newline at end of file diff --git a/app/admin/validate/PagesCheck.php b/app/admin/validate/PagesCheck.php deleted file mode 100644 index 2be325d..0000000 --- a/app/admin/validate/PagesCheck.php +++ /dev/null @@ -1,37 +0,0 @@ - 'require|unique:pages', - 'content' => 'require', - 'name' => 'lower|min:3|unique:pages', - 'id' => 'require', - 'status' => 'require', - ]; - - protected $message = [ - 'title.require' => '标题不能为空', - 'title.unique' => '同样的页面标题已经存在', - 'content.require' => '页面内容不能为空', - 'name.lower' => 'URL文件名称只能是小写字符', - 'name.min' => 'URL文件名称至少需要3个小写字符', - 'name.unique' => '同样的URL文件名称已经存在', - 'id.require' => '缺少更新条件', - 'status.require' => '状态为必选', - ]; - - protected $scene = [ - 'add' => ['title', 'content', 'name', 'status'], - 'edit' => ['title', 'content', 'id', 'name', 'status'], - ]; -} diff --git a/app/admin/validate/PagesValidate.php b/app/admin/validate/PagesValidate.php new file mode 100644 index 0000000..ccb1fd6 --- /dev/null +++ b/app/admin/validate/PagesValidate.php @@ -0,0 +1,26 @@ + 'require', + 'content' => 'require', + 'name' => 'lower|min:3|unique:pages', + ]; + + protected $message = [ + 'title.require' => '页面名称不能为空', + 'content.require' => '页面内容不能为空', + 'name.lower' => 'URL文件名称只能是小写字符', + 'name.min' => 'URL文件名称至少需要3个小写字符', + 'name.unique' => '同样的URL文件名称已经存在', + ]; +} \ No newline at end of file diff --git a/app/admin/validate/PositionCheck.php b/app/admin/validate/PositionCheck.php new file mode 100644 index 0000000..d54e5af --- /dev/null +++ b/app/admin/validate/PositionCheck.php @@ -0,0 +1,32 @@ + 'require|unique:position', + 'work_price' => 'require|number', + 'id' => 'require' + ]; + + protected $message = [ + 'title.require' => '岗位名称不能为空', + 'title.unique' => '同样的岗位名称已经存在', + 'work_price.require' => '岗位工时单价不能为空', + 'work_price.number' => '岗位工时单价只能是整数', + 'id.require' => '缺少更新条件', + ]; + + protected $scene = [ + 'add' => ['title', 'work_price', 'group_id'], + 'edit' => ['title', 'work_price', 'group_id', 'id'], + ]; +} diff --git a/app/admin/view/admin/add.html b/app/admin/view/admin/add.html index 68bf694..fd28b0f 100644 --- a/app/admin/view/admin/add.html +++ b/app/admin/view/admin/add.html @@ -17,9 +17,9 @@ 头像
(如若不上传
系统将自动生成) - -
-
+ +
+
@@ -48,10 +48,28 @@ + 所在部门* + + + + 岗位职称* + + + 用户状态* - + - + @@ -87,8 +105,8 @@ 头像
(如若不上传
系统将自动生成) - -
+ +
@@ -119,10 +137,28 @@ + 所在部门* + + + + 岗位职称* + + + 用户状态* - + - + diff --git a/app/admin/view/admin/index.html b/app/admin/view/admin/index.html index 5eec601..a63e18c 100644 --- a/app/admin/view/admin/index.html +++ b/app/admin/view/admin/index.html @@ -19,7 +19,7 @@ + + + + + + +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/article/edit.html b/app/admin/view/article/edit.html index 5a2d133..8f4aa5d 100644 --- a/app/admin/view/article/edit.html +++ b/app/admin/view/article/edit.html @@ -1,29 +1,27 @@ {extend name="common/base"/} +{block name="style"} + +{/block} {block name="body"} - -
+ +

编辑文章表

+ autocomplete="off" placeholder="请输入文章标题" class="layui-input" value="{$detail.title}"> @@ -48,48 +46,48 @@ {eq name="$editor" value="1"} - + {else/} - + {/eq}
文章标题*
文章分类* - {volist name=":set_recursion(get_article_cate())" id="v"} - {/volist} @@ -31,16 +29,16 @@ 关键字* + value="{$detail.keyword_ids}"> 状态* - -
排序 + value="{$detail.sort}"> 首页显示 - - 属性
是否原创 - - 作者/来源 + value="{$detail.origin}"> 来源链接 + value="{$detail.origin_url}">
摘要 - + 缩略图 @@ -97,42 +95,39 @@
- - + +
文章内容*当前为TinyMCE富文本编辑器，可在【系统管理->系统配置->其他配置】中切换为mardown编辑器文章内容*当前为TinyMCE富文本编辑器，可在【系统管理->系统配置->其他配置】中切换为mardown编辑器
- +
文章内容*当前为mardown编辑器，可在【系统管理->系统配置->其他配置】中切换为TinyMCE富文本编辑器文章内容*当前为mardown编辑器，可在【系统管理->系统配置->其他配置】中切换为TinyMCE富文本编辑器
- +
-
- +
+ -
{/block} @@ -151,8 +146,9 @@ } function gouguInit() { - var form = layui.form, tool = layui.tool, tagspicker = layui.tagpicker, upload = layui.upload; - var tags = new tagspicker({ + var form = layui.form, tool = layui.tool,tagpicker = layui.tagpicker; + + var tags = new tagpicker({ 'url': '/admin/api/get_keyword_cate', 'target': 'keyword_name', 'tag_ids': 'keyword_id', @@ -160,52 +156,43 @@ 'height': 500, 'isDiy': 1 }); - - //封面上传 - var uploadInst = upload.render({ - elem: '#uploadBtn' - , url: '/admin/api/upload' - , done: function (res) { + + //上传缩略图 + var upload_thumb = layui.upload.render({ + elem: '#upload_btn_thumb', + url: '/admin/api/upload', + done: function (res) { //如果上传失败 if (res.code == 1) { - return layer.msg('上传失败'); + layer.msg('上传失败'); + return false; } //上传成功 - $('#demo1 input').attr('value', res.data.id); - $('#demo1 img').attr('src', res.data.filepath); + $('#upload_box_thumb input').attr('value', res.data.id); + $('#upload_box_thumb img').attr('src', res.data.filepath); } }); - //监听返回 - $('body').on('click', '[lay-event="back"]', function () { - tool.tabClose(); - return false; - }); - if (editorType == 1) { var editor = layui.tinymce; var edit = editor.render({ - selector: "#container", + selector: "#container_content", height: 500 }); //监听提交 form.on('submit(webform)', function (data) { - data.field.content = tinyMCE.editors['container'].getContent(); + data.field.content = tinyMCE.editors['container_content'].getContent(); if (data.field.content == '') { layer.msg('请先完善文章内容'); return false; } let callback = function (e) { + layer.msg(e.msg); if (e.code == 0) { - tool.tabRefresh(71); - layer.confirm('保存成功,关闭当前页面吗?', { icon: 3, title: '提示' }, function (index) { - tool.tabClose(); - }); - } else { - layer.msg(e.msg); + tool.sideClose(1000); } } - tool.post("/admin/article/add", data.field, callback); + tool.post("/admin/article/edit", data.field, callback); return false; }); } @@ -221,16 +208,12 @@ return false; } let callback = function (e) { + layer.msg(e.msg); if (e.code == 0) { - tool.tabRefresh(71); - layer.confirm('保存成功,关闭当前页面吗?', { icon: 3, title: '提示' }, function (index) { - tool.tabClose(); - }); - } else { - layer.msg(e.msg); + tool.sideClose(1000); } } - tool.post("/admin/article/add", data.field, callback); + tool.post("/admin/article/edit", data.field, callback); return false; }); } diff --git a/app/admin/view/article/read.html b/app/admin/view/article/read.html new file mode 100644 index 0000000..a08dd47 --- /dev/null +++ b/app/admin/view/article/read.html @@ -0,0 +1,52 @@ +{extend name="common/base"/} + +{block name="body"} +
+

文章表详情

+ + + + + + + + + + + + + + + + + + + + + + + + +
所属分类 + {eq name="$detail.cate_id" value="1"}选项一{/eq} + {eq name="$detail.cate_id" value="2"}选项二{/eq} + 文章标题{$detail.title}关键字{$detail.keywords}
是否原创 + {eq name="$detail.original" value="1"}选项一{/eq} + {eq name="$detail.original" value="2"}选项二{/eq} + 来源或作者{$detail.origin}来源地址{$detail.origin_url}
阅读量{$detail.read}文章属性 + {eq name="$detail.type" value="1"}选项一{/eq} + {eq name="$detail.type" value="2"}选项二{/eq} + 是否首页显示 + {eq name="$detail.is_home" value="1"}选项一{/eq} + {eq name="$detail.is_home" value="2"}选项二{/eq} +
排序{$detail.sort}状态 + {eq name="$detail.status" value="1"}选项一{/eq} + {eq name="$detail.status" value="2"}选项二{/eq} + 创建时间{$detail.create_time}
文章摘要{$detail.desc}
缩略图 + +
文章内容 + {$detail.content|raw} +
+
+{/block} + \ No newline at end of file diff --git a/app/admin/view/article/cate_add.html b/app/admin/view/article_cate/add.html similarity index 62% rename from app/admin/view/article/cate_add.html rename to app/admin/view/article_cate/add.html index 04429df..a9ed033 100644 --- a/app/admin/view/article/cate_add.html +++ b/app/admin/view/article_cate/add.html @@ -2,47 +2,42 @@ {block name="body"}
-

文章分类

+

新建文章分类

- + - + - + - +
父级分类* - 父级分类* 分类名称* - 排序 - +
排序分类名称* - + 关键词 - +
描述 + +
- +
@@ -66,7 +61,7 @@ }, 1000); } } - tool.post("/admin/article/cate_add", data.field, callback); + tool.post("/admin/article_cate/add", data.field, callback); return false; }); } diff --git a/app/admin/view/article/cate.html b/app/admin/view/article_cate/datalist.html similarity index 66% rename from app/admin/view/article/cate.html rename to app/admin/view/article_cate/datalist.html index 953a85e..7105d94 100644 --- a/app/admin/view/article/cate.html +++ b/app/admin/view/article_cate/datalist.html @@ -3,15 +3,12 @@ {block name="body"}
- +
- {/block} @@ -25,11 +22,12 @@ id:'treeTable' ,elem: '#treeTable' ,idField:'id' - ,url:'/admin/article/cate' - ,cellMinWidth: 100 + ,url:'/admin/article_cate/datalist' + ,cellMinWidth: 300 ,treeId:'id'//树形id字段名称 ,treeUpId:'pid'//树形父id字段名称 ,treeShowName:'title'//以树形式显示的字段 + ,page:false ,cols: [[ {field:'id',width:80, title: 'ID号', align:'center'} ,{field: 'sort', title: '排序', align:'center', width:80} @@ -38,27 +36,26 @@ ,{field:'keywords', title: '关键词', width:200,} ,{field:'desc', title: '描述'} ,{width:160,title: '操作', align:'center',templet: function(d){ - var html = ''; + var html = '添加子分类编辑删除'; return html; } } ]] - ,page:false }); //表头工具栏事件 $('.add-menu').on('click', function(){ - tool.side("/admin/article/cate_add"); + tool.side("/admin/article_cate/add"); return; }); //操作按钮 treeGrid.on('tool(treeTable)',function (obj) { if (obj.event === 'add') { - tool.side('/admin/article/cate_add?pid='+obj.data.id); + tool.side("/admin/article_cate/add?pid="+obj.data.id); return; } if (obj.event === 'edit') { - tool.side('/admin/article/cate_add?id='+obj.data.id); + tool.side("/admin/article_cate/edit?id="+obj.data.id); return; } if(obj.event === 'del'){ @@ -69,7 +66,7 @@ obj.del(); } } - tool.delete("/admin/article/cate_delete", { id: obj.data.id }, callback); + tool.delete("/admin/article_cate/del", { id: obj.data.id}, callback); layer.close(index); }); } diff --git a/app/admin/view/article_cate/edit.html b/app/admin/view/article_cate/edit.html new file mode 100644 index 0000000..e266236 --- /dev/null +++ b/app/admin/view/article_cate/edit.html @@ -0,0 +1,70 @@ +{extend name="common/base"/} + +{block name="body"} + +

编辑文章分类

+ + + + + + + + + + + + + + + + + +
父级分类* + + 排序 + +
分类名称* + + 关键词 + +
描述 + +
+
+ + + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/conf/index.html b/app/admin/view/conf/index.html index 5ce7fff..6269903 100644 --- a/app/admin/view/conf/index.html +++ b/app/admin/view/conf/index.html @@ -10,7 +10,7 @@ {/block} diff --git a/app/admin/view/crud/index.html b/app/admin/view/crud/index.html new file mode 100644 index 0000000..461b939 --- /dev/null +++ b/app/admin/view/crud/index.html @@ -0,0 +1,56 @@ +{extend name="common/base" /} + +{block name="body"} +
+ + + + + + + + + + + + + + + + + {volist name="table_info" id="v"} + + + + + + + + + + {/volist} + +
+ 使用【一键CRUD生成代码】功能可以帮你完成 60% 以上的开发工作，使用前请先新建数据表 +
注意：数据表的注释必须带 ::crud 标识才能被识别，例如：文章表::crud。查看建表样例 +
ID编号表前缀数据表名数据量创建时间数据表注释操作
{$i}{$prefix}{$v.title}{$v.Rows}{$v.Create_time}{$v.Comment} + {eq name="$v.crud" value="0"} + 一键CRUD生成代码 + {else/} + 已生成CRUD 详细 + {/eq} +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/crud/table.html b/app/admin/view/crud/table.html new file mode 100644 index 0000000..86e6088 --- /dev/null +++ b/app/admin/view/crud/table.html @@ -0,0 +1,285 @@ +{extend name="common/base"/} + +{block name="body"} +
+

数据表信息

+ + + + + + + + + + + +
数据表名称{$detail.title}数据表备注{$detail.Comment}当前记录数{$detail.Rows}创建时间{$detail.Create_time}
+ {neq name="$detail.c" value="0"} +

文件信息

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ 温馨提示：
+ 1、【一键CRUD生成代码】已帮你完成 60% 以上的开发工作，以下是生成的文件所在目录。 +
+ 2、可以系统刷新页面，点击左边的刚刚新增的菜单访问相关功能，如需更改菜单左侧图标，请在[系统管理]->[菜单节点]找到对应的菜单编辑修改即可。 +
+ 3、代码生成以后，不建议删除(除非不需要了)，建议在当前的基础上修改及新增开发就可以了，开发方式与传统的开发方式无区别。 +
+ 4、CRUD生成的代码是最基础的代码，开发者通过二次开发修改，能使得功能更完善，代码更健壮，特别是逻辑上的处理，以下是二次开发建议。 +
+ 5、后端功能开发参考文档 ThinkPHP6开发文档，前端页面开发参考文档 勾股UI开发文档 +
控制器{$detail.c}开发建议功能逻辑完善、控制器的其他方法的补充完善等
数据模型{$detail.m=='0'?'-':$detail.m}开发建议数据搜索条件完善、查询字段增减调整、关联表查询等
数据校验器{$detail.v=='0'?'-':$detail.v}开发建议增强数据校验规则、修改调整校验提示等
列表页面{$detail.l=='0'?'-':$detail.l}开发建议列表显示字段增减调整、列表字段表格宽度调整、其他按钮、链接的补充完善等
添加页面{$detail.a=='0'?'-':$detail.a}开发建议需要输入的字段增减调整、单选、多选、下拉选的内容调整等
编辑页面{$detail.e=='0'?'-':$detail.e}开发建议需要编辑的字段增减调整、单选、多选、下拉选的内容调整等
查看页面{$detail.r=='0'?'-':$detail.r}开发建议显示字段增减调整、其他按钮、连接的补充完善等
+

数据表字段

+ + + + + + + + {volist name="columns" id="vo"} + + + + + + {/volist} + +
字段列名数据类型字段注释
{$vo.Field}{$vo.Type}{$vo.Comment}
+ {else/} +

数据表字段

+ + + + + + + + + + + + + + + {volist name="columns" id="vo"} + + + + + {eq name="$vo.Field" value="id"} + + + + + + + + {else/} + + + + + + + + {/eq} + + {/volist} + +
字段列名字段注释数据类型字段名称是否必填显示类型插入展示编辑展示列表展示查询展示
{$vo.Field}{$vo.Comment}{$vo.Type}------- + + + +
+
+ + + + +
+ {/neq} +
+{/block} + +{block name="script"} + +{/block} \ No newline at end of file diff --git a/app/admin/view/department/add.html b/app/admin/view/department/add.html new file mode 100644 index 0000000..447eb82 --- /dev/null +++ b/app/admin/view/department/add.html @@ -0,0 +1,95 @@ +{extend name="common/base"/} + +{block name="body"} +
+

部门架构

+ {eq name="$id" value="0"} + + + + + + + + + + + +
部门名称* + + 上级部门* + +
部门联系电话 + +
+ {else/} + + + + + + + + + + + + + +
部门名称* + + 上级部门* + +
部门负责人 + + 部门联系电话 + +
+ {/eq} +
+ + + +
+
+{/block} + + + +{block name="script"} + +{/block} + diff --git a/app/admin/view/department/index.html b/app/admin/view/department/index.html new file mode 100644 index 0000000..6939dbd --- /dev/null +++ b/app/admin/view/department/index.html @@ -0,0 +1,80 @@ +{extend name="common/base"/} + +{block name="body"} + +
+
+ +
+
+
+
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/gallery/add.html b/app/admin/view/gallery/add.html new file mode 100644 index 0000000..cf6f78c --- /dev/null +++ b/app/admin/view/gallery/add.html @@ -0,0 +1,405 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+
+
+ + + + + + + + + +
图集标题*
图集简介 + +
+ +
+ +
+ +

添加图片

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
分类* + +
状态* + + +
关键字* + + +
封面图 +
+ +
+ + +
+
+
作者/来源 + +
来源链接 + +
属性 + +
首页显示 + + +
排序 + +
+
+ + + + +
+
+ +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/goods/index.html b/app/admin/view/gallery/datalist.html similarity index 67% rename from app/admin/view/goods/index.html rename to app/admin/view/gallery/datalist.html index 7911946..96abab2 100644 --- a/app/admin/view/goods/index.html +++ b/app/admin/view/gallery/datalist.html @@ -5,18 +5,18 @@
- +
-
+
{/block} @@ -43,10 +43,10 @@ function gouguInit() { var table = layui.table,tool = layui.tool, form = layui.form; layui.pageTable = table.render({ - elem: '#goods', - title: '商品列表', + elem: '#gallery', + title: '图集列表', toolbar: '#toolbarDemo', - url: '/admin/goods/index', //数据接口 + url: '/admin/gallery/datalist', //数据接口 page: true, //开启分页 limit: 20, cols: [ @@ -56,11 +56,6 @@ title: '编号', align: 'center', width: 80 - }, { - field: 'sort', - title: '排序', - align: 'center', - width: 80 }, { field: 'cate_title', title: '分类', @@ -69,15 +64,15 @@ field: 'title', title: '标题' },{ - field: 'base_price', - title: '市场价格', + field: 'count', + title: '图片数', align: 'center', - width: 100 + width: 80 },{ - field: 'price', - title: '实际价格', + field: 'sort', + title: '排序', align: 'center', - width: 100 + width: 80 }, { field: 'status', title: '状态', @@ -90,11 +85,21 @@ toolbar: '#is_home', align: 'center', width: 90 + },{ + field: 'admin_name', + title: '创建人', + align: 'center', + width: 90 + },{ + field: 'create_time', + title: '创建时间', + align: 'center', + width: 150 }, { field: 'right', title: '操作', toolbar: '#barDemo', - width: 100, + width: 150, align: 'center' } ] @@ -102,10 +107,13 @@ }); //监听行工具事件 - table.on('tool(goods)', function(obj) { + table.on('tool(gallery)', function(obj) { var data = obj.data; - if (obj.event === 'edit') { - tool.tabAdd('/admin/goods/add?id='+obj.data.id,'编辑商品'+obj.data.id); + if (obj.event === 'view') { + tool.side('/admin/gallery/read?id='+obj.data.id); + } + else if (obj.event === 'edit') { + tool.tabAdd('/admin/gallery/edit?id='+obj.data.id,'编辑图集'+obj.data.id); } else if (obj.event === 'del') { layer.confirm('确定要删除吗?', { @@ -118,7 +126,7 @@ obj.del(); } } - tool.delete("/admin/goods/delete", { id: data.id }, callback); + tool.delete("/admin/gallery/del", { id: data.id }, callback); layer.close(index); }); } diff --git a/app/admin/view/gallery/edit.html b/app/admin/view/gallery/edit.html new file mode 100644 index 0000000..7ccb7a8 --- /dev/null +++ b/app/admin/view/gallery/edit.html @@ -0,0 +1,454 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+
+
+ + + + + + + + + +
图集标题*
图集简介 + +
+ +
+ {volist name="$detail.gallery_array" id="vo"} + + {/volist} + +
+ +
+ +

添加图片

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
分类* + +
状态* + + +
关键字* + + +
封面图 +
+ +
+ + +
+
+
作者/来源 + +
来源链接 + +
属性 + +
首页显示 + + +
排序 + +
+
+ + + + +
+
+ +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/gallery/read.html b/app/admin/view/gallery/read.html new file mode 100644 index 0000000..a2e9f0d --- /dev/null +++ b/app/admin/view/gallery/read.html @@ -0,0 +1,138 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
图集标题{$detail.title}所属分类 + {volist name=":set_recursion(get_gallery_cate())" id="v"} + {eq name="$detail.cate_id" value="$v.id" }{$v.title}{/eq} + {/volist} + 图集状态 + {eq name="$detail.status" value="1" }正常{/eq} + {eq name="$detail.status" value="0" }下架{/eq} +
关键字 + {$detail.keyword_names} + 属性 + {eq name="$detail.type" value="1" }精华{/eq} + {eq name="$detail.type" value="2" }热门{/eq} + {eq name="$detail.type" value="3" }推荐{/eq} + 首页显示 + {eq name="$detail.is_home" value="1"}是{/eq} + {eq name="$detail.is_home" value="0"}否{/eq} +
作者/来源{$detail.origin}来源链接{$detail.origin_url}排序{$detail.sort}
图集简介{$detail.desc}封面图 + +
+ +
+ {volist name="$detail.gallery_array" id="vo"} + + {/volist} +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/gallery_cate/add.html b/app/admin/view/gallery_cate/add.html new file mode 100644 index 0000000..5793b77 --- /dev/null +++ b/app/admin/view/gallery_cate/add.html @@ -0,0 +1,71 @@ +{extend name="common/base"/} + +{block name="body"} +
+

新建图集分类

+ + + + + + + + + + + + + + + + + +
父级分类* + + 排序 + +
分类名称* + + 关键词 + +
描述 + +
+
+ + + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/gallery_cate/datalist.html b/app/admin/view/gallery_cate/datalist.html new file mode 100644 index 0000000..6b6d21e --- /dev/null +++ b/app/admin/view/gallery_cate/datalist.html @@ -0,0 +1,104 @@ +{extend name="common/base"/} + +{block name="body"} + +
+
+ +
+ +
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/gallery_cate/edit.html b/app/admin/view/gallery_cate/edit.html new file mode 100644 index 0000000..6b70f44 --- /dev/null +++ b/app/admin/view/gallery_cate/edit.html @@ -0,0 +1,71 @@ +{extend name="common/base"/} + +{block name="body"} +
+

编辑图集分类

+ + + + + + + + + + + + + + + + + +
父级分类* + + 排序 + +
分类名称* + + 关键词 + +
描述 + +
+
+ + + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/goods/add.html b/app/admin/view/goods/add.html index ea7b02b..4cab364 100644 --- a/app/admin/view/goods/add.html +++ b/app/admin/view/goods/add.html @@ -17,37 +17,16 @@ top: 1px; right: 1px; } - - .editormd-code-toolbar select { - display: inline-block - } - - .editormd li { - list-style: inherit; - } {/block} {block name="body"} -
+ +

新建商品

- - - - - - - + - - + + + + + - - + + - - - - + + + + + - - {eq name="$editor" value="1"} - + - - {else/} - - - - - - - {/eq}
商品标题*状态* - - -
关键字* - - - 商品分类*
商品卖点* - + 关键字* + + 缩略图*
- -
+ +
商品卖点* + +
商品简介 +
商品标签* + - + @@ -95,28 +80,24 @@
市场价格* - + 实际价格* - + + 商品库存* + 是否包邮* - + +
首页显示 - - - 属性商品属性 首页显示 + + + 状态* + + +
商品图集 +
@@ -141,35 +132,18 @@
商品介绍*当前为TinyMCE富文本编辑器，可在【系统管理->系统配置->其他配置】中切换为mardown编辑器商品介绍*
- + +
商品介绍*当前为mardown编辑器，可在【系统管理->系统配置->其他配置】中切换为TinyMCE富文本编辑器
-
- -
-
-
-
+
-
{/block} @@ -194,20 +168,60 @@ this.splice(index, 1); } }; - - const editorType = '{$editor}'; - var moduleInit; - if (editorType == 1) { - moduleInit = ['tool', 'tagpicker', 'tinymce']; - } - else { - moduleInit = ['tool', 'tagpicker', 'editormd']; - } + var moduleInit = ['tool','tagpicker','tinymce']; function gouguInit() { - var form = layui.form, tool = layui.tool, tagspicker = layui.tagpicker, upload = layui.upload; + var form = layui.form, tool = layui.tool,tagpicker = layui.tagpicker; - var tags = new tagspicker({ + //上传缩略图 + var upload_thumb = layui.upload.render({ + elem: '#upload_btn_thumb', + url: '/admin/api/upload', + done: function (res) { + //如果上传失败 + if (res.code == 1) { + return layer.msg('上传失败'); + } + //上传成功 + $('#upload_box_thumb input').attr('value', res.data.id); + $('#upload_box_thumb img').attr('src', res.data.filepath); + } + }); + + //banner图上传 + var uploadInst2 = layui.upload.render({ + elem: '#uploadBtn2' + , url: '/admin/api/upload' + , done: function (res) { + //如果上传失败 + if (res.code == 1) { + return layer.msg('上传失败'); + } + //上传成功 + var idsStr = $('#demo2 input').val(); + var idsArray = []; + if (idsStr != '') { + idsArray = idsStr.split(","); + } + idsArray.push(res.data.id); + $('#demo2 input').attr('value', idsArray.join(',')); + $('#demo2').append('
删除
'); + } + }); + + $('#demo2').on('click', '[lay-event="delimg"]', function () { + var _id = $(this).data('id'); + var idsStr = $('#demo2 input').val(); + var idsArray = []; + if (idsStr != '') { + idsArray = idsStr.split(","); + } + idsArray.remove(_id); + $('#demo2 input').attr('value', idsArray.join(',')); + $('#uploadImg' + _id).remove(); + }) + + var tags = new tagpicker({ 'url': '/admin/api/get_keyword_cate', 'target': 'keyword_name', 'tag_ids': 'keyword_id', @@ -216,6 +230,12 @@ 'isDiy': 1 }); + //商品描述富文本编辑器 + var edit = layui.tinymce.render({ + selector: '#container_content', + height: 500 + }); + //自定义验证规则 form.verify({ otherReq: function (value, item) { @@ -242,113 +262,23 @@ } } }); - - //缩略图上传 - var uploadInst = upload.render({ - elem: '#uploadBtn' - , url: '/admin/api/upload' - , done: function (res) { - //如果上传失败 - if (res.code == 1) { - return layer.msg('上传失败'); - } - //上传成功 - $('#demo1 input').attr('value', res.data.id); - $('#demo1 img').attr('src', res.data.filepath); + + //监听提交 + form.on('submit(webform)', function (data) { + data.field.content = tinyMCE.editors['container_content'].getContent(); + if (data.field.content == '') { + layer.msg('请先完善商品描述内容'); + return false; } - }); - - //广告图上传 - var uploadInst2 = upload.render({ - elem: '#uploadBtn2' - , url: '/admin/api/upload' - , done: function (res) { - //如果上传失败 - if (res.code == 1) { - return layer.msg('上传失败'); + let callback = function (e) { + layer.msg(e.msg); + if (e.code == 0) { + tool.sideClose(1000); } - //上传成功 - var idsStr = $('#demo2 input').val(); - var idsArray = []; - if (idsStr != '') { - idsArray = idsStr.split(","); - } - idsArray.push(res.data.id); - $('#demo2 input').attr('value', idsArray.join(',')); - $('#demo2').append('
删除
'); } - }); - - $('#demo2').on('click', '[lay-event="delimg"]', function () { - var _id = $(this).data('id'); - var idsStr = $('#demo2 input').val(); - var idsArray = []; - if (idsStr != '') { - idsArray = idsStr.split(","); - } - idsArray.remove(_id); - $('#demo2 input').attr('value', idsArray.join(',')); - $('#uploadImg' + _id).remove(); - }) - - //监听返回 - $('body').on('click', '[lay-event="back"]', function () { - tool.tabClose(); + tool.post("/admin/goods/add", data.field, callback); return false; }); - - if (editorType == 1) { - var editor = layui.tinymce; - var edit = editor.render({ - selector: "#container", - height: 500 - }); - //监听提交 - form.on('submit(webform)', function (data) { - data.field.content = tinyMCE.editors['container'].getContent(); - if (data.field.content == '') { - layer.msg('请先完善商品内容'); - return false; - } - let callback = function (e) { - if (e.code == 0) { - tool.tabRefresh(77); - layer.confirm('保存成功,关闭当前页面吗?', { icon: 3, title: '提示' }, function (index) { - tool.tabClose(); - }); - } else { - layer.msg(e.msg); - } - } - tool.post("/admin/goods/add", data.field, callback); - return false; - }); - } - else { - var editor = layui.editormd; - var edit = editor.render('docContent', { - markdown: document.getElementById('mdContent').value - }); - //监听提交 - form.on('submit(webform)', function (data) { - if (data.field.mdContent == '') { - layer.msg('请先完善商品内容'); - return false; - } - let callback = function (e) { - if (e.code == 0) { - tool.tabRefresh(77); - layer.confirm('保存成功,关闭当前页面吗?', { icon: 3, title: '提示' }, function (index) { - tool.tabClose(); - }); - } else { - layer.msg(e.msg); - } - } - tool.post("/admin/goods/add", data.field, callback); - return false; - }); - } } {/block} diff --git a/app/admin/view/goods/datalist.html b/app/admin/view/goods/datalist.html new file mode 100644 index 0000000..dfadd9e --- /dev/null +++ b/app/admin/view/goods/datalist.html @@ -0,0 +1,192 @@ +{extend name="common/base"/} + +{block name="body"} + +
+
+
+ +
+
+ +
+ +
+
+
+ + + + + + + + +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/goods/edit.html b/app/admin/view/goods/edit.html index f03fc52..2984459 100644 --- a/app/admin/view/goods/edit.html +++ b/app/admin/view/goods/edit.html @@ -17,184 +17,151 @@ top: 1px; right: 1px; } - - .editormd-code-toolbar select { - display: inline-block - } - - .editormd li { - list-style: inherit; - } {/block} {block name="body"}
+

编辑商品

- - - - - - - + - - + + + + + - - + + - - - + + + + + - - {empty name="$goods.md_content"} - + - - {else/} - {eq name="$editor" value="1"} - - - - - - - {else/} - - - - - - - {/eq} - {/empty}
商品标题*状态* - - -
关键字* - - - 商品分类*
商品卖点* - + 关键字* + + 缩略图*
- -
- - + +
+ +
商品卖点* + +
商品简介 - + +
商品标签* + + name="$detail.tag1" value="1" }checked{/eq} /> + name="$detail.tag2" value="1" }checked{/eq} /> + name="$detail.tag3" value="1" }checked{/eq} /> + name="$detail.tag4" value="1" }checked{/eq} /> + name="$detail.tag5" value="1" }checked{/eq} /> + name="$detail.tag6" value="1" }checked{/eq} />
市场价格* + placeholder="请输入市场价格" class="layui-input" value="{$detail.base_price}"> 实际价格* + class="layui-input" value="{$detail.price}"> + 商品库存* + 是否包邮* - -
首页显示 - - - 属性商品属性 首页显示 + + + 排序 - + + 状态* + +
商品图集 +
- - {notempty name="goods.banner"} - {volist name="goods.banner_array" id="vo"} -
删除
+ + {notempty name="detail.banner"} + {volist name="detail.banner_array" id="vo"} + {/volist} {/notempty}
商品介绍*商品介绍*
- + +
商品介绍*当前为TinyMCE富文本编辑器，可在【系统管理->系统配置->其他配置】中切换为mardown编辑器
- -
商品介绍*当前为mardown编辑器，可在【系统管理->系统配置->其他配置】中切换为TinyMCE富文本编辑器
-
- -
-
-
-
- - +
+ +
@@ -221,20 +188,60 @@ this.splice(index, 1); } }; - - const editorType = '{$editor}'; - var moduleInit; - if (editorType == 1) { - moduleInit = ['tool', 'tagpicker', 'tinymce']; - } - else { - moduleInit = ['tool', 'tagpicker', 'editormd']; - } + var moduleInit = ['tool','tagpicker','tinymce']; function gouguInit() { - var form = layui.form, tool = layui.tool, tagspicker = layui.tagpicker, upload = layui.upload; + var form = layui.form, tool = layui.tool,tagpicker = layui.tagpicker; - var tags = new tagspicker({ + //上传缩略图 + var upload_thumb = layui.upload.render({ + elem: '#upload_btn_thumb', + url: '/admin/api/upload', + done: function (res) { + //如果上传失败 + if (res.code == 1) { + return layer.msg('上传失败'); + } + //上传成功 + $('#upload_box_thumb input').attr('value', res.data.id); + $('#upload_box_thumb img').attr('src', res.data.filepath); + } + }); + + //banner图上传 + var uploadInst2 = layui.upload.render({ + elem: '#uploadBtn2' + , url: '/admin/api/upload' + , done: function (res) { + //如果上传失败 + if (res.code == 1) { + return layer.msg('上传失败'); + } + //上传成功 + var idsStr = $('#demo2 input').val(); + var idsArray = []; + if (idsStr != '') { + idsArray = idsStr.split(","); + } + idsArray.push(res.data.id); + $('#demo2 input').attr('value', idsArray.join(',')); + $('#demo2').append('
删除
'); + } + }); + + $('#demo2').on('click', '[lay-event="delimg"]', function () { + var _id = $(this).data('id'); + var idsStr = $('#demo2 input').val(); + var idsArray = []; + if (idsStr != '') { + idsArray = idsStr.split(","); + } + idsArray.remove(_id); + $('#demo2 input').attr('value', idsArray.join(',')); + $('#uploadImg' + _id).remove(); + }) + + var tags = new tagpicker({ 'url': '/admin/api/get_keyword_cate', 'target': 'keyword_name', 'tag_ids': 'keyword_id', @@ -243,6 +250,12 @@ 'isDiy': 1 }); + //商品描述富文本编辑器 + var edit = layui.tinymce.render({ + selector: '#container_content', + height: 500 + }); + //自定义验证规则 form.verify({ otherReq: function (value, item) { @@ -269,113 +282,23 @@ } } }); - - //缩略图上传 - var uploadInst = upload.render({ - elem: '#uploadBtn' - , url: '/admin/api/upload' - , done: function (res) { - //如果上传失败 - if (res.code == 1) { - return layer.msg('上传失败'); - } - //上传成功 - $('#demo1 input').attr('value', res.data.id); - $('#demo1 img').attr('src', res.data.filepath); + + //监听提交 + form.on('submit(webform)', function (data) { + data.field.content = tinyMCE.editors['container_content'].getContent(); + if (data.field.content == '') { + layer.msg('请先完善商品描述内容'); + return false; } - }); - - //广告图上传 - var uploadInst2 = upload.render({ - elem: '#uploadBtn2' - , url: '/admin/api/upload' - , done: function (res) { - //如果上传失败 - if (res.code == 1) { - return layer.msg('上传失败'); + let callback = function (e) { + layer.msg(e.msg); + if (e.code == 0) { + tool.sideClose(1000); } - //上传成功 - var idsStr = $('#demo2 input').val(); - var idsArray = []; - if (idsStr != '') { - idsArray = idsStr.split(","); - } - idsArray.push(res.data.id); - $('#demo2 input').attr('value', idsArray.join(',')); - $('#demo2').append('
删除
'); } - }); - - $('#demo2').on('click', '[lay-event="delimg"]', function () { - var _id = $(this).data('id'); - var idsStr = $('#demo2 input').val(); - var idsArray = []; - if (idsStr != '') { - idsArray = idsStr.split(","); - } - idsArray.remove(_id); - $('#demo2 input').attr('value', idsArray.join(',')); - $('#uploadImg' + _id).remove(); - }) - - //监听返回 - $('body').on('click', '[lay-event="back"]', function () { - tool.tabClose(); + tool.post("/admin/goods/edit", data.field, callback); return false; }); - - if (editorType == 1) { - var editor = layui.tinymce; - var edit = editor.render({ - selector: "#container", - height: 500 - }); - //监听提交 - form.on('submit(webform)', function (data) { - data.field.content = tinyMCE.editors['container'].getContent(); - if (data.field.content == '') { - layer.msg('请先完善商品内容'); - return false; - } - let callback = function (e) { - if (e.code == 0) { - tool.tabRefresh(77); - layer.confirm('保存成功,关闭当前页面?', { icon: 3, title: '提示' }, function (index) { - tool.tabClose(); - }); - } else { - layer.msg(e.msg); - } - } - tool.post("/admin/goods/add", data.field, callback); - return false; - }); - } - else { - var editor = layui.editormd; - var edit = editor.render('docContent', { - markdown: document.getElementById('mdContent').value - }); - //监听提交 - form.on('submit(webform)', function (data) { - if (data.field.mdContent == '') { - layer.msg('请先完善商品内容'); - return false; - } - let callback = function (e) { - if (e.code == 0) { - tool.tabRefresh(77); - layer.confirm('保存成功,关闭当前页面?', { icon: 3, title: '提示' }, function (index) { - tool.tabClose(); - }); - } else { - layer.msg(e.msg); - } - } - tool.post("/admin/goods/add", data.field, callback); - return false; - }); - } } {/block} diff --git a/app/admin/view/goods/read.html b/app/admin/view/goods/read.html new file mode 100644 index 0000000..2c348f0 --- /dev/null +++ b/app/admin/view/goods/read.html @@ -0,0 +1,122 @@ +{extend name="common/base"/} +{block name="style"} + +{/block} + +{block name="body"} +
+

商品详情

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
商品标题{$detail.title}商品分类{$detail.cate_name}
关键字{$detail.keyword_names}缩略图* + +
商品卖点{$detail.tips}
商品简介{$detail.desc}
商品标签 + + + + + + +
市场价格{$detail.base_price}实际价格{$detail.price}商品库存{$detail.stocks}是否包邮 + {eq name="$detail.is_mail" value="1"}是{/eq} + {eq name="$detail.is_mail" value="0"}否{/eq} +
商品属性 + {eq name="$detail.type" value="1" }精华{/eq} + {eq name="$detail.type" value="2" }热门{/eq} + {eq name="$detail.type" value="3" }推荐{/eq} + 首页显示 + {eq name="$detail.is_home" value="1"}是{/eq} + {eq name="$detail.is_home" value="0"}否{/eq} + 排序{$detail.sort}状态 + {eq name="$detail.status" value="1" }正常{/eq} + {eq name="$detail.status" value="0" }下架{/eq} +
商品图集 +
+
+ {notempty name="detail.banner"} + {volist name="detail.banner_array" id="vo"} +
+ {/volist} + {/notempty} +
+
+
商品介绍 + {$detail.content|raw} +
+
+{/block} + \ No newline at end of file diff --git a/app/admin/view/goods/cate_add.html b/app/admin/view/goods_cate/add.html similarity index 71% rename from app/admin/view/goods/cate_add.html rename to app/admin/view/goods_cate/add.html index 0225f06..96fef1f 100644 --- a/app/admin/view/goods/cate_add.html +++ b/app/admin/view/goods_cate/add.html @@ -2,7 +2,7 @@ {block name="body"} -

商品分类

+

新建商品分类

- + - + - +
父级分类* @@ -15,34 +15,28 @@ {/volist} 分类名称* - 排序 - +
排序分类名称* + - + 关键词 - +
描述
-
- +
@@ -53,11 +47,14 @@ {block name="script"} + {/block} @@ -25,7 +28,7 @@ id:'treeTable' ,elem: '#treeTable' ,idField:'id' - ,url:'/admin/goods/cate' + ,url:'/admin/goods_cate/datalist' ,cellMinWidth: 100 ,treeId:'id'//树形id字段名称 ,treeUpId:'pid'//树形父id字段名称 @@ -48,18 +51,18 @@ }); //表头工具栏事件 $('.add-menu').on('click', function(){ - tool.side("/admin/goods/cate_add"); + tool.side("/admin/goods_cate/add"); return; }); //操作按钮 treeGrid.on('tool(treeTable)',function (obj) { if (obj.event === 'add') { - tool.side('/admin/goods/cate_add?pid='+obj.data.id); + tool.side('/admin/goods_cate/add?pid='+obj.data.id); return; } if (obj.event === 'edit') { - tool.side('/admin/goods/cate_add?id='+obj.data.id); + tool.side('/admin/goods_cate/edit?id='+obj.data.id); return; } if(obj.event === 'del'){ @@ -70,7 +73,7 @@ obj.del(); } } - tool.delete("/admin/goods/cate_delete", { id: obj.data.id }, callback); + tool.delete("/admin/goods_cate/del", { id: obj.data.id }, callback); layer.close(index); }); } diff --git a/app/admin/view/goods_cate/edit.html b/app/admin/view/goods_cate/edit.html new file mode 100644 index 0000000..ad55d2a --- /dev/null +++ b/app/admin/view/goods_cate/edit.html @@ -0,0 +1,72 @@ +{extend name="common/base"/} + +{block name="body"} + +

编辑商品分类

+ + + + + + + + + + + + + + + + + +
父级分类* + + + 排序 + +
分类名称* + + + 关键词 + +
描述
+
+ + + +
+ +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/keywords/index.html b/app/admin/view/keywords/index.html index 361516e..63a2708 100644 --- a/app/admin/view/keywords/index.html +++ b/app/admin/view/keywords/index.html @@ -16,7 +16,7 @@ {/block} diff --git a/app/admin/view/level/index.html b/app/admin/view/level/index.html index 6645950..46aeb8d 100644 --- a/app/admin/view/level/index.html +++ b/app/admin/view/level/index.html @@ -6,7 +6,7 @@
{/block} diff --git a/app/admin/view/links/index.html b/app/admin/view/links/index.html index d0af08a..620d65a 100644 --- a/app/admin/view/links/index.html +++ b/app/admin/view/links/index.html @@ -17,7 +17,7 @@ {/block} diff --git a/app/admin/view/pages/datalist.html b/app/admin/view/pages/datalist.html new file mode 100644 index 0000000..b260448 --- /dev/null +++ b/app/admin/view/pages/datalist.html @@ -0,0 +1,151 @@ +{extend name="common/base"/} + +{block name="body"} + +
+
+
+ +
+ +
+
+
+ + + + + + +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/pages/edit.html b/app/admin/view/pages/edit.html index 4c1d875..730451b 100644 --- a/app/admin/view/pages/edit.html +++ b/app/admin/view/pages/edit.html @@ -17,19 +17,12 @@ top: 1px; right: 1px; } - - .editormd-code-toolbar select { - display: inline-block - } - - .editormd li { - list-style: inherit; - } {/block} {block name="body"} -
+ +

编辑单页面

@@ -37,8 +30,8 @@ - {empty name="$detail.md_content"} - {else/} - {eq name="$editor" value="1"} - - - - - - - {else/} - - - - - - - {/eq} - {/empty}
页面标题*缩略图
- -
+ +
@@ -95,47 +88,19 @@
页面内容*
- +
页面内容*当前为TinyMCE富文本编辑器，可在【系统管理->其他配置】中切换为mardown编辑器
- -
页面内容*当前为mardown编辑器，可在【系统管理->其他配置】中切换为TinyMCE富文本编辑器
-
- -
-
-
-
- +
+ -
{/block} @@ -160,20 +125,27 @@ this.splice(index, 1); } }; - - const editorType = '{$editor}'; - var moduleInit; - if (editorType == 1) { - moduleInit = ['tool', 'tagpicker', 'tinymce']; - } - else { - moduleInit = ['tool', 'tagpicker', 'editormd']; - } + var moduleInit = ['tool','tagpicker','tinymce']; function gouguInit() { - var form = layui.form, tool = layui.tool, tagspicker = layui.tagpicker, upload = layui.upload; + var form = layui.form, tool = layui.tool,tagpicker = layui.tagpicker; - var tags = new tagspicker({ + //上传缩略图 + var upload_thumb = layui.upload.render({ + elem: '#upload_btn_thumb', + url: '/admin/api/upload', + done: function (res) { + //如果上传失败 + if (res.code == 1) { + return layer.msg('上传失败'); + } + //上传成功 + $('#upload_box_thumb input').attr('value', res.data.filepath); + $('#upload_box_thumb img').attr('src', res.data.filepath); + } + }); + + var tags = new tagpicker({ 'url': '/admin/api/get_keyword_cate', 'target': 'keyword_name', 'tag_ids': 'keyword_id', @@ -181,24 +153,9 @@ 'height': 500, 'isDiy': 1 }); - - //缩略图上传 - var uploadInst = upload.render({ - elem: '#uploadBtn' - , url: '/admin/api/upload' - , done: function (res) { - //如果上传失败 - if (res.code == 1) { - return layer.msg('上传失败'); - } - //上传成功 - $('#demo1 input').attr('value', res.data.id); - $('#demo1 img').attr('src', res.data.filepath); - } - }); - - //广告图上传 - var uploadInst2 = upload.render({ + + //banner图上传 + var uploadInst2 = layui.upload.render({ elem: '#uploadBtn2' , url: '/admin/api/upload' , done: function (res) { @@ -230,64 +187,28 @@ $('#uploadImg' + _id).remove(); }) - //监听返回 - $('body').on('click', '[lay-event="back"]', function () { - tool.tabClose(); + //内容描述富文本编辑器 + var edit = layui.tinymce.render({ + selector: '#container_content', + height: 500 + }); + + //监听提交 + form.on('submit(webform)', function (data) { + data.field.content = tinyMCE.editors['container_content'].getContent(); + if (data.field.content == '') { + layer.msg('请先完善内容描述内容'); + return false; + } + let callback = function (e) { + layer.msg(e.msg); + if (e.code == 0) { + tool.sideClose(1000); + } + } + tool.post("/admin/pages/edit", data.field, callback); return false; }); - - if (editorType == 1) { - var editor = layui.tinymce; - var edit = editor.render({ - selector: "#container", - height: 500 - }); - //监听提交 - form.on('submit(webform)', function (data) { - data.field.content = tinyMCE.editors['container'].getContent(); - if (data.field.content == '') { - layer.msg('请先完善页面内容'); - return false; - } - let callback = function (e) { - if (e.code == 0) { - tool.tabRefresh(80); - layer.confirm('保存成功,关闭当前页面吗?', { icon: 3, title: '提示' }, function (index) { - tool.tabClose(); - }); - } else { - layer.msg(e.msg); - } - } - tool.post("/admin/pages/add", data.field, callback); - return false; - }); - } - else { - var editor = layui.editormd; - var edit = editor.render('docContent', { - markdown: document.getElementById('mdContent').value - }); - //监听提交 - form.on('submit(webform)', function (data) { - if (data.field.mdContent == '') { - layer.msg('请先完善页面内容'); - return false; - } - let callback = function (e) { - if (e.code == 0) { - tool.tabRefresh(80); - layer.confirm('保存成功,关闭当前页面吗?', { icon: 3, title: '提示' }, function (index) { - tool.tabClose(); - }); - } else { - layer.msg(e.msg); - } - } - tool.post("/admin/pages/add", data.field, callback); - return false; - }); - } } {/block} diff --git a/app/admin/view/pages/index.html b/app/admin/view/pages/index.html deleted file mode 100644 index 6ced18f..0000000 --- a/app/admin/view/pages/index.html +++ /dev/null @@ -1,128 +0,0 @@ -{extend name="common/base"/} - -{block name="body"} -
-
-
- -
- -
-
-
- - - - -{/block} - - - -{block name="script"} - -{/block} - diff --git a/app/admin/view/pages/read.html b/app/admin/view/pages/read.html new file mode 100644 index 0000000..5f4fa3a --- /dev/null +++ b/app/admin/view/pages/read.html @@ -0,0 +1,39 @@ +{extend name="common/base"/} + +{block name="body"} +
+

单页面详情

+ + + + + + + + + + + + + + + + + + + +
页面名称{$detail.title}图集相册{$detail.banner}阅读量{$detail.read}
排序{$detail.sort}URL文件名{$detail.name}前端模板 + {eq name="$detail.template" value="1"}选项一{/eq} + {eq name="$detail.template" value="2"}选项二{/eq} +
创建人{$detail.admin_id}创建时间{$detail.create_time}
页面摘要{$detail.desc}
缩略图 +
+
+ +
+
+
内容描述 + {$detail.content} +
+
+{/block} + \ No newline at end of file diff --git a/app/admin/view/position/add.html b/app/admin/view/position/add.html new file mode 100644 index 0000000..ca950d9 --- /dev/null +++ b/app/admin/view/position/add.html @@ -0,0 +1,101 @@ +{extend name="common/base"/} + +{block name="body"} +
+

岗位职称

+ {if condition="$id eq 0"} + + + + + + + + + + + + + + + +
岗位名称* + + 岗位工时单价(元)* + +
状态* + + +
岗位备注 + +
+ {else/} + + + + + + + + + + + + + + + +
岗位名称* + + 岗位工时单价(元)* + +
状态* + + +
岗位备注 + +
+ {/if} +
+ + + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/position/index.html b/app/admin/view/position/index.html new file mode 100644 index 0000000..3a2a3d0 --- /dev/null +++ b/app/admin/view/position/index.html @@ -0,0 +1,109 @@ +{extend name="common/base"/} + +{block name="body"} +
+
+
+ + + + + +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/admin/view/role/index.html b/app/admin/view/role/index.html index 876921b..a662adf 100644 --- a/app/admin/view/role/index.html +++ b/app/admin/view/role/index.html @@ -16,7 +16,7 @@ {/block} @@ -40,7 +40,7 @@ , { field: 'desc', title: '备注' } , { field: 'status', title: '状态', toolbar: '#status', align: 'center', width: 80 } , { width: 100,title: '操作',align: 'center',templet: function (d) { - var html = '
'; + var html = '
'; return html; } } diff --git a/app/admin/view/rule/index.html b/app/admin/view/rule/index.html index 0590018..988c735 100644 --- a/app/admin/view/rule/index.html +++ b/app/admin/view/rule/index.html @@ -3,7 +3,7 @@ {block name="body"}
- +
@@ -46,7 +46,7 @@ , { width: 188, title: '操作', align: 'center' , templet: function (d) { - var html = ''; + var html = ''; return html; } } diff --git a/app/admin/view/sitemap/index.html b/app/admin/view/sitemap/index.html index 98e1dee..53fd50b 100644 --- a/app/admin/view/sitemap/index.html +++ b/app/admin/view/sitemap/index.html @@ -15,7 +15,7 @@ diff --git a/app/admin/view/slide/index.html b/app/admin/view/slide/index.html index 96674f3..c819696 100644 --- a/app/admin/view/slide/index.html +++ b/app/admin/view/slide/index.html @@ -16,7 +16,7 @@ diff --git a/app/common.php b/app/common.php index b96b70b..6d625c1 100644 --- a/app/common.php +++ b/app/common.php @@ -216,74 +216,6 @@ function time_format($time = NULL, $format = 'Y-m-d H:i:s') return $time != '' ? str_replace('x', $sec, date($format, intval($usec))) : ''; } -/** - * 间隔时间段格式化 - * @param int $time 时间戳 - * @param string $format 格式 【d：显示到天 i显示到分钟 s显示到秒】 - * @return string - */ -function time_trans($time, $format = 'd') -{ - $now = time(); - $diff = $now - $time; - if ($diff < 60) { - return '1分钟前'; - } else if ($diff < 3600) { - return floor($diff / 60) . '分钟前'; - } else if ($diff < 86400) { - return floor($diff / 3600) . '小时前'; - } - $yes_start_time = strtotime(date('Y-m-d 00:00:00', strtotime('-1 days'))); //昨天开始时间 - $yes_end_time = strtotime(date('Y-m-d 23:59:59', strtotime('-1 days'))); //昨天结束时间 - $two_end_time = strtotime(date('Y-m-d 23:59:59', strtotime('-2 days'))); //2天前结束时间 - $three_end_time = strtotime(date('Y-m-d 23:59:59', strtotime('-3 days'))); //3天前结束时间 - $four_end_time = strtotime(date('Y-m-d 23:59:59', strtotime('-4 days'))); //4天前结束时间 - $five_end_time = strtotime(date('Y-m-d 23:59:59', strtotime('-5 days'))); //5天前结束时间 - $six_end_time = strtotime(date('Y-m-d 23:59:59', strtotime('-6 days'))); //6天前结束时间 - $seven_end_time = strtotime(date('Y-m-d 23:59:59', strtotime('-7 days'))); //7天前结束时间 - - if ($time > $yes_start_time && $time < $yes_end_time) { - return '昨天'; - } - - if ($time > $yes_start_time && $time < $two_end_time) { - return '1天前'; - } - - if ($time > $yes_start_time && $time < $three_end_time) { - return '2天前'; - } - - if ($time > $yes_start_time && $time < $four_end_time) { - return '3天前'; - } - - if ($time > $yes_start_time && $time < $five_end_time) { - return '4天前'; - } - - if ($time > $yes_start_time && $time < $six_end_time) { - return '5天前'; - } - - if ($time > $yes_start_time && $time < $seven_end_time) { - return '6天前'; - } - - switch ($format) { - case 'd': - $show_time = date('Y-m-d', $time); - break; - case 'i': - $show_time = date('Y-m-d H:i', $time); - break; - case 's': - $show_time = date('Y-m-d H:i:s', $time); - break; - } - return $show_time; -} - /** * 根据附件表的id返回url地址 * @param [type] $id [description] @@ -418,26 +350,6 @@ function add_user_log($type, $param_str = '', $param_id = 0, $param = []) \think\facade\Db::name('UserLog')->strict(false)->field(true)->insert($data); } -/** - * 判断是否是手机浏览器 - * @return bool - */ -function isMobile() -{ - if (isset($_SERVER['HTTP_VIA']) && stristr($_SERVER['HTTP_VIA'], "wap")) { - return true; - } elseif (isset($_SERVER['HTTP_ACCEPT']) && strpos(strtoupper($_SERVER['HTTP_ACCEPT']), "VND.WAP.WML")) { - return true; - } elseif (isset($_SERVER['HTTP_X_WAP_PROFILE']) || isset($_SERVER['HTTP_PROFILE'])) { - return true; - } elseif (isset($_SERVER['HTTP_USER_AGENT']) && preg_match('/(blackberry|configuration\/cldc|hp |hp-|htc |htc_|htc-|iemobile|kindle|midp|mmp|motorola|mobile|nokia|opera mini|opera |Googlebot-Mobile|YahooSeeker\/M1A1-R2D2|android|iphone|ipod|mobi|palm|palmos|pocket|portalmmm|ppc;|smartphone|sonyericsson|sqh|spv|symbian|treo|up.browser|up.link|vodafone|windows ce|xda |xda_)/i', $_SERVER['HTTP_USER_AGENT'])) { - return true; - } else { - return false; - } -} - - /** * 邮件发送 * @param $to 接收人 @@ -501,35 +413,24 @@ function send_email($to, $subject = '', $content = '') } } -/** - * 验证输入的邮件地址是否合法 - * @param $user_email 邮箱 - * @return bool - */ -function is_email($user_email) +/* +* 下划线转驼峰 +* 思路: +* step1.原字符串转小写,原字符串中的分隔符用空格替换,在字符串开头加上分隔符 +* step2.将字符串中每个单词的首字母转换为大写,再去空格,去字符串首部附加的分隔符. +*/ +function camelize($uncamelized_words,$separator='_') { - $chars = "/^([a-z0-9+_]|\\-|\\.)+@(([a-z0-9_]|\\-)+\\.)+[a-z]{2,6}\$/i"; - if (strpos($user_email, '@') !== false && strpos($user_email, '.') !== false) { - if (preg_match($chars, $user_email)) { - return true; - } else { - return false; - } - } else { - return false; - } + $uncamelized_words = $separator. str_replace($separator, " ", strtolower($uncamelized_words)); + return ltrim(str_replace(" ", "", ucwords($uncamelized_words)), $separator ); } /** - * 验证输入的手机号码是否合法 - * @param $mobile_phone 手机号 - * @return bool - */ -function is_mobile_phone($mobile_phone) +* 驼峰命名转下划线命名 +* 思路: +* 小写和大写紧挨一起的地方,加上分隔符,然后全部转小写 +*/ +function uncamelize($camelCaps,$separator='_') { - $chars = "/^13[0-9]{1}[0-9]{8}$|15[0-9]{1}[0-9]{8}$|18[0-9]{1}[0-9]{8}$|17[0-9]{1}[0-9]{8}$/"; - if (preg_match($chars, $mobile_phone)) { - return true; - } - return false; -} + return strtolower(preg_replace('/([a-z])([A-Z])/', "$1" . $separator . "$2", $camelCaps)); +} \ No newline at end of file diff --git a/app/crud/command/Crud.php b/app/crud/command/Crud.php new file mode 100644 index 0000000..048f56b --- /dev/null +++ b/app/crud/command/Crud.php @@ -0,0 +1,81 @@ +setName('auto crud') + ->addOption('table', 't', Option::VALUE_OPTIONAL, 'the table name', null) + ->addOption('controller', 'c', Option::VALUE_OPTIONAL, 'the controller name', null) + ->addOption('name', 'm', Option::VALUE_OPTIONAL, 'the name', null) + ->setDescription('auto make crud file'); + } + + protected function execute(Input $input, Output $output) + { + $table = $input->getOption('table'); + if (!$table) { + $output->error("请输入 -t 表名"); + exit; + } + + $controller = $input->getOption('controller'); + if (!$controller) { + $output->error("请输入 -c 控制器名"); + exit; + } + + $path = 'admin'; + $name = $input->getOption('name'); + if (!$name) { + $name = ''; + } + + $make = new AutoMake(); + + // 执行生成controller策略 + $make->executeText(new ControllerMake()); + $make->executeCreate($controller, $path, $table); + + // 执行生成model策略 + $make->executeText(new ModelMake()); + $make->executeCreate($table, $path, ''); + + // 执行生成validate策略 + $make->executeText(new ValidateMake()); + $make->executeCreate($table, $path, ''); + + // 执行生成list策略 + $make->executeText(new ListMake()); + $make->executeCreate($table, $path, $name); + + // 执行生成view策略 + $make->executeText(new ReadMake()); + $make->executeCreate($table, $path, $name); + + // 执行生成add策略 + $make->executeText(new AddMake()); + $make->executeCreate($table, $path, $name); + + // 执行生成edit策略 + $make->executeText(new EditMake()); + $make->executeCreate($table, $path, $name); + + $output->info($name . "crud make success"); + } +} \ No newline at end of file diff --git a/app/crud/command/CrudAdd.php b/app/crud/command/CrudAdd.php new file mode 100644 index 0000000..61e3283 --- /dev/null +++ b/app/crud/command/CrudAdd.php @@ -0,0 +1,52 @@ +setName('auto crud') + ->addOption('table', 't', Option::VALUE_OPTIONAL, 'the table name', null) + ->addOption('controller', 'c', Option::VALUE_OPTIONAL, 'the controller name', null) + ->addOption('name', 'm', Option::VALUE_OPTIONAL, 'the name', null) + ->setDescription('auto make crud file'); + } + + protected function execute(Input $input, Output $output) + { + $table = $input->getOption('table'); + if (!$table) { + $output->error("请输入 -t 表名"); + exit; + } + + $controller = $input->getOption('controller'); + if (!$controller) { + $output->error("请输入 -c 控制器名"); + exit; + } + + $path = 'admin'; + $name = $input->getOption('name'); + if (!$name) { + $name = ''; + } + + $make = new AutoMake(); + + // 执行生成add策略 + $make->executeText(new AddMake()); + $make->executeCreate($table, $path, $name); + + + $output->info($name . "add make success"); + } +} \ No newline at end of file diff --git a/app/crud/command/CrudController.php b/app/crud/command/CrudController.php new file mode 100644 index 0000000..cfe37ad --- /dev/null +++ b/app/crud/command/CrudController.php @@ -0,0 +1,51 @@ +setName('auto crud') + ->addOption('table', 't', Option::VALUE_OPTIONAL, 'the table name', null) + ->addOption('controller', 'c', Option::VALUE_OPTIONAL, 'the controller name', null) + ->addOption('name', 'm', Option::VALUE_OPTIONAL, 'the name', null) + ->setDescription('auto make crud file'); + } + + protected function execute(Input $input, Output $output) + { + $table = $input->getOption('table'); + if (!$table) { + $output->error("请输入 -t 表名"); + exit; + } + + $controller = $input->getOption('controller'); + if (!$controller) { + $output->error("请输入 -c 控制器名"); + exit; + } + + $path = 'admin'; + $name = $input->getOption('name'); + if (!$name) { + $name = ''; + } + + $make = new AutoMake(); + + // 执行生成controller策略 + $make->executeText(new ControllerMake()); + $make->executeCreate($controller, $path, $table); + + $output->info($name . "controller make success"); + } +} \ No newline at end of file diff --git a/app/crud/command/CrudEdit.php b/app/crud/command/CrudEdit.php new file mode 100644 index 0000000..505b67f --- /dev/null +++ b/app/crud/command/CrudEdit.php @@ -0,0 +1,51 @@ +setName('auto crud') + ->addOption('table', 't', Option::VALUE_OPTIONAL, 'the table name', null) + ->addOption('controller', 'c', Option::VALUE_OPTIONAL, 'the controller name', null) + ->addOption('name', 'm', Option::VALUE_OPTIONAL, 'the name', null) + ->setDescription('auto make crud file'); + } + + protected function execute(Input $input, Output $output) + { + $table = $input->getOption('table'); + if (!$table) { + $output->error("请输入 -t 表名"); + exit; + } + + $controller = $input->getOption('controller'); + if (!$controller) { + $output->error("请输入 -c 控制器名"); + exit; + } + + $path = 'admin'; + $name = $input->getOption('name'); + if (!$name) { + $name = ''; + } + + $make = new AutoMake(); + + // 执行生成edit策略 + $make->executeText(new EditMake()); + $make->executeCreate($table, $path, $name); + + $output->info($name . "edit make success"); + } +} \ No newline at end of file diff --git a/app/crud/command/CrudList.php b/app/crud/command/CrudList.php new file mode 100644 index 0000000..2c2a11e --- /dev/null +++ b/app/crud/command/CrudList.php @@ -0,0 +1,51 @@ +setName('auto crud') + ->addOption('table', 't', Option::VALUE_OPTIONAL, 'the table name', null) + ->addOption('controller', 'c', Option::VALUE_OPTIONAL, 'the controller name', null) + ->addOption('name', 'm', Option::VALUE_OPTIONAL, 'the name', null) + ->setDescription('auto make crud file'); + } + + protected function execute(Input $input, Output $output) + { + $table = $input->getOption('table'); + if (!$table) { + $output->error("请输入 -t 表名"); + exit; + } + + $controller = $input->getOption('controller'); + if (!$controller) { + $output->error("请输入 -c 控制器名"); + exit; + } + + $path = 'admin'; + $name = $input->getOption('name'); + if (!$name) { + $name = ''; + } + + $make = new AutoMake(); + + // 执行生成list策略 + $make->executeText(new ListMake()); + $make->executeCreate($table, $path, $name); + + $output->info($name . "list make success"); + } +} \ No newline at end of file diff --git a/app/crud/command/CrudModel.php b/app/crud/command/CrudModel.php new file mode 100644 index 0000000..b7573b6 --- /dev/null +++ b/app/crud/command/CrudModel.php @@ -0,0 +1,51 @@ +setName('auto crud') + ->addOption('table', 't', Option::VALUE_OPTIONAL, 'the table name', null) + ->addOption('controller', 'c', Option::VALUE_OPTIONAL, 'the controller name', null) + ->addOption('name', 'm', Option::VALUE_OPTIONAL, 'the name', null) + ->setDescription('auto make crud file'); + } + + protected function execute(Input $input, Output $output) + { + $table = $input->getOption('table'); + if (!$table) { + $output->error("请输入 -t 表名"); + exit; + } + + $controller = $input->getOption('controller'); + if (!$controller) { + $output->error("请输入 -c 控制器名"); + exit; + } + + $path = 'admin'; + $name = $input->getOption('name'); + if (!$name) { + $name = ''; + } + + $make = new AutoMake(); + + // 执行生成model策略 + $make->executeText(new ModelMake()); + $make->executeCreate($table, $path, ''); + + $output->info($name . "model make success"); + } +} \ No newline at end of file diff --git a/app/crud/command/CrudRead.php b/app/crud/command/CrudRead.php new file mode 100644 index 0000000..9846477 --- /dev/null +++ b/app/crud/command/CrudRead.php @@ -0,0 +1,51 @@ +setName('auto crud') + ->addOption('table', 't', Option::VALUE_OPTIONAL, 'the table name', null) + ->addOption('controller', 'c', Option::VALUE_OPTIONAL, 'the controller name', null) + ->addOption('name', 'm', Option::VALUE_OPTIONAL, 'the name', null) + ->setDescription('auto make crud file'); + } + + protected function execute(Input $input, Output $output) + { + $table = $input->getOption('table'); + if (!$table) { + $output->error("请输入 -t 表名"); + exit; + } + + $controller = $input->getOption('controller'); + if (!$controller) { + $output->error("请输入 -c 控制器名"); + exit; + } + + $path = 'admin'; + $name = $input->getOption('name'); + if (!$name) { + $name = ''; + } + + $make = new AutoMake(); + + // 执行生成view策略 + $make->executeText(new ReadMake()); + $make->executeCreate($table, $path, $name); + + $output->info($name . "read make success"); + } +} \ No newline at end of file diff --git a/app/crud/command/CrudValidate.php b/app/crud/command/CrudValidate.php new file mode 100644 index 0000000..60f1ff9 --- /dev/null +++ b/app/crud/command/CrudValidate.php @@ -0,0 +1,51 @@ +setName('auto crud') + ->addOption('table', 't', Option::VALUE_OPTIONAL, 'the table name', null) + ->addOption('controller', 'c', Option::VALUE_OPTIONAL, 'the controller name', null) + ->addOption('name', 'm', Option::VALUE_OPTIONAL, 'the name', null) + ->setDescription('auto make crud file'); + } + + protected function execute(Input $input, Output $output) + { + $table = $input->getOption('table'); + if (!$table) { + $output->error("请输入 -t 表名"); + exit; + } + + $controller = $input->getOption('controller'); + if (!$controller) { + $output->error("请输入 -c 控制器名"); + exit; + } + + $path = 'admin'; + $name = $input->getOption('name'); + if (!$name) { + $name = ''; + } + + $make = new AutoMake(); + + // 执行生成validate策略 + $make->executeText(new ValidateMake()); + $make->executeCreate($table, $path, ''); + + $output->info($name . "validate make success"); + } +} \ No newline at end of file diff --git a/app/crud/make/AutoMake.php b/app/crud/make/AutoMake.php new file mode 100644 index 0000000..fb3ce7c --- /dev/null +++ b/app/crud/make/AutoMake.php @@ -0,0 +1,21 @@ +create = $obj; + } + + public function executeCreate($flag, $path, $other) + { + $this->create->check($flag, $path); + $this->create->make($flag, $path, $other); + } +} \ No newline at end of file diff --git a/app/crud/make/ToAutoMake.php b/app/crud/make/ToAutoMake.php new file mode 100644 index 0000000..4f6ce75 --- /dev/null +++ b/app/crud/make/ToAutoMake.php @@ -0,0 +1,10 @@ +error("$modelName . DS . add.html已经存在"); + exit; + } + } + + public function make($table, $path, $other) + { + $addTpl = dirname(dirname(__DIR__)) . '/tpl/add.tpl'; + $tplContent = file_get_contents($addTpl); + + $model = $table; + $filePath = empty($path) ? '' : DS . $path; + $namespace = empty($path) ? '\\' : '\\' . $path . '\\'; + + $prefix = config('database.connections.mysql.prefix'); + $column = Db::query('SHOW FULL COLUMNS FROM `' . $prefix . $table . '`'); + $pk = ''; + foreach ($column as $vo) { + if ($vo['Key'] == 'PRI') { + $pk = $vo['Field']; + break; + } + } + /* + //读取数据结构生成字段 + $tritems =''; + $index =0; + foreach ($column as $key => $vo) { + $field = $vo['Field']; + $title = $vo['Comment']==''?$field:$vo['Comment']; + if($field != 'id'){ + if(($index % 3) == 0){ + $tritems.=" + {$title} + "; + }else if(($index % 3) == 1){ + $tritems.=" + {$title} + "; + }else if(($index % 3) == 2){ + $tritems.=" + {$title} + + + "; + } + $index++; + } + } + if(($index % 3) == 1){ + $tritems.=" + "; + } + if(($index % 3) == 2){ + $tritems.=" + "; + } + */ + + //读取提交的数据生成字段 + $field_column = get_cache('crud_a_'.$table); + $tritems =''; + $index =0; + $summernoteIndex=0; + $inputHtml=''; + $textareaHtml=''; + $uploadHtml=''; + $uploadScript = ''; + $summernoteHtml=''; + $summernoteForm=''; + $summernoteScript=''; + $datetimeScript=''; + foreach ($field_column as $key => $vo) { + $field = $vo['field']; + $title = $vo['title']; + if($vo['type'] == 'summernote'){ + $summernoteHtml.="".$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required'])." + "; + + $summernoteScript.= "//".$vo['title']."富文本编辑器 + var edit = layui.tinymce.render({ + selector: '#container_".$vo['field']."', + height: 500 + });"; + + $summernoteForm.= "data.field.".$vo['field']." = tinyMCE.editors['container_".$vo['field']."'].getContent(); + if (data.field.".$vo['field']." == '') { + layer.msg('请先完善".$vo['title']."内容'); + return false; + }"; + $summernoteIndex++; + } + else if($vo['type'] == 'upload'){ + $uploadHtml.="".$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required'])." + "; + $uploadScript.= "//上传".$vo['title']." + var upload_".$vo['field']." = layui.upload.render({ + elem: '#upload_btn_".$vo['field']."', + url: '/admin/api/upload', + done: function (res) { + //如果上传失败 + if (res.code == 1) { + return layer.msg('上传失败'); + } + //上传成功 + $('#upload_box_".$vo['field']." input').attr('value', res.data.filepath); + $('#upload_box_".$vo['field']." img').attr('src', res.data.filepath); + } + });"; + }else if($vo['type'] == 'textarea'){ + $textareaHtml.="".$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required'])." + "; + } + else{ + if(($index % 3) == 0){ + $inputHtml.="".$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required']); + }else if(($index % 3) == 1){ + $inputHtml.=$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required']); + }else if(($index % 3) == 2){ + $inputHtml.=$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required'])." + + "; + } + if($vo['type'] == 'datetime'){ + $datetimeScript.="//日期选择 + layui.laydate.render({ + elem: '#laydate_".$vo['field']."' //指定元素 + });"; + } + $index++; + } + } + if(($index % 3) == 1){ + $inputHtml.=" + "; + } + if(($index % 3) == 2){ + $inputHtml.=" + "; + } + + $moduleInit = "var moduleInit = ['tool'];"; + if($summernoteIndex>0){ + $moduleInit = "var moduleInit = ['tool','tinymce'];"; + } + + $tritems=$inputHtml.$textareaHtml.$uploadHtml.$summernoteHtml; + $tplContent = str_replace('', $namespace, $tplContent); + $tplContent = str_replace('', $model, $tplContent); + $tplContent = str_replace('', $tritems, $tplContent); + $tplContent = str_replace('', $other, $tplContent); + $tplContent = str_replace('', $pk, $tplContent); + $tplContent = str_replace('', $moduleInit, $tplContent); + $tplContent = str_replace('', $datetimeScript, $tplContent); + $tplContent = str_replace('', $uploadScript, $tplContent); + $tplContent = str_replace('', $summernoteForm, $tplContent); + $tplContent = str_replace('', $summernoteScript, $tplContent); + + file_put_contents(base_path() . $path . DS . 'view' . DS . $model . DS . 'add.html', $tplContent); + } + + public function make_form($field, $type, $title,$required) + { + $required_font = ''; + $required_verify = ''; + if($required==1){ + $required_font = '*'; + $required_verify = ' lay-verify="required" lay-reqText="请完善'.$title.'"'; + } + $tem=[ + 'input'=>''.$title.$required_font.' + ', + + 'datetime'=>''.$title.$required_font.' + ', + + 'radio'=>''.$title.$required_font.' + + + + ', + + 'checkbox'=>''.$title.$required_font.' + + + + ', + + 'select'=>''.$title.$required_font.' + + + ', + + 'textarea'=>''.$title.$required_font.' + ', + + 'upload'=>''.$title.$required_font.' + +
+ +
+ + +
+
+ ', + + 'summernote'=>''.$title.$required_font.' + + + ' + ]; + return $tem[$type]; + } +} \ No newline at end of file diff --git a/app/crud/make/make/ControllerMake.php b/app/crud/make/make/ControllerMake.php new file mode 100644 index 0000000..fd8f564 --- /dev/null +++ b/app/crud/make/make/ControllerMake.php @@ -0,0 +1,107 @@ +error("$controller.php已经存在"); + exit; + } + } + + public function make($controller, $path, $table) + { + $controllerTpl = dirname(dirname(__DIR__)) . '/tpl/controller.tpl'; + $tplContent = file_get_contents($controllerTpl); + + $controller = ucfirst(camelize($controller)); + $model = ucfirst(camelize($table)); + $filePath = empty($path) ? '' : DS . $path; + $namespace = empty($path) ? '\\' : '\\' . $path . '\\'; + + $prefix = config('database.connections.mysql.prefix'); + $column = Db::query('SHOW FULL COLUMNS FROM `' . $prefix . $table . '`'); + $pk = ''; + foreach ($column as $vo) { + if ($vo['Key'] == 'PRI') { + $pk = $vo['Field']; + break; + } + } + $wheremap = ''; + foreach ($column as $vo) { + if ($vo['Field'] == 'delete_time') { + $wheremap='$where[] = ["delete_time","=",0];'; + break; + } + } + + $add_column = get_cache('crud_a_'.$table); + $edit_column = get_cache('crud_e_'.$table); + + $timeadd = ''; + $timeedit = ''; + foreach ($add_column as $key => $vo) { + if($vo['type'] == 'datetime'){ + $timeadd.='if(isset($param["'.$vo['field'].'"])){ + '; + $timeadd.='$param["'.$vo['field'].'"]= $param["'.$vo['field'].'"]?strtotime($param["'.$vo['field'].'"]):0; + '; + $timeadd.='} + '; + } + } + + foreach ($edit_column as $key => $vo) { + if($vo['type'] == 'datetime'){ + $timeedit.='if(isset($param["'.$vo['field'].'"])){ + '; + $timeedit.='$param["'.$vo['field'].'"]= $param["'.$vo['field'].'"]?strtotime($param["'.$vo['field'].'"]):0; + '; + $timeedit.='} + '; + } + } + + $tplContent = str_replace('', $namespace, $tplContent); + $tplContent = str_replace('', $controller, $tplContent); + $tplContent = str_replace('', $model, $tplContent); + $tplContent = str_replace('', $pk, $tplContent); + $tplContent = str_replace('', $wheremap, $tplContent); + $tplContent = str_replace('', $timeadd, $tplContent); + $tplContent = str_replace('', $timeedit, $tplContent); + + file_put_contents(base_path() . $filePath . DS . 'controller' . DS . $controller . '.php', $tplContent); + + /* + // 检测BaseController是否存在 + if (!file_exists(App::getAppPath() . $filePath . DS . 'controller' . DS . 'BaseController.php')) { + + $controllerTpl = dirname(dirname(__DIR__)) . '/tpl/baseController.tpl'; + $tplContent = file_get_contents($controllerTpl); + + $tplContent = str_replace('', $namespace, $tplContent); + + file_put_contents(base_path() . $filePath . DS . 'controller' . DS . 'BaseController.php', $tplContent); + } + */ + } +} \ No newline at end of file diff --git a/app/crud/make/make/EditMake.php b/app/crud/make/make/EditMake.php new file mode 100644 index 0000000..7f9ee7a --- /dev/null +++ b/app/crud/make/make/EditMake.php @@ -0,0 +1,248 @@ +error("$modelName . DS . edit.html已经存在"); + exit; + } + } + + public function make($table, $path, $other) + { + $editTpl = dirname(dirname(__DIR__)) . '/tpl/edit.tpl'; + $tplContent = file_get_contents($editTpl); + + $model = $table; + $filePath = empty($path) ? '' : DS . $path; + $namespace = empty($path) ? '\\' : '\\' . $path . '\\'; + + $prefix = config('database.connections.mysql.prefix'); + $column = Db::query('SHOW FULL COLUMNS FROM `' . $prefix . $table . '`'); + $pk = ''; + foreach ($column as $vo) { + if ($vo['Key'] == 'PRI') { + $pk = $vo['Field']; + break; + } + } + /* + //读取数据结构生成字段 + $tritems =''; + $detail ='$detail.'; + $index =0; + foreach ($column as $key => $vo) { + $field = $vo['Field']; + $title = $vo['Comment']==''?$field:$vo['Comment']; + if($field != 'id'){ + if(($index % 3) == 0){ + $tritems.=" + {$title} + "; + }else if(($index % 3) == 1){ + $tritems.=" + {$title} + "; + }else if(($index % 3) == 2){ + $tritems.=" + {$title} + + + "; + } + $index++; + } + } + if(($index % 3) == 1){ + $tritems.=" + "; + } + if(($index % 3) == 2){ + $tritems.=" + "; + } + */ + + //读取提交的数据生成字段 + $field_column = get_cache('crud_e_'.$table); + $tritems =''; + $index =0; + $summernoteIndex=0; + $inputHtml=''; + $textareaHtml=''; + $uploadHtml=''; + $uploadScript = ''; + $summernoteHtml=''; + $summernoteForm=''; + $summernoteScript=''; + $datetimeScript=''; + foreach ($field_column as $key => $vo) { + $field = $vo['field']; + $title = $vo['title']; + if($vo['type'] == 'summernote'){ + $summernoteHtml.="".$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required'])." + "; + + $summernoteScript.= "//".$vo['title']."富文本编辑器 + var edit = layui.tinymce.render({ + selector: '#container_".$vo['field']."', + height: 500 + });"; + + $summernoteForm.= "data.field.".$vo['field']." = tinyMCE.editors['container_".$vo['field']."'].getContent(); + if (data.field.".$vo['field']." == '') { + layer.msg('请先完善".$vo['title']."内容'); + return false; + }"; + $summernoteIndex++; + } + else if($vo['type'] == 'upload'){ + $uploadHtml.="".$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required'])." + "; + $uploadScript.= "//上传".$vo['title']." + var upload_".$vo['field']." = layui.upload.render({ + elem: '#upload_btn_".$vo['field']."', + url: '/admin/api/upload', + done: function (res) { + //如果上传失败 + if (res.code == 1) { + return layer.msg('上传失败'); + } + //上传成功 + $('#upload_box_".$vo['field']." input').attr('value', res.data.filepath); + $('#upload_box_".$vo['field']." img').attr('src', res.data.filepath); + } + });"; + }else if($vo['type'] == 'textarea'){ + $textareaHtml.="".$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required'])." + "; + }else if($vo['type'] == 'textarea'){ + $textareaHtml.="".$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required'])." + "; + } + else{ + if(($index % 3) == 0){ + $inputHtml.="".$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required']); + }else if(($index % 3) == 1){ + $inputHtml.=$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required']); + }else if(($index % 3) == 2){ + $inputHtml.=$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required'])." + + "; + } + if($vo['type'] == 'datetime'){ + $datetimeScript.="//日期选择 + layui.laydate.render({ + elem: '#laydate_".$vo['field']."' //指定元素 + });"; + } + $index++; + } + } + if(($index % 3) == 1){ + $inputHtml.=" + "; + } + if(($index % 3) == 2){ + $inputHtml.=" + "; + } + + $moduleInit = "var moduleInit = ['tool'];"; + if($summernoteIndex>0){ + $moduleInit = "var moduleInit = ['tool','tinymce'];"; + } + + $tritems=$inputHtml.$textareaHtml.$uploadHtml.$summernoteHtml; + $tplContent = str_replace('', $namespace, $tplContent); + $tplContent = str_replace('', $model, $tplContent); + $tplContent = str_replace('', $tritems, $tplContent); + $tplContent = str_replace('', $other, $tplContent); + $tplContent = str_replace('', $pk, $tplContent); + $tplContent = str_replace('', $moduleInit, $tplContent); + $tplContent = str_replace('', $datetimeScript, $tplContent); + $tplContent = str_replace('', $uploadScript, $tplContent); + $tplContent = str_replace('', $summernoteForm, $tplContent); + $tplContent = str_replace('', $summernoteScript, $tplContent); + + file_put_contents(base_path() . $path . DS . 'view' . DS . $model . DS . 'edit.html', $tplContent); + } + + public function make_form($field, $type, $title,$required) + { + $required_font = ''; + $required_verify = ''; + if($required==1){ + $required_font = '*'; + $required_verify = ' lay-verify="required" lay-reqText="请完善'.$title.'"'; + } + $tem=[ + 'input'=>''.$title.$required_font.' + ', + + 'datetime'=>''.$title.$required_font.' + ', + + 'radio'=>''.$title.$required_font.' + + + + ', + + 'checkbox'=>''.$title.$required_font.' + + + + ', + + 'select'=>''.$title.$required_font.' + + + ', + + + 'textarea'=>''.$title.$required_font.' + ', + + 'upload'=>''.$title.$required_font.' + +
+ +
+ + +
+
+ ', + + 'summernote'=>''.$title.$required_font.' + + + ' + ]; + return $tem[$type]; + } +} \ No newline at end of file diff --git a/app/crud/make/make/ListMake.php b/app/crud/make/make/ListMake.php new file mode 100644 index 0000000..255f448 --- /dev/null +++ b/app/crud/make/make/ListMake.php @@ -0,0 +1,80 @@ +error("$modelName datalist.html已经存在"); + exit; + } + } + + public function make($table, $path, $other) + { + $listTpl = dirname(dirname(__DIR__)) . '/tpl/list.tpl'; + $tplContent = file_get_contents($listTpl); + + $model = $table; + $filePath = empty($path) ? '' : DS . $path; + $namespace = empty($path) ? '\\' : '\\' . $path . '\\'; + + $prefix = config('database.connections.mysql.prefix'); + $column = Db::query('SHOW FULL COLUMNS FROM `' . $prefix . $table . '`'); + $pk = ''; + foreach ($column as $vo) { + if ($vo['Key'] == 'PRI') { + $pk = $vo['Field']; + break; + } + } + + $field_column = get_cache('crud_l_'.$table); + $listitems="{ + fixed: 'left', + field: 'id', + title: '编号', + align: 'center', + width: 80 + },"; + foreach ($field_column as $key => $vo) { + if($vo['field'] == 'title'){ + $listitems.="{ + field: '".$vo['field']."', + title: '".$vo['title']."', + },"; + }else{ + $listitems.="{ + field: '".$vo['field']."', + title: '".$vo['title']."', + align: 'center', + width: 100 + },"; + } + } + $tplContent = str_replace('', $namespace, $tplContent); + $tplContent = str_replace('', $model, $tplContent); + $tplContent = str_replace('', $listitems, $tplContent); + $tplContent = str_replace('', $other, $tplContent); + $tplContent = str_replace('', $pk, $tplContent); + + file_put_contents(base_path() . $path . DS . 'view' . DS . $model . DS . 'datalist.html', $tplContent); + } +} \ No newline at end of file diff --git a/app/crud/make/make/ModelMake.php b/app/crud/make/make/ModelMake.php new file mode 100644 index 0000000..9b8ed4e --- /dev/null +++ b/app/crud/make/make/ModelMake.php @@ -0,0 +1,61 @@ +error("$modelName.php已经存在"); + exit; + } + } + + public function make($table, $path, $other) + { + $controllerTpl = dirname(dirname(__DIR__)) . '/tpl/model.tpl'; + $tplContent = file_get_contents($controllerTpl); + + $model = ucfirst(camelize($table)); + $filePath = empty($path) ? '' : DS . $path; + $namespace = empty($path) ? '\\' : '\\' . $path . '\\'; + + $prefix = config('database.connections.mysql.prefix'); + $column = Db::query('SHOW FULL COLUMNS FROM `' . $prefix . $table . '`'); + $pk = ''; + foreach ($column as $vo) { + if ($vo['Key'] == 'PRI') { + $pk = $vo['Field']; + break; + } + } + $fieldlist=$pk; + $list_column = get_cache('crud_l_'.$table); + foreach ($list_column as $key => $vo) { + $fieldlist.=','.$vo['field']; + } + + $tplContent = str_replace('', $namespace, $tplContent); + $tplContent = str_replace('', $model, $tplContent); + $tplContent = str_replace('', $pk, $tplContent); + $tplContent = str_replace('', $fieldlist, $tplContent); + + file_put_contents(base_path() . $path . DS . 'model' . DS . $model . '.php', $tplContent); + } +} \ No newline at end of file diff --git a/app/crud/make/make/ReadMake.php b/app/crud/make/make/ReadMake.php new file mode 100644 index 0000000..023e8b2 --- /dev/null +++ b/app/crud/make/make/ReadMake.php @@ -0,0 +1,182 @@ +error("$modelName . DS . view.html已经存在"); + exit; + } + } + + public function make($table, $path, $other) + { + $readTpl = dirname(dirname(__DIR__)) . '/tpl/read.tpl'; + $tplContent = file_get_contents($readTpl); + + $model = $table; + $filePath = empty($path) ? '' : DS . $path; + $namespace = empty($path) ? '\\' : '\\' . $path . '\\'; + + $prefix = config('database.connections.mysql.prefix'); + $column = Db::query('SHOW FULL COLUMNS FROM `' . $prefix . $table . '`'); + $pk = ''; + foreach ($column as $vo) { + if ($vo['Key'] == 'PRI') { + $pk = $vo['Field']; + break; + } + } + + /* + //读取数据结构生成字段 + $tritems =''; + $detail ='$detail.'; + $index =0; + foreach ($column as $key => $vo) { + $field = $vo['Field']; + $title = $vo['Comment']==''?$field:$vo['Comment']; + if($field != 'id'){ + if(($index % 3) == 0){ + $tritems.=" + {$title} + {{$detail}{$field}}"; + }else if(($index % 3) == 1){ + $tritems.=" + {$title} + {{$detail}{$field}}"; + }else if(($index % 3) == 2){ + $tritems.=" + {$title} + {{$detail}{$field}} + + "; + } + $index++; + } + } + if(($index % 3) == 1){ + $tritems.=" + "; + } + if(($index % 3) == 2){ + $tritems.=" + "; + } + */ + + //读取提交的数据生成字段 + $field_column = get_cache('crud_r_'.$table); + $tritems =''; + $index =0; + $inputHtml=''; + $textareaHtml=''; + $uploadHtml=''; + $summernoteHtml=''; + foreach ($field_column as $key => $vo) { + if($vo['type'] == 'summernote'){ + $summernoteHtml.="".$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required'])." + "; + } + else if($vo['type'] == 'upload'){ + $uploadHtml.="".$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required'])." + "; + }else if($vo['type'] == 'textarea'){ + $textareaHtml.="".$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required'])." + "; + } + else{ + if(($index % 3) == 0){ + $inputHtml.="".$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required']); + }else if(($index % 3) == 1){ + $inputHtml.=$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required']); + }else if(($index % 3) == 2){ + $inputHtml.=$this->make_form($vo['field'], $vo['type'], $vo['title'],$vo['required'])." + "; + } + $index++; + } + } + + if(($index % 3) == 1){ + $inputHtml.=" + "; + } + if(($index % 3) == 2){ + $inputHtml.=" + "; + } + + $tritems=$inputHtml.$textareaHtml.$uploadHtml.$summernoteHtml; + $tplContent = str_replace('', $namespace, $tplContent); + $tplContent = str_replace('', $model, $tplContent); + $tplContent = str_replace('', $tritems, $tplContent); + $tplContent = str_replace('', $other, $tplContent); + $tplContent = str_replace('', $pk, $tplContent); + + file_put_contents(base_path() . $path . DS . 'view' . DS . $model . DS . 'read.html', $tplContent); + } + + public function make_form($field, $type, $title,$required) + { + $tem=[ + 'input'=>''.$title.' + {$detail.'.$field.'}', + + 'datetime'=>''.$title.' + {$detail.'.$field.'|time_format=###,\'Y-m-d\'}', + + 'radio'=>''.$title.' + + {eq name="$detail.'.$field.'" value="0"}选项一{/eq} + {eq name="$detail.'.$field.'" value="1"}选项二{/eq} + ', + + 'checkbox'=>''.$title.' + + {eq name="$detail.'.$field.'" value="1"}选项一{/eq} + {eq name="$detail.'.$field.'" value="2"}选项二{/eq} + ', + + 'select'=>''.$title.' + + {eq name="$detail.'.$field.'" value="1"}选项一{/eq} + {eq name="$detail.'.$field.'" value="2"}选项二{/eq} + ', + + + 'textarea'=>''.$title.' + {$detail.'.$field.'}', + + 'upload'=>''.$title.' + + + ', + + 'summernote'=>''.$title.' + + {$detail.'.$field.'|raw} + ' + ]; + + return $tem[$type]; + } +} \ No newline at end of file diff --git a/app/crud/make/make/ValidateMake.php b/app/crud/make/make/ValidateMake.php new file mode 100644 index 0000000..c9ce4de --- /dev/null +++ b/app/crud/make/make/ValidateMake.php @@ -0,0 +1,60 @@ +error("$validateName.php已经存在"); + exit; + } + } + + public function make($table, $path, $other) + { + $validateTpl = dirname(dirname(__DIR__)) . '/tpl/validate.tpl'; + $tplContent = file_get_contents($validateTpl); + + $model = ucfirst(camelize($table)); + $filePath = empty($path) ? '' : DS . $path; + $namespace = empty($path) ? '\\' : '\\' . $path . '\\'; + + //$prefix = config('database.connections.mysql.prefix'); + //$column = Db::query('SHOW FULL COLUMNS FROM `' . $prefix . $table . '`'); + $column = get_cache('crud_v_'.$table); + $rule = []; + $message = []; + foreach ($column as $vo) { + $rule[$vo['field']] = 'require'; + $message[$vo['field'].'.require'] = $vo['title'].'不能为空'; + } + + $ruleArr = VarExporter::export($rule); + $messageArr = VarExporter::export($message); + + $tplContent = str_replace('', $namespace, $tplContent); + $tplContent = str_replace('', $model, $tplContent); + $tplContent = str_replace('', '' . $ruleArr, $tplContent); + $tplContent = str_replace('', $messageArr, $tplContent); + + file_put_contents(base_path() . $filePath . DS . 'validate' . DS . $model . 'Validate.php', $tplContent); + } +} \ No newline at end of file diff --git a/app/crud/tpl/add.tpl b/app/crud/tpl/add.tpl new file mode 100644 index 0000000..cc8751a --- /dev/null +++ b/app/crud/tpl/add.tpl @@ -0,0 +1,43 @@ +{extend name="common/base"/} + +{block name="body"} +
+

新建

+ + +
+
+ + + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/crud/tpl/baseController.tpl b/app/crud/tpl/baseController.tpl new file mode 100644 index 0000000..5303d53 --- /dev/null +++ b/app/crud/tpl/baseController.tpl @@ -0,0 +1,13 @@ +controller; + +class Base extends \app\BaseController +{ + +} \ No newline at end of file diff --git a/app/crud/tpl/controller.tpl b/app/crud/tpl/controller.tpl new file mode 100644 index 0000000..9ced9e3 --- /dev/null +++ b/app/crud/tpl/controller.tpl @@ -0,0 +1,131 @@ + as Model; +use app\admin\validate\Validate; +use think\exception\ValidateException; +use think\facade\Db; +use think\facade\View; + +class extends BaseController + +{ + /** + * 构造函数 + */ + public function __construct() + { + $this->model = new Model(); + $this->uid = get_login_admin('id'); + } + /** + * 数据列表 + */ + public function datalist() + { + if (request()->isAjax()) { + $param = get_params(); + $where = []; + + $list = $this->model->getList($where,$param); + return table_assign(0, '', $list); + } + else{ + return view(); + } + } + + /** + * 添加 + */ + public function add() + { + if (request()->isAjax()) { + $param = get_params(); + + // 检验完整性 + try { + validate(Validate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + + $this->model->add($param); + }else{ + return view(); + } + } + + + /** + * 编辑 + */ + public function edit() + { + $param = get_params(); + + if (request()->isAjax()) { + // 检验完整性 + try { + validate(Validate::class)->check($param); + } catch (ValidateException $e) { + // 验证失败 输出错误信息 + return to_assign(1, $e->getError()); + } + + $this->model->edit($param); + }else{ + $ = isset($param['']) ? $param[''] : 0; + $detail = $this->model->getById($); + if (!empty($detail)) { + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + } + + + /** + * 查看信息 + */ + public function read() + { + $param = get_params(); + $ = isset($param['']) ? $param[''] : 0; + $detail = $this->model->getById($); + if (!empty($detail)) { + View::assign('detail', $detail); + return view(); + } + else{ + throw new \think\exception\HttpException(404, '找不到页面'); + } + } + + /** + * 删除 + * type=0,逻辑删除，默认 + * type=1,物理删除 + */ + public function del() + { + $param = get_params(); + $ = isset($param['']) ? $param[''] : 0; + $type = isset($param['type']) ? $param['type'] : 0; + + $this->model->delById($,$type); + } +} diff --git a/app/crud/tpl/edit.tpl b/app/crud/tpl/edit.tpl new file mode 100644 index 0000000..c20c488 --- /dev/null +++ b/app/crud/tpl/edit.tpl @@ -0,0 +1,43 @@ +{extend name="common/base"/} + +{block name="body"} +
+

编辑

+ + +
+
+ + + +
+
+{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/crud/tpl/list.tpl b/app/crud/tpl/list.tpl new file mode 100644 index 0000000..abba16b --- /dev/null +++ b/app/crud/tpl/list.tpl @@ -0,0 +1,107 @@ +{extend name="common/base"/} + +{block name="body"} + +
+
+
+ +
+ +
+
+
+ + + + + +{/block} + + + +{block name="script"} + +{/block} + \ No newline at end of file diff --git a/app/crud/tpl/model.tpl b/app/crud/tpl/model.tpl new file mode 100644 index 0000000..8bc66d9 --- /dev/null +++ b/app/crud/tpl/model.tpl @@ -0,0 +1,97 @@ + extends Model +{ + /** + * 获取分页列表 + * @param $where + * @param $param + */ + public function getList($where, $param) + { + $rows = empty($param['limit']) ? get_config('app . page_size') : $param['limit']; + $order = empty($param['order']) ? ' desc' : $param['order']; + $list = $this->where($where)->field('')->order($order)->paginate($rows, false, ['query' => $param]); + return $list; + } + + /** + * 添加数据 + * @param $param + */ + public function add($param) + { + $insertId = 0; + try { + $param['create_time'] = time(); + $insertId = $this->strict(false)->field(true)->insertGetId($param); + add_log('add', $insertId, $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(0,'操作成功',['aid'=>$insertId]); + } + + /** + * 编辑信息 + * @param $param + */ + public function edit($param) + { + try { + $param['update_time'] = time(); + $this->where('', $param[''])->strict(false)->field(true)->update($param); + add_log('edit', $param['id'], $param); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + return to_assign(); + } + + + /** + * 根据id获取信息 + * @param $id + */ + public function getById($id) + { + $info = $this->where('', $id)->find(); + return $info; + } + + /** + * 删除信息 + * @param $id + * @return array + */ + public function delById($id,$type=0) + { + if($type==0){ + //逻辑删除 + try { + $param['delete_time'] = time(); + $this->where('', $id)->update(['delete_time'=>time()]); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + else{ + //物理删除 + try { + $this->where('', $id)->delete(); + add_log('delete', $id); + } catch(\Exception $e) { + return to_assign(1, '操作失败，原因：'.$e->getMessage()); + } + } + return to_assign(); + } +} + diff --git a/app/crud/tpl/read.tpl b/app/crud/tpl/read.tpl new file mode 100644 index 0000000..ce0ec3d --- /dev/null +++ b/app/crud/tpl/read.tpl @@ -0,0 +1,11 @@ +{extend name="common/base"/} + +{block name="body"} +
+

详情

+ + +
+
+{/block} + \ No newline at end of file diff --git a/app/crud/tpl/validate.tpl b/app/crud/tpl/validate.tpl new file mode 100644 index 0000000..4fd8be4 --- /dev/null +++ b/app/crud/tpl/validate.tpl @@ -0,0 +1,16 @@ +Validate extends Validate +{ + protected $rule = ; + + protected $message = ; +} \ No newline at end of file diff --git a/app/home/controller/Pages.php b/app/home/controller/Pages.php index b5144b9..ebe761d 100644 --- a/app/home/controller/Pages.php +++ b/app/home/controller/Pages.php @@ -26,10 +26,26 @@ class Pages extends BaseController throw new \think\exception\HttpException(406, '找不到相关记录'); } } - $detail = (new PagesModel())->detail($id); + $detail = (new PagesModel())->getPagesById($id); if(empty($detail)){ throw new \think\exception\HttpException(406, '找不到相关记录'); } + //轮播图 + if(!empty($detail['banner'])) { + $detail['banner_array'] = explode(',',$detail['banner']); + } + //关键字 + $keyword_array = Db::name('PagesKeywords') + ->field('i.aid,i.keywords_id,k.title') + ->alias('i') + ->join('keywords k', 'k.id = i.keywords_id', 'LEFT') + ->order('i.create_time asc') + ->where(array('i.aid' => $id, 'k.status' => 1)) + ->select()->toArray(); + + $detail['keyword_ids'] = implode(",", array_column($keyword_array, 'keywords_id')); + $detail['keyword_names'] = implode(',', array_column($keyword_array, 'title')); + $detail['keyword_array'] = $keyword_array; PagesModel::where('id', $id)->inc('read')->update(); View::assign('detail', $detail); return view($detail['template']); diff --git a/app/home/view/index/index.html b/app/home/view/index/index.html index a9c218f..ebe1fa8 100644 --- a/app/home/view/index/index.html +++ b/app/home/view/index/index.html @@ -22,8 +22,8 @@
diff --git a/app/home/view/pages/default.html b/app/home/view/pages/default.html index 51b8369..30e3d7c 100644 --- a/app/home/view/pages/default.html +++ b/app/home/view/pages/default.html @@ -19,7 +19,7 @@ {$detail.title}
- 发表于：{:date('Y-m-d H:i:s',$detail.create_time)}浏览：{$detail.read}次TAG：{foreach name='$detail.keyword_array' item='vo'} + 发表于：{$detail.create_time}浏览：{$detail.read}次TAG：{foreach name='$detail.keyword_array' item='vo'} #{$vo.title} {/foreach}
diff --git a/app/install/controller/Index.php b/app/install/controller/Index.php index f6aa85b..f04157e 100644 --- a/app/install/controller/Index.php +++ b/app/install/controller/Index.php @@ -123,9 +123,9 @@ class Index $update_time = time(); $create_admin_sql = "INSERT INTO " . $data['DB_PREFIX'] . "admin " . - "(username,pwd, nickname,thumb,salt,create_time,update_time) " + "(username,pwd, nickname,thumb,salt,did,position_id,create_time,update_time) " . "VALUES " - . "('$username','$password','$nickname','$thumb','$salt','$create_time','$update_time')"; + . "('$username','$password','$nickname','$thumb','$salt',1,1,'$create_time','$update_time')"; if (!$link->query($create_admin_sql)) { return to_assign(1, '创建管理员信息失败，请重试安装'); } diff --git a/app/install/data/gougucms.sql b/app/install/data/gougucms.sql index 4c825bd..02cb1e6 100644 --- a/app/install/data/gougucms.sql +++ b/app/install/data/gougucms.sql @@ -22,6 +22,8 @@ CREATE TABLE `cms_admin` ( `mobile` bigint(11) DEFAULT '0', `email` varchar(255) DEFAULT '', `desc` text COMMENT '备注', + `did` int(11) NOT NULL DEFAULT 0 COMMENT '部门id', + `position_id` int(11) NOT NULL DEFAULT 0 COMMENT '职位id', `create_time` int(11) NOT NULL DEFAULT '0', `update_time` int(11) NOT NULL DEFAULT '0', `last_login_time` int(11) NOT NULL DEFAULT '0', @@ -32,6 +34,173 @@ CREATE TABLE `cms_admin` ( UNIQUE KEY `id` (`id`) USING BTREE ) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 COMMENT='管理员表'; +-- ---------------------------- +-- Table structure for cms_admin_rule +-- ---------------------------- +DROP TABLE IF EXISTS `cms_admin_rule`; +CREATE TABLE `cms_admin_rule` ( + `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, + `pid` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '父id', + `src` varchar(255) NOT NULL DEFAULT '' COMMENT 'url链接', + `title` varchar(255) NOT NULL DEFAULT '' COMMENT '名称', + `name` varchar(255) NOT NULL DEFAULT '' COMMENT '日志操作名称', + `icon` varchar(255) NOT NULL DEFAULT '' COMMENT '图标', + `menu` int(1) NOT NULL DEFAULT 0 COMMENT '是否是菜单,1是,2不是', + `sort` int(11) NOT NULL DEFAULT 1 COMMENT '越小越靠前', + `status` int(1) NOT NULL DEFAULT 1 COMMENT '状态,0禁用,1正常', + `module` varchar(255) NOT NULL DEFAULT '' COMMENT '所属模块', + `crud` varchar(255) NOT NULL DEFAULT '' COMMENT 'crud标识', + `create_time` int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + `update_time` int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COMMENT = '菜单及权限表'; + +-- ---------------------------- +-- Records of cms_admin_rule +-- ---------------------------- +INSERT INTO `cms_admin_rule` VALUES (1, 0, '', '系统管理', '系统管理', 'bi-gear', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (2, 0, '', '系统工具', '系统工具', 'bi-briefcase', 1, 2, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (3, 0, '', '基础数据', '基础数据', 'bi-box', 1, 3, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (4, 0, '', '平台用户', '平台用户', 'bi-people', 1, 4, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (5, 0, '', '资讯中心', '资讯中心', 'bi-journal-text', 1, 5, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (6, 0, '', '图集中心', '图集中心', 'bi-images', 1, 6, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (7, 0, '', '商品中心', '商品中心', 'bi-cart', 1, 7, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (8, 0, '', '单 页 面', '单 页 面', 'bi-stickies', 1, 8, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (9, 1, 'admin/conf/index', '系统配置', '系统配置', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (10, 9, 'admin/conf/add', '新建/编辑', '配置项', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (11, 9, 'admin/conf/delete', '删除', '配置项', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (12, 9, 'admin/conf/edit', '编辑', '配置详情', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (13, 1, 'admin/module/index', '功能模块', '功能模块', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (14, 13, 'admin/module/install', '安装', '功能模块', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (15, 13, 'admin/module/upgrade', '升级', '功能模块', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (16, 13, 'admin/module/uninstall', '卸载', '功能模块', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (17, 1, 'admin/rule/index', '功能节点', '功能节点', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (18, 17, 'admin/rule/add', '新建/编辑', '功能节点', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (19, 17, 'admin/rule/delete', '删除', '功能节点', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (20, 1, 'admin/role/index', '权限角色', '权限角色', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (21, 20, 'admin/role/add', '新建/编辑', '权限角色', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (22, 20, 'admin/role/delete', '删除', '权限角色', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (23, 1, 'admin/department/index', '部门架构', '部门', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (24, 23, 'admin/department/add', '新建/编辑', '部门', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (25, 23, 'admin/department/delete', '删除', '部门', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (26, 1, 'admin/position/index', '岗位职称', '岗位职称', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (27, 26, 'admin/position/add', '新建/编辑', '岗位职称', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (28, 26, 'admin/position/delete', '删除', '岗位职称', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (29, 1, 'admin/admin/index', '系统用户', '系统用户', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (30, 29, 'admin/admin/add', '添加/修改', '系统用户', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (31, 29, 'admin/admin/view', '查看', '系统用户', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (32, 29, 'admin/admin/delete', '删除', '系统用户', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (33, 2, 'admin/log/index', '操作日志', '操作日志', '', 1, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (34, 2, 'admin/crud/index', '一键CRUD', 'CRUD代码生成', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (35, 34, 'admin/crud/table', 'CRUD查看', 'CRUD查看', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (36, 34, 'admin/crud/crud', 'CRUD操作', 'CRUD代码生成', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (37, 34, 'admin/crud/menu', '生成菜单', '菜单生成', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (38, 2, 'admin/database/database', '备份数据', '数据备份', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (39, 38, 'admin/database/backup', '备份数据表', '数据', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (40, 38, 'admin/database/optimize', '优化数据表', '数据表', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (41, 38, 'admin/database/repair', '修复数据表', '数据表', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (42, 2, 'admin/database/backuplist', '还原数据', '数据还原', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (43, 42, 'admin/database/import', '还原数据表', '数据', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (44, 42, 'admin/database/downfile', '下载备份数据', '备份数据', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (45, 42, 'admin/database/del', '删除备份数据', '备份数据', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (46, 3, 'admin/nav/index', '导航设置','导航组', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (47, 46, 'admin/nav/add', '新建/编辑','导航组', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (48, 46, 'admin/nav/delete', '删除','导航组', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (49, 3, 'admin/nav/nav_info', '导航管理','导航', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (50, 49, 'admin/nav/nav_info_add', '新建/编辑','导航', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (51, 49, 'admin/nav/nav_info_delete', '删除导航','导航', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (52, 3, 'admin/sitemap/index', '网站地图','网站地图分类', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (53, 52, 'admin/sitemap/add', '新建/编辑','网站地图分类', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (54, 52, 'admin/sitemap/delete', '删除','网站地图分类', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (55, 3, 'admin/sitemap/sitemap_info', '网站地图管理','网站地图', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (56, 55, 'admin/sitemap/sitemap_info_add', '新建/编辑','网站地图', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (57, 55, 'admin/sitemap/sitemap_info_delete', '删除','网站地图', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (58, 3, 'admin/slide/index', '轮播广告','轮播组', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (59, 58, 'admin/slide/add', '新建/编辑','轮播组', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (60, 58, 'admin/slide/delete', '删除','轮播组', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (61, 3, 'admin/slide/slide_info', '轮播广告管理','轮播图', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (62, 61, 'admin/slide/slide_info_add', '新建/编辑','轮播图', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (63, 61, 'admin/slide/slide_info_delete', '删除','轮播图', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (64, 3, 'admin/links/index', '友情链接', '友情链接', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (65, 64, 'admin/links/add', '新建/编辑', '友情链接', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (66, 64, 'admin/links/delete', '删除', '友情链接', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (67, 3, 'admin/keywords/index', 'SEO关键字','SEO关键字', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (68, 67, 'admin/keywords/add', '新建/编辑','SEO关键字', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (69, 67, 'admin/keywords/delete', '删除','SEO关键字', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (70, 3, 'admin/search/index', '搜索关键字','搜索关键字', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (71, 70, 'admin/search/delete', '删除','搜索关键字', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (72, 4, 'admin/level/index', '用户等级', '用户等级', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (73, 72, 'admin/level/add', '新建/编辑', '用户等级', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (74, 72, 'admin/level/disable', '禁用/启用', '用户等级', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (75, 4, 'admin/user/index', '用户管理','用户', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (76, 75, 'admin/user/edit', '编辑','用户信息', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (77, 75, 'admin/user/view', '查看','用户信息', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (78, 75, 'admin/user/disable', '禁用/启用','用户', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (79, 4, 'admin/user/record', '操作记录','用户操作记录', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (80, 4, 'admin/user/log', '操作日志','用户操作日志', '', 1, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (81, 5, 'admin/article_cate/datalist', '文章分类','文章分类', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (82, 81, 'admin/article_cate/add', '新建','文章分类', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (83, 81, 'admin/article_cate/edit', '编辑','文章分类', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (84, 81, 'admin/article_cate/del', '删除','文章分类', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (85, 5, 'admin/article/datalist', '文章列表','文章', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (86, 85, 'admin/article/add', '新建','文章', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (87, 85, 'admin/article/edit', '编辑','文章', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (88, 85, 'admin/article/read', '查看','文章', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (89, 85, 'admin/article/del', '删除','文章', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (90, 6, 'admin/gallery_cate/datalist', '图集分类','图集分类', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (91, 88, 'admin/gallery_cate/add', '新建','图集分类', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (92, 88, 'admin/gallery_cate/edit', '编辑','图集分类', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (93, 88, 'admin/gallery_cate/del', '删除','图集分类', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (94, 6, 'admin/gallery/datalist', '图集列表','图集', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (95, 94, 'admin/gallery/add', '新建','图集', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (96, 94, 'admin/gallery/edit', '编辑','图集', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (97, 94, 'admin/gallery/read', '查看','图集', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (98, 94, 'admin/gallery/del', '删除','图集', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (99, 7, 'admin/goods_cate/datalist', '商品分类','商品分类', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (100, 99, 'admin/goods_cate/add', '新建','商品分类', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (101, 99, 'admin/goods_cate/edit', '编辑','商品分类', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (102, 99, 'admin/goods_cate/del', '删除','商品分类', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (103, 7, 'admin/goods/datalist', '商品列表','商品', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (104, 103, 'admin/goods/add', '新建','商品', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (105, 103, 'admin/goods/edit', '编辑','商品', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (106, 103, 'admin/goods/read', '查看','商品', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (107, 103, 'admin/goods/del', '删除','商品', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (108, 8, 'admin/pages/datalist', '单页面列表','单页面', '', 1, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (109, 108, 'admin/pages/add', '新建','单页面', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (110, 108, 'admin/pages/edit', '编辑','单页面', '', 2, 1, 1,'','', 0, 0); +INSERT INTO `cms_admin_rule` VALUES (111, 108, 'admin/pages/delete', '删除','单页面', '', 2, 1, 1,'','', 0, 0); + +INSERT INTO `cms_admin_rule` VALUES (112, 8, 'admin/analysis/index', '智能分析', '智能分析', '', 1, 1, 1,'','', 0, 0); + -- ---------------------------- -- Table structure for `cms_admin_group` -- ---------------------------- @@ -51,7 +220,7 @@ CREATE TABLE `cms_admin_group` ( -- ---------------------------- -- Records of cms_admin_group -- ---------------------------- -INSERT INTO `cms_admin_group` VALUES ('1', '超级管理员', '1', '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,81,83', '超级管理员，系统自动分配所有可操作权限及菜单。', 0, 0); +INSERT INTO `cms_admin_group` VALUES ('1', '超级管理员', '1', '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112', '超级管理员，系统自动分配所有可操作权限及菜单。', 0, 0); INSERT INTO `cms_admin_group` VALUES (2, '测试角色', 1, '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,81,83', '测试角色', 0, 0); -- ---------------------------- -- Table structure for `cms_admin_group_access` @@ -70,133 +239,6 @@ CREATE TABLE `cms_admin_group_access` ( -- ---------------------------- INSERT INTO `cms_admin_group_access` VALUES ('1', '1', '0', '0'); --- ---------------------------- --- Table structure for cms_admin_rule --- ---------------------------- -DROP TABLE IF EXISTS `cms_admin_rule`; -CREATE TABLE `cms_admin_rule` ( - `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, - `pid` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '父id', - `src` varchar(255) NOT NULL DEFAULT '' COMMENT 'url链接', - `title` varchar(255) NOT NULL DEFAULT '' COMMENT '名称', - `name` varchar(255) NOT NULL DEFAULT '' COMMENT '日志操作名称', - `icon` varchar(255) NOT NULL DEFAULT '' COMMENT '图标', - `menu` int(1) NOT NULL DEFAULT 0 COMMENT '是否是菜单,1是,2不是', - `sort` int(11) NOT NULL DEFAULT 1 COMMENT '越小越靠前', - `status` int(1) NOT NULL DEFAULT 1 COMMENT '状态,0禁用,1正常', - `create_time` int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - `update_time` int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COMMENT = '菜单及权限表'; - --- ---------------------------- --- Records of cms_admin_rule --- ---------------------------- -INSERT INTO `cms_admin_rule` VALUES (1, 0, '', '系统管理', '系统管理', 'bi-gear', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (2, 0, '', '基础数据', '基础数据', 'bi-box', 1, 2, 1, 0, 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-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); -INSERT INTO `cms_admin_rule` VALUES (9, 7, 'admin/conf/delete', '删除', '配置项', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (10, 7, 'admin/conf/edit', '编辑', '配置详情', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (11, 1, 'admin/module/index', '功能模块', '功能模块', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (12, 11, 'admin/module/add', '新建/编辑', '功能模块', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (13, 11, 'admin/module/disable', '禁用/启用', '功能模块', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (14, 1, 'admin/rule/index', '功能节点', '功能节点', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (15, 14, 'admin/rule/add', '新建/编辑', '功能节点', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (16, 14, 'admin/rule/delete', '删除', '功能节点', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (17, 1, 'admin/role/index', '权限角色', '权限角色', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (18, 17, 'admin/role/add', '新建/编辑', '权限角色', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (19, 17, 'admin/role/delete', '删除', '权限角色', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (20, 1, 'admin/admin/index', '管 理 员', '管理员', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (21, 20, 'admin/admin/add', '添加/修改', '管理员', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (22, 20, 'admin/admin/view', '查看', '管理员', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (23, 20, 'admin/admin/delete', '删除', '管理员', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (24, 1, 'admin/log/index', '操作日志', '操作日志', '', 1, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (25, 1, 'admin/database/database', '备份数据', '数据备份', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (26, 25, 'admin/database/backup', '备份数据表', '数据', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (27, 25, 'admin/database/optimize', '优化数据表', '数据表', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (28, 25, 'admin/database/repair', '修复数据表', '数据表', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (29, 1, 'admin/database/backuplist', '还原数据', '数据还原', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (30, 29, 'admin/database/import', '还原数据表', '数据', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (31, 29, 'admin/database/downfile', '下载备份数据', '备份数据', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (32, 29, 'admin/database/del', '删除备份数据', '备份数据', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (33, 2, 'admin/nav/index', '导航设置','导航组', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (34, 33, 'admin/nav/add', '新建/编辑','导航组', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (35, 33, 'admin/nav/delete', '删除','导航组', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (36, 2, 'admin/nav/nav_info', '导航管理','导航', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (37, 36, 'admin/nav/nav_info_add', '新建/编辑','导航', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (38, 36, 'admin/nav/nav_info_delete', '删除导航','导航', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (39, 2, 'admin/sitemap/index', '网站地图','网站地图分类', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (40, 39, 'admin/sitemap/add', '新建/编辑','网站地图分类', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (41, 39, 'admin/sitemap/delete', '删除','网站地图分类', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (42, 2, 'admin/sitemap/sitemap_info', '网站地图管理','网站地图', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (43, 42, 'admin/sitemap/sitemap_info_add', '新建/编辑','网站地图', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (44, 42, 'admin/sitemap/sitemap_info_delete', '删除','网站地图', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (45, 2, 'admin/slide/index', '轮播广告','轮播组', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (46, 45, 'admin/slide/add', '新建/编辑','轮播组', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (47, 45, 'admin/slide/delete', '删除','轮播组', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (48, 2, 'admin/slide/slide_info', '轮播广告管理','轮播图', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (49, 48, 'admin/slide/slide_info_add', '新建/编辑','轮播图', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (50, 48, 'admin/slide/slide_info_delete', '删除','轮播图', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (51, 2, 'admin/links/index', '友情链接', '友情链接', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (52, 51, 'admin/links/add', '新建/编辑', '友情链接', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (53, 51, 'admin/links/delete', '删除', '友情链接', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (54, 2, 'admin/keywords/index', 'SEO关键字','SEO关键字', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (55, 54, 'admin/keywords/add', '新建/编辑','SEO关键字', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (56, 54, 'admin/keywords/delete', '删除','SEO关键字', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (57, 2, 'admin/search/index', '搜索关键字','搜索关键字', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (58, 57, 'admin/search/delete', '删除','搜索关键字', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (59, 3, 'admin/level/index', '用户等级', '用户等级', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (60, 59, 'admin/level/add', '新建/编辑', '用户等级', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (61, 59, 'admin/level/disable', '禁用/启用', '用户等级', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (62, 3, 'admin/user/index', '用户管理','用户', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (63, 62, 'admin/user/edit', '编辑','用户信息', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (64, 62, 'admin/user/view', '查看','用户信息', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (65, 62, 'admin/user/disable', '禁用/启用','用户', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (66, 3, 'admin/user/record', '操作记录','用户操作记录', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (67, 3, 'admin/user/log', '操作日志','用户操作日志', '', 1, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (68, 4, 'admin/article/cate', '文章分类','文章分类', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (69, 68, 'admin/article/cate_add', '新建/编辑','文章分类', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (70, 68, 'admin/article/cate_delete', '删除','文章分类', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (71, 4, 'admin/article/index', '文章列表','文章', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (72, 71, 'admin/article/add', '新建/编辑','文章', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (73, 71, 'admin/article/delete', '删除','文章', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (74, 5, 'admin/goods/cate', '商品分类','商品分类', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (75, 74, 'admin/goods/cate_add', '新建/编辑','商品分类', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (76, 74, 'admin/goods/cate_delete', '删除','商品分类', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (77, 5, 'admin/goods/index', '商品列表','商品', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (78, 77, 'admin/goods/add', '新建/编辑','商品', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (79, 77, 'admin/goods/delete', '删除','商品', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (80, 6, 'admin/pages/index', '单页面列表','单页面', '', 1, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (81, 80, 'admin/pages/add', '新建/编辑','单页面', '', 2, 1, 1, 0, 0); -INSERT INTO `cms_admin_rule` VALUES (82, 80, 'admin/pages/delete', '删除','单页面', '', 2, 1, 1, 0, 0); - -INSERT INTO `cms_admin_rule` VALUES (83, 6, 'admin/analysis/index', '智能分析', '智能分析', '', 1, 1, 1, 0, 0); - -- ---------------------------- -- Table structure for cms_admin_module -- ---------------------------- @@ -268,6 +310,64 @@ INSERT INTO `cms_config` VALUES (3, '微信配置', 'wechat', 'a:11:{s:2:\"id\"; INSERT INTO `cms_config` VALUES (4, 'Api Token配置', 'token', 'a:5:{s:2:\"id\";s:1:\"5\";s:3:\"iss\";s:16:\"www.gougucms.com\";s:3:\"aud\";s:8:\"gougucms\";s:7:\"secrect\";s:8:\"GOUGUCMS\";s:7:\"exptime\";s:4:\"3600\";}', 1, 1627313142, 1627376290); INSERT INTO `cms_config` VALUES (5, '其他配置', 'other', 'a:4:{s:2:\"id\";s:1:\"5\";s:6:\"author\";s:15:\"勾股工作室\";s:7:\"version\";s:7:\"v2.0.16\";s:6:\"editor\";s:1:\"1\";}', 1, 1613725791, 1645107069); +-- ---------------------------- +-- Table structure for cms_department +-- ---------------------------- +DROP TABLE IF EXISTS `cms_department`; +CREATE TABLE `cms_department` ( + `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, + `title` varchar(100) NOT NULL DEFAULT '' COMMENT '部门名称', + `pid` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '上级部门id', + `leader_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '部门负责人ID', + `phone` varchar(60) NOT NULL DEFAULT '' COMMENT '部门联系电话', + `remark` varchar(1000) NULL DEFAULT '' COMMENT '备注', + `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态：-1删除 0禁用 1启用', + `create_time` int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + `update_time` int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COMMENT = '部门组织'; + +-- ---------------------------- +-- Records of cms_department +-- ---------------------------- +INSERT INTO `cms_department`(`id`, `title`, `pid`, `leader_id`, `phone`) VALUES (1, '勾股科技', 0, 0, '13688888888'); +INSERT INTO `cms_department`(`id`, `title`, `pid`, `leader_id`, `phone`) VALUES (2, '广州总公司', 1, 0, '13688888889'); +INSERT INTO `cms_department`(`id`, `title`, `pid`, `leader_id`, `phone`) VALUES (3, '人事部', 2, 0, '13688888898'); +INSERT INTO `cms_department`(`id`, `title`, `pid`, `leader_id`, `phone`) VALUES (4, '财务部', 2, 0, '13688888898'); +INSERT INTO `cms_department`(`id`, `title`, `pid`, `leader_id`, `phone`) VALUES (5, '市场部', 2, 0, '13688888978'); +INSERT INTO `cms_department`(`id`, `title`, `pid`, `leader_id`, `phone`) VALUES (6, '销售部', 2, 0, '13688889868'); +INSERT INTO `cms_department`(`id`, `title`, `pid`, `leader_id`, `phone`) VALUES (7, '技术部', 2, 0, '13688898858'); +INSERT INTO `cms_department`(`id`, `title`, `pid`, `leader_id`, `phone`) VALUES (8, '客服部', 2, 0, '13688988848'); +INSERT INTO `cms_department`(`id`, `title`, `pid`, `leader_id`, `phone`) VALUES (9, '销售一部', 6, 0, '13688998838'); +INSERT INTO `cms_department`(`id`, `title`, `pid`, `leader_id`, `phone`) VALUES (10, '销售二部', 6, 0, '13688999828'); +INSERT INTO `cms_department`(`id`, `title`, `pid`, `leader_id`, `phone`) VALUES (11, '深圳分公司', 1, 0, '13688999918'); +INSERT INTO `cms_department`(`id`, `title`, `pid`, `leader_id`, `phone`) VALUES (12, '人事部', 11, 0, '13688888886'); +INSERT INTO `cms_department`(`id`, `title`, `pid`, `leader_id`, `phone`) VALUES (13, '市场部', 11, 0, '13688888886'); +INSERT INTO `cms_department`(`id`, `title`, `pid`, `leader_id`, `phone`) VALUES (14, '财务部', 11, 0, '13688888876'); +INSERT INTO `cms_department`(`id`, `title`, `pid`, `leader_id`, `phone`) VALUES (15, '销售部', 11, 0, '13688888666'); + +-- ---------------------------- +-- Table structure for cms_position +-- ---------------------------- +DROP TABLE IF EXISTS `cms_position`; +CREATE TABLE `cms_position` ( + `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, + `title` varchar(100) NOT NULL DEFAULT '' COMMENT '岗位名称', + `work_price` int(10) NOT NULL DEFAULT 0 COMMENT '工时单价', + `remark` varchar(1000) NULL DEFAULT '' COMMENT '备注', + `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态：-1删除 0禁用 1启用', + `create_time` int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', + `update_time` int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COMMENT = '岗位职称'; + +-- ---------------------------- +-- Records of cms_position +-- ---------------------------- +INSERT INTO `cms_position` VALUES (1, '董事长', 1000, '董事长', 1, 0, 0); +INSERT INTO `cms_position` VALUES (2, '人事总监', 1000, '人事部的最大领导', 1, 0, 0); +INSERT INTO `cms_position` VALUES (3, '普通员工', 500, '普通员工', 1, 0, 0); + -- ---------------------------- -- Table structure for `cms_keywords` -- ---------------------------- @@ -289,84 +389,6 @@ INSERT INTO `cms_keywords` VALUES (2, '勾股BLOG', 0, 1, 1610183567, 1610184824 INSERT INTO `cms_keywords` VALUES (3, '勾股OA', 0, 1, 1610183567, 1610184824); INSERT INTO `cms_keywords` VALUES (4, '勾股dev', 0, 1, 1610183567, 1610184824); --- ---------------------------- --- Table structure for `cms_article_cate` --- ---------------------------- -DROP TABLE IF EXISTS `cms_article_cate`; -CREATE TABLE `cms_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) DEFAULT '' COMMENT '关键字', - `desc` varchar(1000) DEFAULT '' COMMENT '描述', - `create_time` int(11) NOT NULL DEFAULT '0' COMMENT '添加时间', - `update_time` int(11) NOT NULL DEFAULT '0' COMMENT '修改时间', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 COMMENT='文章分类表'; --- ---------------------------- --- Records of cms_article_cate --- ---------------------------- -INSERT INTO `cms_article_cate` VALUES (1, 0, 0, '勾股开源系统', '1', '左手自研，右手开源', 0, 1610196442); - --- ---------------------------- --- Table structure for `cms_article` --- ---------------------------- -DROP TABLE IF EXISTS `cms_article`; -CREATE TABLE `cms_article` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `title` varchar(255) NOT NULL DEFAULT '' COMMENT '标题', - `keywords` varchar(255) DEFAULT '' COMMENT '关键字', - `desc` varchar(1000) DEFAULT '' COMMENT '摘要', - `status` int(1) NOT NULL DEFAULT '1' COMMENT '1正常-1下架', - `thumb` int(11) NOT NULL DEFAULT 0 COMMENT '缩略图id', - `original` int(1) NOT NULL DEFAULT 0 COMMENT '是否原创，1原创', - `origin` varchar(255) NOT NULL DEFAULT '' COMMENT '来源或作者', - `origin_url` varchar(255) NOT NULL DEFAULT '' COMMENT '来源地址', - `content` text NOT NULL COMMENT '内容', - `md_content` text NOT NULL COMMENT 'markdown内容', - `read` int(11) NOT NULL DEFAULT '0' COMMENT '阅读量', - `type` tinyint(2) NOT NULL DEFAULT '0' COMMENT '属性：1精华 2热门 3推荐', - `is_home` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否首页显示，0否，1是', - `sort` int(11) NOT NULL DEFAULT '0' COMMENT '排序', - `article_cate_id` int(11) NOT NULL DEFAULT '0', - `create_time` int(11) NOT NULL DEFAULT '0', - `update_time` int(11) NOT NULL DEFAULT '0', - `delete_time` int(11) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 COMMENT='文章表'; - --- ---------------------------- --- Records of cms_article --- ---------------------------- -INSERT INTO `cms_article` VALUES (1, '勾股CMS——轻量级、高性能极速后台开发框架', '', '勾股CMS是一套基于ThinkPHP6 + Layui + MySql打造的轻量级、高性能极速后台开发框架。通用型的后台权限管理框架，极低门槛、操作简单、开箱即用。系统易于功能扩展，代码维护，方便二次开发，让开发者更专注于业务深度需求的开发，帮助开发者简单高效降低二次开发成本。', 1, 1, 0, '', '', '

勾股CMS是一套基于ThinkPHP6 + Layui + MySql打造的轻量级、高性能极速后台开发框架。通用型的后台权限管理框架，极低门槛、操作简单、开箱即用。系统易于功能扩展，代码维护，方便二次开发，让开发者更专注于业务深度需求的开发，帮助开发者简单高效降低二次开发成本。

\n

', '勾股CMS是一套基于ThinkPHP6 + Layui + MySql打造的轻量级、高性能极速后台开发框架。通用型的后台权限管理框架，极低门槛、操作简单、开箱即用。系统易于功能扩展，代码维护，方便二次开发，让开发者更专注于业务深度需求的开发，帮助开发者简单高效降低二次开发成本。', 0, 2, 1, 0, 1, 1625071256, 1650811576, 0); -INSERT INTO `cms_article` VALUES (2, '勾股BLOG——简约，易用开源的个人博客系统', '', '勾股BLOG是一款实用的开源免费的个人博客系统。集成了系统管理、基础数据、博客文章、博客动态、语雀知识库、用户管理、访问统计等功能。具有简约，易用，内存占用低等特点，可以用来做个人博客，工作室官网，自...', 1, 2, 0, '', '', '

勾股BLOG是一款实用的开源免费的个人博客系统。集成了系统管理、基础数据、博客文章、博客动态、语雀知识库、用户管理、访问统计等功能。具有简约，易用，内存占用低等特点，可以用来做个人博客，工作室官网，自媒体官网等网站，二次开发之后也可以作为资讯、展品展示等网站。

\n

', '勾股BLOG是一款实用的开源免费的个人博客系统。集成了系统管理、基础数据、博客文章、博客动态、语雀知识库、用户管理、访问统计等功能。具有简约，易用，内存占用低等特点，可以用来做个人博客，工作室官网，自媒体官网等网站，二次开发之后也可以作为资讯、展品展示等网站。', 0, 0, 1, 0, 1, 1650811439, 1650811624, 0); -INSERT INTO `cms_article` VALUES (3, '勾股OA——实用的开源的企业办公系统框架', '', '勾股OA是一款实用的开源免费的企业办公系统框架。它集成了系统设置、人事管理、消息管理、审批管理、日常办公、财务管理等基础模块。系统简约，易于功能扩展，方便二次开发，让开发者更专注于业务深度需求的开发，...', 1, 3, 0, '', '', '

勾股OA是一款实用的开源免费的企业办公系统框架。它集成了系统设置、人事管理、消息管理、审批管理、日常办公、财务管理等基础模块。系统简约，易于功能扩展，方便二次开发，让开发者更专注于业务深度需求的开发，通过二次开发之后可以用来做CRM，ERP，业务管理等系统。

\n

', '勾股OA是一款实用的开源免费的企业办公系统框架。它集成了系统设置、人事管理、消息管理、审批管理、日常办公、财务管理等基础模块。系统简约，易于功能扩展，方便二次开发，让开发者更专注于业务深度需求的开发，通过二次开发之后可以用来做CRM，ERP，业务管理等系统。', 0, 0, 1, 0, 1, 1650811502, 1650811709, 0); -INSERT INTO `cms_article` VALUES (4, '勾股DEV——研发管理与团队协作的工具软件', '', '勾股DEV是一款专为IT行业研发团队打造的智能化项目管理与团队协作的工具软件，可以在线管理团队的工作、项目和任务，覆盖从需求提出到研发完成上线整个过程的项目协作。', 1, 4, 0, '', '', '

勾股DEV是一款专为IT行业研发团队打造的智能化项目管理与团队协作的工具软件，可以在线管理团队的工作、项目和任务，覆盖从需求提出到研发完成上线整个过程的项目协作。

\n

', '勾股DEV是一款专为IT行业研发团队打造的智能化项目管理与团队协作的工具软件，可以在线管理团队的工作、项目和任务，覆盖从需求提出到研发完成上线整个过程的项目协作。', 0, 0, 1, 0, 1, 1650811542, 1650811682, 0); - - --- ---------------------------- --- Table structure for `cms_article_keywords` --- ---------------------------- -DROP TABLE IF EXISTS `cms_article_keywords`; -CREATE TABLE `cms_article_keywords` ( - `id` int(11) unsigned NOT NULL AUTO_INCREMENT, - `aid` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '文章ID', - `keywords_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '关联关键字id', - `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态：-1删除 0禁用 1启用', - `create_time` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', - PRIMARY KEY (`id`), - KEY `aid` (`aid`), - KEY `inid` (`keywords_id`) -) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 COMMENT='文章关联表'; --- ---------------------------- --- Records of cms_article_keywords --- ---------------------------- -INSERT INTO `cms_article_keywords` VALUES (1, 1, 1, 1, 1610198553); -INSERT INTO `cms_article_keywords` VALUES (2, 2, 2, 1, 1610198553); -INSERT INTO `cms_article_keywords` VALUES (3, 3, 3, 1, 1610198553); -INSERT INTO `cms_article_keywords` VALUES (4, 4, 4, 1, 1610198553); - -- ---------------------------- -- Table structure for cms_sitemap_cate -- ---------------------------- @@ -499,9 +521,9 @@ CREATE TABLE `cms_slide_info` ( DROP TABLE IF EXISTS `cms_links`; CREATE TABLE `cms_links` ( `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, - `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '网站标题', + `name` varchar(255) NOT NULL DEFAULT '' COMMENT '网站标题', `logo` int(11) NOT NULL DEFAULT 0 COMMENT '网站logo', - `src` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '链接', + `src` varchar(255) NULL DEFAULT NULL COMMENT '链接', `target` int(1) NOT NULL DEFAULT 1 COMMENT '是否新窗口打开，1是,0否', `status` int(1) NOT NULL DEFAULT 1 COMMENT '状态:1可用-1禁用', `sort` int(11) NOT NULL DEFAULT 0 COMMENT '排序', @@ -538,6 +560,7 @@ INSERT INTO `cms_search_keywords` VALUES (2, '勾股OA', 1, 1); INSERT INTO `cms_search_keywords` VALUES (3, '勾股DEV', 1, 1); INSERT INTO `cms_search_keywords` VALUES (4, '勾股BLOG', 1, 1); INSERT INTO `cms_search_keywords` VALUES (5, '勾股Admin', 1, 1); +INSERT INTO `cms_search_keywords` VALUES (6, '勾股UI', 1, 1); -- ---------------------------- -- Table structure for cms_user_level @@ -547,7 +570,7 @@ CREATE TABLE `cms_user_level` ( `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, `title` varchar(255) NOT NULL DEFAULT '' COMMENT '等级名称', `desc` varchar(1000) DEFAULT NULL, - `status` int(1) NOT NULL DEFAULT 1 COMMENT '状态,0禁用,1正常', + `status` int(1) NOT NULL DEFAULT 1 COMMENT '状态:0禁用,1正常', `create_time` int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', `update_time` int(11) NOT NULL DEFAULT 0 COMMENT '更新时间', PRIMARY KEY (`id`) USING BTREE @@ -666,27 +689,202 @@ INSERT INTO `cms_file` VALUES (2, 'admin', '5125347886f07f48f7003825660117039eb8 INSERT INTO `cms_file` VALUES (3, 'admin', '5125347886f07f48f7003825660117039eb8784f', '563e5e8f48e607ed54461796b0cb4844', '1193f7a1585b9f6e8a97ae17718018b3.jpg', 'images/1193f7a1585b9f6e8a97ae17718018b3.jpg', 'https://blog.gougucms.com/storage/202204/1193f7a1585b9f6e8a97ae17718018b3.jpg', 62609, 'jpg', 'image/jpeg', 1, '127.0.0.1', 1, 1645057433, 1, 1645057433, 'upload', 'thumb', 0); INSERT INTO `cms_file` VALUES (4, 'admin', '5125347886f07f48f7003825660117039eb8784f', '563e5e8f48e607ed54461796b0cb4844', '0f22a5ba4797b2fa22049ea73e6f779c.jpg', 'images/0f22a5ba4797b2fa22049ea73e6f779c.jpg', 'https://blog.gougucms.com/storage/202202/0f22a5ba4797b2fa22049ea73e6f779c.jpg', 62609, 'jpg', 'image/jpeg', 1, '127.0.0.1', 1, 1645057433, 1, 1645057433, 'upload', 'thumb', 0); +-- ---------------------------- +-- Table structure for `cms_article_cate` +-- ---------------------------- +DROP TABLE IF EXISTS `cms_article_cate`; +CREATE TABLE `cms_article_cate` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `pid` int(11) NOT NULL DEFAULT '0' COMMENT '父类ID', + `title` varchar(255) NOT NULL DEFAULT '' COMMENT '分类名称', + `keywords` varchar(255) DEFAULT '' COMMENT '关键字', + `desc` varchar(1000) DEFAULT '' COMMENT '描述', + `sort` int(5) NOT NULL DEFAULT '0' COMMENT '排序', + `create_time` int(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '添加时间', + `update_time` int(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '修改时间', + `delete_time` int(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '删除时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 COMMENT='文章分类::crud'; +-- ---------------------------- +-- Records of cms_article_cate +-- ---------------------------- +INSERT INTO `cms_article_cate` VALUES (1, 0, '勾股开源系统', '勾股开源', '左手自研，右手开源', 0, 1610196442,0,0); + +-- ---------------------------- +-- Table structure for `cms_article` +-- ---------------------------- +DROP TABLE IF EXISTS `cms_article`; +CREATE TABLE `cms_article` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `cate_id` int(11) NOT NULL DEFAULT '0' COMMENT '所属分类', + `title` varchar(255) NOT NULL DEFAULT '' COMMENT '标题', + `desc` varchar(1000) DEFAULT '' COMMENT '摘要', + `thumb` int(11) NOT NULL DEFAULT 0 COMMENT '缩略图:附件id', + `original` int(1) NOT NULL DEFAULT 0 COMMENT '是否原创:1是,0否', + `origin` varchar(255) NOT NULL DEFAULT '' COMMENT '来源或作者', + `origin_url` varchar(255) NOT NULL DEFAULT '' COMMENT '来源地址', + `content` text NOT NULL COMMENT '内容', + `md_content` text NOT NULL COMMENT 'markdown内容', + `read` int(11) NOT NULL DEFAULT '0' COMMENT '阅读量', + `type` tinyint(2) NOT NULL DEFAULT '0' COMMENT '属性:1精华,2热门,3推荐', + `is_home` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否首页显示:0否,1是', + `sort` int(11) NOT NULL DEFAULT '0' COMMENT '排序', + `status` int(1) NOT NULL DEFAULT '1' COMMENT '状态:1正常,0下架', + `admin_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建人', + `create_time` int(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '创建时间', + `update_time` int(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '更新时间', + `delete_time` int(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '删除时间', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 COMMENT='文章::crud'; + +-- ---------------------------- +-- Records of cms_article +-- ---------------------------- +INSERT INTO `cms_article` VALUES (1,1, '勾股CMS——轻量级、高性能极速后台开发框架','勾股CMS是一套基于ThinkPHP6 + Layui + MySql打造的轻量级、高性能极速后台开发框架。通用型的后台权限管理框架，极低门槛、操作简单、开箱即用。系统易于功能扩展，代码维护，方便二次开发，让开发者更专注于业务深度需求的开发，帮助开发者简单高效降低二次开发成本。', 1, 0, '', '', '

勾股CMS是一套基于ThinkPHP6 + Layui + MySql打造的轻量级、高性能极速后台开发框架。通用型的后台权限管理框架，极低门槛、操作简单、开箱即用。系统易于功能扩展，代码维护，方便二次开发，让开发者更专注于业务深度需求的开发，帮助开发者简单高效降低二次开发成本。

\n

', '勾股CMS是一套基于ThinkPHP6 + Layui + MySql打造的轻量级、高性能极速后台开发框架。通用型的后台权限管理框架，极低门槛、操作简单、开箱即用。系统易于功能扩展，代码维护，方便二次开发，让开发者更专注于业务深度需求的开发，帮助开发者简单高效降低二次开发成本。', 0, 2, 1, 0, 1,1, 1625071256, 1650811576, 0); +INSERT INTO `cms_article` VALUES (2,1, '勾股BLOG——简约，易用开源的个人博客系统','勾股BLOG是一款实用的开源免费的个人博客系统。集成了系统管理、基础数据、博客文章、博客动态、语雀知识库、用户管理、访问统计等功能。具有简约，易用，内存占用低等特点，可以用来做个人博客，工作室官网，自...', 2, 0, '', '', '

勾股BLOG是一款实用的开源免费的个人博客系统。集成了系统管理、基础数据、博客文章、博客动态、语雀知识库、用户管理、访问统计等功能。具有简约，易用，内存占用低等特点，可以用来做个人博客，工作室官网，自媒体官网等网站，二次开发之后也可以作为资讯、展品展示等网站。

\n

', '勾股BLOG是一款实用的开源免费的个人博客系统。集成了系统管理、基础数据、博客文章、博客动态、语雀知识库、用户管理、访问统计等功能。具有简约，易用，内存占用低等特点，可以用来做个人博客，工作室官网，自媒体官网等网站，二次开发之后也可以作为资讯、展品展示等网站。', 0, 0, 1, 0, 1,1, 1650811439, 1650811624, 0); +INSERT INTO `cms_article` VALUES (3,1, '勾股OA——实用的开源的企业办公系统框架', '勾股OA是一款实用的开源免费的企业办公系统框架。它集成了系统设置、人事管理、消息管理、审批管理、日常办公、财务管理等基础模块。系统简约，易于功能扩展，方便二次开发，让开发者更专注于业务深度需求的开发，...', 3, 0, '', '', '

勾股OA是一款实用的开源免费的企业办公系统框架。它集成了系统设置、人事管理、消息管理、审批管理、日常办公、财务管理等基础模块。系统简约，易于功能扩展，方便二次开发，让开发者更专注于业务深度需求的开发，通过二次开发之后可以用来做CRM，ERP，业务管理等系统。

\n

', '勾股OA是一款实用的开源免费的企业办公系统框架。它集成了系统设置、人事管理、消息管理、审批管理、日常办公、财务管理等基础模块。系统简约，易于功能扩展，方便二次开发，让开发者更专注于业务深度需求的开发，通过二次开发之后可以用来做CRM，ERP，业务管理等系统。', 0, 0, 1, 0, 1,1, 1650811502, 1650811709, 0); +INSERT INTO `cms_article` VALUES (4,1, '勾股DEV——研发管理与团队协作的工具软件', '勾股DEV是一款专为IT行业研发团队打造的智能化项目管理与团队协作的工具软件，可以在线管理团队的工作、项目和任务，覆盖从需求提出到研发完成上线整个过程的项目协作。', 4, 0, '', '', '

勾股DEV是一款专为IT行业研发团队打造的智能化项目管理与团队协作的工具软件，可以在线管理团队的工作、项目和任务，覆盖从需求提出到研发完成上线整个过程的项目协作。

\n

', '勾股DEV是一款专为IT行业研发团队打造的智能化项目管理与团队协作的工具软件，可以在线管理团队的工作、项目和任务，覆盖从需求提出到研发完成上线整个过程的项目协作。', 0, 0, 1, 0, 1,1, 1650811542, 1650811682, 0); + +-- ---------------------------- +-- Table structure for `cms_article_keywords` +-- ---------------------------- +DROP TABLE IF EXISTS `cms_article_keywords`; +CREATE TABLE `cms_article_keywords` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `aid` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '文章ID', + `keywords_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '关联关键字id', + `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态：-1删除 0禁用 1启用', + `create_time` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + PRIMARY KEY (`id`), + KEY `aid` (`aid`), + KEY `inid` (`keywords_id`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 COMMENT='文章关联表'; +-- ---------------------------- +-- Records of cms_article_keywords +-- ---------------------------- +INSERT INTO `cms_article_keywords` VALUES (1, 1, 1, 1, 1610198553); +INSERT INTO `cms_article_keywords` VALUES (2, 2, 2, 1, 1610198553); +INSERT INTO `cms_article_keywords` VALUES (3, 3, 3, 1, 1610198553); +INSERT INTO `cms_article_keywords` VALUES (4, 4, 4, 1, 1610198553); + +-- ---------------------------- +-- Table structure for cms_gallery_cate +-- ---------------------------- +DROP TABLE IF EXISTS `cms_gallery_cate`; +CREATE TABLE `cms_gallery_cate` ( + `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, + `title` varchar(100) NOT NULL DEFAULT '' COMMENT '图集分类名称', + `sort` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '排序', + `pid` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '上级id', + `keywords` varchar(255) DEFAULT '' COMMENT '关键字', + `desc` varchar(1000) DEFAULT '' COMMENT '描述', + `create_time` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建时间', + `update_time` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '更新时间', + `delete_time` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '删除时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COMMENT = '图集分类::crud'; + +-- ---------------------------- +-- Records of cms_gallery_cate +-- ---------------------------- +INSERT INTO `cms_gallery_cate` VALUES (1, '勾股图集', 1, 0, '勾股CMS', '左手自研，右手开源', 1645058420, 1645058420, 0); + +-- ---------------------------- +-- Table structure for cms_gallery +-- ---------------------------- +DROP TABLE IF EXISTS `cms_gallery`; +CREATE TABLE `cms_gallery` ( + `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, + `cate_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '分类ID', + `type` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '属性:1精华,2热门,3推荐', + `is_home` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否首页显示:0否,1是', + `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态:0下架 1正常', + `title` varchar(200) NOT NULL DEFAULT '' COMMENT '图集名称', + `thumb` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '缩略图', + `desc` varchar(1000) NOT NULL DEFAULT '' COMMENT '图集摘要', + `content` text NULL COMMENT '内容', + `user_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '用户id', + `origin` varchar(255) NOT NULL DEFAULT '' COMMENT '来源或作者', + `origin_url` varchar(255) NOT NULL DEFAULT '' COMMENT '来源地址', + `read` int(11) NOT NULL DEFAULT '0' COMMENT '阅读量', + `sort` int(11) NOT NULL DEFAULT '0' COMMENT '排序', + `admin_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建人', + `create_time` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建时间', + `update_time` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '更新时间', + `delete_time` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '删除时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COMMENT = '图集::crud'; + +-- ---------------------------- +-- Records of cms_gallery +-- ---------------------------- +INSERT INTO `cms_gallery` VALUES (1, 1, 3, 1, 1, '勾股开源系列系统', 1, '勾股科技专注于CMS系统，OA办公系统，CRM系统，ERP系统，在线教育系统，项目管理系统等系统软件的建设。左手研发，右手开源，未来可期！', NULL, 0, '勾股科技', 'http://www.gougucms.com', 0, 0, 1, 1655452531, 1655633932, 0); + +-- ---------------------------- +-- Table structure for `cms_gallery_keywords` +-- ---------------------------- +DROP TABLE IF EXISTS `cms_gallery_keywords`; +CREATE TABLE `cms_gallery_keywords` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `aid` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '图集ID', + `keywords_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '关联关键字id', + `create_time` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + PRIMARY KEY (`id`), + KEY `aid` (`aid`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 COMMENT='图集关联表'; + +-- ---------------------------- +-- Records of cms_gallery_keywords +-- ---------------------------- +INSERT INTO `cms_gallery_keywords` VALUES (1, 1, 1, 1644823517); + +-- ---------------------------- +-- Table structure for `cms_gallery_file` +-- ---------------------------- +DROP TABLE IF EXISTS `cms_gallery_file`; +CREATE TABLE `cms_gallery_file` ( + `id` int(11) unsigned NOT NULL AUTO_INCREMENT, + `aid` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '图集ID', + `file_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '文件id', + `name` varchar(200) NOT NULL DEFAULT '' COMMENT '图片名称', + `title` varchar(200) NOT NULL DEFAULT '' COMMENT '标题', + `desc` varchar(1000) NOT NULL DEFAULT '' COMMENT '摘要', + `filepath` varchar(200) NOT NULL DEFAULT '' COMMENT '图片路径', + `link` varchar(200) NOT NULL DEFAULT '' COMMENT '链接地址', + `sort` int(11) NOT NULL DEFAULT '0' COMMENT '排序', + `create_time` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', + PRIMARY KEY (`id`), + KEY `aid` (`aid`) +) ENGINE=InnoDB DEFAULT CHARACTER SET = utf8mb4 COMMENT='图集关联表'; + +-- ---------------------------- +-- Records of cms_gallery_file +-- ---------------------------- +INSERT INTO `cms_gallery_file` VALUES (1, 1, 0, '勾股cms', '勾股CMS', '勾股CMS是一套基于ThinkPHP6 + Layui + MySql打造的轻量级的通用后台管理框架。简单、易用且方便二次开发，是一款免费可商用的开源项目', 'https://blog.gougucms.com/storage/202202/f95982689eb222b84e999122a50b3780.jpg', 'http://www.gougucms.com', 1, 1655633932); +INSERT INTO `cms_gallery_file` VALUES (2, 1, 0, '勾股OA', '勾股OA', '勾股OA是一款实用的企业办公系统框架。集成了系统设置、人事管理、消息管理、审批管理、日常办公、财务管理等基础模块。系统简约，易于功能扩展，方便二次开发，让开发者更专注于业务深度需求的开发，通过二次开发之后可以用来做CRM，ERP，业务管理等系统。', 'https://blog.gougucms.com/storage/202202/e729477de18e3be7e7eb4ec7fe2f821e.jpg', 'http://oa.gougucms.com', 2, 1655633932); +INSERT INTO `cms_gallery_file` VALUES (3, 1, 0, '勾股DEV', '勾股DEV', '勾股DEV是一款任务管理与团队协作的任务/项目管理系统，可以进行工作任务计划、执行、管理，完整地覆盖了项目管理的核心流程。项目基于GPL-3.0协议开源发布。', 'https://blog.gougucms.com/storage/202204/1193f7a1585b9f6e8a97ae17718018b3.jpg', 'http://dev.gougucms.com', 3, 1655633932); + -- ---------------------------- -- Table structure for cms_goods_cate -- ---------------------------- DROP TABLE IF EXISTS `cms_goods_cate`; CREATE TABLE `cms_goods_cate` ( `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, - `title` varchar(100) NOT NULL DEFAULT '' COMMENT '商品分类名称', + `title` varchar(100) NOT NULL DEFAULT '' COMMENT '分类名称', `sort` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '排序', `pid` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '上级id', `keywords` varchar(255) DEFAULT '' COMMENT '关键字', `desc` varchar(1000) DEFAULT '' COMMENT '描述', - `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '状态：-1删除 0禁用 1启用', `create_time` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建时间', `update_time` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '更新时间', + `delete_time` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '删除时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COMMENT = '商品分类表'; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COMMENT = '商品分类::crud'; -- ---------------------------- -- Records of cms_goods_cate -- ---------------------------- -INSERT INTO `cms_goods_cate` VALUES (1, '勾股科技', 1, 0, '勾股CMS', '左手自研，右手开源', 1, 1645058420, 0); +INSERT INTO `cms_goods_cate` VALUES (1, '勾股科技', 1, 0, '勾股CMS', '左手自研，右手开源', 1645058420, 0, 0); -- ---------------------------- -- Table structure for cms_goods @@ -695,16 +893,15 @@ DROP TABLE IF EXISTS `cms_goods`; CREATE TABLE `cms_goods` ( `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, `cate_id` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '分类ID', - `type` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '属性：1精华 2热门 3推荐', - `is_home` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否首页显示 0否 1是', - `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '-1删除 0下架 1正常', + `type` tinyint(1) UNSIGNED NOT NULL DEFAULT 0 COMMENT '属性:1精华,2热门,3推荐', + `is_home` tinyint(1) NOT NULL DEFAULT 0 COMMENT '是否首页显示:0否,1是', + `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '商品状态:0下架,1正常', `title` varchar(200) NOT NULL DEFAULT '' COMMENT '商品名称', `thumb` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '缩略图', `banner` varchar(1000) NOT NULL DEFAULT '' COMMENT '商品轮播图', `tips` varchar(255) NOT NULL DEFAULT '' COMMENT '商品卖点，一句话推销', `desc` varchar(1000) NOT NULL DEFAULT '' COMMENT '商品摘要', `content` text NOT NULL COMMENT '内容', - `md_content` text NOT NULL COMMENT 'markdown内容', `base_price` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '市场价格', `price` decimal(10, 2) NULL DEFAULT 0.00 COMMENT '实际价格', `stocks` int(11) NOT NULL DEFAULT 0 COMMENT '商品库存', @@ -714,18 +911,19 @@ CREATE TABLE `cms_goods` ( `end_time` int(10) UNSIGNED NULL DEFAULT 0 COMMENT '结束抢购时间', `read` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '阅读量', `sort` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '排序', - `is_mail` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '是否包邮 0否 1是', - `tag_values` varchar(200) NOT NULL DEFAULT '' COMMENT '商品标签 1正品保证 2一年保修 3七天退换 4赠运费险 5闪电发货 6售后无忧', + `is_mail` tinyint(1) UNSIGNED NOT NULL DEFAULT 1 COMMENT '是否包邮:0否,1是', + `tag_values` varchar(200) NOT NULL DEFAULT '' COMMENT '商品标签:1正品保证,2一年保修,3七天退换,4赠运费险,5闪电发货,6售后无忧', `admin_id` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建人', - `create_time` int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - `update_time` int(11) NOT NULL DEFAULT 0 COMMENT '编辑时间', + `create_time` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建时间', + `update_time` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '编辑时间', + `delete_time` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '删除时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COMMENT = '商品表'; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COMMENT = '商品::crud'; -- ---------------------------- -- Records of cms_goods -- ---------------------------- -INSERT INTO `cms_goods` VALUES (1, 1, 1, 1, 1, '勾股CMS，勾股Blog，勾股OA定制开发方案', 1, '', '赠送一年免费维护服务', '','勾股CMS定制开发方案99元起，勾股Blog定制开发方案199元起，勾股OA定制开发方案299元起。欢迎联系QQ:327725426咨询定制 。

', '勾股CMS定制开发方案99元起，勾股Blog定制开发方案199元起，勾股OA定制开发方案299元起。欢迎联系QQ:327725426咨询定制。', 199.00, 99.00, 0, 0, '', 0, 0, 0, 1, 1, '1,2,6', 0, 1644823517, 0); +INSERT INTO `cms_goods` VALUES (1, 1, 1, 1, 1, '勾股CMS，勾股Blog，勾股OA定制开发方案', 1, '', '赠送一年免费维护服务', '','勾股CMS定制开发方案99元起，勾股Blog定制开发方案199元起，勾股OA定制开发方案299元起。欢迎联系QQ:327725426咨询定制 。

', 199.00, 99.00, 0, 0, '', 0, 0, 0, 1, 1, '1,2,6', 0, 1644823517, 0,0); -- ---------------------------- -- Table structure for `cms_goods_keywords` @@ -735,7 +933,7 @@ CREATE TABLE `cms_goods_keywords` ( `id` int(11) unsigned NOT NULL AUTO_INCREMENT, `aid` int(11) unsigned NOT NULL DEFAULT '0' COMMENT '商品ID', `keywords_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '关联关键字id', - `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态：-1删除 0禁用 1启用', + `status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '状态:-1删除 0禁用 1启用', `create_time` int(11) NOT NULL DEFAULT '0' COMMENT '创建时间', PRIMARY KEY (`id`), KEY `aid` (`aid`), @@ -753,29 +951,29 @@ INSERT INTO `cms_goods_keywords` VALUES (1, 1, 1, 1, 1644823517); DROP TABLE IF EXISTS `cms_pages`; CREATE TABLE `cms_pages` ( `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT, - `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '-1删除 0下架 1正常', `title` varchar(200) NOT NULL DEFAULT '' COMMENT '页面名称', `thumb` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '缩略图', `banner` varchar(1000) NOT NULL DEFAULT '' COMMENT '图集相册', `desc` varchar(1000) NOT NULL DEFAULT '' COMMENT '页面摘要', `content` text NOT NULL COMMENT '内容', - `md_content` text NOT NULL COMMENT 'markdown内容', + `status` tinyint(1) NOT NULL DEFAULT 1 COMMENT '页面状态:0下架,1正常', `read` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '阅读量', `sort` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '排序', `name` varchar(200) NOT NULL DEFAULT '' COMMENT 'url文件名', `template` varchar(200) NOT NULL DEFAULT '' COMMENT '前端模板', `admin_id` int(10) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建人', - `create_time` int(11) NOT NULL DEFAULT 0 COMMENT '创建时间', - `update_time` int(11) NOT NULL DEFAULT 0 COMMENT '编辑时间', + `create_time` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '创建时间', + `update_time` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '编辑时间', + `delete_time` int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '删除时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COMMENT = '单页面表'; +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COMMENT = '单页面::crud'; -- ---------------------------- -- Records of cms_pages -- ---------------------------- -INSERT INTO `cms_pages` VALUES (1, 1, '关于我们', 1, '', '勾股CMS是一套基于ThinkPHP6+Layui+MySql打造的轻量级、高性能快速建站的内容管理系统。后台管理模块，一目了然，操作简单，通用型后台权限管理框架，开箱即用。', '

勾股CMS是一套基于ThinkPHP6 + Layui + MySql打造的轻量级、高性能极速后台开发框架。通用型的后台权限管理框架，操作简单、开箱即用。系统易于功能扩展，代码维护，方便二次开发，让开发者更专注于业务深度需求的开发，帮助开发者简单高效降低二次开发成本。

\n

', '', 1, 0, '', 'default', 0, 1653984295, 1653993466); -INSERT INTO `cms_pages` VALUES (2, 1, '勾股OA办公系统', 0, '', '勾股OA是一款实用的企业办公系统框架。集成了系统设置、人事管理、消息管理、审批管理、日常办公、财务管理等基础模块。系统简约，易于功能扩展，方便二次开发，让开发者更专注于业务深度需求的开发，通过二次开发之后可以用来做CRM，ERP，业务管理等系统。', '

勾股OA是一款实用的企业办公系统框架。集成了系统设置、人事管理、消息管理、审批管理、日常办公、财务管理等基础模块。系统简约，易于功能扩展，方便二次开发，让开发者更专注于业务深度需求的开发，通过二次开发之后可以用来做CRM，ERP，业务管理等系统。

', '', 9, 0, 'gouguoa', 'oa', 0, 1654419120, 0); -INSERT INTO `cms_pages` VALUES (3, 1, '勾股DEV项目管理系统', 0, '', '勾股DEV是一款专为IT研发团队打造的项目管理与团队协作的系统工具，可以在线管理团队的工作、项目和任务，覆盖从需求提出到研发完成上线整个过程的项目协作。', '

勾股DEV是一款专为IT研发团队打造的项目管理与团队协作的系统工具，可以在线管理团队的工作、项目和任务，覆盖从需求提出到研发完成上线整个过程的项目协作。

\n

勾股DEV的产品理念：通过“项目（Project）”的形式把成员、需求、任务、缺陷(BUG)、文档、互动讨论以及各种形式的资源组织在一起，团队成员参与更新任务、文档等内容来推动项目的进度，同时系统利用时间线索和各种动态的报表的形式来自动给成员汇报项目进度。

', '', 8, 0, 'gougudev', 'dev', 0, 1654167139, 0); +INSERT INTO `cms_pages` VALUES (1, '关于我们', 1, '', '勾股CMS是一套基于ThinkPHP6+Layui+MySql打造的轻量级、高性能快速建站的内容管理系统。后台管理模块，一目了然，操作简单，通用型后台权限管理框架，开箱即用。', '

勾股CMS是一套基于ThinkPHP6 + Layui + MySql打造的轻量级、高性能极速后台开发框架。通用型的后台权限管理框架，操作简单、开箱即用。系统易于功能扩展，代码维护，方便二次开发，让开发者更专注于业务深度需求的开发，帮助开发者简单高效降低二次开发成本。

\n

', 1,1, 0, '', 'default', 1, 1653984295, 1653993466,0); +INSERT INTO `cms_pages` VALUES (2, '勾股OA办公系统', 0, '', '勾股OA是一款实用的企业办公系统框架。集成了系统设置、人事管理、消息管理、审批管理、日常办公、财务管理等基础模块。系统简约，易于功能扩展，方便二次开发，让开发者更专注于业务深度需求的开发，通过二次开发之后可以用来做CRM，ERP，业务管理等系统。', '

勾股OA是一款实用的企业办公系统框架。集成了系统设置、人事管理、消息管理、审批管理、日常办公、财务管理等基础模块。系统简约，易于功能扩展，方便二次开发，让开发者更专注于业务深度需求的开发，通过二次开发之后可以用来做CRM，ERP，业务管理等系统。

', 1,9, 0, 'gouguoa', 'oa', 1, 1654419120, 0,0); +INSERT INTO `cms_pages` VALUES (3, '勾股DEV项目管理系统', 0, '', '勾股DEV是一款专为IT研发团队打造的项目管理与团队协作的系统工具，可以在线管理团队的工作、项目和任务，覆盖从需求提出到研发完成上线整个过程的项目协作。', '

勾股DEV是一款专为IT研发团队打造的项目管理与团队协作的系统工具，可以在线管理团队的工作、项目和任务，覆盖从需求提出到研发完成上线整个过程的项目协作。

\n

勾股DEV的产品理念：通过“项目（Project）”的形式把成员、需求、任务、缺陷(BUG)、文档、互动讨论以及各种形式的资源组织在一起，团队成员参与更新任务、文档等内容来推动项目的进度，同时系统利用时间线索和各种动态的报表的形式来自动给成员汇报项目进度。

', 1,8, 0, 'gougudev', 'dev', 1, 1654167139, 0,0); -- ---------------------------- -- Table structure for `cms_pages_keywords` diff --git a/composer.json b/composer.json index 18375e0..34f1d0d 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,8 @@ "topthink/think-view": "^1.0", "topthink/think-captcha": "^3.0", "phpmailer/phpmailer": "^6.6", - "firebase/php-jwt": "6.1.2" + "firebase/php-jwt": "6.1.2", + "symfony/var-exporter": "5.4.10" }, "require-dev": { "symfony/var-dumper": "^4.2", diff --git a/config/console.php b/config/console.php index a818a98..2b6102f 100644 --- a/config/console.php +++ b/config/console.php @@ -5,5 +5,13 @@ return [ // 指令定义 'commands' => [ + 'crud' => 'app\crud\Command\Crud', + 'crud-c' => 'app\crud\Command\CrudController', + 'crud-m' => 'app\crud\Command\CrudModel', + 'crud-v' => 'app\crud\Command\CrudValidate', + 'crud-l' => 'app\crud\Command\CrudList', + 'crud-a' => 'app\crud\Command\CrudAdd', + 'crud-e' => 'app\crud\Command\CrudEdit', + 'crud-r' => 'app\crud\Command\CrudRead', ], ]; diff --git a/extend/dateset/Dateset.php b/extend/dateset/Dateset.php new file mode 100644 index 0000000..8f0c13d --- /dev/null +++ b/extend/dateset/Dateset.php @@ -0,0 +1,164 @@ + $yes_start_time && $time < $yes_end_time) { + return '昨天'; + } + + if ($time > $yes_start_time && $time < $two_end_time) { + return '1天前'; + } + + if ($time > $yes_start_time && $time < $three_end_time) { + return '2天前'; + } + + if ($time > $yes_start_time && $time < $four_end_time) { + return '3天前'; + } + + if ($time > $yes_start_time && $time < $five_end_time) { + return '4天前'; + } + + if ($time > $yes_start_time && $time < $six_end_time) { + return '5天前'; + } + + if ($time > $yes_start_time && $time < $seven_end_time) { + return '6天前'; + } + + switch ($format) { + case 'd': + $show_time = date('Y-m-d', $time); + break; + case 'i': + $show_time = date('Y-m-d H:i', $time); + break; + case 's': + $show_time = date('Y-m-d H:i:s', $time); + break; + } + return $show_time; + } + + + /** + * 计算两个时间戳之间相差的时间 + * + * $differ = self::differ(60, 182, 'minutes,seconds'); // array('minutes' => 2, 'seconds' => 2) + * $differ = self::differ(60, 182, 'minutes'); // 2 + * + * @param int $remote timestamp to find the span of + * @param int $local timestamp to use as the baseline + * @param string $output formatting string + * @return string when only a single output is requested + * @return array associative list of all outputs requested + * @from https://github.com/kohana/ohanzee-helpers/blob/master/src/Date.php + */ + public static function differ($remote, $local = null, $output = 'years,months,weeks,days,hours,minutes,seconds') + { + // Normalize output + $output = trim(strtolower((string)$output)); + if (!$output) { + // Invalid output + return false; + } + // Array with the output formats + $output = preg_split('/[^a-z]+/', $output); + // Convert the list of outputs to an associative array + $output = array_combine($output, array_fill(0, count($output), 0)); + // Make the output values into keys + extract(array_flip($output), EXTR_SKIP); + if ($local === null) { + // Calculate the span from the current time + $local = time(); + } + // Calculate timespan (seconds) + $timespan = abs($remote - $local); + if (isset($output['years'])) { + $timespan -= self::YEAR * ($output['years'] = (int)floor($timespan / self::YEAR)); + } + if (isset($output['months'])) { + $timespan -= self::MONTH * ($output['months'] = (int)floor($timespan / self::MONTH)); + } + if (isset($output['weeks'])) { + $timespan -= self::WEEK * ($output['weeks'] = (int)floor($timespan / self::WEEK)); + } + if (isset($output['days'])) { + $timespan -= self::DAY * ($output['days'] = (int)floor($timespan / self::DAY)); + } + if (isset($output['hours'])) { + $timespan -= self::HOUR * ($output['hours'] = (int)floor($timespan / self::HOUR)); + } + if (isset($output['minutes'])) { + $timespan -= self::MINUTE * ($output['minutes'] = (int)floor($timespan / self::MINUTE)); + } + // Seconds ago, 1 + if (isset($output['seconds'])) { + $output['seconds'] = $timespan; + } + if (count($output) === 1) { + // Only a single output was requested, return it + return array_pop($output); + } + // Return array + return $output; + } + + /** + * 获取指定年月拥有的天数 + * @param int $month + * @param int $year + * @return false|int|string + */ + public static function days_in_month($month, $year) + { + if (function_exists("cal_days_in_month")) { + return cal_days_in_month(CAL_GREGORIAN, $month, $year); + } else { + return date('t', mktime(0, 0, 0, $month, 1, $year)); + } + } +} diff --git a/public/index.php b/public/index.php index e571886..7eecb3a 100644 --- a/public/index.php +++ b/public/index.php @@ -15,10 +15,10 @@ if (empty(file_exists(__DIR__ . '/../vendor/autoload.php'))) { require __DIR__ . '/../vendor/autoload.php'; // 定义当前版本号 -define('CMS_VERSION','3.7.25'); +define('CMS_VERSION','4.0.825'); // 定义Layui版本号 -define('LAYUI_VERSION','2.7.5'); +define('LAYUI_VERSION','2.7.6'); // 定义项目目录 define('CMS_ROOT', __DIR__ . '/../'); diff --git a/public/static/assets/gougu/module/tool.js b/public/static/assets/gougu/module/tool.js index 4eba8b1..51d1b01 100644 --- a/public/static/assets/gougu/module/tool.js +++ b/public/static/assets/gougu/module/tool.js @@ -30,8 +30,6 @@ layui.define([], function (exports) { let op_width = obj.outerWidth(); obj.animate({ left: '+=' + op_width + 'px' }, 200, 'linear', function () { $('body').removeClass('right-open'); - //$('.layui-anim-rl').remove(); - //$('.layui-layer-shade').remove(); layer.close(index); if (layui.pageTable) { layui.pageTable.resize(); @@ -52,8 +50,9 @@ layui.define([], function (exports) { return false; } that.loading = true; - if (width == 0) { - width = window.innerWidth > 1280 ? '1200px' : '996px'; + var sideWidth = window.innerWidth > 1280 ? '1200px' : '996px'; + if (width && width > 0) { + sideWidth = width + 'px'; } $.ajax({ url: url, @@ -64,26 +63,35 @@ layui.define([], function (exports) { layer.msg(res.msg); return false; } - var express = '
' + res + '
关闭
'; + var express = '
' + res + '
关闭
'; $('body').append(express).addClass('right-open'); $('#expressMask').fadeIn(200); $('#expressLayer').animate({ 'right': 0 }, 200, 'linear', function () { - openInit(); - }); - - $('#expressClose').click(function () { + if (typeof (openInit) == "function") { + openInit(); + } + }); + that.loading = false; + + //关闭 + $('body').on('click','.express-close', function () { $('#expressMask').fadeOut(100); $('body').removeClass('right-open'); - $('#expressLayer').animate({ 'right': '-100%' }, 100, 'linear', function () { + let op_width = $('#expressLayer').outerWidth(); + $('#expressLayer').animate({ left: '+=' + op_width + 'px' }, 200, 'linear', function () { $('#expressLayer').remove(); $('#expressMask').remove(); + if (layui.pageTable) { + layui.pageTable.resize(); + } }) }) $(window).resize(function () { width = window.innerWidth > 1280 ? '1200' : '996'; $('#expressLayer').width(width); - }) + }) + } , error: function (xhr, textstatus, thrown) { console.log('错误'); @@ -270,6 +278,13 @@ layui.define([], function (exports) { } return false; }); + $('body').on('click', '.open-a', function () { + let url = $(this).data('href'); + if (url && url !== '') { + tool.open(url); + } + return false; + }); $('body').on('click', '.link-a', function () { let url = $(this).data('href'); if (url && url !== '') {