Commit 148eb76f authored by 吴春's avatar 吴春

提交代码

parent 7482234d
...@@ -1134,6 +1134,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -1134,6 +1134,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
{ {
extModel.BannerList = new List<string>(); extModel.BannerList = new List<string>();
} }
extModel.ProjectName = extModel.ClassName;
if (req.UserId > 0 && extModel.ID > 0) if (req.UserId > 0 && extModel.ID > 0)
{ //判断是否已经关注过 { //判断是否已经关注过
var collectModel = carrierModule.GetList(new RB_Collect_Extend { Status = 0, Type = 2, UserId = req.UserId, SourceId = extModel.ID, MallBaseId = query.MallBaseId, TenantId = query.TenantId }).FirstOrDefault(); var collectModel = carrierModule.GetList(new RB_Collect_Extend { Status = 0, Type = 2, UserId = req.UserId, SourceId = extModel.ID, MallBaseId = query.MallBaseId, TenantId = query.TenantId }).FirstOrDefault();
......
...@@ -1068,10 +1068,10 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -1068,10 +1068,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
{ {
return ApiResult.Failed("请输入开发商"); return ApiResult.Failed("请输入开发商");
} }
//if (query.BannerList == null || query.BannerList.Any()) if (query.BannerList == null || !query.BannerList.Any())
//{ {
// return ApiResult.Failed("请上传介绍图"); return ApiResult.Failed("请上传介绍图");
//} }
if (query.BannerList != null && query.BannerList.Any()) if (query.BannerList != null && query.BannerList.Any())
{ {
query.Banner = JsonConvert.SerializeObject(query.BannerList); query.Banner = JsonConvert.SerializeObject(query.BannerList);
...@@ -1254,6 +1254,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -1254,6 +1254,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
var list = carrierModule.GetBrandPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query); var list = carrierModule.GetBrandPageList(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
foreach (var item in list) foreach (var item in list)
{ {
item.ProjectName = item.ClassName;
if (!string.IsNullOrWhiteSpace(item.Banner)) if (!string.IsNullOrWhiteSpace(item.Banner))
{ {
item.BannerList = JsonConvert.DeserializeObject<List<string>>(item.Banner); item.BannerList = JsonConvert.DeserializeObject<List<string>>(item.Banner);
......
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