From a689fd419db8a989df8ecaff17de3207c8e74d4f Mon Sep 17 00:00:00 2001 From: 487 <2195436316@qq.com> Date: Sat, 24 Dec 2022 15:27:26 +0800 Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E8=BE=93=E5=85=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=80=9F=E5=85=A5=E9=A2=84=E7=BA=A6=E4=B9=A6?= =?UTF-8?q?=E7=B1=8D=E5=8F=96=E6=B6=88=E9=A2=84=E7=BA=A6=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LibManageSystem_Sever/usermanage.cpp | 6 ++++-- LibManageSystem_Sever/widget.cpp | 2 +- LibManagementSystem/borrow.cpp | 18 ++++++++++++++++++ LibManagementSystem/infoedit.cpp | 5 +++-- LibManagementSystem/regis.cpp | 6 ++++-- 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/LibManageSystem_Sever/usermanage.cpp b/LibManageSystem_Sever/usermanage.cpp index 425b582..585a13b 100644 --- a/LibManageSystem_Sever/usermanage.cpp +++ b/LibManageSystem_Sever/usermanage.cpp @@ -256,7 +256,9 @@ void UserManage::on_appoBtn_clicked() { QString account=ui->AcolineEdit->text().trimmed(); QString appointed=ui->appointedbookname->text().trimmed(); - if(!appointed.isEmpty()) + QRegularExpression rgl("([0-9]+)([-])(.+)"); + QRegularExpressionMatch match = rgl.match(appointed); + if(!appointed.isEmpty() && match.hasMatch()) { int id=(appointed.mid(0,appointed.indexOf("-"))).toInt(); int i=db->Appoint(id,account); @@ -270,7 +272,7 @@ void UserManage::on_appoBtn_clicked() } else QMessageBox::warning(this,"警告","您当前无预约权利"); } - QMessageBox::critical(this,"错误","请输入要预约的书籍信息，格式为lib_code-bookname！"); + else QMessageBox::critical(this,"错误","请输入要预约的书籍信息，格式为lib_code-bookname！"); } diff --git a/LibManageSystem_Sever/widget.cpp b/LibManageSystem_Sever/widget.cpp index 2869426..0382aae 100644 --- a/LibManageSystem_Sever/widget.cpp +++ b/LibManageSystem_Sever/widget.cpp @@ -31,7 +31,7 @@ Widget::Widget(QWidget *parent) : ui->stackedWidget->addWidget(manageWidget); ui->stackedWidget->addWidget(loginWidget); - ui->stackedWidget->setCurrentWidget(manageWidget); + ui->stackedWidget->setCurrentWidget(loginWidget); connect(loginWidget,&MainWindow::open_managewin,[=](){ ui->stackedWidget->setCurrentWidget(manageWidget); diff --git a/LibManagementSystem/borrow.cpp b/LibManagementSystem/borrow.cpp index 05d79e7..4865570 100644 --- a/LibManagementSystem/borrow.cpp +++ b/LibManagementSystem/borrow.cpp @@ -53,6 +53,24 @@ void borrow::on_enter_btn_clicked() QByteArray msg; char t = stopChar; msg += "BORROW" + ui->no_edit->text().toStdString() + t + user->account.toStdString(); + if(borbookcut(user->appointedbook,1) == ui->name_edit->text()) + { + QStringMatcher match("预约"); + int re = QMessageBox::question(this,"提示","此书为您预约的书籍，是否取消预约并完成借阅？" + ,QMessageBox::Yes|QMessageBox::No); + switch(re){ + case QMessageBox::Yes: + emit send_app(msg); + if(match.indexIn(user->message) != -1){ + user->message = ""; + } + return; + + default: + return; + } + } + emit send_enter(msg); } diff --git a/LibManagementSystem/infoedit.cpp b/LibManagementSystem/infoedit.cpp index 856c7f3..22a5963 100644 --- a/LibManagementSystem/infoedit.cpp +++ b/LibManagementSystem/infoedit.cpp @@ -128,10 +128,11 @@ void infoEdit::on_enter_clicked() box->setAttribute(Qt::WA_DeleteOnClose); return; } - + QRegularExpression rgl("(.+)([@])(.+)([.])(.+)"); + QRegularExpressionMatch match = rgl.match(mail); int is_at; is_at = mail.indexOf('@'); - if(is_at == -1){ + if(is_at == -1 || !match.hasMatch()){ QMessageBox* box = new QMessageBox(this); box->setIcon(QMessageBox::Critical); box->setWindowTitle("修改失败"); diff --git a/LibManagementSystem/regis.cpp b/LibManagementSystem/regis.cpp index 73f02d3..3d8190b 100644 --- a/LibManagementSystem/regis.cpp +++ b/LibManagementSystem/regis.cpp @@ -27,7 +27,7 @@ regis::regis(QDialog *parent) : ui->inacc->setValidator(new QRegularExpressionValidator(regExp5,this)); ui->inacc->setPlaceholderText("输入您的账号,之后不可更改"); //密码 - QRegularExpression regExp4("[a-zA-Z0-9.@#/?!-%]"); + QRegularExpression regExp4("[a-zA-Z0-9.@#/?!-%]+"); ui->inpass->setValidator(new QRegularExpressionValidator(regExp4,this)); ui->inrepa->setValidator(new QRegularExpressionValidator(regExp4,this)); ui->inpass->setPlaceholderText("输入您的密码,至少6位"); @@ -72,9 +72,11 @@ void regis::on_confirm_clicked() box->setAttribute(Qt::WA_DeleteOnClose); return; } + QRegularExpression rgl("(.+)([@])([^.]+)([.])(.+)"); + QRegularExpressionMatch match = rgl.match(mail); int is_at; is_at = mail.indexOf('@'); - if(is_at == -1){ + if(is_at == -1 || !match.hasMatch()){ QMessageBox* box = new QMessageBox(this); box->setIcon(QMessageBox::Critical); box->setWindowTitle("注册失败"); -- Gitee