Commit 9cf9423d by NitefullWind

1. 编译富罟版本。

parent ac1b2cd1
...@@ -11,7 +11,8 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets ...@@ -11,7 +11,8 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
CONFIG += c++11 CONFIG += c++11
#DEFINES += TEST DEFINES += YCYZ_FUGU \
# FM_DEBUG
SOURCES += \ SOURCES += \
fmp_vip.cpp \ fmp_vip.cpp \
......
...@@ -11,11 +11,17 @@ ...@@ -11,11 +11,17 @@
//#define KEY_CODE "a35e33c8-e6f2-4107-8670-a69a85adf85b" //#define KEY_CODE "a35e33c8-e6f2-4107-8670-a69a85adf85b"
//#define PARTNER_ID "f92b8997-40c7-4622-af3b-512fd49d6113" //#define PARTNER_ID "f92b8997-40c7-4622-af3b-512fd49d6113"
#ifdef YCYZ_FUGU
////! 一茶一座_富罟
#define APP_ID "T021"
#define KEY_CODE "5f300ce7-8d00-464f-a969-f9ebb4c0e7d4"
#define PARTNER_ID "ea86bff6-1783-4c4a-9dee-0189de37b6eb"
#else
////! 一茶一座 ////! 一茶一座
#define APP_ID "T014" #define APP_ID "T014"
#define KEY_CODE "a440d553-87d3-4fcd-b59a-5ec9ce7c4157" #define KEY_CODE "a440d553-87d3-4fcd-b59a-5ec9ce7c4157"
#define PARTNER_ID "df2f90b0-eece-402c-820d-ba8ac56c4687" #define PARTNER_ID "df2f90b0-eece-402c-820d-ba8ac56c4687"
#endif //商户
// 请求类型的枚举值 // 请求类型的枚举值
......
...@@ -81,7 +81,7 @@ void TaskLogin::onLogin() ...@@ -81,7 +81,7 @@ void TaskLogin::onLogin()
} }
bool canPay = (getServerJsonValue(PosProps.CanPay).toInt() == 1); bool canPay = (getServerJsonValue(PosProps.CanPay).toInt() == 1);
#ifdef TEST #ifdef FM_DEBUG
canPay = true; canPay = true;
#endif #endif
if(!canPay) { if(!canPay) {
......
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