From 61ee3fe36f6585b55bd26a8aeafdd316a8dab48f Mon Sep 17 00:00:00 2001 From: caishi Date: Thu, 28 Oct 2021 17:25:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/login/EducoderLogin.js | 6 +- src/modules/login/Trialapplication.js | 4 +- src/modules/login/Trialapplicationysl.js | 4 +- src/modules/user/FindPasswordComponent.js | 2 +- src/modules/user/LoginRegisterComponent.js | 68 +++++++--------------- 5 files changed, 28 insertions(+), 56 deletions(-) diff --git a/src/modules/login/EducoderLogin.js b/src/modules/login/EducoderLogin.js index 9a552673..c687f5f5 100644 --- a/src/modules/login/EducoderLogin.js +++ b/src/modules/login/EducoderLogin.js @@ -153,21 +153,21 @@ class EducoderLogin extends Component { justifyContent: "center", width: "100%", }}> -
© {moment().year()} EduCoder湘ICP备17009477号Trustie   &   IntelliDE inside.
+
© {moment().year()} GitLink | 确实开源京ICP备13000930号GitLink   &   IntelliDE inside.
: this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.main_site===null|| this.props.mygetHelmetapi.main_site===undefined?
-
© {moment().year()} EduCoder湘ICP备17009477号Trustie   &   IntelliDE inside.
+
© {moment().year()} GitLink | 确实开源京ICP备13000930号GitLink   &   IntelliDE inside.
:this.props.mygetHelmetapi.main_site===true?
-
© {moment().year()} EduCoder湘ICP备17009477号Trustie   &   IntelliDE inside.
+
© {moment().year()} GitLink | 确实开源京ICP备13000930号GitLink   &   IntelliDE inside.
:"" } diff --git a/src/modules/login/Trialapplication.js b/src/modules/login/Trialapplication.js index 5cb18166..4f23406e 100644 --- a/src/modules/login/Trialapplication.js +++ b/src/modules/login/Trialapplication.js @@ -142,12 +142,12 @@ class Trialapplication extends Component { if (this.state.Phonenumberisnotcobool === false) { if (this.state.login.length === 0) { this.setState({ - Phonenumberisnotco: "请输入正确的手机号或邮箱", + Phonenumberisnotco: "请输入正确的邮箱账号", }) return } else { this.setState({ - Phonenumberisnotco: "请输入正确的手机号或邮箱", + Phonenumberisnotco: "请输入正确的邮箱账号", }) } return; diff --git a/src/modules/login/Trialapplicationysl.js b/src/modules/login/Trialapplicationysl.js index 25522e86..68c4a244 100644 --- a/src/modules/login/Trialapplicationysl.js +++ b/src/modules/login/Trialapplicationysl.js @@ -158,12 +158,12 @@ class Trialapplicationysl extends Component { if (this.state.Phonenumberisnotcobool === false) { if (this.state.login.length === 0) { this.setState({ - Phonenumberisnotco: "请输入正确的手机号或邮箱", + Phonenumberisnotco: "请输入正确的邮箱账号", }) return } else { this.setState({ - Phonenumberisnotco: "请输入正确的手机号或邮箱", + Phonenumberisnotco: "请输入正确的邮箱账号", }) } return; diff --git a/src/modules/user/FindPasswordComponent.js b/src/modules/user/FindPasswordComponent.js index 85f0285a..c753c66e 100644 --- a/src/modules/user/FindPasswordComponent.js +++ b/src/modules/user/FindPasswordComponent.js @@ -699,7 +699,7 @@ class LoginRegisterComponent extends Component { {/*onBlur={(e) => this.inputOnBlur(e)}*/} this.inputOnBlurzhuche(e)} onChange={this.loginInputonChange} style={{marginTop: '10px', height: "38px"}}> { diff --git a/src/modules/user/LoginRegisterComponent.js b/src/modules/user/LoginRegisterComponent.js index db369458..f3258174 100644 --- a/src/modules/user/LoginRegisterComponent.js +++ b/src/modules/user/LoginRegisterComponent.js @@ -7,6 +7,7 @@ import axios from 'axios'; import CheckInputysl1 from './CheckInputysl'; import CheckInputysl2 from './CheckInputysl'; import Notcompletedysl from './Notcompletedysl'; +import Educoder from '../login/educoder.png'; import './common.css' import './commontwo.css' const { TabPane } = Tabs; @@ -1039,7 +1040,7 @@ class LoginRegisterComponent extends Component { } - this.postLogin()} size={"large"}>登录 - {this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?this.state.isphone===true?

- - ———————— 快速登录 ———————— -

- this.openweixinlogin()}> - 微信登录 - - this.openqqlogin()} className={"ml10"}> - qq登录 - -
-

:

- ———————— 快速登录 ———————— -

- {/*this.openweixinlogin()}>*/} - {/*微信登录*/} - {/**/} - this.openphoneqqlogin()}> - qq登录 - -
-

:""} +

+ ———————— 快速登录 ———————— +

+ + educoder登录 + +
+

} @@ -1115,7 +1102,7 @@ class LoginRegisterComponent extends Component { { weixinlogin===false&&parseInt(tab[0])==1 &&
- 我已阅读并同意 - 《服务协议条款》 + 《服务协议条款》 :""} - {this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?this.state.isphone===true?

- - ———————— 快速登录 ———————— -

- this.openweixinlogin()}> - 微信登录 - - this.openqqlogin()} className={"ml10"}> - qq登录 - -
-

:

- ———————— 快速登录 ———————— -

- {/*this.openweixinlogin()}>*/} - {/*微信登录*/} - {/**/} - this.openphoneqqlogin()}> - qq登录 - -
-

:"" - } +

+ ———————— 快速登录 ———————— +

+ + educoder登录 + +
+

}