From 0d9cfd16fb7447514d7383b206f3b6e9eb0b857c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=95=E7=AB=A5=E5=B4=87?= <792998983@qq.com>
Date: Thu, 17 Nov 2022 15:54:35 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96MD=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/js/editormd/editormd.min.js             | 1 -
 src/modules/tpm/challengesnew/tpm-md-editor.js | 2 --
 2 files changed, 3 deletions(-)

diff --git a/public/js/editormd/editormd.min.js b/public/js/editormd/editormd.min.js
index 89aaf1bc..758c2fcc 100755
--- a/public/js/editormd/editormd.min.js
+++ b/public/js/editormd/editormd.min.js
@@ -560,7 +560,6 @@
 
                     // 此处影响公式加载
                     editormd.loadScript(loadPath + "marked.min", function () {
-
                         editormd.$marked = marked;
 
                         if (settings.previewCodeHighlight) {
diff --git a/src/modules/tpm/challengesnew/tpm-md-editor.js b/src/modules/tpm/challengesnew/tpm-md-editor.js
index 51e65e7e..2f9c820d 100644
--- a/src/modules/tpm/challengesnew/tpm-md-editor.js
+++ b/src/modules/tpm/challengesnew/tpm-md-editor.js
@@ -289,8 +289,6 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
         setEditorInstance(this)
       }
     })
-    console.log('editor_instance');
-    console.log(editor_instance);
 
   }, [containerId, editorInstance, startInit])
 

From c877253b6b5c4bab62af2f9e763b53f13a374827 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Fri, 18 Nov 2022 10:19:31 +0800
Subject: [PATCH 2/3] =?UTF-8?q?readme=E6=98=BE=E7=A4=BA=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/CoderDepotReadme.jsx | 2 +-
 src/forge/Main/Index.scss           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/forge/Main/CoderDepotReadme.jsx b/src/forge/Main/CoderDepotReadme.jsx
index 586f57fb..93d8b04c 100644
--- a/src/forge/Main/CoderDepotReadme.jsx
+++ b/src/forge/Main/CoderDepotReadme.jsx
@@ -66,7 +66,7 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
       {
         content && 
         <div className="commonBox-info">
-          <RenderHtml className="break_word_comments imageLayerParent" value={content} url={history.location}/>
+          <RenderHtml className="break_word_comments imageLayerParent readmeFile" value={content} url={history.location}/>
         </div>
       }
     </div>
diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss
index 35da8324..f17bc480 100644
--- a/src/forge/Main/Index.scss
+++ b/src/forge/Main/Index.scss
@@ -522,6 +522,6 @@
   }
 }
 
-
-
-
+.readmeFile p{
+  white-space: normal;
+}
\ No newline at end of file

From 6547657e45cfdb15d408a84b0267e41c6a864027 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=80=9D?= <2897217417@qq.com>
Date: Mon, 28 Nov 2022 16:01:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=93=E5=BA=93readme=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=81=E7=BB=84=E7=BB=87=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=BF=BB=E9=A1=B5=E7=BB=84=E4=BB=B6bug?=
 =?UTF-8?q?=E3=80=81=E5=85=B3=E4=BA=8E=E6=88=91=E4=BB=AC-=E5=90=88?=
 =?UTF-8?q?=E4=BD=9C=E4=BC=99=E4=BC=B4=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/AboutUs/AboutUs.jsx  | 4 ++--
 src/forge/AboutUs/AboutUs.scss | 4 ++++
 src/forge/Team/List.jsx        | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/forge/AboutUs/AboutUs.jsx b/src/forge/AboutUs/AboutUs.jsx
index bb5deccd..2113f7c7 100644
--- a/src/forge/AboutUs/AboutUs.jsx
+++ b/src/forge/AboutUs/AboutUs.jsx
@@ -35,7 +35,7 @@ function AboutUs(){
     //添加浏览器滚动监听事件
     window.addEventListener('scroll', scrollListener);
     //请求topics.json接口获取合作单位信息
-    axios.get(`/topics.json`, { params: { topic_type: "cooperator", limit: 20, group_size: 5}}).then(response=>{
+    axios.get(`/topics.json`, { params: { topic_type: "cooperator", limit: 30, group_size: 5}}).then(response=>{
       response && setUnits(response.data.topics);
     });
     return ()=>window.removeEventListener('scroll', scrollListener);
@@ -265,7 +265,7 @@ function AboutUs(){
                 <tr>
                   {group.map(item =>{
                     return(
-                      <td><a href={item.url} target="_blank"><img src={getImageUrl(item.image)}></img></a></td>
+                      <td><a href={item.url} target="_blank"><img src={getImageUrl(item.image)} className='unitImg' alt='合作单位'></img></a></td>
                     )
                   })}
                 </tr>
diff --git a/src/forge/AboutUs/AboutUs.scss b/src/forge/AboutUs/AboutUs.scss
index 3d985552..640cd4b5 100644
--- a/src/forge/AboutUs/AboutUs.scss
+++ b/src/forge/AboutUs/AboutUs.scss
@@ -329,6 +329,10 @@
       border: 2px solid #FFFFFF;
       &:hover{ border: 1px solid #466AFF;}
     }
+    .unitImg{
+      max-width: 90%;
+      max-height: 100%;
+    }
   }
 }
 .au_cont{
diff --git a/src/forge/Team/List.jsx b/src/forge/Team/List.jsx
index 91d56b7d..aa3a48c1 100644
--- a/src/forge/Team/List.jsx
+++ b/src/forge/Team/List.jsx
@@ -106,7 +106,7 @@ function List(props){
           {
             totalCount > limit &&
             <div className="mb20 mt20" style={{textAlign:"center"}}>
-              <Pagination simple current={page} total={totalCount} onChange={(page)=>setPage(page)}/>
+              <Pagination simple current={page} total={totalCount} pageSize={limit} onChange={(page)=>setPage(page)}/>
             </div>
           }
         </div>