Merge branch 'master' of http://git.yuzhankeji.cn/xuanchen/new_nyfh

2021-11-22 10:14:23 +08:00
parent 2115c0f0fe 9936525df3
commit 4f627dfbf8
1 changed files with 6 additions and 2 deletions
--- a/app/Http/Controllers/CategoryController.php
+++ b/app/Http/Controllers/CategoryController.php
@@ -18,7 +18,11 @@ class CategoryController extends Controller
        if ($category->type == Category::TYPE_SHOW && $category->article_id) {
            return redirect("articles/" . $category->article_id);
        } else {
-            $articles = $category->relations(Category::TYPE_ARTICLE)->where('status', 1)->latest()->paginate();
+            $articles = $category->relations(Category::TYPE_ARTICLE)
+                                 ->where('status', 1)
+                                 ->latest('sort')
+                                 ->latest()
+                                 ->paginate();
            $parent   = $category;

            if ($category->childrens->isEmpty() && $category->parent) {