Commit ddeb81df authored by 吴春's avatar 吴春

提交代码

parent b26fe25d
...@@ -2368,6 +2368,12 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2368,6 +2368,12 @@ namespace Mall.Model.Extend.MarketingCenter
public string lableName { get; set; } public string lableName { get; set; }
/// <summary>
/// 副标题
/// </summary>
public List<string> lableNameList { get; set; }
/// <summary> /// <summary>
/// 商品图片 /// 商品图片
/// </summary> /// </summary>
......
...@@ -781,6 +781,10 @@ namespace Mall.WebApi.Controllers ...@@ -781,6 +781,10 @@ namespace Mall.WebApi.Controllers
lastItem.name = tempGood.Name; lastItem.name = tempGood.Name;
lastItem.lableName = tempGood.LableName; lastItem.lableName = tempGood.LableName;
lastItem.picUrl = tempGood.ArticlePic; lastItem.picUrl = tempGood.ArticlePic;
if (!string.IsNullOrWhiteSpace(lastItem.lableName))
{
lastItem.lableNameList = JsonConvert.DeserializeObject<List<string>>(lastItem.lableName);
}
newGoodsList.Add(lastItem); newGoodsList.Add(lastItem);
} }
} }
...@@ -796,7 +800,7 @@ namespace Mall.WebApi.Controllers ...@@ -796,7 +800,7 @@ namespace Mall.WebApi.Controllers
TenantId = TenantId, TenantId = TenantId,
MallBaseId = MallBaseId, MallBaseId = MallBaseId,
ArticleStatus = 1, ArticleStatus = 1,
OrderBy=1 OrderBy = 1
}); });
if (articleList != null && articleList.Count > 0) if (articleList != null && articleList.Count > 0)
{ {
...@@ -807,8 +811,10 @@ namespace Mall.WebApi.Controllers ...@@ -807,8 +811,10 @@ namespace Mall.WebApi.Controllers
id = gItem.ID, id = gItem.ID,
name = gItem.Name, name = gItem.Name,
lableName = gItem.LableName, lableName = gItem.LableName,
picUrl = gItem.ArticlePic picUrl = gItem.ArticlePic,
}); lableNameList = string.IsNullOrWhiteSpace(gItem.LableName) ? new List<string>() : JsonConvert.DeserializeObject<List<string>>(gItem.LableName)
}); ;
} }
} }
} }
...@@ -1997,7 +2003,7 @@ namespace Mall.WebApi.Controllers ...@@ -1997,7 +2003,7 @@ namespace Mall.WebApi.Controllers
resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#ffdada", IsEducation = 0 }; resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#ffdada", IsEducation = 0 };
break; break;
case MallShopStyleEnum.Education: case MallShopStyleEnum.Education:
resultMallShopStyle = new ResultMallShopStyle() { main = "#00d6a6", secondary = "#ffc86d",IsEducation=1 }; resultMallShopStyle = new ResultMallShopStyle() { main = "#00d6a6", secondary = "#ffc86d", IsEducation = 1 };
break; break;
} }
mallStyle = new mallStyle = new
...@@ -2285,7 +2291,7 @@ namespace Mall.WebApi.Controllers ...@@ -2285,7 +2291,7 @@ namespace Mall.WebApi.Controllers
/// <summary> /// <summary>
/// 0-商品,1-是 /// 0-商品,1-是
/// </summary> /// </summary>
public int IsEducation{ get; set; } public int IsEducation { get; set; }
} }
......
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