From ae12618c0cc93a9e195df15a72758b53547942a4 Mon Sep 17 00:00:00 2001 From: hucong <1422588487@qq.com> Date: Mon, 25 Oct 2021 10:45:40 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/Detail.js | 5 ----- src/forge/Main/IndexItem.js | 2 +- src/forge/Settings/Setting.js | 5 +++++ src/forge/Team/ListItem.jsx | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js index 06d2fc44..b4d17a81 100644 --- a/src/forge/Main/Detail.js +++ b/src/forge/Main/Detail.js @@ -508,11 +508,6 @@ class Detail extends Component { this.textFunc(projectDetail.forked_from_project_id, projectDetail.fork_info) : "" } - { - projectDetail && projectDetail.type && projectDetail.type !== 0 ? - 导入于 {projectDetail.mirror_url} - : "" - }
diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index 0cba9123..15d7990b 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -55,7 +55,7 @@ class IndexItem extends Component { { item.type && item.type === 1 ? - + :"" } diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js index deccb3da..86383fc7 100644 --- a/src/forge/Settings/Setting.js +++ b/src/forge/Settings/Setting.js @@ -267,6 +267,11 @@ class Setting extends Component { }, ], })()} + { + projectDetail && projectDetail.type && projectDetail.type !== 0 ? + 该项目导入于 {projectDetail.mirror_url} + : "" + }
可见性 diff --git a/src/forge/Team/ListItem.jsx b/src/forge/Team/ListItem.jsx index a908f80b..a1f4fa89 100644 --- a/src/forge/Team/ListItem.jsx +++ b/src/forge/Team/ListItem.jsx @@ -16,7 +16,7 @@ function ListItem({item,key,OIdentifier}) { : - + :"" } From 0e6cb3954a816504495e98fae58b1b190d396cac Mon Sep 17 00:00:00 2001 From: hucong <1422588487@qq.com> Date: Mon, 25 Oct 2021 11:09:13 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A1=B5icon=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/IndexItem.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index 15d7990b..4ddd7633 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -52,12 +52,6 @@ class IndexItem extends Component { :"" } - { - item.type && item.type === 1 ? - - - :"" - } { From aeff357660ace0991da45c8493db7f9af519dd26 Mon Sep 17 00:00:00 2001 From: hucong <1422588487@qq.com> Date: Mon, 25 Oct 2021 11:09:41 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A1=B5icon=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/IndexItem.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index 4ddd7633..15d7990b 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -52,6 +52,12 @@ class IndexItem extends Component { :"" } + { + item.type && item.type === 1 ? + + + :"" + } { From 60da6bd110d55a9ee10ee43a638c2bd1fb15b7f1 Mon Sep 17 00:00:00 2001 From: hucong <1422588487@qq.com> Date: Mon, 25 Oct 2021 15:46:57 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Team/ListItem.jsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/forge/Team/ListItem.jsx b/src/forge/Team/ListItem.jsx index a1f4fa89..8ccfdda2 100644 --- a/src/forge/Team/ListItem.jsx +++ b/src/forge/Team/ListItem.jsx @@ -15,9 +15,7 @@ function ListItem({item,key,OIdentifier}) { : - - - :"" + :"" } From 7872d5ecab95974de47fd50782ec1d6fefe95f8c Mon Sep 17 00:00:00 2001 From: hucong <1422588487@qq.com> Date: Mon, 25 Oct 2021 15:56:06 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/IndexItem.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index 15d7990b..4ddd7633 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -52,12 +52,6 @@ class IndexItem extends Component { :"" } - { - item.type && item.type === 1 ? - - - :"" - } { From 746f552a21dc5e2d5451cf6aa508fc81974b1f44 Mon Sep 17 00:00:00 2001 From: hucong <1422588487@qq.com> Date: Mon, 25 Oct 2021 16:37:50 +0800 Subject: [PATCH 6/7] issue --- src/forge/Team/ListItem.jsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/forge/Team/ListItem.jsx b/src/forge/Team/ListItem.jsx index 8ccfdda2..ab9d64f2 100644 --- a/src/forge/Team/ListItem.jsx +++ b/src/forge/Team/ListItem.jsx @@ -10,12 +10,10 @@ function ListItem({item,key,OIdentifier}) { {item.name} { item.forked_from_project_id && } { - item.type && item.type !== 0 ? - item.type === 2 ? + item.type && item.type === 2 ? - : - :"" + :"" } From 61ee3fe36f6585b55bd26a8aeafdd316a8dab48f Mon Sep 17 00:00:00 2001 From: caishi Date: Thu, 28 Oct 2021 17:25:50 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9B=B8=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?

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

-

:

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

-

:""} +

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

+ + 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?

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

-

:

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

-

:"" - } +

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

+ + educoder登录 + +
+

}