diff --git a/src/components/DetailFramework/DetailFramework.tsx b/src/components/DetailFramework/DetailFramework.tsx index 0f210f9..b589cec 100644 --- a/src/components/DetailFramework/DetailFramework.tsx +++ b/src/components/DetailFramework/DetailFramework.tsx @@ -72,7 +72,8 @@ export default class DetailFramework extends Component< content={pt.get().actIndicator.loading} > ); - } else if (!this.state.rs.success) { + } + if (!this.state.rs.success) { return ( { - this.setState({ - isDisable: false, - }); - }, logInterval); - return; - } memberLogin(this); setTimeout(() => { this.setState({ @@ -72,37 +47,15 @@ export default class UserMemberPage extends Component { render(): ReactNode { return !wechatUser.getAccess() ? ( - - - - - - {pt.get().button.buttonText.login} - - + + + {pt.get().button.memberText.auth} + ) : ( diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx index 4868f0a..a71606b 100644 --- a/src/pages/user/user.tsx +++ b/src/pages/user/user.tsx @@ -123,7 +123,7 @@ export default class UserPage extends Component { className='at-row at-row__justify--center at-row__align--center' style='height:120rpx;color:#696969;' > - EVA Notify v1.0.0 + EVA Eta v1.0.0 { + Taro.request({ + url: getUrl('/member/login'), + method: 'POST', + data: { + token: wechatUser.getToken(), + }, + }) + .then((res) => { + console.log(res.data); + that.setState({ + isLoading: false, + }); + if (res.data.success) { + Taro.atMessage({ + message: pt.get().button.loginText.success, + type: 'success', + }); + wechatUser.setInfo(res.data.data as UserInfo); + wechatUser.setAccess(true); + Taro.reLaunch({ + url: '/pages/index/index', + }); + } else { + Taro.atMessage({ + message: pt.get().button.loginText.fail, + type: 'error', + }); + } + }) + .catch((err) => { + console.log(err); + that.setState({ + isLoading: false, + }); + Taro.atMessage({ + message: pt.get().button.loginText.error + err.toString(), + type: 'error', + }); + }); }, - }) - .then((res) => { - console.log(res.data); - that.setState({ - isLoading: false, - }); - if (res.data.success) { - Taro.atMessage({ - message: pt.get().button.loginText.success, - type: 'success', - }); - wechatUser.setInfo(res.data.data as UserInfo); - wechatUser.setAccess(true); - Taro.reLaunch({ - url: '/pages/index/index', - }); - } else { - Taro.atMessage({ - message: pt.get().button.loginText.fail, - type: 'error', - }); - } - }) - .catch((err) => { - console.log(err); + fail: (err) => { that.setState({ isLoading: false, }); @@ -48,7 +59,8 @@ export function memberLogin(that: UserMemberPage) { message: pt.get().button.loginText.error + err.toString(), type: 'error', }); - }); + }, + }); } export function memberLogout(that: UserMemberPage) {