新闻详情增加上一页下一页

templates/articleDetails.ftl

@@ -39,6 +39,16 @@
             <div class="title">${article.title}</div>
         </div>
         ${article.content}
+        <#if otherNews??>
+        <div class="detail_footer">
+            <#if otherNews?keys?seq_contains("upNew")>
+                <a href="./${otherNews.upNew.uuid}.html">上一篇：${otherNews.upNew.title}</a>
+            </#if>
+            <#if otherNews?keys?seq_contains("nextNew")>
+                <a href="./${otherNews.nextNew.uuid}.html">下一篇：${otherNews.nextNew.title}</a>
+            </#if>
+        </div>
+        </#if>
     </div>
 </div>
 <#include "./detail/footer.ftl" parse=true encoding="utf-8">

templates/joinList.ftl

@@ -32,20 +32,48 @@
             </#list>
         </div>
     </div>
-    <div class="pages">
-        <a class="item prev disableBtn iconfont icon-jiantou" href="./news_012.html#newsPos"></a>
-        <div class="pageList">
-            <a class="item pageItem" href="./news_011.html#newsPos">1</a>
-            <a class="item pageItem" href="./news_012.html#newsPos">2</a>
-            <a class="item pageItem curPageItem" href="./news_013.html#newsPos">3</a>
-            <a class="item pageItem" href="./news_014.html#newsPos">4</a>
-            <a class="item pageItem" href="./news_015.html#newsPos">5</a>
+    <div class="news_paging">
+        <#-- 判断是否有上一页-->
+        <#if (currentPage > 1)>
+            <a id="previousPage" href="joinList${currentPage-1}.html" class="previousPage">
+                <span class="icon iconfont icon-jiantou"></span>
+            </a>
+        </#if>
+        <div id="paging" style="display: flex;align-items: center;">
+            <#--                当前页大于5，显示1和... -->
+            <#if (currentPage > 5)>
+                <#assign start=currentPage-2>
+                <a class="pageNum" href="joinList1.html">1</a>
+                <a class="pageNum pageNums">...</a>
+            <#else >
+                <#assign start=1>
+            </#if>
+            <#--                显示当前页附近的页-->
+            <#assign end=currentPage+2>
+            <#if (end>totalPage)>
+                <#assign end = totalPage>
+            </#if>
+            <#list start..end as index>
+                <#if index == currentPage>
+                    <a class="pageNum pageNumActive" href="joinList${index}.html">${index}</a>
+                <#else>
+                    <a class="pageNum" href="joinList${index}.html">${index}</a>
+                </#if>
+            </#list>
+            <#--                到最后一页相差超过5，显示...-->
+            <#if ((totalPage-currentPage)>5)>
+                <a class="pageNum pageNums">...</a>
+                <a class="pageNum" href="joinList${totalPage}.html">${totalPage}</a>
+            </#if>
         </div>
-        <span class="item space">...</span>
-        <a class="item last" href="./news_0135.html#newsPos">35</a>
-        <a class="item next iconfont icon-jiantou" href="./news_014.html#newsPos"></a>
+        <#--                判断是否有下一页-->
+        <#if (currentPage < totalPage)>
+            <a id="nextPage" href="joinList${currentPage+1}.html" class="nextPage">
+                <span class="icon iconfont icon-jiantou"></span>
+            </a>
+        </#if>
     </div>
-    <a class="pageNext mTxt">加载更多<span class="iconfont icon-jiantou"></span></a></div>
+</div>
 <#include "./footer.ftl" parse=true encoding="utf-8">
 <script defer="defer" src="./runtime/index.js"></script>
 <script defer="defer" src="./vendor/index.js"></script>

webstudio-modules/webstudio-modules-staticize/src/main/java/com/webstudio/staticize/controller/StaticizeController.java

@@ -386,9 +386,22 @@ public class StaticizeController {
         try {
             Map map = getFooter();
             List<News> list = staticizeService.getNewsList(uuid);
-            for (News news : list) {
+            for (int i = 0; i < list.size(); i++) {
+                News news = list.get(i);
                 map.put("article", news);
                 map.put("type", "news");
+                //判断是否有上一页
+                Map otherMap = new HashMap();
+                if (i == 0 && list.size() > 1){
+                    otherMap.put("nextNew",list.get(1));
+                }else {
+                    otherMap.put("upNew",list.get(i-1));
+                    if (i < list.size()-1){
+                        otherMap.put("nextNew",list.get(i+1));
+                    }
+
+                }
+                map.put("otherNews",otherMap);
                 // html名字
                 map.put("fileName", news.getUuid());
                 // 模板
@@ -396,6 +409,7 @@ public class StaticizeController {
                 staticizeService.pushHtml(map, "newsDetail");
                 staticizeService.updatePushStatus(news.getUuid(), "news", "news_");
             }
+
             index();//首页
             news();//新闻
             return true;