Skip to content

F
FMVip_Today
Commit c987ab89 by NitefllWind
Options

1. 只调用会员认证接口时且认证成功时，弹窗显示会员账号、姓名、生日。2. 充值、支付页面增加显示会员生日。3. 所有的会员认证界面认证错误后都可以继续输入认证。

parent 1d1e5399
Showing with 165 additions and 33 deletions
FMVip/fmmsgwnd.cpp
......@@ -30,14 +30,16 @@ void FMMsgWnd::show(InfoType type, const QString &info)
case InfoType::T_Warning:
iconUrl = ":/tip_warning.png";
break;
case InfoType::T_LoginSuccess:
// ui->alertIconLab->setText("会员认证成功");
iconUrl = ":/tip_ok.png";
break;
default:
iconUrl = "";
break;
}
if(iconUrl == ""){
ui->alertIconLab->setText(iconUrl);
}else{
if(iconUrl != ""){
QPixmap icon(iconUrl);
ui->alertIconLab->setPixmap(icon);
}
......@@ -56,6 +58,18 @@ void FMMsgWnd::WarningWnd(const QString &info)
FMMsgWnd window;
window.show(FMMsgWnd::T_Warning, info);
}
void FMMsgWnd::SuccessWnd(const QString &info)
{
FMMsgWnd window;
window.show(FMMsgWnd::T_Success, info);
}
void FMMsgWnd::LoginSuccess(const QString &account, const QString &name, const QString &birthday)
{
FMMsgWnd window;
QString info = QString("账号：%1\n姓名：%2\n生日：%3").arg(account).arg(name).arg(birthday);
window.show(FMMsgWnd::T_LoginSuccess, info);
}
void FMMsgWnd::on_alertBtnOk_clicked()
{
......
FMVip/fmmsgwnd.h
......@@ -20,12 +20,15 @@ public:
T_Normal,
T_Success,
T_Failure,
T_Warning
T_Warning,
T_LoginSuccess
};
void show(InfoType type = T_Normal, const QString &info = "");
static void FailureWnd(const QString &info);
static void WarningWnd(const QString &info);
static void SuccessWnd(const QString &info);
static void LoginSuccess(const QString &account, const QString &name, const QString &birthday);
private slots:
void on_alertBtnOk_clicked();
......
FMVip/fmvipdispatcher.cpp
......@@ -78,6 +78,7 @@ INT FMVipDispatcher::_ParseRequest(LPSTR data)
isLastOne = true;
_serverRspData.clear();
isPayLogin = false;
isLogin = false;
// 唤起客户端界面
emit requested(_posReqObj);
......@@ -137,7 +138,7 @@ void FMVipDispatcher::onRequest(const QJsonObject &jsonObj)
#endif
else if(type == Type_Pay || type == Type_Fund) {
requestSuccess = true;
// 支付、充值、结算先检查登陆状态。
// 支付、充值先检查登陆状态。
QJsonObject copyJsonObj(jsonObj);
if(type == Type_Fund && !isLogined())
{
......@@ -189,31 +190,41 @@ void FMVipDispatcher::onFinished()
}
void FMVipDispatcher::onServerResponsed(const QJsonObject &rspObj)
{
{
int status = rspObj["statusCode"].toInt();
int prompt = rspObj["prompt"].toInt();
if(_vindow != 0) {
_vindow->setIsBusy(false);
// 支付时， 会员认证的返回，如果不可付款
int canPan = FMVipForward::instance()->sessionDataInt("canPay");
int canPay = FMVipForward::instance()->sessionDataInt("canPay");
// 如果是支付认证则不关闭窗口
if(isPayLogin)
{
if(status != 100)
{
if(isLogin) {
// 失败则弹出错误信息
if(status != 100) {
_vindow->resetWnd();
FMMsgWnd::FailureWnd(rspObj["msg"].toString());
return;
}else if(canPan != 1)
{
_vindow->resetWnd();
FMMsgWnd::FailureWnd("请使用支付码付款");
return;
}
isPayLogin = false;
// 成功，且是最后一步，则弹出认证信息
else if(isLastOne) {
QString account = FMVipForward::instance()->sessionData("fm_open_id");
QString name = FMVipForward::instance()->sessionData("name");
QString birthday = FMVipForward::instance()->sessionData("birthday");
FMMsgWnd::LoginSuccess(account, name, birthday);
}
// 成功，是支付认证，但不能支付
else if(isPayLogin) {
if(canPay != 1) {
_vindow->resetWnd();
FMMsgWnd::FailureWnd("请使用支付码付款");
return;
}
isPayLogin = false;
}
}
isLogin = false;
_vindow->deleteLater();
}
......@@ -221,7 +232,6 @@ void FMVipDispatcher::onServerResponsed(const QJsonObject &rspObj)
QByteArray rspData = rspDoc.toJson();
_serverRspData = rspData;
if(status != 100) {
if(prompt == 0)
{
......@@ -246,6 +256,7 @@ void FMVipDispatcher::onDoPost()
void FMVipDispatcher::login()
{
isLogin = true;
if (!_vindow) {
FMVipLogin *login = new FMVipLogin(isPayLogin);
connect(login, SIGNAL(destroyed(QObject*)), SLOT(onFinished()));
......
FMVip/fmvipdispatcher.h
......@@ -65,6 +65,7 @@ private:
QWaitCondition serverIsBusy;
BOOL requestSuccess;
BOOL isPayLogin;
BOOL isLogin;
};
#endif // FMVIPDISPATCHER_H
FMVip/fmvipforward.cpp
......@@ -301,8 +301,11 @@ void FMVipForward::logined(const QJsonObject &serverJob, QJsonObject &posJob)
name = (name.isEmpty()) ? "未知" : name;
QString mobile = memberObj["mobile"].toString();
mobile = (mobile.isEmpty()) ? "未知" : mobile;
QString birthday = memberObj["birthday"].toString();
birthday = (birthday.isEmpty()) ? "未知" : birthday;
addSessionData("name", name);
addSessionData("mobile", mobile);
addSessionData("birthday", birthday);
}
void FMVipForward::funded(const QJsonObject &serverJob, QJsonObject &posJob)
......
FMVip/fmvipfund.cpp
......@@ -14,6 +14,7 @@ FMVipFund::FMVipFund(QDialog *parent) :
QString amount_str = FMVipForward::instance()->sessionData("amount");
QString charge_amount_str = FMVipForward::instance()->sessionData("charge_amount");
QString name = FMVipForward::instance()->sessionData("name");
QString birthday = FMVipForward::instance()->sessionData("birthday");
double amount = amount_str.toDouble() / 100.0;
double charge_amount = charge_amount_str.toDouble() / 100.0;
......@@ -27,6 +28,7 @@ FMVipFund::FMVipFund(QDialog *parent) :
ui->balance_label->setText(show_amount_str);
ui->amount_edit->setText(show_charge_amount_str);
ui->name_label->setText(name);
ui->bir_label->setText(birthday);
ui->fund_btn->setFocus();
}
......
FMVip/fmviporder.cpp
......@@ -18,6 +18,7 @@ FMVipOrder::FMVipOrder(QDialog *parent) :
QString score_str = FMVipForward::instance()->sessionData("score");
QString needPay_str = FMVipForward::instance()->sessionData("needPay");
QString name = FMVipForward::instance()->sessionData("name");
QString birthday = FMVipForward::instance()->sessionData("birthday");
double standard_amount = FMVipForward::instance()->sessionDataInt("standard_amount") / 100.0;
orderInfo = new FMVipOrder::OrderInfo(amount_str, score_str, needPay_str);
......@@ -30,6 +31,7 @@ FMVipOrder::FMVipOrder(QDialog *parent) :
ui->balance_label->setText(orderInfo->getAmountStr());
ui->price_label->setText(orderInfo->getNeedPayStr());
ui->name_label->setText(name);
ui->bir_label->setText(birthday);
initCouponItems();
connect(ui->coupon_page, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(onItemClicked(QListWidgetItem*)));
......
FMVip/forms/fmmsgwnd.ui
......@@ -25,20 +25,21 @@
background: transparent;
}
#alertIconLab
{
image:url(":/tip_error.png");
}
#close_btn {
min-width: 30px; min-height: 30px;
max-width: 30px; max-height: 30px;
border-image: url(":/btn_alert_close.png");
}
#alertIconLab
{
color: rgb(0, 0, 0);
font: normal 22px "Microsoft YaHei";
margin-top: 20px;
}
#alertLabMsg
{
min-height: 110px;
color: rgb(129, 129, 129);
font: normal 19px "Microsoft YaHei"
}
......@@ -84,8 +85,11 @@
</property>
<item>
<widget class="QLabel" name="alertIconLab">
<property name="text">
<string>Title</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
</property>
</widget>
</item>
......
FMVip/forms/fmvipfund.ui
......@@ -257,6 +257,36 @@ QPushButton#fund_btn:hover {
</spacer>
</item>
<item>
<widget class="QLabel" name="bir_desc_label">
<property name="text">
<string>生日：</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="bir_label">
<property name="text">
<string>2016-9-27</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_20">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>122</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="name_desc_label">
<property name="text">
<string>姓名：</string>
......
FMVip/forms/fmviporder.ui
......@@ -131,7 +131,7 @@
}
#coupon_prev_btn, #coupon_next_btn {
font: 400 16px &quot;Microsoft YaHei&quot;;
min-height: 40px; max-height: 40px;
min-height: 60px; max-height: 60px;
min-width: 70px; max-width: 70px;
border: 1 solid rgb(228,228,228);
border-radius: 7px;
......@@ -141,14 +141,15 @@
background: rgb(154,200,50);
color: white;
}
/*
#coupon_prev_btn
{
margin-top: 50px;
margin-top: 35px;
}
#coupon_next_btn
{
margin-bottom: 50px;
}
margin-bottom: 35px;
}*/
/*
* 支付
......@@ -397,6 +398,36 @@
</spacer>
</item>
<item>
<widget class="QLabel" name="bir_desc_label">
<property name="text">
<string>生日：</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="bir_label">
<property name="text">
<string>2016-9-27</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_20">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>122</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="name_desc_label">
<property name="text">
<string>姓名：</string>
......@@ -460,7 +491,7 @@
<item>
<widget class="QLabel" name="point_label">
<property name="text">
<string>0</string>
<string>100000</string>
</property>
</widget>
</item>
......@@ -597,13 +628,30 @@
</item>
<item>
<layout class="QVBoxLayout" name="pageCtrlLayLayout">
<property name="spacing">
<number>0</number>
</property>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="coupon_prev_btn">
<property name="cursor">
<cursorShape>PointingHandCursor</cursorShape>
</property>
<property name="text">
<string>向上</string>
<string>向
上</string>
</property>
</widget>
</item>
......@@ -626,10 +674,24 @@
<bool>false</bool>
</property>
<property name="text">
<string>向下</string>
<string>向
下</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
......
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