From 831ff66ebe1744c0d3f9df567da23efac4ea8ec6 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 21 Apr 2021 16:54:47 +0800
Subject: [PATCH] merge develop

---
 public/css/edu-purge.css       | 67 +++++++++++++++++++++++-----------
 src/forge/Head/header.scss     | 52 ++++++++++++++++++++++++++
 src/modules/tpm/TPMIndexHOC.js | 12 ++----
 3 files changed, 101 insertions(+), 30 deletions(-)

diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css
index ea431ddfb..f721824be 100644
--- a/public/css/edu-purge.css
+++ b/public/css/edu-purge.css
@@ -3957,28 +3957,62 @@ html>body #ajax-indicator {
   display: block;
   height: 100%;
   width: 100%;
-  color: #fff;
+  color: #333;
   font-size: 16px;
-  position: relative;
 }
 
 .head-nav ul#header-nav li a:hover,.head-nav ul#header-nav li.active a {
   color: #5091FF;
 }
-.head-nav ul#header-nav li.active a::after{
-  content: "";
-  width: 18px;
-  height: 2px;
-  background-color: #4cacff;
-  position: absolute;
-  bottom: 14px;
-  left: 0;
-}
 
 .head-nav ul#header-nav li:last-child {
   margin-right: 0px
 }
 
+.head-nav ul#header-nav li.active{
+  /* background-color: #3B3B3B; */
+}
+
+
+.head-nav ul#header-nav li p:hover {
+  color: #cccccc;
+}
+
+.head-nav ul#header-nav li p {
+  display: block;
+  height: 100%;
+  width: 100%;
+  color: #fff
+}
+
+/* .head-nav ul#header-nav li.active div ul li a {
+  color: #000 !important;
+} */
+
+/* .head-nav ul#header-nav li.active div ul li a:hover {
+  color: #FFF !important;
+}
+
+.head-nav ul#header-nav li.active ul li a {
+  color: #000 !important;
+} */
+
+/* .head-nav ul#header-nav li.active ul li a:hover {
+  color: #FFF !important;
+} */
+
+/* .head-nav ul#header-nav li.active:after {
+  content: '';
+  position: absolute;
+  left: 0px;
+  top: auto;
+  bottom: 10px;
+  right: auto;
+  height: 2px;
+  width: 32px;
+  background-color: #459be5;
+} */
+
 .head-right {
   box-sizing: border-box;
   height: 60px;
@@ -4054,17 +4088,6 @@ em.vertical-line {
 /* 右侧内容宽度变化的话，需要调整posi-search right的值*/
 
 
-.newFooter {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  background: #323232;
-  clear: both;
-  min-width: 1200px;
-  z-index: 8;
-  left: 0px;
-}
-
 .footercon {
   border-bottom: 1px solid #47494d;
 }
diff --git a/src/forge/Head/header.scss b/src/forge/Head/header.scss
index fc8ca9d62..6c696fd91 100644
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@@ -126,4 +126,56 @@
     width: 110px;
     text-align: right;
   }
+}
+
+.newFooter {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  background: #323232;
+  clear: both;
+  min-width: 1200px;
+  z-index: 8;
+  left: 0px;
+  p {
+    margin-top: 0;
+    margin-bottom:0px !important;
+  }
+  .footerInfos{
+    display: flex;
+    max-width: 1200px;
+    margin:0px auto;
+    justify-content: space-around;
+    padding:60px 0px;
+    & >ul{
+      padding:0px 40px;
+      box-sizing: border-box;
+      max-width: 25%;
+      text-align: left;
+      li{
+        color: #fff;
+        font-weight: 300;
+        &:first-child{
+          font-size: 17px;
+        }
+        &>a,&>span{
+          color: #bbb;
+        }
+        &>a:hover{
+          color: #4cacff;
+        }
+      }
+    }
+  }
+  .footerCopy{
+    color: #bbb;
+    border-top: 1px solid #4e4e4e;
+    padding:10px 0px;
+    a{
+      color: #bbb;
+      &:hover{
+        color: #4cacff;
+      }
+    }
+  }
 }
\ No newline at end of file
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index f5d52a8e8..ce5c4514e 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@@ -181,11 +181,10 @@ export function TPMIndexHOC(WrappedComponent) {
 						}
 					}
 					if(response.data && response.data.login){
-						if(!response.data.has_gitea_user || (response.data.has_gitea_user && !response.data.is_sync_pwd)){
+						if(response.data.need_edit_info){
 							this.setState({
 								giteaVisible:true,
-								email:response.data.email,
-								is_sync_pwd:response.data.is_sync_pwd
+								email:response.data.email
 							})
 						}
 					}
@@ -237,11 +236,8 @@ export function TPMIndexHOC(WrappedComponent) {
 
 
 		onOk =(values)=>{
-			let url = `/accounts/gitea_register.json`;
-			const { email , current_user , is_sync_pwd } = this.state;
-			if(email && !is_sync_pwd){
-				url = `/users/change_password.json`;
-			}
+			let url = `/users/sync_user_info.json`;
+			const { current_user } = this.state;
 			axios.post(url,{
 				login:current_user && current_user.login,
 				...values