Commit 93d9bb7f by wuyang.zou

fix bug: 网络断网导致插件 注册到 服务端 ip 127.0.0.1;

银联支付 在插件上退单 导致 订单入机挂载 交易流水不正确;
parent 6d726341
...@@ -245,8 +245,10 @@ void FloatForm::RefreshStoreStatus(int eleStoreStatus, int modStoreStatus,int mo ...@@ -245,8 +245,10 @@ void FloatForm::RefreshStoreStatus(int eleStoreStatus, int modStoreStatus,int mo
this->ui->Mod2Lable->move(70, 36); // 在 Mod1Lable 基础上 x+4; y-4; this->ui->Mod2Lable->move(70, 36); // 在 Mod1Lable 基础上 x+4; y-4;
if(1 == modStoreStatus){ if(1 == modStoreStatus){
this->ui->Mod2Lable->setPixmap(QPixmap(":StoreOn.png")); this->ui->Mod2Lable->setPixmap(QPixmap(":StoreOn.png"));
}else{ }else if(2 == modStoreStatus){
this->ui->Mod2Lable->setPixmap(QPixmap(":StoreOff.png")); this->ui->Mod2Lable->setPixmap(QPixmap(":StoreOff.png"));
}else {
this->ui->Mod2Lable->setPixmap(QPixmap(":StoreDef.png"));
} }
//准备Eleme门店营业状态Label; //准备Eleme门店营业状态Label;
...@@ -257,8 +259,10 @@ void FloatForm::RefreshStoreStatus(int eleStoreStatus, int modStoreStatus,int mo ...@@ -257,8 +259,10 @@ void FloatForm::RefreshStoreStatus(int eleStoreStatus, int modStoreStatus,int mo
this->ui->Eleme2Lable->move(70, 62); // x 与 Mod1Lable 对齐; y-4; this->ui->Eleme2Lable->move(70, 62); // x 与 Mod1Lable 对齐; y-4;
if(1 == eleStoreStatus){ if(1 == eleStoreStatus){
this->ui->Eleme2Lable->setPixmap(QPixmap(":StoreOn.png")); this->ui->Eleme2Lable->setPixmap(QPixmap(":StoreOn.png"));
}else{ }else if(2 == eleStoreStatus){
this->ui->Eleme2Lable->setPixmap(QPixmap(":StoreOff.png")); this->ui->Eleme2Lable->setPixmap(QPixmap(":StoreOff.png"));
} else {
this->ui->Eleme2Lable->setPixmap(QPixmap(":StoreDef.png"));
} }
//准备Mop门店营业状态Label; //准备Mop门店营业状态Label;
...@@ -269,8 +273,10 @@ void FloatForm::RefreshStoreStatus(int eleStoreStatus, int modStoreStatus,int mo ...@@ -269,8 +273,10 @@ void FloatForm::RefreshStoreStatus(int eleStoreStatus, int modStoreStatus,int mo
this->ui->Mop2Lable->move(70, 88); // x 与 Mod1Lable 对齐; y-4; this->ui->Mop2Lable->move(70, 88); // x 与 Mod1Lable 对齐; y-4;
if(1 == mopStoreStatus){ if(1 == mopStoreStatus){
this->ui->Mop2Lable->setPixmap(QPixmap(":StoreOn.png")); this->ui->Mop2Lable->setPixmap(QPixmap(":StoreOn.png"));
}else{ } else if(2 == mopStoreStatus) {
this->ui->Mop2Lable->setPixmap(QPixmap(":StoreOff.png")); this->ui->Mop2Lable->setPixmap(QPixmap(":StoreOff.png"));
} else {
this->ui->Mop2Lable->setPixmap(QPixmap(":StoreDef.png"));
} }
//准备订单管理状态Label; //准备订单管理状态Label;
......
...@@ -119,7 +119,7 @@ public slots: ...@@ -119,7 +119,7 @@ public slots:
* 参数:1 [ele开关店状态] 2[MOD开关店状态] 3[MOP开关店状态] * 参数:1 [ele开关店状态] 2[MOD开关店状态] 3[MOP开关店状态]
* 返回:NULL * 返回:NULL
* */ * */
void RefreshStoreStatus(int eleStoreStatus=1, int modStoreStatus=1,int mopStoreStatus=1); void RefreshStoreStatus(int eleStoreStatus=0, int modStoreStatus=0,int mopStoreStatus=0);
/* 功能:新订单到POS更新悬浮框显示; /* 功能:新订单到POS更新悬浮框显示;
* 参数:1 [是否存在新订单] * 参数:1 [是否存在新订单]
......
...@@ -7,8 +7,8 @@ IDI_ICON ICON DISCARDABLE "logo.ico" ...@@ -7,8 +7,8 @@ IDI_ICON ICON DISCARDABLE "logo.ico"
#endif #endif
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
//***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***// //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
FILEVERSION 2,2019,528,1 FILEVERSION 2,2019,729,1
PRODUCTVERSION 2,2019,528,1 PRODUCTVERSION 2,2019,729,1
//*************************************************************************// //*************************************************************************//
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
...@@ -31,8 +31,8 @@ VS_VERSION_INFO VERSIONINFO ...@@ -31,8 +31,8 @@ VS_VERSION_INFO VERSIONINFO
VALUE "OriginalFilename", "fmTakeout.exe" VALUE "OriginalFilename", "fmTakeout.exe"
VALUE "ProductName", "Delivery Order Plugin" VALUE "ProductName", "Delivery Order Plugin"
//***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***// //***每次修改后编译发版必须变更版本号(preDefine.h中APP_VERSION 需要一致)***//
VALUE "ProductVersion", "2.2019.528.1" VALUE "ProductVersion", "2.2019.729.1"
VALUE "FileVersion", "2.2019.528.1" VALUE "FileVersion", "2.2019.729.1"
//*************************************************************************// //*************************************************************************//
END END
END END
......
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
//#define APP_VERSION "2.2019.410.1" //#define APP_VERSION "2.2019.410.1"
//#define APP_VERSION "2.2019.422.1" //#define APP_VERSION "2.2019.422.1"
//#define APP_VERSION "2.2019.520.1" //#define APP_VERSION "2.2019.520.1"
#define APP_VERSION "2.2019.528.1" //#define APP_VERSION "2.2019.528.1"
#define APP_VERSION "2.2019.729.1"
//修正版本号时,切记修正 FmTakeout.rc 中的版本号 //修正版本号时,切记修正 FmTakeout.rc 中的版本号
......
...@@ -43,5 +43,6 @@ ...@@ -43,5 +43,6 @@
<file>MopTitle.png</file> <file>MopTitle.png</file>
<file>StoreOff.png</file> <file>StoreOff.png</file>
<file>StoreOn.png</file> <file>StoreOn.png</file>
<file>StoreDef.png</file>
</qresource> </qresource>
</RCC> </RCC>
\ No newline at end of file
No preview for this file type
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