From 53d9b0fb156764fec21fd76f0117f395ae4c198d Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 25 Sep 2020 23:43:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Menu.php    | 11 +++++++++++
 app/admin/view/login/index.html  |  2 +-
 app/data/controller/NewsItem.php |  2 +-
 config/cookie.php                |  2 +-
 vendor/services.php              |  2 +-
 5 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/admin/controller/Menu.php b/app/admin/controller/Menu.php
index 7171db8e1..df64e0c7c 100644
--- a/app/admin/controller/Menu.php
+++ b/app/admin/controller/Menu.php
@@ -121,6 +121,17 @@ class Menu extends Controller
         }
     }
 
+    /**
+     * 菜单编辑成功后刷新页面
+     * @param bool $state
+     */
+    protected function _form_result(bool $state)
+    {
+        if ($state) {
+            $this->success('系统菜单修改成功！', 'javascript:location.reload()');
+        }
+    }
+
     /**
      * 修改菜单状态
      * @auth true
diff --git a/app/admin/view/login/index.html b/app/admin/view/login/index.html
index 0d9191380..095a82ea9 100644
--- a/app/admin/view/login/index.html
+++ b/app/admin/view/login/index.html
@@ -26,7 +26,7 @@
                 </label>
             </li>
             <li class="verify layui-hide">
-                <label class="inline-block relative">
+                <label class="inline-block relative label-required-null">
                     <i class="layui-icon layui-icon-picture-fine"></i>
                     <input class="layui-input" required pattern="^\S{4,}$" name="verify" maxlength="4" autocomplete="off" placeholder="验证码" title="请输入验证码">
                 </label>
diff --git a/app/data/controller/NewsItem.php b/app/data/controller/NewsItem.php
index 1e1b7dbd3..96a764806 100644
--- a/app/data/controller/NewsItem.php
+++ b/app/data/controller/NewsItem.php
@@ -95,7 +95,7 @@ class NewsItem extends Controller
         if ($this->request->isGet()) {
             $query = $this->app->db->name('DataNewsMark')->where(['deleted' => 0, 'status' => 1]);
             $this->mark = $query->order('sort desc,id desc')->select()->toArray();
-            $data['mark'] = mark_string_array($data['mark']);
+            $data['mark'] = mark_string_array($data['mark'] ?? '');
         } else {
             $data['mark'] = mark_array_string($data['mark'] ?? []);
         }
diff --git a/config/cookie.php b/config/cookie.php
index 65fa95b4b..6425bc22a 100644
--- a/config/cookie.php
+++ b/config/cookie.php
@@ -23,7 +23,7 @@ return [
     // cookie 启用安全传输
     'secure'    => false,
     // httponly 设置
-    'httponly'  => false,
+    'httponly'  => true,
     // 是否使用 setcookie
     'setcookie' => true,
 ];
diff --git a/vendor/services.php b/vendor/services.php
index 15d605ab7..2e9bac54c 100644
--- a/vendor/services.php
+++ b/vendor/services.php
@@ -1,5 +1,5 @@
 <?php 
-// This file is automatically generated at:2020-09-25 21:38:55
+// This file is automatically generated at:2020-09-25 23:42:07
 declare (strict_types = 1);
 return array (
   0 => 'think\\admin\\Library',