From 76a652661c1d206a6aa3aad3cec3a373559d6b2b Mon Sep 17 00:00:00 2001
From: jsasg <735273025@qq.com>
Date: Tue, 10 Jun 2025 09:58:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20nas=E4=B8=BB=E9=A2=98=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=A1=B5=E6=8E=92=E5=BA=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index/controller/TopicNas.php | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/index/controller/TopicNas.php b/app/index/controller/TopicNas.php
index e5bccc4d..0ba369eb 100644
--- a/app/index/controller/TopicNas.php
+++ b/app/index/controller/TopicNas.php
@@ -111,7 +111,9 @@ class TopicNas extends Common
         $trial_instructions = [];
         // 获取banner数据
         $banners = SysBannerModel::with(['items' => function($query) {
-                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at'])->enabled(true);
+                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at'])
+                    ->order(['sort' => 'asc', 'id' => 'desc'])
+                    ->enabled(true);
             }])
             ->atPlatform(request()->from)
             ->uniqueLabel([
@@ -150,7 +152,9 @@ class TopicNas extends Common
         $cooperation_cotacts    = [];
         // 获取banner数据
         $banners = SysBannerModel::with(['items' => function($query) {
-                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at'])->enabled(true);
+                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at'])
+                    ->order(['sort' => 'asc', 'id' => 'desc'])
+                    ->enabled(true);
             }])
             ->atPlatform(request()->from)
             ->uniqueLabel([
@@ -189,7 +193,9 @@ class TopicNas extends Common
         // 获取文章分类及文章数据
         $parent = ArticleCategoryModel::uniqueLabel('CATEGORY_681182e0a4529')->language($this->lang_id)->value('id');
         $article_categorys = ArticleCategoryModel::with(['article' => function($query) {
-                $query->field(['id', 'title', 'category_id'])->limit(3);
+                $query->field(['id', 'title', 'category_id'])
+                    ->order(['sort' => 'asc', 'id' => 'desc'])
+                    ->limit(3);
             }])
             ->field([
                 'id',
@@ -205,7 +211,9 @@ class TopicNas extends Common
         $contacts = [];
         // 获取banner数据
         $banners = SysBannerModel::with(['items' => function ($query) {
-                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at'])->enabled(true);
+                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at'])
+                    ->order(['sort' => 'asc', 'id' => 'desc'])
+                    ->enabled(true);
             }])
             ->atPlatform(request()->from)
             ->uniqueLabel(['BANNER_6819754be2dc6'])
@@ -238,7 +246,7 @@ class TopicNas extends Common
         // 获取文章分类及文章数据
         $parent = ArticleCategoryModel::uniqueLabel('CATEGORY_681182e0a4529')->language($this->lang_id)->value('id');
         $article_categorys = ArticleCategoryModel::with(['article' => function ($query) {
-                $query->field(['id', 'title', 'category_id']);
+                $query->field(['id', 'title', 'category_id'])->order(['sort' => 'asc', 'id' => 'desc']);
             }])
             ->field([
                 'id',
@@ -282,7 +290,9 @@ class TopicNas extends Common
         $data = [];
         // 获取banner数据
         $banners = SysBannerModel::with(['items' => function($query) {
-                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at'])->enabled(true);
+                $query->withoutField(['sort', 'created_at', 'updated_at', 'deleted_at'])
+                    ->order(['sort' => 'asc', 'id' => 'desc'])
+                    ->enabled(true);
             }])
             ->atPlatform(request()->from)
             ->uniqueLabel([