From e2b5086be3592666f48d3108c5e8c2ae8601cfe7 Mon Sep 17 00:00:00 2001
From: Ah jung <735878602@qq.com>
Date: Wed, 12 Jan 2022 11:53:33 +0800
Subject: [PATCH 1/7] Update README.md

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index eaa4014..dd6a7e2 100644
--- a/README.md
+++ b/README.md
@@ -141,6 +141,11 @@ yarn build
 
 - QQ 群 `328347666`
 
+- 微信群（过期请issues留言）
+
+![image](https://user-images.githubusercontent.com/19426584/149060860-3ab2be00-303a-4cd1-b357-9fd8f2c30ad6.png)
+
+
 ## 赞助
 #### 如果你觉得这个项目帮助到了你，你可以帮作者买一杯果汁表示鼓励 🍹。
 

From 9e255da5d7110091d2f254484432348f1a4af554 Mon Sep 17 00:00:00 2001
From: Ah jung <735878602@qq.com>
Date: Wed, 12 Jan 2022 11:55:15 +0800
Subject: [PATCH 2/7] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dd6a7e2..c5d98c0 100644
--- a/README.md
+++ b/README.md
@@ -137,7 +137,7 @@ yarn build
 
 ## 交流
 
-`Naive Ui Admin` 在帮助开发者更方便地进行中大型管理系统开发，同时也提供 QQ 交流群使用问题欢迎在群内提问。
+`Naive Ui Admin` 在帮助开发者更方便地进行中大型管理系统开发，同时也提供交流群，使用或者其他问题，都可以在群内讨论或提问。
 
 - QQ 群 `328347666`
 

From c5bb818f138a234dcc2fa0b0503808b829f1be54 Mon Sep 17 00:00:00 2001
From: Ah jung <735878602@qq.com>
Date: Wed, 19 Jan 2022 15:32:12 +0800
Subject: [PATCH 3/7] Update README.md

---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c5d98c0..1ce0dc3 100644
--- a/README.md
+++ b/README.md
@@ -141,9 +141,14 @@ yarn build
 
 - QQ 群 `328347666`
 
+![(2O3HZAL78@@6H G9XTVM%9](https://user-images.githubusercontent.com/19426584/150084502-9783bf65-28e8-4435-95bf-3bae3bc63d99.png)
+
+
+
 - 微信群（过期请issues留言）
 
-![image](https://user-images.githubusercontent.com/19426584/149060860-3ab2be00-303a-4cd1-b357-9fd8f2c30ad6.png)
+![IMG_1029(20220118-134629)](https://user-images.githubusercontent.com/19426584/150084024-85076114-7d39-4afb-825c-e11799530873.JPG)
+
 
 
 ## 赞助

From 65d6d4d21eb11439b4d7a4d5b9bb3d0b3266d629 Mon Sep 17 00:00:00 2001
From: Ah jung <735878602@qq.com>
Date: Wed, 26 Jan 2022 10:29:45 +0800
Subject: [PATCH 4/7] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1ce0dc3..fefa39a 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@
 
 ## 文档
 
-[v1文档地址](https://naive-ui-admin-docs.vercel.app) 
+[文档地址](https://www.naiveadmin.com) 
 
 ## 准备
 

From a50cbfa44d9bdddc3022b527a4db8fcac1fcf286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E8=90=8C?= <84368145@qq.com>
Date: Wed, 26 Jan 2022 15:58:19 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0naive-ui=E5=88=B02.24.6?=
 =?UTF-8?q?=20show-password-toggle=E6=9B=BF=E6=8D=A2=E6=88=90showPasswordO?=
 =?UTF-8?q?n=3D"click"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json              |  2 +-
 src/views/login/index.vue |  2 +-
 yarn.lock                 | 25 +++++++++++++++----------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 1e36a66..5bbf882 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "makeit-captcha": "^1.2.5",
     "mitt": "^2.1.0",
     "mockjs": "^1.1.0",
-    "naive-ui": "^2.23.2",
+    "naive-ui": "^2.24.6",
     "pinia": "^2.0.0-rc.4",
     "qs": "^6.10.1",
     "vfonts": "^0.1.0",
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index dbbfbf6..7667cff 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -29,7 +29,7 @@
             <n-input
               v-model:value="formInline.password"
               type="password"
-              show-password-toggle
+              showPasswordOn="click"
               placeholder="请输入密码"
             >
               <template #prefix>
diff --git a/yarn.lock b/yarn.lock
index 24270a1..e2227d6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4978,10 +4978,10 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
-naive-ui@^2.23.2:
-  version "2.23.2"
-  resolved "https://registry.yarnpkg.com/naive-ui/-/naive-ui-2.23.2.tgz#4fa03b3ffec0768c0fe5d8eb7b51dadf36319119"
-  integrity sha512-x5XtoJrfMcBGqkryJ6RPg3hB7xDqbO+5TfDB1UGIaVsj2fsidn9S9a6yK/jXqKbw+h5h97NqOu+Lf5EH8tAIog==
+naive-ui@^2.24.6:
+  version "2.24.6"
+  resolved "https://registry.yarnpkg.com/naive-ui/-/naive-ui-2.24.6.tgz#544a50ee627b8c95a744e24b4d5862abf2fcf390"
+  integrity sha512-8eK9os7gruxBfhzvbXoUn8ok/jBc1T+PWhoW1Je0Ou446XsyHsZ9B5vZMQQ4w29C3dVc7OBfeIm/vTq5rLnVBw==
   dependencies:
     "@css-render/plugin-bem" "^0.15.8"
     "@css-render/vue3-ssr" "^0.15.8"
@@ -4998,9 +4998,9 @@ naive-ui@^2.23.2:
     seemly "^0.3.3"
     treemate "^0.3.9"
     vdirs "^0.1.7"
-    vfonts "^0.1.0"
+    vfonts "^0.0.3"
     vooks "^0.2.12"
-    vueuc "^0.4.19"
+    vueuc "^0.4.24"
 
 nanoid@^3.1.30:
   version "3.1.30"
@@ -6790,6 +6790,11 @@ vfile@^4.0.0:
     unist-util-stringify-position "^2.0.0"
     vfile-message "^2.0.0"
 
+vfonts@^0.0.3:
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/vfonts/-/vfonts-0.0.3.tgz#999d66fecea18efee3f2b966c81101ae8ce01a29"
+  integrity sha512-nguyw8L6Un8eelg1vQ31vIU2ESxqid7EYmy8V+MDeMaHBqaRSkg3dTBToC1PR00D89UzS/SLkfYPnx0Wf23IQQ==
+
 vfonts@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/vfonts/-/vfonts-0.1.0.tgz#c16af37ca044b2725ae55553049280efbe6222a9"
@@ -6926,10 +6931,10 @@ vuedraggable@^4.0.3:
   dependencies:
     sortablejs "1.14.0"
 
-vueuc@^0.4.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/vueuc/-/vueuc-0.4.19.tgz#4f7f5f91201994e400d670944c7d880013bbf601"
-  integrity sha512-mzhYwv60cldElLolvG5sMsDFNMP1+vQbxPnbWzT2BdIG6XfF0hzCxq0KMoYpg4cAekKijty2txRgNkySIjTWLA==
+vueuc@^0.4.24:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/vueuc/-/vueuc-0.4.24.tgz#16b2ef68f19f711da81bea83a7dd37d480ee2d6c"
+  integrity sha512-AocMRepM9x78GOZi6m/1WLHfarwtNbMQeFl4N/XQoft5iewUq0x2Tw/F0CbxMSrCVSKgBas47tZFabp4kYADmQ==
   dependencies:
     css-render "^0.15.7"
     evtd "^0.2.2"

From 4ebdbc7203ad92b32826d04dc3e5743f54fd8496 Mon Sep 17 00:00:00 2001
From: Ah jung <735878602@qq.com>
Date: Sun, 13 Feb 2022 15:54:29 +0800
Subject: [PATCH 6/7] Update README.md

---
 README.md | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index fefa39a..c093157 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@
 
 ## 文档
 
-[文档地址](https://www.naiveadmin.com) 
+[v1文档地址](https://naive-ui-admin-docs.vercel.app)
 
 ## 准备
 
@@ -137,21 +137,16 @@ yarn build
 
 ## 交流
 
-`Naive Ui Admin` 在帮助开发者更方便地进行中大型管理系统开发，同时也提供交流群，使用或者其他问题，都可以在群内讨论或提问。
+`Naive Ui Admin` 使用或者其他问题，都可以在群内讨论或提问。
 
 - QQ 群 `328347666`
 
 ![(2O3HZAL78@@6H G9XTVM%9](https://user-images.githubusercontent.com/19426584/150084502-9783bf65-28e8-4435-95bf-3bae3bc63d99.png)
 
 
-
-- 微信群（过期请issues留言）
-
-![IMG_1029(20220118-134629)](https://user-images.githubusercontent.com/19426584/150084024-85076114-7d39-4afb-825c-e11799530873.JPG)
-
-
-
 ## 赞助
 #### 如果你觉得这个项目帮助到了你，你可以帮作者买一杯果汁表示鼓励 🍹。
 
 ![donate](https://jekip.github.io/docs/images/sponsor.png)
+
+[Paypal Me](https://www.paypal.com/paypalme/majunping)

From 58dadbb95ac88517aab4902615b0bc7236e7fcc9 Mon Sep 17 00:00:00 2001
From: liu1013269528 <1013269528@qq.com>
Date: Mon, 14 Feb 2022 00:19:05 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E2=80=9CComputedRef<{=20bgColor:=20string;=20fixed:=20boolean;?=
 =?UTF-8?q?=20show:=20boolean;=20}>=E2=80=9D=E4=B8=8A=E4=B8=8D=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E5=B1=9E=E6=80=A7=E2=80=9Cfixed=E2=80=9D=E3=80=82=20?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=A1=E7=AE=97=E5=B1=9E=E6=80=A7=E5=80=BC?=
 =?UTF-8?q?=EF=BC=8C=E9=9C=80=E8=A6=81=E5=A2=9E=E5=8A=A0=20value=20?=
 =?UTF-8?q?=E5=90=A6=E5=88=99=E8=BF=94=E5=9B=9E=20undefined?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/TagsView/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index fcd5bcb..d85b435 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -258,8 +258,8 @@
           window.pageYOffset ||
           document.body.scrollTop; // 滚动条偏移量
         state.isMultiHeaderFixed = !!(
-          !getHeaderSetting.fixed &&
-          getMultiTabsSetting.fixed &&
+          !getHeaderSetting.value.fixed &&
+          getMultiTabsSetting.value.fixed &&
           scrollTop >= 64
         );
       }