From b4f789397e1e30d526653ef8cfba5f2057d89977 Mon Sep 17 00:00:00 2001
From: "yadong.zhang" <yadong.zhang0415@gmail.com>
Date: Thu, 3 Jun 2021 20:39:37 +0800
Subject: [PATCH] =?UTF-8?q?:alien:=20admin=20=E7=AB=AF=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E5=BC=B9=E7=AA=97=E6=94=AF=E6=8C=81=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8D=E5=86=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/include/macros.ftl |  1 +
 .../src/main/resources/templates/index.ftl      | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/blog-admin/src/main/resources/templates/include/macros.ftl b/blog-admin/src/main/resources/templates/include/macros.ftl
index a6bb67b..2d9d273 100644
--- a/blog-admin/src/main/resources/templates/include/macros.ftl
+++ b/blog-admin/src/main/resources/templates/include/macros.ftl
@@ -343,6 +343,7 @@
             </div>
             <div class="modal-footer">
                 <span class="pull-left">tips: 如不想显示该弹窗，可在 <code>index.ftl</code> 中搜索 <code>aboutOneBlog</code> 后删掉相关代码</span>
+                <button type="button" class="btn btn-danger" data-dismiss="modal" id="neverShowNoticeModal"><i class="fa fa-close"> 不再显示</i></button>
                 <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-close"> 关闭</i></button>
             </div>
         </div>
diff --git a/blog-admin/src/main/resources/templates/index.ftl b/blog-admin/src/main/resources/templates/index.ftl
index 0bc118f..8e6b603 100644
--- a/blog-admin/src/main/resources/templates/index.ftl
+++ b/blog-admin/src/main/resources/templates/index.ftl
@@ -68,8 +68,6 @@
         }
     </style>
 </@header>
-<#-- 网站首页的项目介绍内容 -->
-<@aboutOneBlog></@aboutOneBlog>
 <div class="row">
     <div class="col-md-12 col-sm-12 col-xs-12 top_tiles">
         <#-- 文章 -->
@@ -250,9 +248,21 @@
     </div>
 </div>
 </div>
+<#-- 网站首页的项目介绍内容 -->
+<@aboutOneBlog></@aboutOneBlog>
 <@footer>
 <script src="https://cdn.jsdelivr.net/npm/echarts@4.1.0/dist/echarts.min.js"></script>
 <script src="/assets/js/zhyd.echarts.js"></script>
+<#-- 显示或者关闭首页的弹窗，当点击“不再显示后”，如果清缓存，这个弹窗仍然会再次显示 -->
+<script type="text/javascript">
+    var neverShowNoticeModal = localStorage.getItem("neverShowNoticeModal");
+    if(!neverShowNoticeModal) {
+        $("#noticeModal").modal('show');
+    }
+    $("#neverShowNoticeModal").click(function (){
+        localStorage.setItem("neverShowNoticeModal", 1);
+    })
+</script>
 <script>
     /* 顶部卡片统计 */
     $.post("/statistics/siteInfo", function (json) {
@@ -300,6 +310,5 @@
         return resultArr;
     }
     init_echarts();
-    $("#noticeModal").modal('show');
 </script>
-</@footer>
\ No newline at end of file
+</@footer>
-- 
GitLab