From c3b43bb5c72f010a5219fc387c7ef1dcc7a350ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Wed, 4 Aug 2021 11:18:21 +0800
Subject: [PATCH] merge ff75065a0a4c6f219f748baffaac6bee178c2f63

---
 src/App.js                                 |  4 +-
 src/forge/Wiki/Index.jsx                   |  1 -
 src/forge/Wiki/components/Login/index.scss | 56 ++++++++++++++++++++++
 src/forge/Wiki/fetch.js                    |  2 +-
 4 files changed, 59 insertions(+), 4 deletions(-)
 create mode 100644 src/forge/Wiki/components/Login/index.scss

diff --git a/src/App.js b/src/App.js
index de3bf88c8..b596b4901 100644
--- a/src/App.js
+++ b/src/App.js
@@ -96,8 +96,8 @@ const ProjectIndex = Loadable({
 const keyWord = ["explore", "settings", "setting", "CCF", "mulan", "wiki", "issues", "setting", "trending", "code", "projects", "pulls", "mine", "login", "register", "email", "export", "nopage", "404", "403", "500", "501", "search"];
 
 const ProjectIndex = Loadable({
-  loader: () => import("./forge/Main/Index"),
-  loading: Loading,
+	loader: () => import("./forge/Index"),
+	loading: Loading,
 });
 class App extends Component {
 	constructor(props) {
diff --git a/src/forge/Wiki/Index.jsx b/src/forge/Wiki/Index.jsx
index f15b19686..f8f78861d 100644
--- a/src/forge/Wiki/Index.jsx
+++ b/src/forge/Wiki/Index.jsx
@@ -217,7 +217,6 @@ export default (props) => {
                 <Button type="default" className="ml10">导出<Icon type="caret-down" /></Button>
               </Dropdown>
               <Button type="default" className="ml10" onClick={preview}>预览</Button>
-
             </div>
           </div>
 
diff --git a/src/forge/Wiki/components/Login/index.scss b/src/forge/Wiki/components/Login/index.scss
new file mode 100644
index 000000000..13d160665
--- /dev/null
+++ b/src/forge/Wiki/components/Login/index.scss
@@ -0,0 +1,56 @@
+.delete-modal {
+  .ant-modal-header {
+    padding: 9px 24px;
+    background: #f8f8f8;
+    border-bottom: 1px solid #eee;
+  }
+  .ant-modal-title {
+    text-align: left;
+  }
+  .ant-modal-close {
+    top: 0px !important;
+  }
+  .ant-modal-close-x {
+    font-size: 24px;
+  }
+  .ant-modal-body {
+    text-align: center;
+  }
+  .delete-title {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: 2rem 0 1rem !important;
+    font-size: 16px;
+    color: #333;
+    letter-spacing: 0;
+    line-height: 29px;
+    font-weight: 400;
+  }
+  .red-circle {
+    align-self: flex-start;
+    color: #ca0002;
+    font-size: 1.5rem !important;
+  }
+  .delete-descibe {
+    font-size: 14px;
+    color: #666;
+    line-height: 33px;
+    font-weight: 400;
+  }
+  .ant-modal-footer {
+    padding: 2rem 0;
+    text-align: center;
+    border: 0;
+    .ant-btn {
+      width: 6rem;
+    }
+  }
+  .foot-submit {
+    margin-left: 3rem;
+    color: #df0002;
+    &:hover {
+      border-color: #df0002;
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/forge/Wiki/fetch.js b/src/forge/Wiki/fetch.js
index 9f0e69017..ccb9676a2 100644
--- a/src/forge/Wiki/fetch.js
+++ b/src/forge/Wiki/fetch.js
@@ -12,7 +12,7 @@ if (window.location.href.indexOf('localhost') > -1) {
   actionUrl = "https://test-search.trustie.net";
   // actionUrl = 'https://testforgeplus.trustie.net';
   axios.defaults.withCredentials = true;
-}else if (window.location.href.indexOf('forgeplus') > -1) {
+}else if (window.location.href.indexOf('wiki-api') > -1) {
   actionUrl = "https://wiki-api.trustie.net";
   axios.defaults.withCredentials = true;
 }