From 7ae8fae255456f723b1993044265592c11ef7a36 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 28 七月 2022 19:27:08 +0800
Subject: [PATCH] 2022-07-28
---
src/pc/components/login/normal-login/index.jsx | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/src/pc/components/login/normal-login/index.jsx b/src/pc/components/login/normal-login/index.jsx
index 26991ba..ddd7413 100644
--- a/src/pc/components/login/normal-login/index.jsx
+++ b/src/pc/components/login/normal-login/index.jsx
@@ -13,9 +13,10 @@
import './index.scss'
const LoginForm = asyncComponent(() => import('./loginform'))
+const SignForm = asyncComponent(() => import('./signform'))
const NormalForm = asyncIconComponent(() => import('@/components/normalform'))
-class PropCardEditComponent extends Component {
+class LoginComponent extends Component {
static propTpyes = {
card: PropTypes.object,
deletecomponent: PropTypes.func,
@@ -41,13 +42,8 @@
width: card.width || 24,
name: card.name,
subtype: card.subtype,
- wrap: { name: card.name, width: card.width || 24, loginWays: ['uname_pwd'], shortcut: 'remember' },
- style: { background: '#ffffff', width: '330px', borderRadius: '4px', marginLeft: '55vw'},
- loginWays: [
- {type: 'uname_pwd', label: '璐﹀彿鐧诲綍', shortcut: 'remember'},
- {type: 'sms_vcode', label: '鐭俊鐧诲綍'},
- {type: 'app_scan', label: '鎵爜鐧诲綍'},
- ]
+ wrap: { name: card.name, width: card.width || 24, classify: 'login', loginWays: ['uname_pwd'], shortcut: 'remember' },
+ style: { background: '#ffffff', width: '330px', borderRadius: '4px', marginLeft: '55vw'}
}
if (ismob) {
@@ -69,9 +65,6 @@
this.updateComponent(_card)
} else {
let _card = fromJS(card).toJS()
- if (_card.loginWays.length === 2) {
- _card.loginWays.push({type: 'app_scan', label: '鎵爜鐧诲綍'})
- }
if (_card.wrap.link && _card.wrap.link === 'menu') {
_card.wrap.linkmenu = _card.uuid
}
@@ -153,10 +146,6 @@
card.wrap = res
- if (res.shortcut) {
- card.loginWays[0].shortcut = res.shortcut
- }
-
this.updateComponent(card)
}
@@ -178,7 +167,7 @@
<div className="login-edit-box" style={style} onClick={this.clickComponent} id={card.uuid}>
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <NormalForm title="鐧诲綍璁剧疆" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
+ <NormalForm title="娉ㄥ唽/鐧诲綍璁剧疆" width={800} update={this.updateWrap} getForms={this.getWrapForms}>
<EditOutlined style={{color: '#1890ff'}} title="缂栬緫"/>
</NormalForm>
<FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={this.changeStyle}/>
@@ -187,7 +176,8 @@
} trigger="hover">
<ToolOutlined />
</Popover>
- <LoginForm loginWays={card.loginWays} wrap={card.wrap} />
+ {card.wrap.loginWays ? <LoginForm wrap={card.wrap} /> : null}
+ {card.wrap.signWays ? <SignForm wrap={card.wrap} /> : null}
<div className="component-name">
<div className="center">
<div className="title">{card.name}</div>
@@ -207,4 +197,4 @@
}
}
-export default PropCardEditComponent
\ No newline at end of file
+export default LoginComponent
\ No newline at end of file
--
Gitblit v1.8.0