From c39ea1f23d21b070188abcf5f4dd5bdd7b47c1f9 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 10 三月 2020 10:32:13 +0800 Subject: [PATCH] 2020-03-10 --- src/views/login/index.jsx | 63 +++++++++++++++---------------- 1 files changed, 31 insertions(+), 32 deletions(-) diff --git a/src/views/login/index.jsx b/src/views/login/index.jsx index 004eb56..e1b9292 100644 --- a/src/views/login/index.jsx +++ b/src/views/login/index.jsx @@ -56,45 +56,44 @@ async loginsubmit (param) { // 鐧诲綍鎻愪氦 // let password = this.md5Password(param.password) - let result = await Api.loginsystem(param.username, param.password) - if (!result.IsError) { - Api.getusermsg(param.username, param.password).then(res => { - if (res.status) { - sessionStorage.setItem('UserID', res.UserID) - sessionStorage.setItem('SessionUid', Utils.getuuid()) - sessionStorage.setItem('LoginUID', res.LoginUID) - sessionStorage.setItem('User_Name', res.UserName) - sessionStorage.setItem('avatar', res.icon || '') - - localStorage.setItem('lang', param.lang) + // let result = await Api.loginsystem(param.username, param.password) + // if (!result.IsError) { + let res = await Api.getusermsg(param.username, param.password) + if (res.status) { + sessionStorage.setItem('UserID', res.UserID) + sessionStorage.setItem('SessionUid', Utils.getuuid()) + sessionStorage.setItem('LoginUID', res.LoginUID) + sessionStorage.setItem('User_Name', res.UserName) + sessionStorage.setItem('avatar', res.icon || '') + + localStorage.setItem('lang', param.lang) - let _url = window.location.href.split('#')[0] + let _url = window.location.href.split('#')[0] - if (param.remember) { // 璁颁綇瀵嗙爜鏃惰处鍙峰瘑鐮佸瓨鍏ocalStorage - localStorage.setItem(_url, window.btoa(window.encodeURIComponent(JSON.stringify({username: param.username, password: param.password})))) - } else { - localStorage.removeItem(_url) - } - - if (this.props.location.state && this.props.location.state.from.pathname) { - // 鏌ョ湅鏄惁涓哄叾浠栭〉闈㈣烦杞紝璺緞瀛樺湪鏃讹紝璺冲洖鍘熼〉闈� - this.props.history.replace(this.props.location.state.from.pathname) - } else { - this.props.history.replace('/main') - } - } else { - message.warning(res.message) - this.setState({ - isDisabled: false - }) - } - }) + if (param.remember) { // 璁颁綇瀵嗙爜鏃惰处鍙峰瘑鐮佸瓨鍏ocalStorage + localStorage.setItem(_url, window.btoa(window.encodeURIComponent(JSON.stringify({username: param.username, password: param.password})))) + } else { + localStorage.removeItem(_url) + } + + if (this.props.location.state && this.props.location.state.from.pathname) { + // 鏌ョ湅鏄惁涓哄叾浠栭〉闈㈣烦杞紝璺緞瀛樺湪鏃讹紝璺冲洖鍘熼〉闈� + this.props.history.replace(this.props.location.state.from.pathname) + } else { + this.props.history.replace('/main') + } } else { - message.warning(result.Message) + message.warning(res.message) this.setState({ isDisabled: false }) } + // } else { + // message.warning(result.Message) + // this.setState({ + // isDisabled: false + // }) + // } } componentDidMount () { -- Gitblit v1.8.0