1、华润通小助手登录界面修改 2、修改登录界面最小化后不弹出问题

fmp_home.cpp

@@ -54,6 +54,54 @@ QString FMPHome::userName()
     return d->_userName;
 }
 
+QString FMPHome::partnerName()
+{
+    Q_D(FMPHome);
+    return d->_partnerName;
+}
+
+QString FMPHome::partnerId()
+{
+    Q_D(FMPHome);
+    return d->_partnerId;
+}
+
+QString FMPHome::storeName()
+{
+    Q_D(FMPHome);
+    return d->_storeName;
+}
+
+QString FMPHome::storeId()
+{
+    Q_D(FMPHome);
+    return d->_storeId;
+}
+
+QString FMPHome::deviceId()
+{
+    Q_D(FMPHome);
+    return d->_deviceId;
+}
+
+QString FMPHome::deviceName()
+{
+    Q_D(FMPHome);
+    return d->_deviceName;
+}
+
+QString FMPHome::stationId()
+{
+    Q_D(FMPHome);
+    return d->_stationId;
+}
+
+QString FMPHome::operatorId()
+{
+    Q_D(FMPHome);
+    return d->_operatorId;
+}
+
 int FMPHome::blink(FMPluginInterface *plugin, const QString &image)
 {
     Q_D(FMPHome);

fmp_home.h

@@ -24,6 +24,15 @@ public:
     int                 login();
     bool                isLogined();
     QString             userName();
+    QString             partnerName();
+    QString             partnerId();
+    QString             storeName();
+    QString             storeId();
+    QString             deviceId();
+    QString             deviceName();
+    QString             stationId();
+    QString             operatorId();
+
 
     int                 blink(FMPluginInterface *plugin, const QString &image);
     bool                stopBlink(int blinkId);

fmp_home_def.h

@@ -6,6 +6,7 @@
 #define FMP_INIKEY_LOGINPWD         "Home/Pwd"
 #define FMP_INIKEY_LOGINSTOREID     "Home/StoreId"
 #define FMP_INIKEY_LOGINPOSID       "Home/PosId"
+#define FMP_INIKEY_LOGINDEVICEID    "Home/DeviceId"
 #define FMP_INIKEY_LOGINBUSINESS    "Home/Business"
 #define FMP_INIKEY_LOGINCASHIER     "Home/CashierId"
 #define FMP_INIKEY_LOGINPARTNERID   "Home/PartnerId"

fmp_home_i.h

@@ -20,6 +20,14 @@ public:
     virtual int         login() = 0;
     virtual bool        isLogined() = 0;
     virtual QString     userName() = 0;
+    virtual QString     partnerName() = 0;
+    virtual QString     partnerId() = 0;
+    virtual QString     storeName() = 0;
+    virtual QString     storeId() = 0;
+    virtual QString     deviceId() = 0;
+    virtual QString     deviceName() = 0;
+    virtual QString     stationId() = 0;
+    virtual QString     operatorId() = 0;
 
     /**
      * Entry 插件不需要请求启动，直接执行 StartService 启动

fmp_home_navwindow.cpp

@@ -29,11 +29,12 @@ 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("vip", QString::fromLocal8Bit("非码会员")));
-    btns.push_back(std::make_pair("takeout", QString::fromLocal8Bit("非码外卖")));
+    btns.push_back(std::make_pair("vip", QString::fromLocal8Bit("非码会员")));
+    btns.push_back(std::make_pair("list", QString::fromLocal8Bit("会员账单")));
+//    btns.push_back(std::make_pair("payment", 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("tool", QString::fromLocal8Bit("设置")));
 
     MenuUiProp.distance = 100;
     MenuUiProp.beginAngle = -(PI/2);

fmp_home_navwindow.ui

@@ -45,6 +45,12 @@ QPushButton:hover {
 #vip:pressed {
 	border-image: url(:vip_onclick);
 }
+#list {
+	border-image: url(:list);
+}
+#list:pressed {
+	border-image: url(:list_onclick);
+}
 #takeout {
 	border-image: url(:takeout);
 }

fmp_home_p.cpp

@@ -16,16 +16,27 @@
 FMPHomePrivate::FMPHomePrivate(FMPHome *q)
     : q_ptr(q),
       _isLogined(false),
-      _isLogining(false),
       _userName(""),
-      _errorMsg("")
+      _partnerName(""),
+      _partnerId(""),
+      _storeName(""),
+      _storeId(""),
+      _deviceId(""),
+      _deviceName(""),
+      _errorMsg(""),
+      _stationId(""),
+      _operatorId(""),
+      _loginWnd(nullptr)
 {
     FMPLoggerInterface::InitContext(q->_ctx);
 }
 
 FMPHomePrivate::~FMPHomePrivate()
 {
-
+    if(_loginWnd!=nullptr) {
+        delete _loginWnd;
+        _loginWnd = nullptr;
+    }
 }
 
 int FMPHomePrivate::Init()
@@ -45,9 +56,17 @@ int FMPHomePrivate::Init()
 
     login();
     // 启动外卖
-    FMPBaseInterface *svc = q->GetService<FMPTakeoutInterface>(q->_ctx);
-    if(svc) {
-        svc->StartService();
+//    FMPBaseInterface *svc = q->GetService<FMPTakeoutInterface>(q->_ctx);
+//    if(svc) {
+//        svc->StartService();
+//    }
+
+    // 启动会员
+    FMPBaseInterface *svc_vip = q->GetService<FMPVipInterface>(q->_ctx);
+    Q_ASSERT(svc_vip != nullptr);
+    if(svc_vip) {
+        qDebug() << "svc_vip !========================= nullptr";
+        svc_vip->StartService();
     }
 
     q->_inited = true;
@@ -71,20 +90,30 @@ int FMPHomePrivate::Uninit()
 
 int FMPHomePrivate::login()
 {
-    if(_isLogining) {
+#if 1
+    if(_loginWnd!=nullptr) {
+        _loginWnd->raise();
         return FMP_FAILURE;
     }
-    _isLogining = true;
-#if 0
-    FMPLogin loginWnd;
-    loginWnd.exec();
-    _isLogining = false;
-    if(loginWnd.isLogined()) {
+//    FMPLogin loginWnd;
+    _loginWnd = new FMPLogin();
+    _loginWnd->exec();
+    if(_loginWnd->isLogined()) {
         _isLogined = true;
-        _userName = loginWnd.userName();
+        _userName = _loginWnd->userName();
+        _partnerName = _loginWnd->partnerName();
+        _partnerId = _loginWnd->partnerId();
+        _storeName = _loginWnd->storeName();
+        _storeId = _loginWnd->storeId();
+        _deviceId = _loginWnd->deviceId();
+        _deviceName = _loginWnd->deviceName();
+        _stationId = FMPHomeSettings::instance()->getStationId();
+        _operatorId = FMPHomeSettings::instance()->getOperatorId();
     } else {
         _isLogined = false;
     }
+    delete _loginWnd;
+    _loginWnd = nullptr;
 #else
     _isLogining = false;
     _isLogined = true;
@@ -141,11 +170,30 @@ void FMPHomePrivate::onMenuBtnClicked(QString btnName)
 
     FMPBaseInterface *svc = 0;
     if(btnName == "payment") {
-        svc = q->GetService<FMPePayInterface>(q->_ctx);
+//        svc = q->GetService<FMPePayInterface>(q->_ctx);
     } else if(btnName == "vip") {
         svc = q->GetService<FMPVipInterface>(q->_ctx);
-        q->blink((FMPluginInterface*)svc, ":/image/float_remind.png");
-    } else if(btnName == "takeout") {
+
+        /*支付服务*/
+        if(svc) {
+            if(!static_cast<FMPVipInterface*>(svc)->isBusy())
+            {
+                static_cast<FMPVipInterface*>(svc)->pay();
+            }
+        }
+        return;
+    } else if(btnName == "list")  {
+        svc = q->GetService<FMPVipInterface>(q->_ctx);
+
+        /*会员账单*/
+        if(svc) {
+            if(!static_cast<FMPVipInterface*>(svc)->isBusy())
+            {
+                static_cast<FMPVipInterface*>(svc)->list();
+            }
+        }
+
+    }else if(btnName == "takeout") {
         svc = q->GetService<FMPTakeoutInterface>(q->_ctx);
     } else if(btnName == "coupons") {
 //        FMPVipInterface *e = q->GetService<FMPVipInterface>(q->_ctx);

fmp_home_p.h

@@ -38,13 +38,20 @@ public:
 
     bool            _isLogined;
     QString         _userName;
+    QString         _partnerName;
+    QString         _partnerId;
+    QString         _storeName;
+    QString         _storeId;
+    QString         _deviceId;
+    QString         _deviceName;
     QString         _errorMsg;
+    QString         _stationId;
+    QString         _operatorId;
 
 private:
     NavWindow       *_navWindow;
     FMPSettingsInterface    *_settings;
-
-    bool            _isLogining;
+    FMPLogin        *_loginWnd;
 };
 
 #endif // FMP_HOME_P_H

fmp_home_settings.cpp

@@ -60,6 +60,22 @@ QString FMPHomeSettings::getStroeId()
     return _GetValue(FMP_INIKEY_LOGINSTOREID).toString();
 }
 
+QString FMPHomeSettings::getDeviceId()
+{
+    return _GetValue(FMP_INIKEY_LOGINDEVICEID).toString();
+}
+
+QString FMPHomeSettings::getStationId()
+{
+    return _GetValue(FMP_INIKEY_LOGINPOSID).toString();
+}
+
+QString FMPHomeSettings::getOperatorId()
+{
+    return _GetValue(FMP_INIKEY_LOGINCASHIER).toString();
+}
+
+
 bool FMPHomeSettings::getIsRememberPwd()
 {
     return _GetValue(FMP_INIKEY_REMEMBERPWD, false).toBool();

fmp_home_settings.h

@@ -53,6 +53,12 @@ public:
      */
     QString getStroeId();
 
+    QString getDeviceId();
+
+    QString getStationId();
+
+    QString getOperatorId();
+
     /**
      * @brief getIsRememberPwd setIsRememberPwd
      * 获取/设置是否记住登录密码

fmp_login.cpp

@@ -40,9 +40,14 @@ FMPLogin::FMPLogin(QDialog *parent) :
     ui->pwd_label->setAlignment(Qt::AlignCenter);
     ui->pwd_label->setPixmap(QPixmap(":pwd"));
 
+    QString dateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd");;
+    ui->bd_label->setText(dateTime);
+
     _url = FMPHomeSettings::instance()->getServer();
     _storeId = FMPHomeSettings::instance()->getStroeId();
     _partnerId = FMPHomeSettings::instance()->getPartnerId();
+    _deviceId = FMPHomeSettings::instance()->getDeviceId();
+
 
     if(FMPHomeSettings::instance()->getIsRememberPwd()) {
         QString userName, password;
@@ -85,11 +90,19 @@ void FMPLogin::on_login_btn_clicked()
 bool FMPLogin::login(QString userName, QString password)
 {
     _userName = "";
-    QByteArray reqData = tr("{\"StoreId\": \"%1\",\"PartnerId\": \"%2\",\"UserId\": \"%3\",\"Pwd\": \"%4\"}")
+//    QByteArray reqData = tr("{\"StoreId\": \"%1\",\"PartnerId\": \"%2\",\"UserId\": \"%3\",\"Pwd\": \"%4\"}")
+//            .arg(_storeId)
+//            .arg(_partnerId)
+//            .arg(userName)
+//            .arg(password).toLatin1();
+
+    QByteArray reqData = tr("{\"storeId\": \"%1\",\"partnerId\": \"%2\",\"userId\": \"%3\",\"pwd\": \"%4\",\"classNo\":\"\",\"deviceId\":\"%5\"}")
             .arg(_storeId)
             .arg(_partnerId)
             .arg(userName)
-            .arg(password).toLatin1();
+            .arg(password)
+            .arg(_deviceId).toLatin1();
+
     QByteArray rspData;
     FMNetwork net;
     if(net.post(_url, &reqData, &rspData)) {
@@ -98,11 +111,18 @@ bool FMPLogin::login(QString userName, QString password)
         QJsonDocument json = QJsonDocument::fromJson(rspData, &error);
         if(error.error == QJsonParseError::NoError) {
             QJsonObject job = json.object();
-
-            if(job["Code"] == 1000) {
-                _userName = job["Data"].toObject()["UserId"].toString();
+            qDebug() << job;
+
+            if(job["errcode"] == 0) {
+                _userName = job["data"].toObject()["userId"].toString();
+                _partnerName = job["data"].toObject()["partnerName"].toString();
+                _PartnerId = job["data"].toObject()["partnerId"].toString();
+                _storeName = job["data"].toObject()["storeName"].toString();
+                _StoreId = job["data"].toObject()["storeId"].toString();
+                _deviceId = job["data"].toObject()["deviceId"].toString();
+                _deviceName = job["data"].toObject()["deviceName"].toString();
             } else{
-                _errorMsg = job["Msg"].toString();
+                _errorMsg = job["errmsg"].toString();
             }
         } else {
             _errorMsg = error.errorString();

fmp_login.h

@@ -25,7 +25,12 @@ public:
     bool            isLogined() {return _userName != "";}
     QString         userName() {return _userName;}
     QString         errorMsg() {return _errorMsg;}
-
+    QString         partnerName() {return _partnerName;}
+    QString         partnerId() {return _PartnerId;}
+    QString         storeName() {return _storeName;}
+    QString         storeId() {return _StoreId;}
+    QString         deviceId() {return _DeviceId;}
+    QString         deviceName() {return _deviceName;}
 
 private slots:
     void on_login_btn_clicked();
@@ -36,11 +41,18 @@ private:
     Ui::FMPLogin *ui;
 
     QString         _userName;
+    QString         _partnerName;
+    QString         _storeName;
+    QString         _StoreId;
+    QString         _DeviceId;
+    QString         _deviceName;
     QString         _errorMsg;
+    QString         _PartnerId;
 
     QString         _url;
     QString         _storeId;
     QString         _partnerId;
+    QString         _deviceId;
 
     void savePassword(const QString &userName, const QString &pwd);
     void readPassword(QString &userName, QString &pwd);

fmp_login.ui

@@ -447,35 +447,35 @@
       <item>
        <widget class="QLabel" name="store_desc_label">
         <property name="text">
-         <string>门店/</string>
+         <string/>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QLabel" name="pos_desc_label">
         <property name="text">
-         <string>pos编号：</string>
+         <string/>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QLabel" name="store_label">
         <property name="text">
-         <string>fm9999</string>
+         <string/>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="label">
+       <widget class="QLabel" name="pos_label">
         <property name="text">
-         <string>/</string>
+         <string>华润通小助手</string>
         </property>
        </widget>
       </item>
       <item>
-       <widget class="QLabel" name="pos_label">
+       <widget class="QLabel" name="label">
         <property name="text">
-         <string>001</string>
+         <string/>
         </property>
        </widget>
       </item>

res/img.qrc

@@ -17,5 +17,7 @@
         <file>img/fm-icon_close_02.png</file>
         <file alias="pwd">img/password.png</file>
         <file alias="user">img/user.png</file>
+        <file alias="list">img/fm-icon_member01.png</file>
+        <file alias="list_onclick">img/fm-icon_member01_2.png</file>
     </qresource>
 </RCC>

version.h

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