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

阶段更新

Browse Source
This commit is contained in:
徐永宾
2021-10-11 13:09:29 +08:00
parent d89bc90cef
commit 11b9e2ae76
31 changed files with 1095 additions and 659 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,35 +45,39 @@ class IndexController extends AdminController
* Make a form builder.
* @return Form
*/
protected function form()
protected function form(): Form
{
$form = new Form(new Advert);
$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(function () {
return Category::query()
->where('status', 1)
->where('type', Category::TYPE_ADVERT)
->pluck('title', 'id');
})
->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;
}

6
app/Admin/Controllers/Article/IndexController.php
View File

@@ -5,6 +5,7 @@ namespace App\Admin\Controllers\Article;
use App\Admin\Selectable\CategorySelectAble;
use App\Models\Article;
use App\Models\Category;
use App\Models\CategoryOld;
use Encore\Admin\Controllers\AdminController;
use Encore\Admin\Form;
use Encore\Admin\Grid;
@@ -24,6 +25,7 @@ class IndexController extends AdminController
$filter->equal('category_id', '所属分类')->select(Category::selectOptions(function ($model) {
return $model->where('status', 1)->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
}, '所有分类'));
});
$filter->disableIdFilter();
@@ -32,6 +34,7 @@ class IndexController extends AdminController
$grid->column('id', '#ID#');
$grid->column('cover', '封面图片')->image('', 100);
$grid->column('category.title', '所属分类');
$grid->column('category_old.title', '所属老分类');
$grid->column('title', '文章标题');
$states = [
'on' => ['value' => 1, 'text' => '打开', 'color' => 'primary'],
@@ -50,10 +53,11 @@ class IndexController extends AdminController
$form->text('title', '文章标题')->rules('min:2');
$form->text('remark', '子标题');
$form->select('category_id', '上级分类')
$form->select('category_id', '所属分类')
->options(Category::selectOptions(function ($model) {
return $model->where('status', 1)->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
}, '一级分类'));
$form->textarea('description', '内容简介');
$form->image('cover', '封面')
->move('images/' . date('Y/m/d'))

82
app/Admin/Controllers/Article/OldController.php Normal file
View File

@@ -0,0 +1,82 @@
<?php
namespace App\Admin\Controllers\Article;
use App\Admin\Selectable\CategorySelectAble;
use App\Models\ArticleOld;
use App\Models\Category;
use Encore\Admin\Controllers\AdminController;
use Encore\Admin\Form;
use Encore\Admin\Grid;
class OldController extends AdminController
{
protected $title = '内容管理';
public function grid()
{
$grid = new Grid(new ArticleOld);
$grid->model()->orderBy('id', 'desc');
$grid->filter(function ($filter) {
$filter->column(1 / 2, function ($filter) {
$filter->like('title', '文章标题');
$filter->equal('category_id', '所属分类')->select(Category::selectOptions(function ($model) {
return $model->where('status', 1)
->whereIn('type', [Category::TYPE_ARTICLE, Category::TYPE_SHOW]);
}, '所有分类'));
});
$filter->disableIdFilter();
});
$grid->column('id', '#ID#');
$grid->column('cover', '封面图片')->image('', 100);
$grid->column('category.title', '所属分类');
$grid->column('title', '文章标题');
$states = [
'on' => ['value' => 1, 'text' => '打开', 'color' => 'primary'],
'off' => ['value' => 2, 'text' => '关闭', 'color' => 'default'],
];
$grid->column('status', '状态')->switch($states);
$grid->column('sort', '序号');
$grid->column('测试')->display(function () {
$cids = $this->categories()->pluck('id')->toArray();
if (empty($this->category_id) && !empty($cids)) {
$this->category_id = $cids[0];
$this->save();
}
});
$grid->column('created_at', '创建时间');
return $grid;
}
public function form()
{
$form = new Form(new ArticleOld);
$form->text('title', '文章标题')->rules('min:2');
$form->text('remark', '子标题');
$form->select('category_id', '上级分类')
->options(Category::selectOptions(function ($model) {
return $model->where('status', 1)->whereIn('type', [Category::TYPE_ArticleOld, Category::TYPE_SHOW]);
}, '一级分类'));
$form->textarea('description', '内容简介');
$form->image('cover', '封面')
->move('images/' . date('Y/m/d'))
->removable()
->uniqueName();
$form->ueditor('content', '文章内容')->rules('required', ['required' => '详情不能为空']);
$form->number('sort', '序号')->default(0)->rules('required', ['required' => '序号必须填写'])->help('倒序优先');
$states = [
'on' => ['value' => 1, 'text' => '打开', 'color' => 'success'],
'off' => ['value' => 0, 'text' => '关闭', 'color' => 'danger'],
];
$form->datetime('created_at', '发布时间');
$form->switch('status', '状态')->states($states)->default(1);
return $form;
}
}

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

@@ -39,7 +39,7 @@ class IndexController extends AdminController
->when('show', function (WidgetsForm $form) {
$form->select('article_id', '关联文章')
->options(function ($option, $info) {
return Article::whereHas('categories', function ($q) {
return Article::whereHas('category', function ($q) {
$q->where('type', 'show');
})->pluck('title', 'id');
})->help('当分类类型是文章详情的时候需要选择关联文章');
@@ -109,7 +109,7 @@ class IndexController extends AdminController
->when('show', function (Form $form) {
$form->select('article_id', '关联文章')
->options(function ($option, $info) {
return Article::whereHas('categories', function ($q) {
return Article::whereHas('category', function ($q) {
$q->where('type', 'show');
})->pluck('title', 'id');
})->help('当分类类型是文章详情的时候需要选择关联文章');

155
app/Admin/Controllers/Category/OldController.php Normal file
View File

@@ -0,0 +1,155 @@
<?php
namespace App\Admin\Controllers\Category;
use App\Models\Article;
use App\Models\CategoryOld;
use Encore\Admin\Controllers\AdminController;
use Encore\Admin\Form;
use Encore\Admin\Layout\Column;
use Encore\Admin\Layout\Row;
use Encore\Admin\Tree;
use Encore\Admin\Widgets\Box;
use Encore\Admin\Widgets\Form as WidgetsForm;
class OldController extends AdminController
{
protected $title = '分类管理';
/**
* Index interface.
* @return \Closure
*/
public function grid()
{
return function (Row $row) {
$row->column(6, $this->treeView());
$row->column(6, function (Column $column) {
$form = new WidgetsForm();
$form->select('parent_id', '上级分类')->options(CategoryOld::selectOptions(function ($model) {
return $model->where('status', 1);
}, '一级分类'));
$form->text('title', '分类名称')->rules('required');
$form->text('alias', '别名');
$form->select('type', '分类类型')
->options(CategoryOld::TYPES)
->when('show', function (WidgetsForm $form) {
$form->select('article_id', '关联文章')
->options(function ($option, $info) {
return Article::whereHas('categories', function ($q) {
$q->where('type', 'show');
})->pluck('title', 'id');
})->help('当分类类型是文章详情的时候需要选择关联文章');
})
->required();
$form->textarea('description', '分类简介')
->rules('nullable');
$form->image('logo', 'Logo')
->move('logos/' . date('Y/m/d'))
->removable()
->uniqueName();
$form->image('cover', '封面')
->move('images/' . date('Y/m/d'))
->removable()
->uniqueName();
$form->text('template', '模板');
$form->number('order', '排序')->default(0);
$form->switch('top_show', '顶部导航显示')->states()->default(0);
$form->switch('status', '显示')->states()->default(1);
$form->action(admin_url('categories'));
$column->append((new Box('新增分类', $form))->style('success'));
});
};
}
/**
* @return Tree
*/
protected function treeView()
{
return CategoryOld::tree(function (Tree $tree) {
$tree->disableCreate();
$tree->branch(function ($branch) {
if ($branch['status'] == 1) {
$payload = "<i class='fa fa-eye text-primary'></i> ";
} else {
$payload = "<i class='fa fa-eye text-gray'></i> ";
}
$payload .= " [ID:{$branch['id']}] - ";
$payload .= " <strong>{$branch['title']}</strong> ";
$payload .= " <strong>{$branch['alias']}</strong> ";
$payload .= " <small>{$branch['type']}</small> ";
$payload .= " <small style='color:#999'>{$branch['template']}</small>";
return $payload;
});
});
}
/**
* Make a form builder.
* @return Form
*/
protected function form(): Form
{
$form = new Form(new CategoryOld);
$form->select('parent_id', '上级分类')->options(CategoryOld::selectOptions(function ($model) {
return $model->where('status', 1);
}, '一级分类'));
$form->text('title', '分类名称')->rules('required');
$form->text('alias', '别名');
$form->select('type', '分类类型')
->options(CategoryOld::TYPES)
->when('show', function (Form $form) {
$form->select('article_id', '关联文章')
->options(function ($option, $info) {
return Article::whereHas('categories', function ($q) {
$q->where('type', 'show');
})->pluck('title', 'id');
})->help('当分类类型是文章详情的时候需要选择关联文章');
})
->required()
->rules('required');
$form->textarea('description', '分类简介')->rows(4)->rules('nullable');
$form->image('logo', 'Logo')
->move('logos/' . date('Y/m/d'))
->removable()
->uniqueName();
$form->image('cover', '封面')
->move('images/' . date('Y/m/d'))
->removable()
->uniqueName();
$form->text('template', '模板');
$form->number('order', '排序')->default(0)->help('正序优先');
$form->switch('top_show', '顶部导航显示')->states()->default(0);
$form->switch('status', '显示')->states()->default(1);
$form->saving(function (Form $form) {
if (request()->has('title')) {
// if (request()->type == CategoryOld::TYPE_SHOW && empty(request()->article_id)) {
// $error = new MessageBag([
// 'title' => '错误',
// 'message' => '文章类型是文章详情的时候需要选择关联文章',
// ]);
//
// return back()->withInput()->with(compact('error'));
// }
}
});
return $form;
}
public function destroy($id)
{
return $this->form()->destroy($id);
}
}

9
app/Admin/Controllers/Video/IndexController.php
View File

@@ -50,9 +50,12 @@ class IndexController extends AdminController
$form->text('title', '视频名称')->required();
$form->select('category_id', '所属分类')
->options(Category::selectOptions(function ($model) {
return $model->where('status', 1);
}, '选择分类'))
->options(function () {
return Category::query()
->where('status', 1)
->where('type', Category::TYPE_VIDEO)
->pluck('title', 'id');
})
->rules('required|min:1', [
'required' => '必须选择所属分类',
'min' => '必须选择所属分类',

1
app/Admin/Routes/category.php
View File

@@ -8,5 +8,6 @@ Route::group([
'middleware' => config('admin.route.middleware'),
], function (Router $router) {
$router->resource('categories', 'IndexController');
$router->resource('categorie_olds', 'OldController');
});

31
app/Helpers/function.php
View File

@@ -84,7 +84,7 @@ function getCateChild($categoryId)
{
return Category::where('status', 1)
->where('parent_id', $categoryId)
->orderBy('order', 'asc')
->orderBy('order', 'desc')
->get();
}
@@ -126,6 +126,14 @@ function getOneAdvertByCate($categoryId, $result = '')
}
}
function getAdvertsByCate($categoryId, $take = '8')
{
return Advert::where('category_id', $categoryId)
->latest()
->take($take)
->get();
}
function getVideoByCate($categoryId, $result = '')
{
$video = Video::where('category_id', $categoryId)
@@ -151,3 +159,24 @@ function getVideosByCate($categoryId, $take = '8')
->get();
}
function dateLocalMonth($m)
{
$months = [
'1' => '一月',
'2' => '二月',
'3' => '三月',
'4' => '四月',
'5' => '五月',
'6' => '六月',
'7' => '七月',
'8' => '八月',
'9' => '九月',
'10' => '十月',
'11' => '十一月',
'12' => '十二月',
];
return $months[$m] ?? $m;
}

3
app/Http/Controllers/CategoryController.php
View File

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
use App\Models\Advert;
use App\Models\Category;
use Carbon\Carbon;
class CategoryController extends Controller
{
@@ -11,7 +12,7 @@ class CategoryController extends Controller
/**
* 显示分类
* @param Category $category [description]
* @return [type] [description]
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector|\Illuminate\View\View [type] [description]
*/
public function index(Category $category)
{

14
app/Http/Controllers/IndexController.php
View File

@@ -6,6 +6,7 @@ use App\Models\Advert;
use App\Models\Article;
use App\Models\Category;
use App\Models\Link;
use Illuminate\Http\Request;
class IndexController extends Controller
{
@@ -24,15 +25,12 @@ class IndexController extends Controller
return view('index.index', compact('top_adverts', 'top_adverts'));
}
//通用获取文章
public function getArticle($category_ids, $take = 3)
public function search(Request $request)
{
return Article::where('status', 1)
->ByCategory($category_ids)
->select('id', 'description', 'title', 'created_at', 'cover', 'content')
->orderBy('created_at', 'desc')
->take($take)
->get();
$title = $request->title;
$articles = Article::query()->where('title', 'like', "%{$title}%")->paginate();
return view('index.search', compact('articles'));
}
}

5
app/Models/Article.php
View File

@@ -76,6 +76,11 @@ class Article extends Model
return $this->belongsTo(Category::class);
}
public function category_old(): BelongsTo
{
return $this->belongsTo(CategoryOld::class);
}
/**
* Notes: description
* @Author: 玄尘

100
app/Models/ArticleOld.php Normal file
View File

@@ -0,0 +1,100 @@
<?php
namespace App\Models;
use App\Models\Traits\BelongsToCategory;
use App\Models\Traits\HasCovers;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
class ArticleOld extends Model
{
use HasCovers, BelongsToCategory;
public function getLinkAttribute(): string
{
return route('article.show', $this);
}
/***
* Notes: 获取详情内图片
* @Author: 玄尘
* @Date : 2021/10/8 11:58
* @return mixed|string
*/
public function get_content_cover()
{
preg_match("/<img.*?src=\"([^\"]+)\"[^>].*?>/isU", str_ireplace("\\", "", $this->content), $matches);
if (isset($matches[1])) {
return $matches[1];
} else {
return '';
}
}
/**
* Notes: 获取一个默认图片
* @Author: 玄尘
* @Date : 2020/6/3 16:29
* @return mixed|string
*/
public function get_one_cover()
{
if ($this->cover_url) {
$path = $this->cover_url;
} else {
$path = $this->get_content_cover();
if ($path) {
$this->cover = str_replace("/storage", "", $path);
$this->save();
$path = config('app.url') . $path;
}
}
return $path;
}
/**
* Notes: 关联分类
* @Author: 玄尘
* @Date : 2021/4/2 9:11
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
*/
public function categories(): BelongsToMany
{
return $this->belongsToMany(CategoryOld::class, 'article_old_category')
->using(ArticleOldCategory::class);
}
public function category(): BelongsTo
{
return $this->belongsTo(CategoryOld::class);
}
/**
* Notes: description
* @Author: 玄尘
* @Date : 2021/4/2 9:17
* @param $query
* @param $ids
* @return mixed
*/
public function scopeByCategory($query, $ids)
{
if (!is_array($ids)) {
$ids = [$ids];
}
return $query->whereIn('category_id', $ids);
//
// return $query->whereHas('categories', function ($q) use ($ids) {
// $q->whereIN('id', $ids);
// });
}
}

11
app/Models/ArticleOldCategory.php Normal file
View File

@@ -0,0 +1,11 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Relations\Pivot;
class ArticleOldCategory extends Pivot
{
//
}

4
app/Models/Category.php
View File

@@ -6,10 +6,8 @@ use App\Models\Traits\HasCovers;
use Encore\Admin\Traits\AdminBuilder;
use Encore\Admin\Traits\ModelTree;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Support\Str;
class Category extends Model
{
@@ -114,8 +112,6 @@ class Category extends Model
public function getDescriptionHtmlAttribute(): string
{
return str_replace("\n", "</br>", $this->description);
return Str::replaceArray('\n', ['</br>'], $this->description);
}
}

119
app/Models/CategoryOld.php Normal file
View File

@@ -0,0 +1,119 @@
<?php
namespace App\Models;
use App\Models\Traits\HasCovers;
use Encore\Admin\Traits\AdminBuilder;
use Encore\Admin\Traits\ModelTree;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Relations\HasOne;
use Illuminate\Support\Str;
class CategoryOld extends Model
{
use AdminBuilder, ModelTree, HasCovers;
public const TYPE_SHOW = 'show';
public const TYPE_ARTICLE = 'article';
public const TYPE_ADVERT = 'advert';
public const TYPE_VIDEO = 'video';
public const TYPES = [
self::TYPE_ARTICLE => '文章列表',
self::TYPE_SHOW => '文章详情',
self::TYPE_ADVERT => '图片列表',
self::TYPE_VIDEO => '视频列表',
];
public $cover_field = 'cover';
public function getLogoUrlAttribute(): string
{
return $this->parseImageUrl($this->logo);
}
public function getLinkAttribute(): string
{
return route('category.show', $this);
}
/**
* 关联的数据
* @return \Illuminate\Database\Eloquent\Relations\BelongsToMany|\Illuminate\Database\Eloquent\Relations\HasMany|\Illuminate\Database\Eloquent\Relations\HasOne|null [type] [description]
*/
public function relations()
{
switch ($this->type) {
case self::TYPE_SHOW:
return $this->hasOne(Article::class)->where('id', $this->article_id);
break;
case self::TYPE_ARTICLE:
return $this->belongsToMany(Article::class);
break;
case self::TYPE_ADVERT:
return $this->hasMany(Advert::class);
break;
case self::TYPE_VIDEO:
return $this->hasMany(Video::class);
break;
default:
return null;
}
}
public function childrens(): HasMany
{
return $this->hasMany(self::class, 'parent_id');
}
public function parent(): HasOne
{
return $this->hasOne(self::class, 'id', 'parent_id');
}
public function article(): BelongsTo
{
return $this->belongsTo(Article::class);
}
/**
* Notes: 获取当前分类及子分类ID
* @Author: <C.Jason>
* @Date : 2020/4/6 3:12 下午
* @return array
*/
public function getAllChildrenId(): array
{
$ids = array_keys($this->buildSelectOptions([], $this->id));
if ($ids) {
array_unshift($ids, $this->id);
return $ids;
}
return [];
}
// public function articles(): BelongsToMany
// {
// return $this->belongsToMany(Article::class);
// }
public function articles(): HasMany
{
return $this->hasMany(Article::class);
}
/**
* Notes: 格式化description
* @Author: 玄尘
* @Date : 2021/10/8 15:24
*/
public function getDescriptionHtmlAttribute(): string
{
return str_replace("\n", "</br>", $this->description);
}
}