Commit 7ca4e385 by Amnes1a

由单例exe版本改为悬浮窗版本

parent ec1fb466
......@@ -15,10 +15,8 @@ Level=4
[Home]
Server=http://115.159.226.87:20001/api/user/login
;PartnerId=1371
;StoreId=fm99999
PartnerId=1670
StoreId=99999
PartnerId=1371
StoreId=fm99999
PosId=01
Position=1479, 521
CashierId=001
......
......@@ -57,6 +57,7 @@ RESOURCES += \
res/$${ORIGIN_TARGET}.qrc
win32 {
QMAKE_CXXFLAGS += /wd4100 /wd4189
RC_FILE += res/$${ORIGIN_TARGET}.rc
system($$PWD/../fmprc.bat $$PWD/version.h $$ORIGIN_TARGET)
}
......
......@@ -40,6 +40,7 @@ RESOURCES += \
res/$${ORIGIN_TARGET}.qrc
win32 {
QMAKE_CXXFLAGS += /wd4100
RC_FILE += res/$${ORIGIN_TARGET}.rc
system($$PWD/../fmprc.bat $$PWD/version.h $$ORIGIN_TARGET)
}
......
......@@ -49,6 +49,7 @@ RESOURCES += \
res/$${ORIGIN_TARGET}.qrc
win32 {
QMAKE_CXXFLAGS += /wd4100 /wd4189
RC_FILE += res/$${ORIGIN_TARGET}.rc
system($$PWD/../fmprc.bat $$PWD/version.h $$ORIGIN_TARGET)
}
......
......@@ -45,6 +45,7 @@ RESOURCES += \
res/fmp_redeem.qrc
win32 {
QMAKE_CXXFLAGS += /wd4819
RC_FILE += res/$${ORIGIN_TARGET}.rc
system($$PWD/../fmprc.bat $$PWD/version.h $$ORIGIN_TARGET)
}
......
......@@ -57,6 +57,7 @@ RESOURCES += \
res/$${ORIGIN_TARGET}.qrc
win32 {
QMAKE_CXXFLAGS += /wd4189
RC_FILE += res/$${ORIGIN_TARGET}.rc
system($$PWD/../fmprc.bat $$PWD/version.h $$ORIGIN_TARGET)
}
......
......@@ -82,16 +82,6 @@ private:
widget->raise();
widget->activateWindow();
}
//程序已启动,则直接显示核销界面
FMPRedeemInterface* svcRedeem = FMP::GetService<FMPRedeemInterface>();
if(svcRedeem)
{
svcRedeem->StartService();
QJsonObject result = svcRedeem->Redeem(QJsonArray());
FMP_DEBUG() << result;
}
return;
}
......
......@@ -15,8 +15,8 @@ Level=0
[Home]
Server=http://115.159.226.87:20001/api/user/login
PartnerId=1670
StoreId=99999
PartnerId=1371
StoreId=fm99999
PosId=01
Position=1382, 776
CashierId=001
......
[Service]
Name=FMPService
Desc=\xe9\x9d\x9e\xe7\xa0\x81 POS \xe6\x8f\x92\xe4\xbb\xb6\xe6\x9c\x8d\xe5\x8a\xa1
StartType=0
[Plugin]
Path=../plugins
EntryService=com.fmp.home
Animation=1
[Log]
Path=log
Size=1
Level=1
[Home]
Server=http://115.159.226.87:20001/api/user/login
PartnerId=1371
StoreId=fm99999
PosId=fm1802
Position=1666, 276
CashierId=001
[Pay]
Server=https://115.159.18.100/api
Timeout=60
[Vip]
Server=http://jtest.sandload.cn/member_tianfu/service/restful/pos
[Syncer]
Interval=3
TaskUrl=http://115.159.33.143/api/fork/checkupdate
DeployPath=..
DownloadPath=download
This source diff could not be displayed because it is too large. You can view the blob instead.
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