Commit 298b1ad8 by NitefllWind

1.loading和弹窗修改为模态窗口。

2.不再判断用户是否可支付。
3.修复支付金额的类型转换错误。
parent 8dde5e63
......@@ -29,7 +29,7 @@ void FMMsgWnd::show(InfoType type, const QString &info)
break;
}
ui->info_lbl->setText(info);
this->exec();
QDialog::exec();
}
void FMMsgWnd::on_ok_btn_clicked()
......
......@@ -236,12 +236,9 @@ void FMVipDispatcher::pay()
FMVipForward::instance()->addSessionData("needPay", QString::number(needPay));
FMVipForward::instance()->addSessionData("standard_amount", QString::number(standard_amount));
int canPay = FMVipForward::instance()->sessionDataInt("canPay");
// int canPay = FMVipForward::instance()->sessionDataInt("canPay");
if(canPay != 1) {
onDoPost();
}
else if (!_vindow) {
if (!_vindow) {
FMVipOrder *order = new FMVipOrder;
connect(order, SIGNAL(destroyed(QObject*)), SLOT(onFinished()));
connect(order, SIGNAL(doPost()), SLOT(onDoPost()));
......
......@@ -49,6 +49,6 @@ void FMVipFund::on_fund_btn_clicked()
ui->fund_btn->setEnabled(false);
setIsBusy(true);
emit doPost();
setIsBusy(true);
}
......@@ -39,8 +39,8 @@ void FMVipLogin::on_login_btn_clicked()
ui->login_btn->setEnabled(false);
ui->login_edit->setEnabled(false);
setIsBusy(true);
emit doPost();
setIsBusy(true);
}
void FMVipLogin::on_login_result(QNetworkReply *reply)
......
......@@ -67,8 +67,8 @@ void FMVipOrder::on_pay_btn_clicked()
ui->pay_btn->setEnabled(false);
ui->pay_chk->setEnabled(false);
setIsBusy(true);
emit doPost();
setIsBusy(true);
}
void FMVipOrder::on_pay_chk_clicked(bool checked)
......
......@@ -62,7 +62,7 @@ private:
QString getPayAmountStr(QString amountStr)
{
int payAmount = amountStr.toInt() * 100;
double payAmount = amountStr.toDouble() * 100;
return QString::number(payAmount);
}
......
......@@ -50,7 +50,7 @@ void FMVipWnd::setIsBusy(const bool isBusy)
{
if(isBusy)
{
loadingWindow->show();
loadingWindow->exec();
}else{
loadingWindow->hide();
}
......
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