From c80a9d1e65d53cbbe53730e419c72f02ee8d6e55 Mon Sep 17 00:00:00 2001
From: hanhh <18330117883@163.com>
Date: Tue, 12 Oct 2021 23:06:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/services/user.ts             |  4 +-
 src/layouts/index.tsx             | 75 +++++++------------------------
 src/pages/setting/checkUpdate.tsx | 10 +++--
 3 files changed, 24 insertions(+), 65 deletions(-)

diff --git a/back/services/user.ts b/back/services/user.ts
index cfc9d4ac..d60303f0 100644
--- a/back/services/user.ts
+++ b/back/services/user.ts
@@ -395,10 +395,10 @@ export default class UserService {
           ...result,
         },
       };
-    } catch (error) {
+    } catch (error: any) {
       return {
         code: 400,
-        data: '获取版本文件失败',
+        data: error.message,
       };
     }
   }
diff --git a/src/layouts/index.tsx b/src/layouts/index.tsx
index 35241448..0c8968e0 100644
--- a/src/layouts/index.tsx
+++ b/src/layouts/index.tsx
@@ -91,38 +91,6 @@ export default function (props: any) {
     }
   };
 
-  const showNewVersionModal = () => {
-    Modal.confirm({
-      width: 500,
-      title: (
-        <>
-          <div>更新可用</div>
-          <div style={{ fontSize: 12, fontWeight: 400, marginTop: 5 }}>
-            新版本5.8.0 (1780)可用。你使用的版本为{version}。
-          </div>
-        </>
-      ),
-      content: (
-        <pre
-          style={{
-            wordBreak: 'break-all',
-            whiteSpace: 'pre-wrap',
-            paddingTop: 15,
-            fontSize: 12,
-            fontWeight: 400,
-          }}
-        >
-          {changeLog}
-        </pre>
-      ),
-      okText: '更新',
-      cancelText: '以后再说',
-      onOk() {
-        console.log('ok');
-      },
-    });
-  };
-
   useEffect(() => {
     vhCheck();
   }, []);
@@ -211,39 +179,26 @@ export default function (props: any) {
       title={
         <>
           控制面板
-          <span onClick={showNewVersionModal}>
-            <Badge
-              count={'New'}
-              size="small"
-              offset={[15, 0]}
+          <a
+            href={changeLogLink}
+            target="_blank"
+            rel="noopener noreferrer"
+            onClick={(e) => {
+              e.stopPropagation();
+            }}
+          >
+            <span
               style={{
                 fontSize: isFirefox ? 9 : 12,
+                color: '#666',
+                marginLeft: 2,
                 zoom: isSafari ? 0.66 : 0.8,
-                padding: '0 5px',
+                letterSpacing: isQQBrowser ? -2 : 0,
               }}
             >
-              <a
-                href={changeLogLink}
-                target="_blank"
-                rel="noopener noreferrer"
-                onClick={(e) => {
-                  e.stopPropagation();
-                }}
-              >
-                <span
-                  style={{
-                    fontSize: isFirefox ? 9 : 12,
-                    color: '#666',
-                    marginLeft: 2,
-                    zoom: isSafari ? 0.66 : 0.8,
-                    letterSpacing: isQQBrowser ? -2 : 0,
-                  }}
-                >
-                  v{version}
-                </span>
-              </a>
-            </Badge>
-          </span>
+              v{version}
+            </span>
+          </a>
         </>
       }
       menuItemRender={(menuItemProps: any, defaultDom: any) => {
diff --git a/src/pages/setting/checkUpdate.tsx b/src/pages/setting/checkUpdate.tsx
index c5c3b60e..4a62272a 100644
--- a/src/pages/setting/checkUpdate.tsx
+++ b/src/pages/setting/checkUpdate.tsx
@@ -20,10 +20,14 @@ const CheckUpdate = ({ ws }: any) => {
       .then((_data: any) => {
         message.destroy();
         const { code, data } = _data;
-        if (code === 200 && data.hasNewVersion) {
-          showConfirmUpdateModal(data);
+        if (code === 200) {
+          if (data.hasNewVersion) {
+            showConfirmUpdateModal(data);
+          } else {
+            message.success('已经是最新版了！');
+          }
         } else {
-          message.success('已经是最新版了！');
+          message.error(data);
         }
       })
       .catch((error: any) => {