From 9d08fe3b5d72694a5e002684547423b297f326c9 Mon Sep 17 00:00:00 2001
From: augushong <augushong@163.com>
Date: Tue, 18 Aug 2020 12:16:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=87=AA=E5=8A=A8=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/css/index.articles.css | 22 ++++++++++++--
 view/admin/post/create.html          |  8 +++++-
 view/admin/post/edit.html            |  7 +++++
 view/index/common/_require.html      | 38 ++++++++++++++----------
 view/index/index/index.html          |  4 ++-
 view/index/post/read.html            | 43 ++++++++++++++++++++++++++++
 6 files changed, 103 insertions(+), 19 deletions(-)

diff --git a/public/static/css/index.articles.css b/public/static/css/index.articles.css
index 766ecdf..15450e5 100644
--- a/public/static/css/index.articles.css
+++ b/public/static/css/index.articles.css
@@ -130,6 +130,13 @@
   text-overflow: ellipsis;
 }
 
+.post-item .info .desc {
+  margin: 0 0 8px;
+  font-size: 13px;
+  line-height: 24px;
+  color: #999;
+}
+
 .post-item .info .plus-info {
   margin-top: 5px;
 }
@@ -153,6 +160,18 @@
   color: #777;
 }
 
+.content-container .desc {
+  margin: 0 0 8px;
+  font-size: 13px;
+  line-height: 24px;
+  color: #999;
+  margin-top: 15px;
+}
+
+.content-container .jump-container {
+  margin-top: 15px;
+}
+
 @media screen and (max-width: 768px) {
   .nav-left-list {
     text-align: left;
@@ -172,8 +191,7 @@
     font-weight: 500;
     font-size: 14px;
   }
-
-  .content-container .title{
+  .content-container .title {
     font-size: 18px;
     line-height: 28px;
   }
diff --git a/view/admin/post/create.html b/view/admin/post/create.html
index 85dc788..d62f75b 100644
--- a/view/admin/post/create.html
+++ b/view/admin/post/create.html
@@ -197,7 +197,13 @@
                         <input type="text" name="jump_to_url" class="layui-input">
                       </div>
                     </div>
-
+                    <div class="layui-form-item">
+                      <div class="layui-form-label">跳转按钮名称</div>
+                      <div class="layui-input-block">
+                        <input type="text" name="jump_to_btn_title" value="立即跳转"
+                          class="layui-input">
+                      </div>
+                    </div>
                     <div class="layui-form-item">
                       <div class="layui-form-label">跳转链接状态</div>
                       <div class="layui-input-block">
diff --git a/view/admin/post/edit.html b/view/admin/post/edit.html
index dbec0ef..abf5101 100644
--- a/view/admin/post/edit.html
+++ b/view/admin/post/edit.html
@@ -200,6 +200,13 @@
                           class="layui-input">
                       </div>
                     </div>
+                    <div class="layui-form-item">
+                      <div class="layui-form-label">跳转按钮名称</div>
+                      <div class="layui-input-block">
+                        <input type="text" name="jump_to_btn_title" value="{$post->getData('jump_to_btn_title')}"
+                          class="layui-input">
+                      </div>
+                    </div>
 
                     <div class="layui-form-item">
                       <div class="layui-form-label">跳转链接状态</div>
diff --git a/view/index/common/_require.html b/view/index/common/_require.html
index 33aed98..b448315 100644
--- a/view/index/common/_require.html
+++ b/view/index/common/_require.html
@@ -8,25 +8,33 @@
 <script src="/static/js/common.js"></script>
 
 
-<link rel="shortcut icon" href="{:get_source_link(get_system_config('site_favicon','/favicon.ico'))}"  />
-<link rel="icon" href="{:get_source_link(get_system_config('site_favicon','/favicon.ico'))}" >
+<link rel="shortcut icon" href="{:get_source_link(get_system_config('site_favicon','/favicon.ico'))}" />
+<link rel="icon" href="{:get_source_link(get_system_config('site_favicon','/favicon.ico'))}">
 
 
 <script>
 
-    //JavaScript代码区域
-    layui.use(['element', 'layer', 'util'], function () {
-        var element = layui.element;
-        var util = layui.util;
-        
-          //执行
-          util.fixbar({
-            bar1: false
-            ,click: function(type){
-              
-            }
-          });
+  window.layuiInitSuccess = [];
 
+  //JavaScript代码区域
+  layui.use(['element', 'layer', 'util'], function () {
+    var element = layui.element;
+    var util = layui.util;
+
+    //执行
+    util.fixbar({
+      bar1: false
+      , click: function (type) {
+
+      }
     });
+
+    window.layuiInitSuccess.forEach(item => {
+      if(typeof item == "function"){
+        item(layui)
+      }
+    });
+
+  });
 </script>
-{:get_system_config('site_tongji')}
+{:get_system_config('site_tongji')}
\ No newline at end of file
diff --git a/view/index/index/index.html b/view/index/index/index.html
index eebd1b1..14d8a3d 100644
--- a/view/index/index/index.html
+++ b/view/index/index/index.html
@@ -27,7 +27,7 @@
                   <img src="{$nav.img}">
                   <div class="panel">
                     <p class="title">{$nav.title}</p>
-                    <p>{$nav.desc}</p>
+                    <p class="desc">{$nav.desc}</p>
                   </div>
                 </a>
                 {/volist}
@@ -65,6 +65,8 @@
 
                 <div class="info">
                   <div class="title">{$post.title}</div>
+                  <div class="desc">{$post.desc_html}</div>
+
                   <div class="plus-info">
                     <span>{$post.hits}访问</span>
                     <span>{$post.comment_count}评论</span>
diff --git a/view/index/post/read.html b/view/index/post/read.html
index eea1417..3ad348e 100644
--- a/view/index/post/read.html
+++ b/view/index/post/read.html
@@ -29,6 +29,49 @@
             <div class="info">
               <span>{$post->publish_time_text}</span>
             </div>
+            <div class="desc">
+              {$post.desc_html}
+            </div>
+            {if !empty($post.desc) && $post.jump_to_url_status != 0}
+            <div class="jump-container">
+              <a href="{$post.jump_to_url}" class="layui-btn jump-btn" target="_blank">{$post.jump_to_btn_title|default='立即跳转'}</a>
+            </div>
+            {if $post.jump_to_url_status == 2 }
+            <script>
+              window.layuiInitSuccess.push(function () {
+                var isJumped = false;
+                var countDownNum = 5;
+                var closeJump = false;
+                var jumpUrl = '{$post.jump_to_url}'
+                window.layerJump = layer.confirm('即将自动打开新页面(倒计时<span class="jump-count-dowm">5</span>秒)', {
+                  btn: ['立即跳转', '取消'],
+                  offset:['20%']
+                }
+                  , function (index, layero) {
+                    //按钮【按钮一】的回调
+                    window.open(jumpUrl)
+                    isJumped = true
+                    layer.close(index)
+                  }, function (index) {
+                    //按钮【按钮二】的回调
+                    closeJump = true
+                  })
+
+                window.timerJump = setInterval(() => {
+                  countDownNum--
+                  $('.jump-count-dowm').text(countDownNum)
+                  if (countDownNum <= 0) {
+                    clearInterval(window.timerJump)
+                    layer.close(window.layerJump)
+                    if (!closeJump && !isJumped) {
+                      window.open(jumpUrl)
+                    }
+                  }
+                }, 1000);
+              })
+            </script>
+            {/if}
+            {/if}
             <div class="ql-snow">
               <div class="ql-editor">{$post->content_html|raw}</div>
             </div>