From 92e1773b3932119420ee8f6aa806684255bd6961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Mon, 13 Dec 2021 22:46:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=9D=99=E6=80=81=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/public/index.html               |   2 +-
 jshERP-web/public/{ => static}/color.less  |   0
 jshERP-web/public/{ => static}/favicon.ico | Bin
 jshERP-web/public/{ => static}/less.min.js |   0
 jshERP-web/src/components/tools/setting.js |   4 ++--
 jshERP-web/src/views/system/MsgList.vue    |   1 -
 6 files changed, 3 insertions(+), 4 deletions(-)
 rename jshERP-web/public/{ => static}/color.less (100%)
 rename jshERP-web/public/{ => static}/favicon.ico (100%)
 rename jshERP-web/public/{ => static}/less.min.js (100%)

diff --git a/jshERP-web/public/index.html b/jshERP-web/public/index.html
index cc95b501..811e182a 100644
--- a/jshERP-web/public/index.html
+++ b/jshERP-web/public/index.html
@@ -5,7 +5,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <title></title>
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+  <link rel="icon" href="<%= BASE_URL %>static/favicon.ico">
   <style>
     html,
     body,
diff --git a/jshERP-web/public/color.less b/jshERP-web/public/static/color.less
similarity index 100%
rename from jshERP-web/public/color.less
rename to jshERP-web/public/static/color.less
diff --git a/jshERP-web/public/favicon.ico b/jshERP-web/public/static/favicon.ico
similarity index 100%
rename from jshERP-web/public/favicon.ico
rename to jshERP-web/public/static/favicon.ico
diff --git a/jshERP-web/public/less.min.js b/jshERP-web/public/static/less.min.js
similarity index 100%
rename from jshERP-web/public/less.min.js
rename to jshERP-web/public/static/less.min.js
diff --git a/jshERP-web/src/components/tools/setting.js b/jshERP-web/src/components/tools/setting.js
index 71113b40..27f438d5 100644
--- a/jshERP-web/src/components/tools/setting.js
+++ b/jshERP-web/src/components/tools/setting.js
@@ -64,7 +64,7 @@ const updateTheme = primaryColor => {
     const lessConfigNode = document.createElement('script');
     const lessScriptNode = document.createElement('script');
     lessStyleNode.setAttribute('rel', 'stylesheet/less');
-    lessStyleNode.setAttribute('href', '/color.less');
+    lessStyleNode.setAttribute('href', '/static/color.less');
     lessConfigNode.innerHTML = `
       window.less = {
         async: true,
@@ -72,7 +72,7 @@ const updateTheme = primaryColor => {
         javascriptEnabled: true
       };
     `;
-    lessScriptNode.src = '/less.min.js';
+    lessScriptNode.src = '/static/less.min.js';
     lessScriptNode.async = true;
     lessScriptNode.onload = () => {
       buildIt();
diff --git a/jshERP-web/src/views/system/MsgList.vue b/jshERP-web/src/views/system/MsgList.vue
index 09f8e320..4a653065 100644
--- a/jshERP-web/src/views/system/MsgList.vue
+++ b/jshERP-web/src/views/system/MsgList.vue
@@ -4,7 +4,6 @@
     :width="modalWidth"
     :visible="visible"
     :confirmLoading="confirmLoading"
-    @ok="handleOk"
     @cancel="handleCancel"
     cancelText="关闭"
     style="top:20%;height: 60%;overflow-y: hidden">