Commit c987ab89 by NitefllWind

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

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