From 2a5823a34720bdc6c3cfa5eaf6d31bcf7c13c289 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sun, 27 Sep 2020 13:58:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html                    |  6 +++---
 src/App.js                           | 12 ++++++------
 src/forge/Main/CoderRootDirectory.js |  2 +-
 src/forge/Merge/MessageCount.js      | 14 ++++++--------
 src/forge/Order/newMilepost.js       |  9 ++-------
 src/modules/tpm/TPMIndex.css         |  2 +-
 src/modules/tpm/TPMIndexHOC.js       |  5 +++--
 7 files changed, 22 insertions(+), 28 deletions(-)

diff --git a/public/index.html b/public/index.html
index 70396e4c..b024c3b7 100755
--- a/public/index.html
+++ b/public/index.html
@@ -20,7 +20,7 @@
   <meta name="theme-color" content="#000000">
   <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
 
-  <script type="text/javascript">
+  <!-- <script type="text/javascript">
     window.__isR = true;
     if (
       (navigator.userAgent.indexOf('MSIE 9') != -1
@@ -29,7 +29,7 @@
       location.pathname.indexOf("/compatibility") == -1) {
       location.href = '/compatibility.html'
     }
-  </script>
+  </script> -->
 
   <link rel=" stylesheet" type="text/css" href="%PUBLIC_URL%css/iconfont.css">
   <link rel=" stylesheet" type="text/css" href="%PUBLIC_URL%css/edu-purge.css">
@@ -43,7 +43,7 @@
   <div id="md_div" style="display: none;"></div>
   <div id="root" class="page -layout-v -fit widthunit"></div>
   <div id="picture_display" style="display: none;"></div>
-  <script src="%PUBLIC_URL%js/js_min_all.js"></script>
+  <script src="%PUBLIC_URL%js/jquery-1.8.3.min.js"></script>
   <script src="%PUBLIC_URL%js/codemirror/codemirror.js"></script>
   <script src="%PUBLIC_URL%js/editormd/editormd.min.js"></script>
   <script src="%PUBLIC_URL%js/codemirror/merge/merge.js"></script>
diff --git a/src/App.js b/src/App.js
index 534706b8..28ec0d5f 100644
--- a/src/App.js
+++ b/src/App.js
@@ -213,13 +213,13 @@ class App extends Component {
 			<Provider store={store}>
 				<ConfigProvider locale={zhCN}>
 					<MuiThemeProvider theme={theme}>
-						<Accountnewprofile {...this.props}{...this.state} />
+						{/* <Accountnewprofile {...this.props}{...this.state} /> */}
 						<LoginDialog {...this.props} {...this.state} Modifyloginvalue={() => this.Modifyloginvalue()}></LoginDialog>
-						<Notcompletedysl {...this.props} {...this.state}></Notcompletedysl>
-						<Trialapplicationysl  {...this.props} {...this.state}></Trialapplicationysl>
-						<Trialapplicationreview  {...this.props} {...this.state}></Trialapplicationreview>
-						<AccountProfile {...this.props} {...this.state} />
-						<Certifiedprofessional {...this.props} {...this.state} ModalCancelsy={this.ModalCancelsy} ModalshowCancelsy={this.ModalshowCancelsy} />
+						{/* <Notcompletedysl {...this.props} {...this.state}></Notcompletedysl> */}
+						{/* <Trialapplicationysl  {...this.props} {...this.state}></Trialapplicationysl> */}
+						{/* <Trialapplicationreview  {...this.props} {...this.state}></Trialapplicationreview> */}
+						{/* <AccountProfile {...this.props} {...this.state} /> */}
+						{/* <Certifiedprofessional {...this.props} {...this.state} ModalCancelsy={this.ModalCancelsy} ModalshowCancelsy={this.ModalshowCancelsy} /> */}
 						<Router>
 							<Switch>
 								{/*项目*/}
diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index aeecf7eb..47c2b0a5 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -427,7 +427,7 @@ class CoderRootDirectory extends Component {
         width: "60%",
         render: (text, item) =>
           item.commit && item.commit.message ? 
-            <span className="task-hide" style={{ display: "block", maxWidth: "670px" }} >
+            <span title={item.commit.message} className="task-hide" style={{ display: "block", maxWidth: "670px" }} >
               {item.commit.message}
             </span>
           : ""
diff --git a/src/forge/Merge/MessageCount.js b/src/forge/Merge/MessageCount.js
index c837ccb4..c7052fe7 100644
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@@ -378,14 +378,12 @@ class MessageCount extends Component {
                     </div>
                   </div>
                 </div>
-                <div className="mt15">
-                  {data.issue.description &&
-                  data.issue.description.length > 0 ? (
-                    this.commentCtx(data.issue.description)
-                  ) : (
-                    <span className="color-grey-9 ml3 mr3">没有描述</span>
-                  )}
-                </div>
+                {
+                data.issue.description ? 
+                  <div className="mt15">{this.commentCtx(data.issue.description)}</div>
+                :
+                  <p className="color-grey-9 ml3 mr3 mt15">没有描述</p>
+                }
               </div>
               <div className="mt15">
                 {pr_status === 2 && (
diff --git a/src/forge/Order/newMilepost.js b/src/forge/Order/newMilepost.js
index 0e3e25d9..965e5a6a 100644
--- a/src/forge/Order/newMilepost.js
+++ b/src/forge/Order/newMilepost.js
@@ -52,12 +52,9 @@ class NewMilepost extends Component {
         const { projectsId , owner } = this.props.match.params;
         const url = `/${owner}/${projectsId}/milestones.json`;
         let time = undefined;
-        if (this.state.selectedValue === undefined) {
-
-        } else {
-          time = this.state.selectedValue.format("YYYY-MM-DD")
+        if (this.state.selectedValue) {
+          time = this.state.selectedValue.format("YYYY-MM-DD");
         }
-
         axios.post(url, {
           ...values,
           project_id: projectsId,
@@ -68,10 +65,8 @@ class NewMilepost extends Component {
             this.setState({ isSpin: false })
             this.props.history.push(`/projects/${owner}/${projectsId}/milestones`);
           }
-
         }).catch(error => {
           this.setState({ isSpin: false })
-          console.log(error);
         })
       }else{
         this.setState({ isSpin: false })
diff --git a/src/modules/tpm/TPMIndex.css b/src/modules/tpm/TPMIndex.css
index f47632d3..cf3b7ffe 100644
--- a/src/modules/tpm/TPMIndex.css
+++ b/src/modules/tpm/TPMIndex.css
@@ -29,7 +29,7 @@ body>.-task-title {
   width: 100%;
   height:70px;
   min-width: 1200px;
-  z-index: 1000;
+  z-index: 10000;
   -moz-box-shadow: 0px 2px 10px 0px rgba(0,0,0,0.1);
   background:rgba(255,255,255,1);
   box-shadow:0px 2px 10px 0px rgba(0,0,0,0.1);
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index a4c47d4f..e267d8d3 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@@ -8,7 +8,6 @@ import './TPMIndex.css';
 import LoginDialog from '../login/LoginDialog';
 import AccountProfile from '../user/AccountProfile';
 import AccountPhoneemail from '../user/AccountPhoneemail';
-import cookies from 'react-cookies';
 
 export function TPMIndexHOC(WrappedComponent) {
 	return class II extends React.Component {
@@ -184,15 +183,16 @@ export function TPMIndexHOC(WrappedComponent) {
 					json[key] = value;
 				}
 			} while (arr);
-
 			return json;
 		};
+
 		hideLoginDialog = () => {
 			this.setState({
 				isRender: false,
 				isloginCancel: undefined
 			})
 		}
+
 		showLoginDialog = () => {
 			this.setState({
 				isRender: true,
@@ -209,6 +209,7 @@ export function TPMIndexHOC(WrappedComponent) {
 				AccountProfiletype: false
 			})
 		}
+
 		showProfileCompleteDialog = () => {
 			this.dialogObj = {}
 			this.setState({