Skip to content

T
takeout_sbk
Commit 2e62a6be by wuyang.zou
Options

New Feature: 

1、SVC卡-B账户优惠入机
2、详情界面显示 优惠列表;

Version: 2.2021.2.22
parent 576ec1d1
Pipeline #30199 failed with stage
in 0 seconds
Showing with 8 additions and 6 deletions
fmTakeout/Model/orderObject.h
...@@ -117,7 +117,7 @@ public: ...@@ -117,7 +117,7 @@ public:
void FetchDataFromJson(const QJsonObject& json); void FetchDataFromJson(const QJsonObject& json);
QList<dishesObject*>proList; QList<dishesObject*>proList;
//扩展 星巴克 预约实物的券信息 List; //扩展 星巴克 WSG 券信息 List;
QList<CouponsObject*>coupList; QList<CouponsObject*>coupList;
//扩展 星巴克 多条支付方式入机 List; //扩展 星巴克 多条支付方式入机 List;
......
fmTakeout/detailForm.h
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
#include <QTableWidget> #include <QTableWidget>
#include "Model/orderObject.h" #include "Model/orderObject.h"
#include "Model/deliverObject.h" #include "Model/deliverObject.h"
#include "Model/PromotionItemObject.h"
#include "RejectForm.h" #include "RejectForm.h"
#include "refuseForm.h" #include "refuseForm.h"
......
fmTakeout/fmTakeout.rc
...@@ -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,2021,1,11 FILEVERSION 2,2021,2,22
PRODUCTVERSION 2,2021,1,11 PRODUCTVERSION 2,2021,2,22
//*************************************************************************// //*************************************************************************//
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.2021.1.11" VALUE "ProductVersion", "2.2021.2.22"
VALUE "FileVersion", "2.2021.1.11" VALUE "FileVersion", "2.2021.2.22"
//*************************************************************************// //*************************************************************************//
END END
END END
......
fmTakeout/preDefine.h
...@@ -32,7 +32,8 @@ ...@@ -32,7 +32,8 @@
//#define APP_VERSION "2.2020.9.29" //#define APP_VERSION "2.2020.9.29"
//#define APP_VERSION "2.2020.10.27" //#define APP_VERSION "2.2020.10.27"
//#define APP_VERSION "2.2020.12.18" //#define APP_VERSION "2.2020.12.18"
#define APP_VERSION "2.2021.1.11" //#define APP_VERSION "2.2021.1.11"
#define APP_VERSION "2.2021.2.22"
//修正版本号时,切记修正 FmTakeout.rc 中的版本号 //修正版本号时,切记修正 FmTakeout.rc 中的版本号
......
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