xuanchen/new_haai
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

初步完成

Browse Source
This commit is contained in:
徐永宾
2020-09-11 10:27:23 +08:00
parent 9c6d4da51e
commit 49c3511dbe
43 changed files with 3437 additions and 1188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
app/Admin/Controllers/Advert/IndexController.php
View File

@@ -24,7 +24,7 @@ class IndexController extends AdminController
$grid->filter(function ($filter) {
$filter->column(1 / 2, function ($filter) {
$filter->like('title', '图片名称');
$filter->like('category.id', '分类名称')->select(Category::selectOptions(function ($model) {
$filter->equal('category.id', '分类名称')->select(Category::selectOptions(function ($model) {
return $model->where('status', 1)->where('type', Category::TYPE_ADVERT);
}, '所有分类'));
});
@@ -51,29 +51,29 @@ class IndexController extends AdminController
$form->text('title', '图片名称')->required();
$form->select('category_id', '所属分类')
->options(Category::selectOptions(function ($model) {
return $model->where('status', 1)->where('type', Category::TYPE_ADVERT);
}, '选择分类'))
->rules('required|min:1', [
'required' => '必须选择所属分类',
'min' => '必须选择所属分类',
]);
->options(Category::selectOptions(function ($model) {
return $model->where('status', 1)->where('type', Category::TYPE_ADVERT);
}, '选择分类'))
->rules('required|min:1', [
'required' => '必须选择所属分类',
'min' => '必须选择所属分类',
]);
$form->image('cover', '封面图片')
->rules(function ($form) {
if ($form->model()->cover != []) {
return 'nullable|image';
} else {
return 'required';
}
})
->move('images/' . date('Y/m/d'))
->removable()
->uniqueName();
->rules(function ($form) {
if ($form->model()->cover != []) {
return 'nullable|image';
} else {
return 'required';
}
})
->move('images/' . date('Y/m/d'))
->removable()
->uniqueName();
$form->text('url', '链接地址');
$form->number('sort', '排序')
->default(1)
->required()
->help('数字越大越靠前');
->default(1)
->required()
->help('数字越大越靠前');
return $form;
}

40
app/Admin/Controllers/Article/ArticleController.php → app/Admin/Controllers/Article/IndexController.php
View File

@@ -8,8 +8,9 @@ use Encore\Admin\Controllers\AdminController;
use Encore\Admin\Form;
use Encore\Admin\Grid;
class ArticleController extends AdminController
class IndexController extends AdminController
{
protected $title = '内容管理';
public function grid()
@@ -19,7 +20,7 @@ class ArticleController extends AdminController
$grid->filter(function ($filter) {
$filter->column(1 / 2, function ($filter) {
$filter->like('title', '文章标题');
$filter->like('category.id', '所属分类')->select(Category::selectOptions(function ($model) {
$filter->equal('category.id', '所属分类')->select(Category::selectOptions(function ($model) {
return $model->where('status', 1)->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
}, '所有分类'));
});
@@ -32,6 +33,10 @@ class ArticleController extends AdminController
$grid->column('category.title', '所属分类');
$grid->column('title', '文章标题');
$grid->column('sort', '序号');
$grid->status('状态')->switch([
'on' => ['value' => 1, 'text' => '正常', 'color' => 'primary'],
'off' => ['value' => 0, 'text' => '关闭', 'color' => 'danger'],
]);
$grid->column('created_at', '创建时间');
return $grid;
@@ -43,21 +48,30 @@ class ArticleController extends AdminController
$form->text('title', '文章标题')->rules('min:2');
$form->select('category_id', '所属分类')
->options(Category::selectOptions(function ($model) {
return $model->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
}, '选择分类'))
->rules('required|min:1', [
'required' => '必须选择所属分类',
'min' => '必须选择所属分类',
]);
$form->text('keywords', '关键词')->rules('nullable');
->options(Category::selectOptions(function ($model) {
return $model->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
}, '选择分类'))
->when('in', [3, 29], function (Form $form) {
$form->text('working', '工龄');
$form->text('job', '岗位');
})
->when('in', [56], function (Form $form) {
$form->text('url', '跳转地址');
})
->rules('required|min:1', [
'required' => '必须选择所属分类',
'min' => '必须选择所属分类',
]);
// $form->text('keywords', '关键词')->rules('nullable');
$form->textarea('description', '内容简介')->rules('max:350');
$form->image('cover', '封面')
->move('images/' . date('Y/m/d'))
->removable()
->uniqueName();
->move('images/' . date('Y/m/d'))
->removable()
->uniqueName();
$form->ueditor('content', '文章内容')->rules('required', ['required' => '详情不能为空']);
$form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先');
$form->switch('status', '状态')->default(1);
return $form;
}

83
app/Admin/Controllers/Article/PatentController.php Normal file
View File

@@ -0,0 +1,83 @@
<?php
namespace App\Admin\Controllers\Article;
use App\Models\Category;
use App\Models\Patent;
use Encore\Admin\Controllers\AdminController;
use Encore\Admin\Form;
use Encore\Admin\Grid;
class PatentController extends AdminController
{
protected $title = '专利论文';
public function grid()
{
$grid = new Grid(new Patent);
$grid->model()->orderBy('id', 'desc');
$grid->filter(function ($filter) {
$filter->column(1 / 2, function ($filter) {
$filter->like('title', '专利/论文题目');
$filter->equal('category_id', '所属分类')
->select(Category::where('type', Category::TYPE_PATENT)->pluck('title', 'id'));
$filter->equal('type', '类别')
->select(Patent::TYPES);
});
$filter->column(1 / 2, function ($filter) {
$filter->like('number', '专利号');
$filter->like('nickname', '第一发明人/论文作者');
});
$filter->disableIdFilter();
});
$grid->column('id', '#ID#');
$grid->column('type', '类别')->using(Patent::TYPES)->label();
$grid->column('title', '专利/论文题目');
$grid->column('number', '专利号');
$grid->column('category.title', '所属分类');
$grid->column('nickname', '第一发明人/论文作者');
$grid->column('created_at', '创建时间');
return $grid;
}
public function form()
{
$form = new Form(new Patent);
$form->text('title', '题目')->required();
$form->select('type', '类别')
->options(Patent::TYPES)
->when('patent', function (Form $form) {
$form->select('category_id', '专利类别')
->options(Category::selectOptions(function ($model) {
return $model->whereIn('type', [Category::TYPE_PATENT]);
}, '专利类别'));
$form->text('number', '专利号');
})
->when('paper', function (Form $form) {
$form->text('publication', '刊物名称');
})
->required();
$form->text('nickname', '第一发明人/论文作者')->required();
$form->image('cover', '封面')
->move('images/' . date('Y/m/d'))
->removable()
->uniqueName();
$form->ueditor('content', '详情')->rules('required', ['required' => '详情不能为空']);
$form->number('sort', '序号')->default(0)->required()->help('倒序优先');
$form->switch('status', '显示')->states()->default(1);
return $form;
}
}

54
app/Admin/Controllers/Article/PictureController.php
View File

@@ -1,54 +0,0 @@
<?php
namespace App\Admin\Controllers\Article;
use App\Models\ArticlePicture;
use Encore\Admin\Controllers\AdminController;
use Encore\Admin\Form;
use Encore\Admin\Grid;
class PictureController extends AdminController
{
protected $title = '随手拍';
public function grid()
{
$grid = new Grid(new ArticlePicture);
$grid->model()->orderBy('id', 'desc');
$grid->filter(function ($filter) {
$filter->column(1 / 2, function ($filter) {
$filter->like('title', '文章标题');
});
$filter->disableIdFilter();
});
$grid->column('id', '#ID#');
$grid->column('cover')->display(function () {
return $this->one_picture_path;
})->image('', 100);
$grid->column('category.title', '所属分类');
$grid->column('title', '文章标题');
$grid->column('sort', '序号');
$grid->column('created_at', '创建时间');
return $grid;
}
public function form()
{
$form = new Form(new ArticlePicture);
$form->text('title', '文章标题')->rules('min:2');
$form->hidden('category_id')->value(6);
$form->multipleImage('pictures', '封面')
->move('images/' . date('Y/m/d'))
->removable()
->uniqueName();
$form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先');
return $form;
}
}

79
app/Admin/Controllers/Category/IndexController.php
View File

@@ -31,32 +31,31 @@ class IndexController extends AdminController
$form = new WidgetsForm();
$form->select('parent_id', '上级分类')
->options(Category::selectOptions(function ($model) {
return $model->where('status', 1);
}, '一级分类'))
;
->options(Category::selectOptions(function ($model) {
return $model->where('status', 1);
}, '一级分类'));
$form->text('title', '分类名称')->rules('required');
$form->select('type', '分类类型')
->options(Category::TYPES)
->when('show', function (WidgetsForm $form) {
$form->select('article_id', '关联文章')
->options(function ($option, $info) {
return Article::whereHas('category', function ($q) {
$q->where('type', 'show');
})->pluck('title', 'id');
})->help('当分类类型是文章详情的时候需要选择关联文章');
})
->required();
->options(Category::TYPES)
->when('show', function (WidgetsForm $form) {
$form->select('article_id', '关联文章')
->options(function ($option, $info) {
return Article::whereHas('category', function ($q) {
$q->where('type', 'show');
})->pluck('title', 'id');
})->help('当分类类型是文章详情的时候需要选择关联文章');
})
->required();
$form->textarea('description', '分类简介')
->rules('nullable');
->rules('nullable');
$form->text('keywords', '关键词')->rules('nullable');
$form->image('cover', 'Logo')
->move('images/' . date('Y/m/d'))
->removable()
->uniqueName();
->move('images/' . date('Y/m/d'))
->removable()
->uniqueName();
$form->number('order', '排序')->default(0);
$form->switch('top_show', '顶部导航显示')->states()->default(1);
$form->switch('top_show', '顶部导航显示')->states()->default(0);
$form->switch('status', '显示')->states()->default(1);
$form->action(admin_url('categories'));
@@ -102,22 +101,22 @@ class IndexController extends AdminController
}, '一级分类'));
$form->text('title', '分类名称')->rules('required');
$form->select('type', '分类类型')
->options(Category::TYPES)
->when('show', function (Form $form) {
$form->select('article_id', '关联文章')
->options(function ($option, $info) {
return Article::whereHas('category', function ($q) {
$q->where('type', 'show');
})->pluck('title', 'id');
})->help('当分类类型是文章详情的时候需要选择关联文章');
})
->required();
->options(Category::TYPES)
->when('show', function (Form $form) {
$form->select('article_id', '关联文章')
->options(function ($option, $info) {
return Article::whereHas('category', function ($q) {
$q->where('type', 'show');
})->pluck('title', 'id');
})->help('当分类类型是文章详情的时候需要选择关联文章');
})
->required();
$form->textarea('description', '分类简介')->rows(4)->rules('nullable');
$form->text('keywords', '关键词')->rules('nullable');
$form->image('cover', 'Logo')
->move('images/' . date('Y/m/d'))
->removable()
->uniqueName();
->move('images/' . date('Y/m/d'))
->removable()
->uniqueName();
$form->number('order', '排序')->default(0)->help('正序优先');
$form->switch('status', '显示')->states()->default(1);
@@ -126,14 +125,14 @@ class IndexController extends AdminController
$form->saving(function (Form $form) {
if (request()->has('title')) {
if (request()->type == Category::TYPE_SHOW && empty(request()->article_id)) {
$error = new MessageBag([
'title' => '错误',
'message' => '文章类型是文章详情的时候需要选择关联文章',
]);
return back()->withInput()->with(compact('error'));
}
// if (request()->type == Category::TYPE_SHOW && empty(request()->article_id)) {
// $error = new MessageBag([
// 'title' => '错误',
// 'message' => '文章类型是文章详情的时候需要选择关联文章',
// ]);
//
// return back()->withInput()->with(compact('error'));
// }
}
});

4
app/Admin/Routes/article.php
View File

@@ -7,6 +7,6 @@ Route::group([
'namespace' => config('admin.route.namespace') . '\\Article',
'middleware' => config('admin.route.middleware'),
], function (Router $router) {
$router->resource('articles', 'ArticleController');
$router->resource('pictures', 'PictureController');
$router->resource('articles', 'IndexController');
$router->resource('patents', 'PatentController');
});