Commit e606da53 by 刘帅

中石化卡券核销

parent 3af3b991
...@@ -65,7 +65,7 @@ NavWindow::NavWindow(QWidget *parent) : ...@@ -65,7 +65,7 @@ NavWindow::NavWindow(QWidget *parent) :
this->move(pos); this->move(pos);
connect(ui->navMainBtn, SIGNAL(moved(QPoint)), this, SLOT(onMoved(QPoint))); connect(ui->navMainBtn, SIGNAL(moved(QPoint)), this, SLOT(onMoved(QPoint)));
// connect(ui->navMainBtn, SIGNAL(clicked(bool)), this, SLOT(onOnlyPayment())); connect(ui->navMainBtn, SIGNAL(clicked(bool)), this, SLOT(onOnlyPayment()));
connect(this, SIGNAL(navImageChanged()), this, SLOT(onNavImageChanged())); connect(this, SIGNAL(navImageChanged()), this, SLOT(onNavImageChanged()));
} }
...@@ -122,7 +122,7 @@ void NavWindow::initMenu() ...@@ -122,7 +122,7 @@ void NavWindow::initMenu()
stateDefault->assignProperty(this, "navImage", ":fm-icon_01"); stateDefault->assignProperty(this, "navImage", ":fm-icon_01");
stateDefault->addTransition(ui->navMainBtn, &QPushButton::clicked, stateSpread); stateDefault->addTransition(ui->navMainBtn, &QPushButton::clicked, stateSpread);
stateSpread->assignProperty(this, "navImage", ":fm-icon_02"); stateSpread->assignProperty(this, "navImage", ":fm-icon_02");
stateSpread->addTransition(ui->navMainBtn, &QPushButton::clicked, stateDefault); //stateSpread->addTransition(ui->navMainBtn, &QPushButton::clicked, stateDefault);
stateGroup->setInitialState(stateSpread); stateGroup->setInitialState(stateSpread);
QHistoryState *stateGroupHistory = new QHistoryState(stateGroup); QHistoryState *stateGroupHistory = new QHistoryState(stateGroup);
stateGroupHistory->setDefaultState(stateDefault); stateGroupHistory->setDefaultState(stateDefault);
...@@ -346,5 +346,6 @@ void NavWindow::showMessage(const QString &title, const QString &msg, QSystemTra ...@@ -346,5 +346,6 @@ void NavWindow::showMessage(const QString &title, const QString &msg, QSystemTra
void NavWindow::onOnlyPayment() void NavWindow::onOnlyPayment()
{ {
emit menuBtnClicked("payment"); //emit menuBtnClicked("payment");
emit menuBtnClicked("coupons");
} }
...@@ -46,7 +46,7 @@ int FMPHomePrivate::Init() ...@@ -46,7 +46,7 @@ int FMPHomePrivate::Init()
// _navWindow->createMenuBtn("payment", QString::fromLocal8Bit("非码支付")); // _navWindow->createMenuBtn("payment", QString::fromLocal8Bit("非码支付"));
// _navWindow->createMenuBtn("vip", QString::fromLocal8Bit("非码会员")); // _navWindow->createMenuBtn("vip", QString::fromLocal8Bit("非码会员"));
// _navWindow->createMenuBtn("takeout", QString::fromLocal8Bit("非码外卖")); // _navWindow->createMenuBtn("takeout", QString::fromLocal8Bit("非码外卖"));
_navWindow->createMenuBtn("coupons", QString::fromLocal8Bit("码多多")); //_navWindow->createMenuBtn("coupons", QString::fromLocal8Bit("码多多"));
// _navWindow->createMenuBtn("tool", QString::fromLocal8Bit("设置")); // _navWindow->createMenuBtn("tool", QString::fromLocal8Bit("设置"));
_navWindow->show(); _navWindow->show();
...@@ -175,6 +175,10 @@ void FMPHomePrivate::onMenuBtnClicked(QString btnName) ...@@ -175,6 +175,10 @@ void FMPHomePrivate::onMenuBtnClicked(QString btnName)
QJsonObject result = svcRedeem->Redeem(QJsonArray()); QJsonObject result = svcRedeem->Redeem(QJsonArray());
FMP_DEBUG() << QString::fromLocal8Bit("核销结果: ") << result; FMP_DEBUG() << QString::fromLocal8Bit("核销结果: ") << result;
} }
else
{
FMP_DEBUG() << "coupon service not available";
}
return; return;
} else if(btnName == "tool") { } else if(btnName == "tool") {
svc = FMP::GetService<FMPSettingsInterface>(); svc = FMP::GetService<FMPSettingsInterface>();
......
res/img/fm-icon_01.png

10.7 KB | W: | H:

res/img/fm-icon_01.png

7.94 KB | W: | H:

res/img/fm-icon_01.png
res/img/fm-icon_01.png
res/img/fm-icon_01.png
res/img/fm-icon_01.png
  • 2-up
  • Swipe
  • Onion skin
res/img/fm-icon_02.png

3.8 KB | W: | H:

res/img/fm-icon_02.png

9.26 KB | W: | H:

res/img/fm-icon_02.png
res/img/fm-icon_02.png
res/img/fm-icon_02.png
res/img/fm-icon_02.png
  • 2-up
  • Swipe
  • Onion skin
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