From ee01272a4b5141998f0fef201021de4925758469 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Sat, 12 Oct 2019 10:34:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/login/LoginDialog.css | 4 ++ public/react/src/modules/login/LoginDialog.js | 44 ++++++++++++------ public/react/src/modules/login/WeChat.png | Bin 0 -> 2844 bytes public/react/src/modules/login/WeChat@2x.png | Bin 0 -> 8077 bytes public/react/src/modules/login/qq.png | Bin 0 -> 2702 bytes public/react/src/modules/login/qq@2x.png | Bin 0 -> 7663 bytes 6 files changed, 35 insertions(+), 13 deletions(-) create mode 100644 public/react/src/modules/login/WeChat.png create mode 100644 public/react/src/modules/login/WeChat@2x.png create mode 100644 public/react/src/modules/login/qq.png create mode 100644 public/react/src/modules/login/qq@2x.png 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 0000000000000000000000000000000000000000..afadeb36f4a738ef40f349990f4dbf3e8b0b0890 GIT binary patch literal 2844 zcmV+%3*+>OP)V0<3vjqpOplY!A}5BgC;|3)?}N2
zWwnxs-%lxx%9E;EPpm?041$BB0qakmq-QGlRB)~7b>~L0WXTLomccgQ()ghj{Y61o
ztMQ}(Rk_qa#zC9*eFS??Ijk@AQvkd-4ijq4*Xn&7xc0Wr&))&L_n%k|Hnx%H38}cV
zUJ$0OKrE5?vsmNN^%PIn%123F=sM1Wqb}~HYw&h3mM)X<6T!D*%xc3Z^ R>v7zL<0A3V4p)AhgdO9Yx$XigQM4`!Z%%xzd5JA*f_0
zY+OL$TkI4(r^nr-#$swN=vuvHv0z-3lVT6luUkx6C=~!f81u&MN7-tFzGoD9#TasI
z45fX#og8%oy(8ddVCz&}`)qCfs#CaHvnvC*%d4Cv1osNXvZ5QwGQJKOp)CnzQqYO9
z_V<*}
zdYuM21?~v5tdT!{0VD}N{J?_zT%wVXV_BF&>Wf=dEho_JN#%O7J;Mp`9SsCNg