Commit 4d1d7702 by 刘帅

优化悬浮窗展示,卡券核销请求接口添加商品信息

parent a18d4b20
fmp_home @ e365193e
Subproject commit d259cf0707090402ac9e2512af4350818aa67e1f Subproject commit e365193e8a450fd956213305b252c950993d8abd
...@@ -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);
} }
......
...@@ -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 82 #define VER_BUILD 83
//! Convert version numbers to string //! Convert version numbers to string
#define _STR(S) #S #define _STR(S) #S
......
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