仅支付

fmp_home_navwindow.cpp

@@ -35,11 +35,11 @@ NavWindow::NavWindow(QWidget *parent) :
     connect(this, SIGNAL(startBlink()), ui->navMainBtn, SLOT(start()));
     connect(this, SIGNAL(stopBlink()), ui->navMainBtn, SLOT(stop()));
 
-    btns.push_back(std::make_pair("payment", QString::fromLocal8Bit("非码支付")));
+    //btns.push_back(std::make_pair("payment", QString::fromLocal8Bit("非码支付")));
     //btns.push_back(std::make_pair("vip", QString::fromLocal8Bit("非码会员")));
     //btns.push_back(std::make_pair("takeout", QString::fromLocal8Bit("非码外卖")));
-   // btns.push_back(std::make_pair("coupons", QString::fromLocal8Bit("码多多")));
-    btns.push_back(std::make_pair("tool", QString::fromLocal8Bit("设置")));
+    //btns.push_back(std::make_pair("coupons", QString::fromLocal8Bit("码多多")));
+    //btns.push_back(std::make_pair("tool", QString::fromLocal8Bit("设置")));
 
     MenuUiProp.distance = 100;
     MenuUiProp.beginAngle = -(PI/2);
@@ -72,7 +72,7 @@ NavWindow::NavWindow(QWidget *parent) :
     connect(ui->navMainBtn, SIGNAL(moved(QPoint)), this, SLOT(onMoved(QPoint)));
     connect(this, SIGNAL(qcodeReceived(QString)), this, SLOT(onPayDialogAutoShow(QString))); //zxj触发弹出支付窗口
     connect(this, SIGNAL(navImageChanged()), this, SLOT(onNavImageChanged()));
-
+    connect(ui->navMainBtn, SIGNAL(clicked(bool)), this, SLOT(onOnlyPayment()));
     ui->navMainBtn->setFocus(); //设置默认焦点
     ui->navMainBtn->setDefault(true);
 
@@ -405,4 +405,7 @@ void NavWindow::showMessage(const QString &title, const QString &msg, QSystemTra
     _systemTrayIcon->showMessage(title, msg, icon, mecs);
 }
 
-
+void NavWindow::onOnlyPayment()
+{
+    emit menuBtnClicked("payment");
+}

fmp_home_navwindow.h

@@ -120,6 +120,7 @@ private slots:
     void onMoved(QPoint point);
     void onNavImageChanged();
     void onPayDialogAutoShow(QString code);
+    void onOnlyPayment();   //针对只有支付功能 点击悬浮按钮直接弹出收银窗口
 
 private:
     Ui::NavWindow *ui;

version.h

@@ -5,7 +5,7 @@
 #define VER_MINOR 1
 #define VER_REVISION 0
 
-#define VER_BUILD 21
+#define VER_BUILD 24
 
 //! Convert version numbers to string
 #define _STR(S)  #S