Commit 35fe4f4b by NitefullWind

v1.6 更新:1. 充值前增加一个"是否确认"的提示框。 2. 限制只能进行实体卡充值。

parent 6c703210
......@@ -42,7 +42,8 @@ SOURCES += main.cpp\
fmprinter.cpp \
fmsetting.cpp \
windows/fmvipsetting.cpp \
task/taskconfirmrecharge.cpp
task/taskconfirmrecharge.cpp \
windows/fmconfirmwnd.cpp
HEADERS += \
task/fmtask.h \
......@@ -76,7 +77,8 @@ HEADERS += \
fmprinter.h \
fmsetting.h \
windows/fmvipsetting.h \
task/taskconfirmrecharge.h
task/taskconfirmrecharge.h \
windows/fmconfirmwnd.h
FORMS += \
windows/forms/fmloading.ui \
......@@ -86,7 +88,8 @@ FORMS += \
windows/forms/fmviporder.ui \
windows/forms/fmvippanel.ui \
windows/forms/fmnumpad.ui \
windows/forms/fmvipsetting.ui
windows/forms/fmvipsetting.ui \
windows/forms/fmconfirmwnd.ui
INCLUDEPATH += ../FMVipDC/ ./task ./windows ./backup
......
#include "fmconfirmwnd.h"
#include "ui_fmconfirmwnd.h"
FMConfirmWnd::FMConfirmWnd(QString text, FMVipWnd *parent) :
FMVipWnd(parent),
ui(new Ui::FMConfirmWnd)
{
ui->setupUi(this);
setAttribute(Qt::WA_TranslucentBackground);
ui->labelContext->setText(text);
}
FMConfirmWnd::~FMConfirmWnd()
{
delete ui;
}
int FMConfirmWnd::exec()
{
return QDialog::exec();
}
int FMConfirmWnd::Confirm(QString text)
{
FMConfirmWnd confirmWnd(text);
return confirmWnd.exec();
}
void FMConfirmWnd::on_btnCancel_clicked()
{
this->done(FMCancel);
}
void FMConfirmWnd::on_btnOk_clicked()
{
this->done(FMOk);
}
#ifndef FMCONFIRMND_H
#define FMCONFIRMND_H
#include "fmvipwnd.h"
namespace Ui {
class FMConfirmWnd;
}
class FMConfirmWnd : public FMVipWnd
{
Q_OBJECT
public:
explicit FMConfirmWnd(QString text="", FMVipWnd *parent = 0);
~FMConfirmWnd();
enum {
FMCancel = -1,
FMOk = 1
};
int exec();
static int Confirm(QString text);
private slots:
void on_btnCancel_clicked();
void on_btnOk_clicked();
private:
Ui::FMConfirmWnd *ui;
};
#endif // FMCONFIRMND_H
......@@ -3,6 +3,7 @@
#include "ui_fmvipfund.h"
#include "fmnumpad.h"
#include "fmmsgwnd.h"
#include "fmconfirmwnd.h"
FMVipFund::FMVipFund(QDialog *parent) :
FMVipWnd(parent),
......@@ -74,9 +75,13 @@ void FMVipFund::on_fund_btn_clicked()
{
qDebug() << __FUNCTION__;
int fundAmount = ui->amount_edit->text().toDouble() * 100;
_session->addData(PosProps.ChargeAmount, fundAmount);
this->setEnabled(false);
QString text = QString("确认充值 %1 元?").arg(ui->amount_edit->text().toDouble());
if(FMConfirmWnd::Confirm(text) != FMConfirmWnd::FMOk){
return;
}
_session->addData(PosProps.ChargeAmount, fundAmount);
setIsBusy(true);
......
......@@ -3,6 +3,7 @@
#include "ui_fmvippanel.h"
#include "fmvipfund.h"
#include "fmvipfund.h"
#include "fmmsgwnd.h"
#include <QFile>
......@@ -42,5 +43,9 @@ bool FMVipPanel::initWnd(Session *session)
void FMVipPanel::on_fund_btn_clicked()
{
emit fund();
if(session()->data(PosProps.Member_type).toInt() == Member_Type::EntityCard) {
emit fund();
} else {
FMMsgWnd::FailureWnd("POS上只能进行实体卡充值!");
}
}
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>FMConfirmWnd</class>
<widget class="QWidget" name="FMConfirmWnd">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>425</width>
<height>290</height>
</rect>
</property>
<property name="maximumSize">
<size>
<width>425</width>
<height>290</height>
</size>
</property>
<property name="mouseTracking">
<bool>false</bool>
</property>
<property name="windowTitle">
<string>FMConfirmwnd</string>
</property>
<property name="styleSheet">
<string notr="true">
#FMConfirmWnd{
min-width: 425px; min-height: 290;
border-image:url(&quot;:/alert_bg.png&quot;);
background: transparent;
font: normal 22px &quot;Microsoft YaHei&quot;;
}
#close_btn {
min-width: 30px; min-height: 30px;
max-width: 30px; max-height: 30px;
border-image: url(&quot;:/btn_alert_close.png&quot;);
}
#alertIconLab
{
color: rgb(0, 0, 0);
font: normal 22px &quot;Microsoft YaHei&quot;;
margin-top: 20px;
}
#alertLabMsg
{
min-height: 110px;
color: rgb(129, 129, 129);
font: normal 19px &quot;Microsoft YaHei&quot;
}
QPushButton
{
max-width: 180px; max-height: 45px;
color: rgb(255, 255, 255);
border-radius: 3px;
font: normal 22px &quot;Microsoft YaHei&quot;
}
#btnCancel
{
background-color: rgb(221, 88, 51);
}
#btnOk
{
background-color: rgb(37,176,241);
}
QPushButton:pressed
{
color: rgb(161, 161, 161);
border-radius: 3px;
}
#labelContext
{
font: normal 22px &quot;Microsoft YaHei&quot;;
}</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>20</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="spacing">
<number>0</number>
</property>
<property name="leftMargin">
<number>20</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>20</number>
</property>
<item>
<widget class="QLabel" name="labelContext">
<property name="text">
<string>确认吗?确认吗?确认吗?确认吗?</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<property name="spacing">
<number>0</number>
</property>
<property name="bottomMargin">
<number>10</number>
</property>
<item>
<widget class="QPushButton" name="btnCancel">
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="text">
<string>取消</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="btnOk">
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="text">
<string>确认</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
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