Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmPOS
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhenfei.zhang
fmPOS
Commits
4d1d7702
Commit
4d1d7702
authored
May 15, 2019
by
刘帅
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化悬浮窗展示,卡券核销请求接口添加商品信息
parent
a18d4b20
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
3 deletions
+5
-3
fmp_home
+1
-1
fmp_redeem/fmp_redeem.cpp
+3
-1
fmp_redeem/version.h
+1
-1
No files found.
fmp_home
@
e365193e
Subproject commit
d259cf0707090402ac9e2512af4350818aa67e1f
Subproject commit
e365193e8a450fd956213305b252c950993d8abd
fmp_redeem/fmp_redeem.cpp
View file @
4d1d7702
...
@@ -300,6 +300,8 @@ QJsonObject FMPRedeem::ShowForUnConsum(QJsonObject json)
...
@@ -300,6 +300,8 @@ QJsonObject FMPRedeem::ShowForUnConsum(QJsonObject json)
QString
channel
=
json
[
"channel"
].
toString
();
QString
channel
=
json
[
"channel"
].
toString
();
QString
fullChannel
=
json
[
"channel"
].
toString
();
QString
fullChannel
=
json
[
"channel"
].
toString
();
_products_info
=
codeInfo
[
"products"
].
toArray
();
int
index
=
fullChannel
.
indexOf
(
"-"
);
int
index
=
fullChannel
.
indexOf
(
"-"
);
if
(
index
!=
-
1
)
if
(
index
!=
-
1
)
{
{
...
@@ -340,7 +342,7 @@ QJsonObject FMPRedeem::ShowForUnConsum(QJsonObject json)
...
@@ -340,7 +342,7 @@ QJsonObject FMPRedeem::ShowForUnConsum(QJsonObject json)
QJsonObject
product
;
QJsonObject
product
;
product
.
insert
(
"seq"
,
i
+
1
);
product
.
insert
(
"seq"
,
i
+
1
);
product
.
insert
(
"pid"
,
_products_info
[
i
].
toObject
()[
"pid"
]);
product
.
insert
(
"pid"
,
_products_info
[
i
].
toObject
()[
"pid"
]);
product
.
insert
(
"consume_num"
,
_products_info
[
i
].
toObject
()[
"
consume_num
"
]);
product
.
insert
(
"consume_num"
,
_products_info
[
i
].
toObject
()[
"
number
"
]);
products
.
append
(
product
);
products
.
append
(
product
);
}
}
...
...
fmp_redeem/version.h
View file @
4d1d7702
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
#define VER_MINOR 1
#define VER_MINOR 1
#define VER_REVISION 0
#define VER_REVISION 0
#define VER_BUILD 8
2
#define VER_BUILD 8
3
//! Convert version numbers to string
//! Convert version numbers to string
#define _STR(S) #S
#define _STR(S) #S
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment