Commit ce35a7d8 by NitefullWind

1. 修复金额输入错误时金额被清空问题。 2. 修复支付自动关闭窗口后未退出时间循环问题。

parent 3c678510
...@@ -620,10 +620,10 @@ void FMPPayDialog::onBtnConfirmClicked() ...@@ -620,10 +620,10 @@ void FMPPayDialog::onBtnConfirmClicked()
(ui->lineedit_code->text().size() < 15 && ui->lineedit_code_refund->text().size() < 15) (ui->lineedit_code->text().size() < 15 && ui->lineedit_code_refund->text().size() < 15)
) )
{ {
if (!_is_api) { // if (!_is_api) {
ui->lineedit_num->clear(); // ui->lineedit_num->clear();
ui->lineedit_num_refund->clear(); // ui->lineedit_num_refund->clear();
} // }
ui->lineedit_code->clear(); ui->lineedit_code->clear();
ui->lineedit_code_refund->clear(); ui->lineedit_code_refund->clear();
_wait->SetContent(FMPPayWait::ERRORS, QString::fromLocal8Bit("金额或条码错误\n请重新输入")); _wait->SetContent(FMPPayWait::ERRORS, QString::fromLocal8Bit("金额或条码错误\n请重新输入"));
...@@ -715,6 +715,9 @@ void FMPPayDialog::on_btn_success_confirm_clicked() ...@@ -715,6 +715,9 @@ void FMPPayDialog::on_btn_success_confirm_clicked()
PlayAnimation(ui->wdg_success_main, nextwdg, LeftToRight); PlayAnimation(ui->wdg_success_main, nextwdg, LeftToRight);
on_btn_close_clicked(); on_btn_close_clicked();
//! 退出事件循环
_control->OnFinish();
} }
void FMPPayDialog::on_btn_paycheck_clicked() void FMPPayDialog::on_btn_paycheck_clicked()
......
Plugin-SymbolicName: fmp.epay Plugin-SymbolicName: fmp.epay
Plugin-Version: 0.1.0 Plugin-Version: 0.1.0
Plugin-Name: fmp.epay Plugin-Name: fmp.epay
Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2017 Plugin-Copyright: Freemud Ltd. Copyright (C) 2014-2018
Plugin-Vendor: Freemud Plugin-Vendor: Freemud
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#define VER_MINOR 1 #define VER_MINOR 1
#define VER_REVISION 0 #define VER_REVISION 0
#define VER_BUILD 22 #define VER_BUILD 24
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_FILE_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD) #define RES_STR_PRODUCT_VER MAK_VER(VER_MAJOR, VER_MINOR, VER_REVISION, VER_BUILD)
#define RES_COMPANY_NAME "上海非码网络科技有限公司\0" #define RES_COMPANY_NAME "上海非码网络科技有限公司\0"
#define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2017\0" #define RES_COPYRIGHT "Freemud Ltd. Copyright (C) 2014-2018\0"
#define RES_FILE_DESC "fmp.epay\0" #define RES_FILE_DESC "fmp.epay\0"
#define RES_INTER_NAME "fmp.epay\0" #define RES_INTER_NAME "fmp.epay\0"
#define RES_FILE_NAME "fmp.epay\0" #define RES_FILE_NAME "fmp.epay\0"
......
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