diff --git a/app/Admin/Controllers/Article/IndexController.php b/app/Admin/Controllers/Article/IndexController.php index 3bf2a86..05b797a 100644 --- a/app/Admin/Controllers/Article/IndexController.php +++ b/app/Admin/Controllers/Article/IndexController.php @@ -55,14 +55,19 @@ class IndexController extends AdminController $form->belongsToMany('categories', CategorySelectAble::class, __('关联分类')); $form->textarea('description', '内容简介'); - $form->list('subjoin', '附加') - ->help('只有领导班子需要添加'); +// $form->list('subjoin', '附加') +// ->help('只有领导班子需要添加'); $form->image('cover', '封面') ->move('images/'.date('Y/m/d')) ->removable() ->uniqueName(); + $form->image('label', '图标') + ->move('images/'.date('Y/m/d')) + ->removable() + ->uniqueName(); + $form->multipleImage('pictures', '多图') ->move('images/'.date('Y/m/d')) ->removable() diff --git a/app/Http/Controllers/CategoryController.php b/app/Http/Controllers/CategoryController.php index 56c3dee..ae4e08e 100644 --- a/app/Http/Controllers/CategoryController.php +++ b/app/Http/Controllers/CategoryController.php @@ -34,7 +34,7 @@ class CategoryController extends Controller $parent = $category->parent; } - $articles = Article::ByCategory($category->getAllChildrenId()) + $articles = Article::shown()->ByCategory($category->getAllChildrenId()) ->where('status', 1) ->Bysort() ->paginate(); @@ -47,7 +47,7 @@ class CategoryController extends Controller ]; if ($category->id == 2) { - $article = Article::query()->ByCategory(2)->Bysort()->first(); + $article = Article::shown()->ByCategory(2)->Bysort()->first(); $data = array_merge($data, [ 'article' => $article, ]); @@ -57,9 +57,9 @@ class CategoryController extends Controller $cgCate = Category::find(24); $hjCate = Category::find(20); $zlCate = Category::find(21); - $cgArticles = Article::query()->ByCategory($cgCate->id)->Bysort()->take(3)->get(); - $hjArticles = Article::query()->ByCategory($hjCate->id)->Bysort()->take(3)->get(); - $zlArticles = Article::query()->ByCategory($zlCate->id)->Bysort()->take(6)->get(); + $cgArticles = Article::shown()->ByCategory($cgCate->id)->Bysort()->take(3)->get(); + $hjArticles = Article::shown()->ByCategory($hjCate->id)->Bysort()->take(3)->get(); + $zlArticles = Article::shown()->ByCategory($zlCate->id)->Bysort()->take(6)->get(); $data = array_merge($data, [ 'cgCate' => $cgCate, @@ -72,7 +72,7 @@ class CategoryController extends Controller } if ($category->id == 3) { - $articles = Article::ByCategory($category->getAllChildrenId()) + $articles = Article::shown()->ByCategory($category->getAllChildrenId()) ->where('status', 1) ->Bysort() ->get(); @@ -87,9 +87,9 @@ class CategoryController extends Controller $nyydtCate = Category::find(7); $mtbdCate = Category::find(31); - $tzArticles = Article::query()->ByCategory($tzCate->id)->Bysort()->take(4)->get(); - $nyydtArticles = Article::query()->ByCategory($nyydtCate->id)->Bysort()->take(3)->get(); - $mtbdArticles = Article::query()->ByCategory($mtbdCate->id)->Bysort()->take(3)->get(); + $tzArticles = Article::shown()->ByCategory($tzCate->id)->Bysort()->take(4)->get(); + $nyydtArticles = Article::shown()->ByCategory($nyydtCate->id)->Bysort()->take(3)->get(); + $mtbdArticles = Article::shown()->ByCategory($mtbdCate->id)->Bysort()->take(3)->get(); $data = array_merge($data, [ 'tzCate' => $tzCate, 'nyydtCate' => $nyydtCate, @@ -105,8 +105,8 @@ class CategoryController extends Controller $zdCate = Category::find(16); $ljCate = Category::find(29); - $yjArticles = Article::query()->ByCategory($yjCate->id)->Bysort()->take(3)->get(); - $ljLeaders = Leader::query()->where('category_id', $ljCate->id)->Bysort()->take(3)->get(); + $yjArticles = Article::shown()->ByCategory($yjCate->id)->Bysort()->take(3)->get(); + $ljLeaders = Leader::shown()->where('category_id', $ljCate->id)->Bysort()->take(3)->get(); $data = array_merge($data, [ 'yjCate' => $yjCate, 'zdCate' => $zdCate, @@ -118,9 +118,14 @@ class CategoryController extends Controller if ($category->id == 32) { - $nghjxhArticle = Article::query()->ByCategory($category->id)->Bysort()->first(); - $data = array_merge($data, [ + $nghjxhArticle = Article::shown()->ByCategory($category->id)->Bysort()->first(); + $xhdtCate = Category::find(33); + $xhdtArticles = Article::shown()->ByCategory($xhdtCate->id)->Bysort()->get(); + + $data = array_merge($data, [ 'nghjxhArticle' => $nghjxhArticle, + 'xhdtCate' => $xhdtCate, + 'xhdtArticles' => $xhdtArticles, ]); } diff --git a/app/Http/Controllers/StaffController.php b/app/Http/Controllers/StaffController.php index a40e5ae..6b8cc8d 100644 --- a/app/Http/Controllers/StaffController.php +++ b/app/Http/Controllers/StaffController.php @@ -22,7 +22,7 @@ class StaffController extends Controller $parent = $category->parent; } - $staffs = Staff::query()->latest('order')->get(); + $staffs = Staff::shown()->latest('order')->get(); $data = [ 'staffs' => $staffs, diff --git a/app/Models/Article.php b/app/Models/Article.php index d7dd432..e257aea 100644 --- a/app/Models/Article.php +++ b/app/Models/Article.php @@ -4,12 +4,13 @@ namespace App\Models; use App\Models\Traits\HasCovers; use App\Models\Traits\HasSort; +use App\Models\Traits\ScopeStatus; use Illuminate\Database\Eloquent\Relations\BelongsToMany; class Article extends Model { - use HasCovers,HasSort; + use HasCovers, HasSort, ScopeStatus; /** * 应进行类型转换的属性 @@ -59,16 +60,40 @@ class Article extends Model }); } - - + /** + * Notes: 获取时间 天 + * + * @Author: 玄尘 + * @Date: 2022/6/30 10:33 + * @return mixed + */ public function getDateD() { return $this->created_at->format('d'); } + /** + * Notes: 获取时间 年月 + * + * @Author: 玄尘 + * @Date: 2022/6/30 10:33 + * @return mixed + */ public function getDateYM() { return $this->created_at->format('Y-m'); } + /** + * Notes : 解析单图地址 + * + * @Date : 2021/3/16 4:54 下午 + * @Author : + * @return string + */ + public function getLabelUrlAttribute(): string + { + return $this->parseImageUrl($this->label); + } + } diff --git a/app/Models/Leader.php b/app/Models/Leader.php index 8823e12..ed7d35a 100644 --- a/app/Models/Leader.php +++ b/app/Models/Leader.php @@ -5,12 +5,14 @@ namespace App\Models; use App\Models\Traits\BelongsToCategory; use App\Models\Traits\HasCovers; use App\Models\Traits\HasSort; +use App\Models\Traits\ScopeStatus; use Illuminate\Database\Eloquent\Model; class Leader extends Model { use BelongsToCategory, HasCovers, + ScopeStatus, HasSort; const STATUS_FALSE = 0; diff --git a/app/Models/Staff.php b/app/Models/Staff.php index 8f0b7a4..8a21360 100644 --- a/app/Models/Staff.php +++ b/app/Models/Staff.php @@ -4,10 +4,11 @@ namespace App\Models; use App\Models\Traits\BelongsToCategory; use App\Models\Traits\HasCovers; +use App\Models\Traits\ScopeStatus; class Staff extends Model { - use BelongsToCategory, HasCovers; + use BelongsToCategory, HasCovers,ScopeStatus; const STATUS_FALSE = 0; diff --git a/app/Models/Traits/ScopeStatus.php b/app/Models/Traits/ScopeStatus.php new file mode 100644 index 0000000..f526a8f --- /dev/null +++ b/app/Models/Traits/ScopeStatus.php @@ -0,0 +1,26 @@ +where('status',1); + } + +} diff --git a/resources/views/category/nyhjxh.blade.php b/resources/views/category/nyhjxh.blade.php index 198ff1f..464f013 100644 --- a/resources/views/category/nyhjxh.blade.php +++ b/resources/views/category/nyhjxh.blade.php @@ -35,62 +35,38 @@
-
-
活动新闻列表
-
Event news
- +
+
{{ $xhdtCate->title }}
+
{{ $xhdtCate->description }}
+ +
查看更多 >>
- + @if ($xhdtArticles->isNotEmpty()) + + @endif