前端:商品分类列表
This commit is contained in:
@@ -105,7 +105,7 @@ function List ({ dataSource, loading, pagination, searchParams, dispatch,
|
||||
<a className={styles.tableDelete} onClick={() => handleDelete(record)}>
|
||||
删除
|
||||
</a>
|
||||
</span> : ''
|
||||
</span> : null
|
||||
}
|
||||
</Fragment>
|
||||
);
|
||||
@@ -379,13 +379,14 @@ const RoleAssignModal = Form.create()(props => {
|
||||
);
|
||||
});
|
||||
|
||||
@connect(({ adminList, loading }) => ({
|
||||
|
||||
@connect(({ adminList }) => ({
|
||||
// list: adminList.list,
|
||||
// pagination: adminList.pagination,
|
||||
...adminList,
|
||||
loading: loading.models.resourceList,
|
||||
}))
|
||||
|
||||
// 主界面
|
||||
@Form.create()
|
||||
class AdminList extends PureComponent {
|
||||
state = {
|
||||
@@ -499,4 +500,4 @@ class AdminList extends PureComponent {
|
||||
}
|
||||
}
|
||||
|
||||
export default AdminList;
|
||||
export default AdminList;
|
||||
@@ -108,62 +108,45 @@ class LoginPage extends Component {
|
||||
}}
|
||||
/>
|
||||
</Tab>
|
||||
<Tab key="mobile" tab={formatMessage({ id: 'app.login.tab-login-mobile' })}>
|
||||
{login.status === 'error' &&
|
||||
login.type === 'mobile' &&
|
||||
!submitting &&
|
||||
this.renderMessage(
|
||||
formatMessage({ id: 'app.login.message-invalid-verification-code' })
|
||||
)}
|
||||
<Mobile
|
||||
name="username"
|
||||
placeholder={formatMessage({ id: 'form.phone-number.placeholder' })}
|
||||
rules={[
|
||||
{
|
||||
required: true,
|
||||
message: formatMessage({ id: 'validation.phone-number.required' }),
|
||||
},
|
||||
{
|
||||
pattern: /^1\d{10}$/,
|
||||
message: formatMessage({ id: 'validation.phone-number.wrong-format' }),
|
||||
},
|
||||
]}
|
||||
/>
|
||||
<Captcha
|
||||
name="password"
|
||||
placeholder={formatMessage({ id: 'form.verification-code.placeholder' })}
|
||||
countDown={120}
|
||||
onGetCaptcha={this.onGetCaptcha}
|
||||
getCaptchaButtonText={formatMessage({ id: 'form.get-captcha' })}
|
||||
getCaptchaSecondText={formatMessage({ id: 'form.captcha.second' })}
|
||||
rules={[
|
||||
{
|
||||
required: true,
|
||||
message: formatMessage({ id: 'validation.verification-code.required' }),
|
||||
},
|
||||
]}
|
||||
/>
|
||||
</Tab>
|
||||
<div>
|
||||
<Checkbox checked={autoLogin} onChange={this.changeAutoLogin}>
|
||||
<FormattedMessage id="app.login.remember-me" />
|
||||
</Checkbox>
|
||||
<a style={{ float: 'right' }} href="">
|
||||
<FormattedMessage id="app.login.forgot-password" />
|
||||
</a>
|
||||
</div>
|
||||
{/*<Tab key="mobile" tab={formatMessage({ id: 'app.login.tab-login-mobile' })}>*/}
|
||||
{/*{login.status === 'error' &&*/}
|
||||
{/*login.type === 'mobile' &&*/}
|
||||
{/*!submitting &&*/}
|
||||
{/*this.renderMessage(*/}
|
||||
{/*formatMessage({ id: 'app.login.message-invalid-verification-code' })*/}
|
||||
{/*)}*/}
|
||||
{/*<Mobile*/}
|
||||
{/*name="username"*/}
|
||||
{/*placeholder={formatMessage({ id: 'form.phone-number.placeholder' })}*/}
|
||||
{/*rules={[*/}
|
||||
{/*{*/}
|
||||
{/*required: true,*/}
|
||||
{/*message: formatMessage({ id: 'validation.phone-number.required' }),*/}
|
||||
{/*},*/}
|
||||
{/*{*/}
|
||||
{/*pattern: /^1\d{10}$/,*/}
|
||||
{/*message: formatMessage({ id: 'validation.phone-number.wrong-format' }),*/}
|
||||
{/*},*/}
|
||||
{/*]}*/}
|
||||
{/*/>*/}
|
||||
{/*<Captcha*/}
|
||||
{/*name="password"*/}
|
||||
{/*placeholder={formatMessage({ id: 'form.verification-code.placeholder' })}*/}
|
||||
{/*countDown={120}*/}
|
||||
{/*onGetCaptcha={this.onGetCaptcha}*/}
|
||||
{/*getCaptchaButtonText={formatMessage({ id: 'form.get-captcha' })}*/}
|
||||
{/*getCaptchaSecondText={formatMessage({ id: 'form.captcha.second' })}*/}
|
||||
{/*rules={[*/}
|
||||
{/*{*/}
|
||||
{/*required: true,*/}
|
||||
{/*message: formatMessage({ id: 'validation.verification-code.required' }),*/}
|
||||
{/*},*/}
|
||||
{/*]}*/}
|
||||
{/*/>*/}
|
||||
{/*</Tab>*/}
|
||||
<Submit loading={submitting}>
|
||||
<FormattedMessage id="app.login.login" />
|
||||
</Submit>
|
||||
<div className={styles.other}>
|
||||
<FormattedMessage id="app.login.sign-in-with" />
|
||||
<Icon type="alipay-circle" className={styles.icon} theme="outlined" />
|
||||
<Icon type="taobao-circle" className={styles.icon} theme="outlined" />
|
||||
<Icon type="weibo-circle" className={styles.icon} theme="outlined" />
|
||||
<Link className={styles.register} to="/user/register">
|
||||
<FormattedMessage id="app.login.signup" />
|
||||
</Link>
|
||||
</div>
|
||||
</Login>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
name="viewport"
|
||||
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
|
||||
/>
|
||||
<title>Ant Design Pro</title>
|
||||
<title>小商城管理平台</title>
|
||||
<link rel="icon" href="/favicon.png" type="image/x-icon" />
|
||||
</head>
|
||||
<body>
|
||||
|
||||
Reference in New Issue
Block a user