diff --git a/app/admin/controller/v1/Article.php b/app/admin/controller/v1/Article.php index 536efb74..dd5c99b3 100644 --- a/app/admin/controller/v1/Article.php +++ b/app/admin/controller/v1/Article.php @@ -33,6 +33,7 @@ class Article 'seo_desc' ]) ->with('category') + ->language(request()->lang_id) ->where(function($query) use($param) { if (isset($param['category_id'])) { $query->where('category_id', '=', $param['category_id']); diff --git a/app/admin/controller/v1/ArticleCategory.php b/app/admin/controller/v1/ArticleCategory.php index 7195ea9b..1cce9809 100644 --- a/app/admin/controller/v1/ArticleCategory.php +++ b/app/admin/controller/v1/ArticleCategory.php @@ -9,6 +9,21 @@ use app\admin\validate\v1\ArticleCategoryValidate; class ArticleCategory { // 分类列表 + public function list() + { + $param = request()->param(['name' => '']); + $categorys = ArticleCategoryModel::field([ + 'id', + 'name' + ]) + ->language(request()->lang_id) + ->withSearch(['name'], ['name' => $param['name']]) + ->order('sort', 'asc') + ->select(); + return success('获取成功', $categorys); + } + + // 分类分页列表 public function index() { $param = request()->param([ @@ -24,6 +39,7 @@ class ArticleCategory 'seo_keywords', 'seo_desc', ]) + ->language(request()->lang_id) ->where(function($query) use($param) { if (isset($param['name'])) { $query->withSearch(['name'], ['name' => $param['name']]); diff --git a/app/admin/model/v1/ArticleCategoryModel.php b/app/admin/model/v1/ArticleCategoryModel.php index 8b99bff0..9d08f889 100644 --- a/app/admin/model/v1/ArticleCategoryModel.php +++ b/app/admin/model/v1/ArticleCategoryModel.php @@ -16,6 +16,12 @@ class ArticleCategoryModel extends ArticleCategoryBaseModel // 软删除标记数据字段 protected $deleteTime = 'deleted_at'; + // 根据语言查询 + public function scopeLanguage($query, $lang_id) + { + $query->where('language_id', '=', $lang_id); + } + // 搜索分类名 public function searchNameAttr($query, $value, $data) { diff --git a/app/admin/model/v1/ArticleModel.php b/app/admin/model/v1/ArticleModel.php index c4848c59..0c18dbe2 100644 --- a/app/admin/model/v1/ArticleModel.php +++ b/app/admin/model/v1/ArticleModel.php @@ -46,6 +46,12 @@ class ArticleModel extends ArticleBaseModel $query->where('id', '=', $value); } + // 语言查询 + public function scopeLanguage($query, $value) + { + $query->where('language_id', '=', $value); + } + // 分类查询 public function scopeCategory($query, $value) { diff --git a/app/admin/route/v1.php b/app/admin/route/v1.php index 1d7dae15..058a08d3 100644 --- a/app/admin/route/v1.php +++ b/app/admin/route/v1.php @@ -50,6 +50,9 @@ Route::group('v1', function () { Route::delete('delete/:id', 'Article/delete'); // 文章分类 + Route::get('categorys', 'ArticleCategory/list'); + + // 文章分类管理 Route::group('category', function () { // 分类列表 Route::get('index', 'ArticleCategory/index');