更新前端首页显示文章

app/index/controller/Index.php

@@ -11,76 +11,102 @@ use think\facade\Config;
 
 class Index extends Base
 {
-    // 首页 
+    /**
+     * 首页
+     */
     public function index()
     {
-        // 获取文章列表
-        $articles = Db::table('yz_article')
-            ->where('delete_time', null)
-            ->where('status', '<>', 3)
-            ->order('id DESC')
-            ->select()
-            ->toArray();
-
-        $articleList = [];
-        foreach ($articles as $article) {
-            $cate = $article['cate'];
-            // 获取分类信息
-            $cateInfo = Db::table('yz_article_category')
-                ->where('id', $cate)
-                ->where('delete_time', null)
-                ->where('status', 1)
-                ->field('name, image')
-                ->find();
-
-            if ($cateInfo) {  // 只添加有效的分类
-                // 如果文章没有图片，使用分类的图片
-                if (empty($article['image']) && !empty($cateInfo['image'])) {
-                    $article['image'] = $cateInfo['image'];
-                }
-
-                // 转换发布日期格式为Y-m-d
-                $article['publishdate'] = date('Y-m-d', $article['publishdate']);
-
-                if (!isset($articleList[$cateInfo['name']])) {
-                    $articleList[$cateInfo['name']] = [];
-                }
-                $articleList[$cateInfo['name']][] = $article;
-            }
-        }
-
-        // 调试信息
-        trace('Articles: ' . json_encode($articles, JSON_UNESCAPED_UNICODE));
-        trace('ArticleList: ' . json_encode($articleList, JSON_UNESCAPED_UNICODE));
-
-        // 将变量传递给视图
-        View::assign([
-            'articleList' => $articleList,
-        ]);
-        return view('index');
-    }
-
-    // 文章列表
-    public function articlelist()
-    {
-        $articles = Db::table('yz_article')
-            ->where('delete_time', null)
-            ->where('status', 1)
-            ->order('id DESC')
-            ->select()
-            ->toArray();
-
-        $articleList = [];
-        foreach ($articles as $article) {
-            $cate = $article['cate'];
-            $cateName = Db::table('yz_article_category')->where('id', $cate)->value('name');
-            if (!isset($articleList[$cateName])) {
-                $articleList[$cateName] = [];
-            }
-            $articleList[$cateName][] = $article;
-        }
-
-        View::assign('articleList', $articleList);
         return View::fetch();
     }
+
+    /**
+     * 获取站点资讯列表
+     */
+    public function siteNewslist()
+    {
+        // 获取站点资讯分类（顶级分类id为1的子分类）
+        $categories = Db::name('yz_article_category')
+            ->where('cid', 1)
+            ->where('delete_time', null)
+            ->select()
+            ->toArray();
+        
+        $articles = [];
+        $categoryData = [];
+        
+        // 提取分类名称和ID用于前端tab显示
+        foreach ($categories as $category) {
+            $categoryData[] = [
+                'id' => $category['id'],
+                'name' => $category['name']
+            ];
+            
+            // 获取该分类下的文章
+            $articles = Db::name('yz_article')
+                ->where('cate', $category['id'])
+                ->where('delete_time', null)
+                ->where('status', 2)
+                ->order('id', 'desc')
+                ->field('id, cate, title, image, author, publishdate, views')
+                ->select()
+                ->toArray();
+            
+        }
+        
+        return json([
+            'code' => 1, 
+            'msg' => '获取成功', 
+            'articles' => $articles,
+            'categories' => $categoryData
+        ]);
+    }
+
+    /**
+     * 获取技术文章列表
+     */
+    public function technicalArticleslist()
+    {
+        // 获取技术文章分类（顶级分类id为3的子分类）
+        $categories = Db::name('yz_article_category')
+            ->where('cid', 3)
+            ->where('delete_time', null)
+            ->select()
+            ->toArray();
+
+        // 组装分类数据，方便后续查找
+        $categoryData = [];
+        $categoryImageMap = [];
+        foreach ($categories as $category) {
+            $categoryData[] = [
+                'id' => $category['id'],
+                'name' => $category['name']
+            ];
+            $categoryImageMap[$category['id']] = $category['image'] ?? '';
+        }
+
+        // 获取所有技术分类下的文章
+        $technicalarticles = Db::name('yz_article')
+            ->whereIn('cate', array_column($categories, 'id'))
+            ->where('delete_time', null)
+            ->where('status', 2)
+            ->order('id', 'desc')
+            ->field('id, cate, title, image, author, publishdate, views')
+            ->select()
+            ->toArray();
+
+        // 替换image为空的文章
+        foreach ($technicalarticles as &$article) {
+            if (empty($article['image']) && !empty($categoryImageMap[$article['cate']])) {
+                $article['image'] = $categoryImageMap[$article['cate']];
+            }
+        }
+        unset($article);
+
+        return json([
+            'code' => 1,
+            'msg' => '获取成功',
+            'articles' => $technicalarticles,
+            'categories' => $categoryData
+        ]);
+    }
 }