Commit 635f82ff authored by 吴春's avatar 吴春

11

parent 688d6ae5
...@@ -107,17 +107,24 @@ namespace Mall.Module.MarketingCenter ...@@ -107,17 +107,24 @@ namespace Mall.Module.MarketingCenter
{ {
extModel = new RB_Miniprogram_Template_Extend(); extModel = new RB_Miniprogram_Template_Extend();
} }
if (extModel.TemplateData != null && !string.IsNullOrEmpty(extModel.TemplateData)) try
{ {
extModel.ComponentDataList = JsonHelper.DeserializeObject<List<ComponentItem>>(extModel.TemplateData); if (extModel.TemplateData != null && !string.IsNullOrEmpty(extModel.TemplateData))
if (extModel.ComponentDataList != null && extModel.ComponentDataList.Count > 0)
{ {
foreach (var item in extModel.ComponentDataList) extModel.ComponentDataList = JsonHelper.DeserializeObject<List<ComponentItem>>(extModel.TemplateData);
if (extModel.ComponentDataList != null && extModel.ComponentDataList.Count > 0)
{ {
AnalyzePlusModule(item); foreach (var item in extModel.ComponentDataList)
{
AnalyzePlusModule(item);
}
} }
} }
} }
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "GetMiniprogramTemplateModule_Id" + Id.ToString());
}
return extModel; return extModel;
} }
...@@ -992,6 +999,12 @@ namespace Mall.Module.MarketingCenter ...@@ -992,6 +999,12 @@ namespace Mall.Module.MarketingCenter
} }
item.data = tradeActivityItemList; item.data = tradeActivityItemList;
break; break;
//首店首页
case "tradeIndex":
List<TradeActivityItem> tradeIndexItemList = new List<TradeActivityItem>();
item.data = tradeIndexItemList;
break;
} }
} }
......
...@@ -4359,7 +4359,6 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -4359,7 +4359,6 @@ namespace Mall.WebApi.Controllers.TradePavilion
[HttpGet] [HttpGet]
[HttpPost] [HttpPost]
[AllowAnonymous] [AllowAnonymous]
[RateValve(Policy = Policy.Ip, Limit = 20, Duration = 60)]
public ApiResult GetTradeIndexData() public ApiResult GetTradeIndexData()
{ {
JObject parms = JObject.Parse(RequestParm.msg.ToString()); JObject parms = JObject.Parse(RequestParm.msg.ToString());
......
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