📦 按要求修改

CommonQuery.php

@@ -38,6 +38,7 @@ function loadListByChannelNameAndPage($maxCount, $name, $page, $searchKeyword =
             ->where('name', $name)
             ->where('status', 'normal')
             ->first(['id']);
+
         
         // 如果没有找到对应的频道，返回包含空列表和0总页数的数组
         if (!$channel) {

css/style.css

@@ -298,13 +298,15 @@ nav.main-nav a:hover, nav.main-nav a:active {
 .notice-item:last-child {
   border-bottom: none;
 }
-.notice-item:hover .notice-title {
-  font-size: 20px;
-  opacity: 1;
-}
-.notice-item:hover p {
-  opacity: 1;
-  height: 85px;
+.notice-item:hover {
+  /* .notice-title {
+    font-size: 20px;
+    opacity: 1;
+  } */
+  /* p {
+    opacity: 1;
+    height: 85px;
+  } */
 }
 
 .notice-title {
@@ -658,11 +660,6 @@ footer {
   margin: 30px 0;
 }
 
-.swiper-slide img {
-  object-fit: cover;
-  object-position: center;
-}
-
 @media (max-width: 992px) {
   .featured-image {
     width: 100%;
@@ -684,6 +681,10 @@ footer {
     padding: 10px 5px;
   }
 }
+.swiper-slide img {
+  object-fit: cover;
+}
+
 @media (max-width: 768px) {
   header .inner {
     padding: 0 30px;
@@ -729,7 +730,6 @@ footer {
   }
 }
 @media (max-width: 576px) {
-  
   .featured-grid {
     grid-template-columns: 1fr;
   }

css/style.scss

@@ -325,14 +325,14 @@ nav.main-nav {
     border-bottom: none;
   }
   &:hover {
-    .notice-title {
+    /* .notice-title {
       font-size: 20px;
       opacity: 1;
-    }
-    p {
+    } */
+    /* p {
       opacity: 1;
       height: 85px;
-    }
+    } */
   }
 }
 .notice-title {

danWeiGaiKuang.php

@@ -2,48 +2,46 @@
 // 引入公共查询类
 require_once 'CommonQuery.php';
 
-// 频道名称
-$channelName = '单位概况';
+// 主频道名称
+$mainChannelName = '单位概况';
 
-// 获取URL参数中的文章ID
-$articleId = isset($_GET['id']) ? $_GET['id'] : '';
+// 使用loadChildChannelByChannelName函数获取子分类
+$sideMenu = loadChildChannelByChannelName($mainChannelName);
 
-// 使用loadListByChannelName函数获取文章列表（最多10篇）
-$articlesList = loadListByChannelName(10, $channelName);
+// 获取URL参数
+$selectedChannel = isset($_GET['channel']) ? $_GET['channel'] : '';
+$currentPage = isset($_GET['page']) ? intval($_GET['page']) : 1;
 
-// 默认显示第一篇文章或指定ID的文章
-$currentArticle = null;
-
-if (!empty($articleId)) {
-    // 如果有指定ID，则获取该文章内容
-    $currentArticle = getContentById($articleId);
-} elseif (!empty($articlesList)) {
-    // 如果没有指定ID但有文章列表，则显示第一篇文章
-    $firstArticle = $articlesList[0];
-    $currentArticle = getContentById($firstArticle['id']);
+// 验证当前页码
+if ($currentPage < 1) {
+    $currentPage = 1;
 }
 
-// 如果没有获取到文章，使用默认数据
-if (!$currentArticle) {
-    $currentArticle = [
-        "title" => "暂无内容",
-        "content" => "抱歉，当前没有相关内容。",
-        "date" => date('Y-m-d'),
-        "views" => 0
-    ];
-} else {
-    // 确保必要字段存在
-    $currentArticle['title'] = isset($currentArticle['title']) ? $currentArticle['title'] : (isset($currentArticle['subject']) ? $currentArticle['subject'] : '无标题');
-    $currentArticle['content'] = isset($currentArticle['content']) ? $currentArticle['content'] : '无内容';
-    $currentArticle['date'] = isset($currentArticle['date']) ? $currentArticle['date'] : (isset($currentArticle['createtime']) ? date('Y-m-d', intval($currentArticle['createtime'])) : date('Y-m-d'));
-    $currentArticle['views'] = isset($currentArticle['views']) ? $currentArticle['views'] : 0;
+// 每页显示的文章数量
+$pageSize = 12;
+
+// 确定要查询的频道名称
+$queryChannel = !empty($selectedChannel) ? $selectedChannel : $mainChannelName;
+
+// 使用loadListByChannelNameAndPage函数获取文章列表
+$results = loadListByChannelNameAndPage($pageSize, $queryChannel, $currentPage);
+$workUpdates = $results['list'];
+$totalPages = $results['totalPages'];
+
+// 如果没有结果但选择了子分类，尝试查询主频道
+if (empty($workUpdates) && !empty($selectedChannel)) {
+    $results = loadListByChannelNameAndPage($pageSize, $mainChannelName, 1);
+    $workUpdates = $results['list'];
+    $totalPages = $results['totalPages'];
+    $currentPage = 1;
+    $queryChannel = $mainChannelName;
 }
 
 // 轮播图数据
 $carouselItems = [
   [
-    "image" => "/uploads/20251013/6af88ead615998ad6c789327b26f7bbe.jpg",
-    "alt" => $channelName
+    "image" => "/images/test-header-4.png",
+    "alt" => $mainChannelName
   ]
 ];
 ?>
@@ -53,7 +51,7 @@ $carouselItems = [
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>厦门市文化遗产保护中心 - <?php echo $currentArticle['title']; ?></title>
+  <title>厦门市文化遗产保护中心 - <?php echo $queryChannel; ?></title>
   <link rel="stylesheet" href="/css/fonts.css">
   <link rel="stylesheet" href="/css/fontawesome.min.css">
   <link rel="stylesheet" href="/css/bootstrap.min.css">
@@ -89,48 +87,69 @@ $carouselItems = [
         <div class="col-12 col-sm-12 col-md-4 col-lg-3">
           <div class="sidebar">
             <div class="title">
-              <h2><?php echo $channelName; ?></h2>
+                <h2><?php echo $mainChannelName; ?></h2>
+              </div>
+              <ul class="sidebar-menu">
+                <?php if (!empty($sideMenu)): ?>
+                  <?php foreach ($sideMenu as $item): ?>
+                    <li><a href="?channel=<?php echo urlencode($item['name']); ?>&page=1" class="<?php echo $selectedChannel == $item['name'] ? 'active' : ''; ?>"><?php echo $item['name']; ?><i class="fa fa-arrow-right"></i></a></li>
+                  <?php endforeach; ?>
+                <?php else: ?>
+                  <li class="no-content">暂无相关子分类</li>
+                <?php endif; ?>
+              </ul>
             </div>
-            <ul class="sidebar-menu">
-              <?php if (!empty($articlesList)): ?>
-                <?php foreach ($articlesList as $article): ?>
-                  <?php 
-                    $articleTitle = isset($article['title']) ? $article['title'] : (isset($article['subject']) ? $article['subject'] : '无标题');
-                    $isActive = (isset($article['id']) && isset($currentArticle['id']) && $article['id'] == $currentArticle['id']);
-                  ?>
-                  <li>
-                    <a href="danWeiGaiKuang.php?id=<?php echo $article['id']; ?>" 
-                       <?php echo $isActive ? 'class="active"' : ''; ?>>
-                      <?php echo $articleTitle; ?><i class="fa fa-arrow-right"></i>
-                    </a>
-                  </li>
-                <?php endforeach; ?>
-              <?php else: ?>
-                <li><a href="#">暂无相关内容<i class="fa fa-arrow-right"></i></a></li>
-              <?php endif; ?>
-            </ul>
           </div>
-        </div>
         
         <!-- 右侧内容 -->
         <div class="col-12 col-sm-12 col-md-8 col-lg-9">
           <div class="content">
             <div class="section-title">
-              <h2 class="icon"><?php echo $currentArticle['title']; ?></h2>
+              <h2 class="icon"><?php echo $queryChannel; ?></h2>
               
               <nav aria-label="breadcrumb">
                 <ol class="breadcrumb">
                   <li class="breadcrumb-item"><a href="/">首页</a></li>
-                  <li class="breadcrumb-item active" aria-current="page"><?php echo $channelName; ?></li>
+                  <li class="breadcrumb-item"><a href="./">工作动态</a></li>
+                  <?php if ($selectedChannel): ?>
+                    <li class="breadcrumb-item active" aria-current="page"><?php echo $selectedChannel; ?></li>
+                  <?php else: ?>
+                    <li class="breadcrumb-item active" aria-current="page">工作动态</li>
+                  <?php endif; ?>
                 </ol>
               </nav>
             </div>
             
-            <div class="news-detail">
-              <?php echo $currentArticle['content']; ?>
+            <!-- 文章列表 -->
+            <div class="news-list">
+              <?php if (!empty($workUpdates)): ?>
+                <?php foreach ($workUpdates as $item): ?>
+                  <?php
+                  // 确保所有必要字段存在
+                  $title = isset($item['title']) ? $item['title'] : '暂无标题';
+                  $articleId = isset($item['id']) ? $item['id'] : '';
+                  $date = isset($item['createtime']) ? date('Y-m-d', strtotime($item['createtime'])) : '未知日期';
+                  ?>
+                  <div class="news-item">
+                    <a href="/xinWenXiangQing/?id=<?php echo $articleId; ?>&channel=<?php echo urlencode($queryChannel); ?>" class="title"><?php echo $title; ?></a>
+                    <span class="date"><?php echo $date; ?></span>
+                  </div>
+                <?php endforeach; ?>
+              <?php else: ?>
+                <div class="no-news">暂无相关文章</div>
+              <?php endif; ?>
             </div>
-
-
+                    
+                    <!-- 分页 -->
+            <nav aria-label="List Page navigation">
+              <ul class="pagination mt-4">
+                <li class="prev"><a href="?channel=<?php echo urlencode($selectedChannel); ?>&page=<?php echo $currentPage > 1 ? $currentPage - 1 : 1; ?>">&lt;</a></li>
+                <?php for ($i = 1; $i <= $totalPages; $i++): ?>
+                  <li class="<?php echo $i == $currentPage ? 'active' : ''; ?>"><a href="?channel=<?php echo urlencode($selectedChannel); ?>&page=<?php echo $i; ?>"><?php echo $i; ?></a></li>
+                <?php endfor; ?>
+                <li class="next"><a href="?channel=<?php echo urlencode($selectedChannel); ?>&page=<?php echo $currentPage < $totalPages ? $currentPage + 1 : $totalPages; ?>">&gt;</a></li>
+              </ul>
+            </nav>
           </div>
         </div>
       </div>
@@ -138,7 +157,7 @@ $carouselItems = [
   </div>
 
   <?php include __DIR__ . '/components/footer.php'; ?>
-  
+
   <script>
     $(document).ready(function() {
       // 初始化 Swiper
@@ -159,6 +178,7 @@ $carouselItems = [
           disableOnInteraction: false,
         },
       });
+      
     });
   </script>
 </body>

danWeiGaiKuang1.php

@@ -0,0 +1,166 @@
+<?php
+// 引入公共查询类
+require_once 'CommonQuery.php';
+
+// 频道名称
+$channelName = '单位概况';
+
+// 获取URL参数中的文章ID
+$articleId = isset($_GET['id']) ? $_GET['id'] : '';
+
+// 使用loadListByChannelName函数获取文章列表（最多10篇）
+$articlesList = loadListByChannelName(10, $channelName);
+
+// 默认显示第一篇文章或指定ID的文章
+$currentArticle = null;
+
+if (!empty($articleId)) {
+    // 如果有指定ID，则获取该文章内容
+    $currentArticle = getContentById($articleId);
+} elseif (!empty($articlesList)) {
+    // 如果没有指定ID但有文章列表，则显示第一篇文章
+    $firstArticle = $articlesList[0];
+    $currentArticle = getContentById($firstArticle['id']);
+}
+
+// 如果没有获取到文章，使用默认数据
+if (!$currentArticle) {
+    $currentArticle = [
+        "title" => "暂无内容",
+        "content" => "抱歉，当前没有相关内容。",
+        "date" => date('Y-m-d'),
+        "views" => 0
+    ];
+} else {
+    // 确保必要字段存在
+    $currentArticle['title'] = isset($currentArticle['title']) ? $currentArticle['title'] : (isset($currentArticle['subject']) ? $currentArticle['subject'] : '无标题');
+    $currentArticle['content'] = isset($currentArticle['content']) ? $currentArticle['content'] : '无内容';
+    $currentArticle['date'] = isset($currentArticle['date']) ? $currentArticle['date'] : (isset($currentArticle['createtime']) ? date('Y-m-d', intval($currentArticle['createtime'])) : date('Y-m-d'));
+    $currentArticle['views'] = isset($currentArticle['views']) ? $currentArticle['views'] : 0;
+}
+
+// 轮播图数据
+$carouselItems = [
+  [
+    "image" => "/uploads/20251013/6af88ead615998ad6c789327b26f7bbe.jpg",
+    "alt" => $channelName
+  ]
+];
+?>
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>厦门市文化遗产保护中心 - <?php echo $currentArticle['title']; ?></title>
+  <link rel="stylesheet" href="/css/fonts.css">
+  <link rel="stylesheet" href="/css/fontawesome.min.css">
+  <link rel="stylesheet" href="/css/bootstrap.min.css">
+  <link rel="stylesheet" href="/css/swiper-bundle.min.css">
+  <link rel="stylesheet" href="/css/style.css">
+  <script src="/js/jquery-3.7.1.js"></script>
+  <script src="/js/bootstrap.bundle.js"></script>
+  <script src="/js/swiper-bundle.min.js"></script>
+</head>
+
+<body>
+  <?php include __DIR__ . '/components/navbar.php'; ?>
+
+  <!-- 轮播图 -->
+  <div class="swiper mySwiper" style="width: 100%; height: 400px;">
+    <div class="swiper-wrapper">
+      <?php foreach ($carouselItems as $item): ?>
+        <div class="swiper-slide">
+          <img src="<?php echo $item['image']; ?>" alt="<?php echo $item['alt']; ?>" style="width: 100%; height: 100%; object-fit: cover;">
+        </div>
+      <?php endforeach; ?>
+    </div>
+    <div class="swiper-pagination"></div>
+    <div class="swiper-button-prev"></div>
+    <div class="swiper-button-next"></div>
+  </div>
+
+  <!-- 主要内容 -->
+  <div class="main-content">
+    <div class="container">
+      <div class="row">
+        <!-- 左侧导航 -->
+        <div class="col-12 col-sm-12 col-md-4 col-lg-3">
+          <div class="sidebar">
+            <div class="title">
+              <h2><?php echo $channelName; ?></h2>
+            </div>
+            <ul class="sidebar-menu">
+              <?php if (!empty($articlesList)): ?>
+                <?php foreach ($articlesList as $article): ?>
+                  <?php 
+                    $articleTitle = isset($article['title']) ? $article['title'] : (isset($article['subject']) ? $article['subject'] : '无标题');
+                    $isActive = (isset($article['id']) && isset($currentArticle['id']) && $article['id'] == $currentArticle['id']);
+                  ?>
+                  <li>
+                    <a href="danWeiGaiKuang.php?id=<?php echo $article['id']; ?>" 
+                       <?php echo $isActive ? 'class="active"' : ''; ?>>
+                      <?php echo $articleTitle; ?><i class="fa fa-arrow-right"></i>
+                    </a>
+                  </li>
+                <?php endforeach; ?>
+              <?php else: ?>
+                <li><a href="#">暂无相关内容<i class="fa fa-arrow-right"></i></a></li>
+              <?php endif; ?>
+            </ul>
+          </div>
+        </div>
+        
+        <!-- 右侧内容 -->
+        <div class="col-12 col-sm-12 col-md-8 col-lg-9">
+          <div class="content">
+            <div class="section-title">
+              <h2 class="icon"><?php echo $currentArticle['title']; ?></h2>
+              
+              <nav aria-label="breadcrumb">
+                <ol class="breadcrumb">
+                  <li class="breadcrumb-item"><a href="/">首页</a></li>
+                  <li class="breadcrumb-item active" aria-current="page"><?php echo $channelName; ?></li>
+                </ol>
+              </nav>
+            </div>
+            
+            <div class="news-detail">
+              <?php echo $currentArticle['content']; ?>
+            </div>
+
+
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <?php include __DIR__ . '/components/footer.php'; ?>
+  
+  <script>
+    $(document).ready(function() {
+      // 初始化 Swiper
+      const swiper = new Swiper(".mySwiper", {
+        slidesPerView: 1,
+        spaceBetween: 30,
+        loop: true,
+        pagination: {
+          el: ".swiper-pagination",
+          clickable: true,
+        },
+        navigation: {
+          nextEl: ".swiper-button-next",
+          prevEl: ".swiper-button-prev",
+        },
+        autoplay: {
+          delay: 5000,
+          disableOnInteraction: false,
+        },
+      });
+    });
+  </script>
+</body>
+
+</html>

dangnJianGongZuo.php

@@ -78,6 +78,7 @@ $carouselItems = [
               <h2><?php echo $channel; ?></h2>
             </div>
             <ul class="sidebar-menu">
+              <li><a href="https://www.12371.cn/special/xxzd/">学习专栏<i class="fa fa-arrow-right"></i></a></li>
               <li><a href="?channel=党建工作">党建工作<i class="fa fa-arrow-right"></i></a></li>
               <li><a href="?channel=党建要闻">党建要闻<i class="fa fa-arrow-right"></i></a></li>
             </ul>

index.php

@@ -82,7 +82,7 @@ $featured = loadListByChannelName(6, "热门新闻");
                 </div>
               <?php endforeach; ?>
             <?php else: ?>
-              <div class="no-news">暂无数据</div>
+              <div class="no-news">通知公告暂无数据</div>
             <?php endif; ?>
           </div>
           <div id="hot-news-list" style="display:none;" class="news-content">
@@ -94,7 +94,7 @@ $featured = loadListByChannelName(6, "热门新闻");
                 </div>
               <?php endforeach; ?>
             <?php else: ?>
-              <div class="no-news">暂无数据</div>
+              <div class="no-news">热点新闻暂无数据</div>
             <?php endif; ?>
           </div>
 
@@ -117,33 +117,37 @@ $featured = loadListByChannelName(6, "热门新闻");
                 <?php endforeach; ?>
               <?php else: ?>
                 <div class="swiper-slide featured-image">
-                  <div class="no-news">暂无数据</div>
+                  <div class="no-news">热门新闻暂无数据</div>
                 </div>
               <?php endif; ?>
             </div>
             <div class="swiper-pagination"></div>
           </div>
+          <a href="https://www.12371.cn/special/xxzd/">
+            <img src="images/xuexi.png" style="width: 100%; height:130px;object-fit:cover;" /> 
+          </a>
         </div>
       </div>
 
       <!-- 工作动态和党建工作 -->
       <div class="row mt-lg-3 mt-md-2 mt-sm-2">
+
         <div class="col col-sm-12 col-md-6 col-lg-6">
           <div class="main-box">
             <div class="section-title">
-              <h2><i class="fa fa-refresh"></i> 工作动态</h2>
-              <a href="./gongZuoDongTai.php" class="section-more">查看更多 <i class="fa fa-angle-right"></i></a>
+              <h2><i class="fa fa-flag"></i> 党建工作</h2>
+              <a href="./dangnJianGongZuo.php" class="section-more">查看更多 <i class="fa fa-angle-right"></i></a>
             </div>
             <div class="news-content">
-              <?php if (!empty($workUpcreatetimes)): ?>
-                <?php foreach ($workUpcreatetimes as $upcreatetime): ?>
+              <?php if (!empty($partyBuilding)): ?>
+                <?php foreach ($partyBuilding as $item): ?>
                   <div class="news-item">
-                    <a href="/xinWenXiangQing/?id=<?php echo $upcreatetime['id']; ?>" class="title"><?php echo $upcreatetime['title']; ?></a>
-                    <span class="createtime"><?php echo date('Y-m-d', intval($upcreatetime['createtime'])); ?></span>
+                    <a href="/xinWenXiangQing/?id=<?php echo $item['id']; ?>" class="title"><?php echo $item['title']; ?></a>
+                    <span class="createtime"><?php echo date('Y-m-d', intval($item['createtime'])); ?></span>
                   </div>
                 <?php endforeach; ?>
               <?php else: ?>
-                <div class="no-news">暂无数据</div>
+                <div class="no-news">党建工作暂无数据</div>
               <?php endif; ?>
             </div>
           </div>
@@ -152,23 +156,24 @@ $featured = loadListByChannelName(6, "热门新闻");
         <div class="col col-sm-12 col-md-6 col-lg-6">
           <div class="main-box">
             <div class="section-title">
-              <h2><i class="fa fa-flag"></i> 党建工作</h2>
-              <a href="./dangnJianGongZuo.php" class="section-more">查看更多 <i class="fa fa-angle-right"></i></a>
+              <h2><i class="fa fa-refresh"></i> 工作动态</h2>
+              <a href="./gongZuoDongTai.php" class="section-more">查看更多 <i class="fa fa-angle-right"></i></a>
             </div>
             <div class="news-content">
-              <?php if (!empty($partyBuilding)): ?>
-                <?php foreach ($partyBuilding as $item): ?>
+              <?php if (!empty($workUpcreatetimes)): ?>
+                <?php foreach ($workUpcreatetimes as $upcreatetime): ?>
                   <div class="news-item">
-                    <a href="/xinWenXiangQing/?id=<?php echo $item['id']; ?>" class="title"><?php echo $item['title']; ?></a>
-                    <span class="createtime"><?php echo date('Y-m-d', intval($item['createtime'])); ?></span>
+                    <a href="/xinWenXiangQing/?id=<?php echo $upcreatetime['id']; ?>" class="title"><?php echo $upcreatetime['title']; ?></a>
+                    <span class="createtime"><?php echo date('Y-m-d', intval($upcreatetime['createtime'])); ?></span>
                   </div>
                 <?php endforeach; ?>
               <?php else: ?>
-                <div class="no-news">暂无数据</div>
+                <div class="no-news">工作动态暂无数据</div>
               <?php endif; ?>
             </div>
           </div>
         </div>
+
       </div>
 
       <hr class="main-hr" />
@@ -190,7 +195,7 @@ $featured = loadListByChannelName(6, "热门新闻");
               </div>
             <?php endforeach; ?>
           <?php else: ?>
-            <div class="no-news">暂无数据</div>
+            <div class="no-news">精彩推荐暂无数据</div>
           <?php endif; ?>
         </div>
       </div>

lianXiWoMeng.php

@@ -53,15 +53,15 @@ $carouselItems = [
           <ul class="info-list">
             <li class="info-item">
               <i class="fa fa-phone"></i>
-              电话: 13888888888
+              电话: 0592-2085737
             </li>
             <li class="info-item">
               <i class="fa fa-envelope"></i>
-              邮箱: 13888888888@163.com
+              邮箱: 734381242@qq.com
             </li>
             <li class="info-item">
               <i class="fa fa-fax"></i>
-              传真: 13888888888
+              传真: 0592-2090633
             </li>
             <li class="info-item">
               <i class="fa fa-clock"></i>
@@ -69,7 +69,7 @@ $carouselItems = [
             </li>
             <li class="info-item">
               <i class="fa fa-map-marker"></i>
-              地址: 厦门市文化遗产保护中心
+              地址: 福建省厦门市思明区体育路95号
             </li>
           </ul>
         </div>
@@ -128,12 +128,12 @@ $carouselItems = [
       var map = new AMap.Map('map-container', {
         resizeEnable: true,
         zoom: 16,
-        center: [118.08294, 24.476082] // 厦门市中心坐标
+        center: [118.1086912,24.49078560] // 厦门市中心坐标
       });
       
       // 添加标记
       var marker = new AMap.Marker({
-        position: [118.08294, 24.476082],
+        position: [118.10869122,24.490785603],
         title: '厦门市文化遗产保护中心'
       });
       

luDaoWenMai.php

@@ -1,48 +1,49 @@
 <?php
+// 引入公共查询类
 require_once 'CommonQuery.php';
 
-// 轮播图数据 - 修改为单张图片
-$carouselItems = [
-  [
-    "image" => "/uploads/20251013/246147ec48aeefa28998917497f2ef6b.jpg",
-    "alt" => "鹭岛文脉"
-  ]
-];
-
 // 主频道名称
-$mainChannelName = "鹭岛文脉";
+$mainChannelName = '鹭岛文脉';
 
-// 获取文保家园的子分类
+// 使用loadChildChannelByChannelName函数获取子分类
 $sideMenu = loadChildChannelByChannelName($mainChannelName);
 
-// 获取URL参数 - 选中的频道
-$queryChannel = isset($_GET['channel']) ? trim($_GET['channel']) : '';
+// 获取URL参数
+$selectedChannel = isset($_GET['channel']) ? $_GET['channel'] : '';
+$currentPage = isset($_GET['page']) ? intval($_GET['page']) : 1;
 
-// 获取URL参数 - 当前页码
-$currentPage = isset($_GET['page']) && is_numeric($_GET['page']) && $_GET['page'] > 0 ? intval($_GET['page']) : 1;
+// 验证当前页码
+if ($currentPage < 1) {
+    $currentPage = 1;
+}
 
 // 每页显示的文章数量
-$pageSize = 6;
+$pageSize = 12;
 
 // 确定要查询的频道名称
-$channelToQuery = $queryChannel;
-if (empty($channelToQuery)) {
-    // 如果没有选中的频道或选中的频道不存在于子分类中，则使用主频道
-    $channelToQuery = $mainChannelName;
+$queryChannel = !empty($selectedChannel) ? $selectedChannel : $mainChannelName;
+
+// 使用loadListByChannelNameAndPage函数获取文章列表
+$results = loadListByChannelNameAndPage($pageSize, $queryChannel, $currentPage);
+$workUpdates = $results['list'];
+$totalPages = $results['totalPages'];
+
+// 如果没有结果但选择了子分类，尝试查询主频道
+if (empty($workUpdates) && !empty($selectedChannel)) {
+    $results = loadListByChannelNameAndPage($pageSize, $mainChannelName, 1);
+    $workUpdates = $results['list'];
+    $totalPages = $results['totalPages'];
+    $currentPage = 1;
+    $queryChannel = $mainChannelName;
 }
 
-// 获取文章列表和总页数
-$articleResult = loadListByChannelNameAndPage($pageSize, $channelToQuery, $currentPage);
-$workUpdates = $articleResult['list'];
-$totalPages = $articleResult['totalPages'];
-
-// 如果查询的频道没有文章，则显示主频道的文章
-if (empty($workUpdates)) {
-    $articleResult = loadListByChannelNameAndPage($pageSize, $mainChannelName, $currentPage);
-    $workUpdates = $articleResult['list'];
-    $totalPages = $articleResult['totalPages'];
-    $channelToQuery = $mainChannelName;
-}
+// 轮播图数据
+$carouselItems = [
+  [
+    "image" => "/images/test-header-4.png",
+    "alt" => $mainChannelName
+  ]
+];
 ?>
 <!DOCTYPE html>
 <html lang="zh-CN">
@@ -50,7 +51,7 @@ if (empty($workUpdates)) {
 <head>
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>厦门市文化遗产保护中心 - 鹭岛文脉</title>
+  <title>厦门市文化遗产保护中心 - <?php echo $queryChannel; ?></title>
   <link rel="stylesheet" href="/css/fonts.css">
   <link rel="stylesheet" href="/css/fontawesome.min.css">
   <link rel="stylesheet" href="/css/bootstrap.min.css">
@@ -82,7 +83,6 @@ if (empty($workUpdates)) {
   <div class="main-content">
     <div class="container">
       <div class="row">
-
         <!-- 左侧导航 -->
         <div class="col-12 col-sm-12 col-md-4 col-lg-3">
           <div class="sidebar">
@@ -92,90 +92,64 @@ if (empty($workUpdates)) {
               <ul class="sidebar-menu">
                 <?php if (!empty($sideMenu)): ?>
                   <?php foreach ($sideMenu as $item): ?>
-                    <li>
-                      <a href="?channel=<?php echo urlencode($item['name']); ?>&page=1" class="<?php echo $queryChannel == $item['name'] ? 'active' : ''; ?>">
-                        <?php echo $item['name']; ?>
-                        <i class="fa fa-arrow-right"></i>
-                      </a>
-                    </li>
+                    <li><a href="?channel=<?php echo urlencode($item['name']); ?>&page=1" class="<?php echo $selectedChannel == $item['name'] ? 'active' : ''; ?>"><?php echo $item['name']; ?><i class="fa fa-arrow-right"></i></a></li>
                   <?php endforeach; ?>
                 <?php else: ?>
-                  <li>
-                    <a href="?channel=<?php echo urlencode($mainChannelName); ?>&page=1" class="active">
-                      <?php echo $mainChannelName; ?>
-                      <i class="fa fa-arrow-right"></i>
-                    </a>
-                  </li>
+                  <li class="no-content">暂无相关子分类</li>
                 <?php endif; ?>
               </ul>
+            </div>
           </div>
-        </div>
+        
+        <!-- 右侧内容 -->
         <div class="col-12 col-sm-12 col-md-8 col-lg-9">
           <div class="content">
+            <div class="section-title">
+              <h2 class="icon"><?php echo $queryChannel; ?></h2>
+              
+              <nav aria-label="breadcrumb">
+                <ol class="breadcrumb">
+                  <li class="breadcrumb-item"><a href="/">首页</a></li>
+                  <li class="breadcrumb-item"><a href="./">工作动态</a></li>
+                  <?php if ($selectedChannel): ?>
+                    <li class="breadcrumb-item active" aria-current="page"><?php echo $selectedChannel; ?></li>
+                  <?php else: ?>
+                    <li class="breadcrumb-item active" aria-current="page">工作动态</li>
+                  <?php endif; ?>
+                </ol>
+              </nav>
+            </div>
             
-            <!-- 精彩推荐网格布局 -->
-                <div class="featured-section">
-                  <div class="section-title center large">
-                    <h2 class="icon">鹭岛文脉</h2>
-                  </div>
-                  <div class="featured-grid">
-                    <?php if (!empty($luDaoItems)): ?>
-                      <?php foreach ($luDaoItems as $item): ?>
-                        <div class="featured-card">
-                          <img 
-                            src="<?php echo isset($item['image']) ? $item['image'] : '/images/test-header-1.png'; ?>" 
-                            alt="<?php echo isset($item['title']) ? $item['title'] : '鹭岛文脉'; ?>"
-                          >
-                          <p>
-                            <a href="/xinWenXiangQing/?id=<?php echo isset($item['id']) ? $item['id'] : ''; ?>">
-                              <?php echo isset($item['title']) ? $item['title'] : ''; ?>
-                            </a>
-                          </p>
-                        </div>
-                      <?php endforeach; ?>
-                    <?php else: ?>
-                      <div class="no-news text-center w-100">暂无相关数据</div>
-                    <?php endif; ?>
+            <!-- 文章列表 -->
+            <div class="news-list">
+              <?php if (!empty($workUpdates)): ?>
+                <?php foreach ($workUpdates as $item): ?>
+                  <?php
+                  // 确保所有必要字段存在
+                  $title = isset($item['title']) ? $item['title'] : '暂无标题';
+                  $articleId = isset($item['id']) ? $item['id'] : '';
+                  $date = isset($item['createtime']) ? date('Y-m-d', strtotime($item['createtime'])) : '未知日期';
+                  ?>
+                  <div class="news-item">
+                    <a href="/xinWenXiangQing/?id=<?php echo $articleId; ?>&channel=<?php echo urlencode($queryChannel); ?>" class="title"><?php echo $title; ?></a>
+                    <span class="date"><?php echo $date; ?></span>
                   </div>
-                </div>
-                
-                <!-- 分页 -->
-                <?php if ($totalPages > 1): ?>
-                  <nav aria-label="List Page navigation" class="mt-6">
-                    <ul class="pagination justify-content-center">
-                      <!-- 上一页 -->
-                      <li class="page-item <?php echo $currentPage <= 1 ? 'disabled' : ''; ?>">
-                        <a 
-                          class="page-link" 
-                          href="?page=<?php echo $currentPage - 1; ?>" 
-                          aria-label="Previous"
-                        >
-                          <span aria-hidden="true">&laquo;</span>
-                        </a>
-                      </li>
-                      
-                      <!-- 页码 -->
-                      <?php for ($i = 1; $i <= $totalPages; $i++): ?>
-                        <li class="page-item <?php echo $i == $currentPage ? 'active' : ''; ?>">
-                          <a class="page-link" href="?page=<?php echo $i; ?>">
-                            <?php echo $i; ?>
-                          </a>
-                        </li>
-                      <?php endfor; ?>
-                      
-                      <!-- 下一页 -->
-                      <li class="page-item <?php echo $currentPage >= $totalPages ? 'disabled' : ''; ?>">
-                        <a 
-                          class="page-link" 
-                          href="?page=<?php echo $currentPage + 1; ?>" 
-                          aria-label="Next"
-                        >
-                          <span aria-hidden="true">&raquo;</span>
-                        </a>
-                      </li>
-                    </ul>
-                  </nav>
-                <?php endif; ?>
+                <?php endforeach; ?>
+              <?php else: ?>
+                <div class="no-news">暂无相关文章</div>
+              <?php endif; ?>
+            </div>
+                    
+                    <!-- 分页 -->
+            <nav aria-label="List Page navigation">
+              <ul class="pagination mt-4">
+                <li class="prev"><a href="?channel=<?php echo urlencode($selectedChannel); ?>&page=<?php echo $currentPage > 1 ? $currentPage - 1 : 1; ?>">&lt;</a></li>
+                <?php for ($i = 1; $i <= $totalPages; $i++): ?>
+                  <li class="<?php echo $i == $currentPage ? 'active' : ''; ?>"><a href="?channel=<?php echo urlencode($selectedChannel); ?>&page=<?php echo $i; ?>"><?php echo $i; ?></a></li>
+                <?php endfor; ?>
+                <li class="next"><a href="?channel=<?php echo urlencode($selectedChannel); ?>&page=<?php echo $currentPage < $totalPages ? $currentPage + 1 : $totalPages; ?>">&gt;</a></li>
+              </ul>
+            </nav>
           </div>
         </div>
       </div>

luDaoWenMai1.php

@@ -0,0 +1,212 @@
+<?php
+require_once 'CommonQuery.php';
+
+// 轮播图数据 - 修改为单张图片
+$carouselItems = [
+  [
+    "image" => "/uploads/20251013/246147ec48aeefa28998917497f2ef6b.jpg",
+    "alt" => "鹭岛文脉"
+  ]
+];
+
+// 主频道名称
+$mainChannelName = "鹭岛文脉";
+
+// 获取文保家园的子分类
+$sideMenu = loadChildChannelByChannelName($mainChannelName);
+
+// 获取URL参数 - 选中的频道
+$queryChannel = isset($_GET['channel']) ? trim($_GET['channel']) : '';
+
+// 获取URL参数 - 当前页码
+$currentPage = isset($_GET['page']) && is_numeric($_GET['page']) && $_GET['page'] > 0 ? intval($_GET['page']) : 1;
+
+// 每页显示的文章数量
+$pageSize = 6;
+
+// 确定要查询的频道名称
+$channelToQuery = $queryChannel;
+if (empty($channelToQuery)) {
+    // 如果没有选中的频道或选中的频道不存在于子分类中，则使用主频道
+    $channelToQuery = $mainChannelName;
+}
+
+// 获取文章列表和总页数
+$articleResult = loadListByChannelNameAndPage($pageSize, $channelToQuery, $currentPage);
+$workUpdates = $articleResult['list'];
+$totalPages = $articleResult['totalPages'];
+
+// 如果查询的频道没有文章，则显示主频道的文章
+if (empty($workUpdates)) {
+    $articleResult = loadListByChannelNameAndPage($pageSize, $mainChannelName, $currentPage);
+    $workUpdates = $articleResult['list'];
+    $totalPages = $articleResult['totalPages'];
+    $channelToQuery = $mainChannelName;
+}
+?>
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>厦门市文化遗产保护中心 - 鹭岛文脉</title>
+  <link rel="stylesheet" href="/css/fonts.css">
+  <link rel="stylesheet" href="/css/fontawesome.min.css">
+  <link rel="stylesheet" href="/css/bootstrap.min.css">
+  <link rel="stylesheet" href="/css/swiper-bundle.min.css">
+  <link rel="stylesheet" href="/css/style.css">
+  <script src="/js/jquery-3.7.1.js"></script>
+  <script src="/js/bootstrap.bundle.js"></script>
+  <script src="/js/swiper-bundle.min.js"></script>
+</head>
+
+<body>
+  <?php include __DIR__ . '/components/navbar.php'; ?>
+
+  <!-- 轮播图 -->
+  <div class="swiper mySwiper" style="width: 100%; height: 400px;">
+    <div class="swiper-wrapper">
+      <?php foreach ($carouselItems as $item): ?>
+        <div class="swiper-slide">
+          <img src="<?php echo $item['image']; ?>" alt="<?php echo $item['alt']; ?>" style="width: 100%; height: 100%; object-fit: cover;">
+        </div>
+      <?php endforeach; ?>
+    </div>
+    <div class="swiper-pagination"></div>
+    <div class="swiper-button-prev"></div>
+    <div class="swiper-button-next"></div>
+  </div>
+
+  <!-- 主要内容 -->
+  <div class="main-content">
+    <div class="container">
+      <div class="row">
+
+        <!-- 左侧导航 -->
+        <div class="col-12 col-sm-12 col-md-4 col-lg-3">
+          <div class="sidebar">
+            <div class="title">
+                <h2><?php echo $mainChannelName; ?></h2>
+              </div>
+              <ul class="sidebar-menu">
+                <?php if (!empty($sideMenu)): ?>
+                  <?php foreach ($sideMenu as $item): ?>
+                    <li>
+                      <a href="?channel=<?php echo urlencode($item['name']); ?>&page=1" class="<?php echo $queryChannel == $item['name'] ? 'active' : ''; ?>">
+                        <?php echo $item['name']; ?>
+                        <i class="fa fa-arrow-right"></i>
+                      </a>
+                    </li>
+                  <?php endforeach; ?>
+                <?php else: ?>
+                  <li>
+                    <a href="?channel=<?php echo urlencode($mainChannelName); ?>&page=1" class="active">
+                      <?php echo $mainChannelName; ?>
+                      <i class="fa fa-arrow-right"></i>
+                    </a>
+                  </li>
+                <?php endif; ?>
+              </ul>
+          </div>
+        </div>
+        <div class="col-12 col-sm-12 col-md-8 col-lg-9">
+          <div class="content">
+            
+            <!-- 精彩推荐网格布局 -->
+                <div class="featured-section">
+                  <div class="section-title center large">
+                    <h2 class="icon">鹭岛文脉</h2>
+                  </div>
+                  <div class="featured-grid">
+                    <?php if (!empty($luDaoItems)): ?>
+                      <?php foreach ($luDaoItems as $item): ?>
+                        <div class="featured-card">
+                          <img 
+                            src="<?php echo isset($item['image']) ? $item['image'] : '/images/test-header-1.png'; ?>" 
+                            alt="<?php echo isset($item['title']) ? $item['title'] : '鹭岛文脉'; ?>"
+                          >
+                          <p>
+                            <a href="/xinWenXiangQing/?id=<?php echo isset($item['id']) ? $item['id'] : ''; ?>">
+                              <?php echo isset($item['title']) ? $item['title'] : ''; ?>
+                            </a>
+                          </p>
+                        </div>
+                      <?php endforeach; ?>
+                    <?php else: ?>
+                      <div class="no-news text-center w-100">暂无相关数据</div>
+                    <?php endif; ?>
+                  </div>
+                </div>
+                
+                <!-- 分页 -->
+                <?php if ($totalPages > 1): ?>
+                  <nav aria-label="List Page navigation" class="mt-6">
+                    <ul class="pagination justify-content-center">
+                      <!-- 上一页 -->
+                      <li class="page-item <?php echo $currentPage <= 1 ? 'disabled' : ''; ?>">
+                        <a 
+                          class="page-link" 
+                          href="?page=<?php echo $currentPage - 1; ?>" 
+                          aria-label="Previous"
+                        >
+                          <span aria-hidden="true">&laquo;</span>
+                        </a>
+                      </li>
+                      
+                      <!-- 页码 -->
+                      <?php for ($i = 1; $i <= $totalPages; $i++): ?>
+                        <li class="page-item <?php echo $i == $currentPage ? 'active' : ''; ?>">
+                          <a class="page-link" href="?page=<?php echo $i; ?>">
+                            <?php echo $i; ?>
+                          </a>
+                        </li>
+                      <?php endfor; ?>
+                      
+                      <!-- 下一页 -->
+                      <li class="page-item <?php echo $currentPage >= $totalPages ? 'disabled' : ''; ?>">
+                        <a 
+                          class="page-link" 
+                          href="?page=<?php echo $currentPage + 1; ?>" 
+                          aria-label="Next"
+                        >
+                          <span aria-hidden="true">&raquo;</span>
+                        </a>
+                      </li>
+                    </ul>
+                  </nav>
+                <?php endif; ?>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <?php include __DIR__ . '/components/footer.php'; ?>
+
+  <script>
+    $(document).ready(function() {
+      // 初始化 Swiper
+      const swiper = new Swiper(".mySwiper", {
+        slidesPerView: 1,
+        spaceBetween: 30,
+        loop: true,
+        pagination: {
+          el: ".swiper-pagination",
+          clickable: true,
+        },
+        navigation: {
+          nextEl: ".swiper-button-next",
+          prevEl: ".swiper-button-prev",
+        },
+        autoplay: {
+          delay: 5000,
+          disableOnInteraction: false,
+        },
+      });
+      
+    });
+  </script>
+</body>
+
+</html>