diff --git a/controller/user.go b/controller/user.go
index 935ac327..8fd10b82 100644
--- a/controller/user.go
+++ b/controller/user.go
@@ -483,7 +483,7 @@ func DeleteSelf(c *gin.Context) {
if user.Role == common.RoleRootUser {
c.JSON(http.StatusOK, gin.H{
"success": false,
- "message": "无权删除超级管理员",
+ "message": "不能删除超级管理员账户",
})
return
}
diff --git a/web/src/components/PersonalSetting.js b/web/src/components/PersonalSetting.js
index 9d0c6784..a4cc80ec 100644
--- a/web/src/components/PersonalSetting.js
+++ b/web/src/components/PersonalSetting.js
@@ -1,19 +1,19 @@
-import React, { useEffect, useState, useContext } from 'react';
-import { Button, Divider, Form, Header, Image, Message, Modal, Label } from 'semantic-ui-react';
+import React, { useContext, useEffect, useState } from 'react';
+import { Button, Divider, Form, Header, Image, Message, Modal } from 'semantic-ui-react';
import { Link, useNavigate } from 'react-router-dom';
import { API, copy, showError, showInfo, showNotice, showSuccess } from '../helpers';
import Turnstile from 'react-turnstile';
import { UserContext } from '../context/User';
const PersonalSetting = () => {
- const [userDispatch] = useContext(UserContext);
+ const [userState, userDispatch] = useContext(UserContext);
let navigate = useNavigate();
const [inputs, setInputs] = useState({
wechat_verification_code: '',
email_verification_code: '',
email: '',
- self_account_deletion_confirmation: '',
+ self_account_deletion_confirmation: ''
});
const [status, setStatus] = useState({});
const [showWeChatBindModal, setShowWeChatBindModal] = useState(false);
@@ -64,8 +64,8 @@ const PersonalSetting = () => {
};
const deleteAccount = async () => {
- if (inputs.self_account_deletion_confirmation !== 'CONFIRM') {
- showError('请确认您要删除账户!');
+ if (inputs.self_account_deletion_confirmation !== userState.user.username) {
+ showError('请输入你的账户名以确认删除!');
return;
}
@@ -81,7 +81,7 @@ const PersonalSetting = () => {
} else {
showError(message);
}
- }
+ };
const bindWeChat = async () => {
if (inputs.wechat_verification_code === '') return;
@@ -151,7 +151,7 @@ const PersonalSetting = () => {
+ }}>删除个人账户
{
@@ -266,14 +266,13 @@ const PersonalSetting = () => {
size={'tiny'}
style={{ maxWidth: '450px' }}
>
- 您是否确认删除自己的帐户?
+ 确认删除自己的帐户