diff --git a/public/react/src/modules/login/LoginDialog.css b/public/react/src/modules/login/LoginDialog.css index 7be7b12cc..b2738e798 100644 --- a/public/react/src/modules/login/LoginDialog.css +++ b/public/react/src/modules/login/LoginDialog.css @@ -126,4 +126,8 @@ .myinput{ display: flex; justify-content: center; +} + +.startlogin{ + color:#888; } \ No newline at end of file diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js index 13ba02238..015510566 100644 --- a/public/react/src/modules/login/LoginDialog.js +++ b/public/react/src/modules/login/LoginDialog.js @@ -398,19 +398,32 @@ class LoginDialog extends Component { }); } handleDialogClose = () => { - if(this.props.isloginCancel===undefined){ - window.location.href="/"; - this.props.Modifyloginvalue(); - // this.setState({ - // isRender: false - // }) - // this.props.Modifyloginvalue(); - }else{ - this.setState({ - isRender: false - }) - this.props.Modifyloginvalue(); - } + // if(this.props.match.path==='/'){ + // this.setState({ + // isRender: false + // }) + // this.props.Modifyloginvalue(); + // }else{ + // if(this.props.isloginCancel===undefined){ + // window.location.href="/"; + // this.props.Modifyloginvalue(); + // // this.setState({ + // // isRender: false + // // }) + // // this.props.Modifyloginvalue(); + // }else{ + // this.setState({ + // isRender: false + // }) + // this.props.Modifyloginvalue(); + // } + + this.setState({ + isRender: false + }) + this.props.Modifyloginvalue(); + + // this.setState({ // isRender: false // }) @@ -598,6 +611,11 @@ class LoginDialog extends Component {
+ {/**/} + + {/*———————— 快速登录 ————————*/} + + {/*
*/} diff --git a/public/react/src/modules/login/WeChat.png b/public/react/src/modules/login/WeChat.png new file mode 100644 index 000000000..afadeb36f Binary files /dev/null and b/public/react/src/modules/login/WeChat.png differ diff --git a/public/react/src/modules/login/WeChat@2x.png b/public/react/src/modules/login/WeChat@2x.png new file mode 100644 index 000000000..2cca81b42 Binary files /dev/null and b/public/react/src/modules/login/WeChat@2x.png differ diff --git a/public/react/src/modules/login/qq.png b/public/react/src/modules/login/qq.png new file mode 100644 index 000000000..1f4a09bdc Binary files /dev/null and b/public/react/src/modules/login/qq.png differ diff --git a/public/react/src/modules/login/qq@2x.png b/public/react/src/modules/login/qq@2x.png new file mode 100644 index 000000000..f6937c2ba Binary files /dev/null and b/public/react/src/modules/login/qq@2x.png differ