From 146d4c9baad1c04705a2f28264d9220c1d863a57 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 19 Mar 2021 09:33:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Component/EAccount.scss       |  5 +++++
 src/forge/Component/EducoderAccount.jsx |  9 +++++++--
 src/modules/tpm/TPMIndexHOC.js          | 27 +++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/forge/Component/EAccount.scss b/src/forge/Component/EAccount.scss
index 6fe44ab3a..38dc0adf8 100644
--- a/src/forge/Component/EAccount.scss
+++ b/src/forge/Component/EAccount.scss
@@ -3,4 +3,9 @@
 }
 .ant-modal-wrap{
   z-index: 1032;
+}
+.ant-modal-wrap{
+  .ant-form-explain{
+    position: absolute;
+  }
 }
\ No newline at end of file
diff --git a/src/forge/Component/EducoderAccount.jsx b/src/forge/Component/EducoderAccount.jsx
index 51fe0ded5..b9b2f7afc 100644
--- a/src/forge/Component/EducoderAccount.jsx
+++ b/src/forge/Component/EducoderAccount.jsx
@@ -35,14 +35,19 @@ function EducoderAccount({form , visible , onOk , email}){
     >
       <div>
         <p className="mb15 edu-txt-center" style={{maxWidth:"350px",margin:"0px auto"}}>
-        为确保您能正常使用平台功能，请确认以下信息:
+          { 
+          email ? 
+          `平台已检测到您已绑定邮箱${email},请您确认如下操作`
+          :
+          "平台已检测到您未绑定邮箱，为不影响使用协同开发功能，请先绑定邮箱"
+          }
         </p>
         <Form {...layout}>
           <Form.Item label="邮箱">
             {getFieldDecorator("email",{
               rules:[{required:true,message:"请输入邮箱账号"}]
             })(
-              <Input placeholder="请输入您的邮箱账号" width="220px"/>
+              <Input placeholder="请输入您的邮箱账号" width="220px" disabled={email}/>
             )}
           </Form.Item>
           <Form.Item label="密码">
diff --git a/src/modules/tpm/TPMIndexHOC.js b/src/modules/tpm/TPMIndexHOC.js
index b9215568b..ab01a94cd 100644
--- a/src/modules/tpm/TPMIndexHOC.js
+++ b/src/modules/tpm/TPMIndexHOC.js
@@ -7,6 +7,8 @@ import './TPMIndex.css';
 import LoginDialog from '../login/LoginDialog';
 import EducoderAccount from '../../forge/Component/EducoderAccount';
 import ProfileModal from '../../forge/Component/ProfileModal/Index';
+// import AccountProfile from '../user/AccountProfile';
+// import AccountPhoneemail from '../user/AccountPhoneemail';
 
 export function TPMIndexHOC(WrappedComponent) {
 	return class II extends React.Component {
@@ -168,6 +170,12 @@ export function TPMIndexHOC(WrappedComponent) {
 							})
 						}
 					}
+					if(!response.data.has_gitea_user){
+						this.setState({
+							giteaVisible:true,
+							email:response.data.email
+						})
+					}
 				}
 			}).catch((error) => {
 				console.log(error)
@@ -215,6 +223,25 @@ export function TPMIndexHOC(WrappedComponent) {
 		}
 
 
+		onOk =(values)=>{
+			let url = `/accounts/gitea_regsiter.json`;
+			const { email , current_user } = this.state;
+			if(email){
+				url = `/register.json`;
+			}
+			axios.post(url,{
+				login:current_user && current_user.login,
+				...values
+			}).then(result=>{
+				if(result && result.data && result.data.status === 1){
+					this.setState({
+						giteaVisible:false,
+						email:undefined
+					})
+					window.location.reload();
+				}
+			}).catch(error=>{})
+		}
 		render() {
 			let { isRender , current_user , giteaVisible , email , completeProfile , showCP } = this.state;
 			const common = {