Commit fd5aa690 authored by 文旺-丰林-DEV's avatar 文旺-丰林-DEV

merge code

parents ef0fd56b b59a755e
...@@ -133,7 +133,7 @@ const Chat: React.FC = () => { ...@@ -133,7 +133,7 @@ const Chat: React.FC = () => {
/> />
</Col> </Col>
<Col>AI改变世界</Col> <Col>AI改变世界</Col>
<Col pull={1}></Col> <Col pull={1} />
</Row> </Row>
); );
}; };
...@@ -219,7 +219,7 @@ const Chat: React.FC = () => { ...@@ -219,7 +219,7 @@ const Chat: React.FC = () => {
</Col> </Col>
{promptLoading && ( {promptLoading && (
<Col span={24}> <Col span={24}>
<PageLoading></PageLoading> <PageLoading />
</Col> </Col>
)} )}
<Col span={'24'} style={{ padding: isMobile ? '' : '0 100px' }}> <Col span={'24'} style={{ padding: isMobile ? '' : '0 100px' }}>
......
...@@ -92,11 +92,11 @@ const UserManage = () => { ...@@ -92,11 +92,11 @@ const UserManage = () => {
status: 'Error', status: 'Error',
}, },
}, },
render(text, record) { render(_text, record) {
return ( return (
<div className={styles.isActive}> <div className={styles.isActive}>
<span className={classNames(styles.dot, record.isActive ? styles.green : styles.red)} /> <span className={classNames(styles.dot, record.isActive ? styles.green : styles.red)} />
<div>{record.isActive ? '启' : '禁用'}</div> <div>{record.isActive ? '启' : '禁用'}</div>
</div> </div>
); );
}, },
...@@ -174,19 +174,14 @@ const UserManage = () => { ...@@ -174,19 +174,14 @@ const UserManage = () => {
const createdAccount = (values: any) => { const createdAccount = (values: any) => {
setLoading(true); setLoading(true);
const data = {
role: values.roles,
Phone: values.phoneNumber,
Password: values,
};
CreatedAccount(values) CreatedAccount(values)
.then((res) => { .then(() => {
setLoading(false); setLoading(false);
setIsModalAccountOpen(false); setIsModalAccountOpen(false);
accountForm.resetFields(); accountForm.resetFields();
actionRef.current?.reload(); actionRef.current?.reload();
}) })
.catch((error) => { .catch(() => {
setLoading(false); setLoading(false);
}); });
}; };
...@@ -198,14 +193,14 @@ const UserManage = () => { ...@@ -198,14 +193,14 @@ const UserManage = () => {
id: editMessage.id, id: editMessage.id,
}; };
postEditUser(data) postEditUser(data)
.then((res) => { .then(() => {
setLoading(false); setLoading(false);
setIsModalAccountOpen(false); setIsModalAccountOpen(false);
message.success('编辑成功'); message.success('编辑成功');
accountForm.resetFields(); accountForm.resetFields();
actionRef.current?.reload(); actionRef.current?.reload();
}) })
.catch((error) => { .catch(() => {
setLoading(false); setLoading(false);
}); });
}; };
...@@ -247,12 +242,12 @@ const UserManage = () => { ...@@ -247,12 +242,12 @@ const UserManage = () => {
postDeleteUser({ postDeleteUser({
id: deleteMessage.id, id: deleteMessage.id,
}) })
.then((res) => { .then(() => {
setIsModalDeleteAccountOpen(false); setIsModalDeleteAccountOpen(false);
actionRef.current?.reload(); actionRef.current?.reload();
message.success('删除成功'); message.success('删除成功');
}) })
.catch((err) => { .catch(() => {
setIsModalDeleteAccountOpen(false); setIsModalDeleteAccountOpen(false);
}); });
}; };
...@@ -264,14 +259,14 @@ const UserManage = () => { ...@@ -264,14 +259,14 @@ const UserManage = () => {
Password: values?.newPassword, Password: values?.newPassword,
}; };
postResetUser(data) postResetUser(data)
.then((res) => { .then(() => {
setResetLoading(false); setResetLoading(false);
setIsModalResetPassword(false); setIsModalResetPassword(false);
actionRef.current?.reload(); actionRef.current?.reload();
resetPasswordForm.resetFields(); resetPasswordForm.resetFields();
message.success('重置成功'); message.success('重置成功');
}) })
.catch((err) => { .catch(() => {
setResetLoading(false); setResetLoading(false);
}); });
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment