From e9c48bd7356462ba9257540b130a47a65ad1861d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 26 八月 2021 17:17:11 +0800
Subject: [PATCH] 2021-08-26
---
src/views/login/loginform.jsx | 125 +++++++++++++++++++++++++++++++----------
1 files changed, 94 insertions(+), 31 deletions(-)
diff --git a/src/views/login/loginform.jsx b/src/views/login/loginform.jsx
index 8518aae..7f207ed 100644
--- a/src/views/login/loginform.jsx
+++ b/src/views/login/loginform.jsx
@@ -1,24 +1,28 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
-import { is, fromJS } from 'immutable'
import { Form, Icon, Input, Button, Modal, message } from 'antd'
import md5 from 'md5'
import moment from 'moment'
import Api from '@/api'
+import Utils from '@/utils/utils.js'
import options from '@/store/options.js'
+import asyncLoadComponent from '@/utils/asyncLoadComponent'
import './index.scss'
const { warning } = Modal
let LoginVerCodeTimer = null
+const QrCode = asyncLoadComponent(() => import('@/components/qrcode'))
class LoginTabForm extends Component {
static propTpyes = {
isDisabled: PropTypes.bool,
changelang: PropTypes.func,
handleSubmit: PropTypes.func,
+ authLogin: PropTypes.func,
dict: PropTypes.object,
auth: PropTypes.bool,
+ authError: PropTypes.string,
touristLogin: PropTypes.bool,
lang: PropTypes.string,
langList: PropTypes.array,
@@ -28,14 +32,19 @@
state = {
activeKey: 'uname_pwd',
+ scanId: '',
username: '',
password: '',
remember: true,
delay: null,
loginWays: [],
smsId: '',
- verdisabled: false
+ verdisabled: false,
+ timeout: false
}
+
+ timer = null
+ splitTime = 0
UNSAFE_componentWillMount () {
const { loginWays } = this.props
@@ -54,36 +63,64 @@
_loginWays.push(item)
} else if (item.type === 'uname_pwd') {
_loginWays.push(item)
+ } else if (item.type === 'app_scan') {
+ _loginWays.push(item)
}
})
+
+ let activeKey = _loginWays[0].type
this.setState({
smsId: smsId,
loginWays: _loginWays,
- activeKey: _loginWays[0].type,
+ activeKey,
+ scanId: activeKey === 'app_scan' ? Utils.getuuid() : '',
+ timeout: false,
remember
})
+
+ if (activeKey === 'app_scan') {
+ this.splitTime = 0
+ this.timer = setTimeout(() => {
+ this.checkResult()
+ }, 10000)
+ }
}
- UNSAFE_componentWillReceiveProps (nextProps) {
- if (!is(fromJS(this.props.loginWays), fromJS(nextProps.loginWays))) {
- let smsId = ''
- let _loginWays = []
- nextProps.loginWays.forEach(item => {
- if (item.type === 'sms_vcode') {
- smsId = item.smsId
- _loginWays.push(item)
- } else if (item.type === 'uname_pwd') {
- _loginWays.push(item)
- }
- })
+ checkResult = () => {
+ const { scanId } = this.state
- this.setState({
- smsId: smsId,
- loginWays: _loginWays,
- activeKey: _loginWays[0].type
- })
+ this.splitTime += 10000
+
+ let _param = {
+ func: 'webapi_get_binding_key',
+ scan_type: 'pc',
+ id: scanId,
+ UserName: ''
}
+
+ _param.userid = sessionStorage.getItem('visitorUserID')
+ _param.LoginUID = sessionStorage.getItem('visitorLoginUID')
+
+ if (this.splitTime >= 180000) {
+ this.setState({
+ timeout: true
+ })
+ return
+ }
+
+ Api.getSystemConfig(_param).then(res => {
+ if (!res.status) {
+ message.warning(res.message)
+ return
+ } else if (res.thd_party_appid && res.thd_party_member_id && res.thd_party_openid) {
+ this.props.authLogin(res.thd_party_appid, res.thd_party_openid, res.thd_party_member_id, scanId)
+ } else {
+ this.timer = setTimeout(() => {
+ this.checkResult()
+ }, 10000)
+ }
+ })
}
handleConfirm = () => {
@@ -110,9 +147,9 @@
e.preventDefault()
if (!this.props.auth) {
warning({
- title: this.props.dict['login.auth.tip'],
- okText: this.props.dict['login.auth.ok'],
- cancelText: this.props.dict['login.auth.cancel'],
+ title: this.props.authError || this.props.dict['login.auth.tip'],
+ okText: this.props.dict['login.ok'],
+ cancelText: this.props.dict['login.cancel'],
onOk() {},
onCancel() {}
})
@@ -182,7 +219,29 @@
}
onChangeTab = (activeKey) => {
- this.setState({activeKey})
+ this.setState({activeKey, scanId: activeKey === 'app_scan' ? Utils.getuuid() : ''})
+
+ if (this.state.activeKey === 'app_scan') {
+ this.timer && clearTimeout(this.timer)
+ }
+
+ if (activeKey === 'app_scan') {
+ this.splitTime = 0
+ this.setState({timeout: false})
+ this.timer = setTimeout(() => {
+ this.checkResult()
+ }, 10000)
+ }
+ }
+
+ reCode = () => {
+ this.splitTime = 0
+
+ this.setState({timeout: false, scanId: Utils.getuuid()})
+
+ this.timer = setTimeout(() => {
+ this.checkResult()
+ }, 10000)
}
getvercode = () => {
@@ -296,7 +355,7 @@
render() {
const { getFieldDecorator } = this.props.form
- const { activeKey, verdisabled, delay, loginWays } = this.state
+ const { activeKey, verdisabled, delay, loginWays, scanId, timeout } = this.state
return (
<Form className={`login-form login-form-${loginWays.length}`} id="login-form" onSubmit={this.handleSubmit}>
@@ -357,17 +416,21 @@
/>
)}
</Form.Item> : null}
- {/* {activeKey === 'uname_pwd' ? <Form.Item className="minline">
- {getFieldDecorator('remember', {
- valuePropName: 'checked',
- initialValue: remember,
- })(<Checkbox onChange={this.rememberChange}>{this.props.dict['login.remember']}</Checkbox>)}
- </Form.Item> : null} */}
{['uname_pwd', 'sms_vcode'].includes(activeKey) ? <Form.Item className="btn-login">
<Button type="primary" htmlType="submit" className="login-form-button" disabled={this.props.isDisabled} loading={this.props.isDisabled}>
{this.props.dict['login.submit']}
</Button>
</Form.Item> : null}
+ {activeKey === 'app_scan' ? <div className="form-scan-wrap">
+ <div className="qr-wrap">
+ {scanId ? <QrCode card={{qrWidth: 500, color: '#000000'}} value={`mkpcscan,${window.GLOB.appkey},${scanId}`}/> : null}
+ {timeout ? <div className="qrcode-out">
+ <Icon onClick={this.reCode} type="redo" />
+ 浜岀淮鐮佸凡澶辨晥銆�
+ </div> : null}
+ </div>
+ 璇蜂娇鐢ㄥ鎴风鎵竴鎵櫥褰�
+ </div> : null}
{options.sysType === 'cloud' && options.cdomain.indexOf('mk9h') > -1 ? <Form.Item className="register-line">
<a href="http://minkesoft.com/#/signup" target="_blank" rel="noopener noreferrer" className="register">娉ㄥ唽</a>
<a href="http://minkesoft.com/#/forgotPwd" target="_blank" rel="noopener noreferrer" className="forgot">蹇樿瀵嗙爜锛�</a>
--
Gitblit v1.8.0