|
@@ -57,21 +57,21 @@ void LoginView::connectSignalsAndSlots()
|
|
|
{
|
|
|
connect(m_loginWidget, &LoginWidget::signalLogin, this, &LoginView::slotLogin);
|
|
|
connect(m_loginWidget, &LoginWidget::signalCancel, this, &LoginView::slotCancelLogin);
|
|
|
- connect(m_registerWidget, &RegisterWidget::signalConfirm, this, &LoginView::slotConfirmAcc);
|
|
|
- connect(m_registerWidget, &RegisterWidget::signalCancel, this, &LoginView::slotCancelAcc);
|
|
|
+ connect(m_registerWidget, &RegisterWidget::signalConfirm, this, &LoginView::slotConfirmAccount);
|
|
|
+ connect(m_registerWidget, &RegisterWidget::signalCancel, this, &LoginView::slotCancelAccount);
|
|
|
connect(m_stackedWidget, &QStackedWidget::currentChanged, this, &LoginView::slotStackIndexChanged);
|
|
|
}
|
|
|
|
|
|
/// 提示登录错误信息
|
|
|
void LoginView::showAlertWithCode(int code) const
|
|
|
{
|
|
|
- if (code == QF_CODE_COMPLETED) {
|
|
|
+ if (code == QF_CODE_SUCCEEDED) {
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
QString msg;
|
|
|
|
|
|
- if (code == QF_CODE_EMPTY_USERNAME) {
|
|
|
+ if (code == QF_CODE_EMPTY_ACCOUNT) {
|
|
|
msg = "账号不能为空";
|
|
|
} else if (code == QF_CODE_EMPTY_PASSWORD) {
|
|
|
msg = "密码不能为空";
|
|
@@ -79,6 +79,12 @@ void LoginView::showAlertWithCode(int code) const
|
|
|
msg = "用户不存在";
|
|
|
} else if (code == QF_CODE_WRONG_PASSWORD) {
|
|
|
msg = "密码错误";
|
|
|
+ } else if (code == QF_CODE_PASSWORD_NOT_SAME) {
|
|
|
+ msg = "两次输入密码不一致,请修改后重试";
|
|
|
+ } else if (code == QF_CODE_PASSWORD_UNCHANGED) {
|
|
|
+ msg = "不能与旧密码相同,请修改后重试";
|
|
|
+ } else if (code == QF_CODE_DATA_ERROR) {
|
|
|
+ msg = "数据错误";
|
|
|
}
|
|
|
|
|
|
if (!msg.isEmpty()) {
|
|
@@ -96,7 +102,7 @@ void LoginView::slotLogin()
|
|
|
|
|
|
qDebug() << __FUNCTION__ << __LINE__ << "login code:" << code;
|
|
|
|
|
|
- if ((code == QF_CODE_COMPLETED || code == QF_CODE_ALREADY_LOGIN) && QFUser::currentUser() != nullptr) {
|
|
|
+ if ((code == QF_CODE_SUCCEEDED || code == QF_CODE_ALREADY_LOGIN) && QFUser::currentUser() != nullptr) {
|
|
|
m_loginWidget->saveAccountConfig(); // 登录成功后存储登录设置
|
|
|
|
|
|
if (QFDConfig::roleType() == QFUser::SuperAdmin) {
|
|
@@ -113,20 +119,23 @@ void LoginView::slotLogin()
|
|
|
|
|
|
void LoginView::slotCancelLogin()
|
|
|
{
|
|
|
- qDebug() << __FUNCTION__ << __LINE__;
|
|
|
- setStackIndex(m_stackedWidget->currentIndex() + 1);
|
|
|
emit signalCancelLogin();
|
|
|
}
|
|
|
|
|
|
-void LoginView::slotConfirmAcc()
|
|
|
+void LoginView::slotConfirmAccount()
|
|
|
{
|
|
|
- qDebug() << __FUNCTION__ << __LINE__;
|
|
|
- setStackIndex(m_stackedWidget->currentIndex() + 1);
|
|
|
+ QString account = m_registerWidget->account();
|
|
|
+ QString password = m_registerWidget->password();
|
|
|
+ QString repeatPassword = m_registerWidget->repeatPassword();
|
|
|
+ QFUser *user = QFUser::currentUser();
|
|
|
+
|
|
|
+ int code = user->resetAdmin(account, password, repeatPassword);
|
|
|
+ qDebug() << __FUNCTION__ << __LINE__ << "reset code:" << code;
|
|
|
+ showAlertWithCode(code);
|
|
|
}
|
|
|
|
|
|
-void LoginView::slotCancelAcc()
|
|
|
+void LoginView::slotCancelAccount()
|
|
|
{
|
|
|
- qDebug() << __FUNCTION__ << __LINE__;
|
|
|
setStackIndex(m_stackedWidget->currentIndex() + 1);
|
|
|
}
|
|
|
|