Skip to content

Commit 03d4ed7

Browse files
committed
Fix join bug
1 parent ece7dd7 commit 03d4ed7

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

src/components/Join.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,9 @@ class Join extends React.Component<JoinProps, JoinState> {
146146
);
147147

148148
componentDidMount() {
149-
this.getJoinInfo();
149+
if (this.props.user) {
150+
this.getJoinInfo();
151+
}
150152
}
151153

152154
render() {

src/components/Register.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class Register extends React.Component<LoginProps, LoginState> {
103103
<div className="flex-spacer container login-container register-container">
104104
<Card bordered={false} title="完善您的资料">
105105
<Form onSubmit={this.onSubmit} className="join-form">
106-
<Alert message="注意:提交成功后,若要修改请联系管理员" type="info" />
106+
<Alert message="注意:注册成功后若要修改阵营则需请联系管理员" type="info" />
107107

108108
{this.state.error !== '' && (
109109
<Alert message={this.state.error} type="error" closable />

src/libs/googleAuth2.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ const gapiScript = new Promise<typeof gapi>((resolve, reject) => {
88
break;
99

1010
case ScriptStatus.Success:
11+
if (typeof gapi.load !== 'function') {
12+
break;
13+
}
14+
1115
gapi.load('auth2', () => {
1216
gapi.auth2.init({});
1317
resolve(gapi);

0 commit comments

Comments
 (0)