From 46f79b491173d284a4900d19e7aecf7509481438 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 一月 2022 17:21:25 +0800
Subject: [PATCH] 2022-01-21
---
src/pc/components/login/normal-login/loginform.jsx | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/pc/components/login/normal-login/loginform.jsx b/src/pc/components/login/normal-login/loginform.jsx
index 536b883..0ca5d72 100644
--- a/src/pc/components/login/normal-login/loginform.jsx
+++ b/src/pc/components/login/normal-login/loginform.jsx
@@ -1,7 +1,8 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Form, Icon, Input, Button, Checkbox } from 'antd'
+import { Form, Input, Button, Checkbox, notification } from 'antd'
+import { QrcodeOutlined, UserOutlined, LockOutlined } from '@ant-design/icons'
import asyncElementComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
@@ -11,8 +12,6 @@
class LoginTabForm extends Component {
static propTpyes = {
- dict: PropTypes.object,
- menuId: PropTypes.string,
loginWays: PropTypes.array,
wrap: PropTypes.array,
}
@@ -80,10 +79,19 @@
}
changeMenu = () => {
- const { wrap, menuId } = this.props
+ const { wrap } = this.props
+
+ if (!wrap.linkmenu) {
+ notification.warning({
+ top: 92,
+ message: '璇疯缃叧鑱旇彍鍗曪紒',
+ duration: 5
+ })
+ return
+ }
MKEmitter.emit('changeEditMenu', {
- MenuID: wrap.link === 'linkmenu' ? wrap.linkmenu : menuId,
+ MenuID: wrap.linkmenu,
copyMenuId: '',
MenuNo: '',
MenuName: ''
@@ -105,17 +113,17 @@
return (
<Form className="login-edit-form">
<div className="login-way-title">{activeWay.label}</div>
- {scanWay && activeWay.type !== 'app_scan' ? <div className="scan-icon" onClick={() => this.onChangeTab(scanWay)}><Icon type="qrcode" /></div> : null}
+ {scanWay && activeWay.type !== 'app_scan' ? <div className="scan-icon" onClick={() => this.onChangeTab(scanWay)}><QrcodeOutlined /></div> : null}
{activeWay.type === 'uname_pwd' ? <div className={'form-item-wrap ' + (activeWay.shortcut === 'none' ? 'no-short' : '')}>
<Form.Item>
<Input
- prefix={<Icon type="user" style={{ color: 'rgba(0,0,0,.25)' }} />}
+ prefix={<UserOutlined style={{ color: 'rgba(0,0,0,.25)' }} />}
placeholder="鐢ㄦ埛鍚�"
autoComplete="off"
/>
</Form.Item>
<Form.Item>
- <Input.Password placeholder="瀵嗙爜" prefix={<Icon type="lock" style={{ color: 'rgba(0,0,0,.25)' }} />} />
+ <Input.Password placeholder="瀵嗙爜" prefix={<LockOutlined style={{ color: 'rgba(0,0,0,.25)' }} />} />
</Form.Item>
{!activeWay.shortcut || activeWay.shortcut === 'remember' ? <Form.Item className="minline">
<Checkbox>璁颁綇瀵嗙爜</Checkbox>
@@ -159,6 +167,9 @@
</div>
璇蜂娇鐢ㄥ鎴风鎵竴鎵櫥褰�
</div> : null}
+ {/* {wrap.protocol === 'true' ? <div className={'protocol-wrap '}>
+ <Checkbox>{wrap.tip}</Checkbox>{wrap.groups.map((item, i) => (<span className="protocol" key={i}>銆妠item.label}銆�</span>))}
+ </div> : null} */}
<div className={'login-ways ' + (activeWay.type === 'app_scan' ? 'center' : '')}>
{loginWays.map(item => {
if (item.type === 'app_scan' || activeWay.type === item.type) return null
--
Gitblit v1.8.0