修改发现
This commit is contained in:
parent
c91b39b3c5
commit
76e13adeaf
|
|
@ -73,70 +73,71 @@ namespace HuanMeng.MiaoYu.Code.Category
|
|||
var node = DictionaryInfo.GetDictionariesChildNode(T_Sys_DictionaryEnum.categorymenu);
|
||||
node.ForEach(_node =>
|
||||
{
|
||||
var menu = menuList.Where(it => it.Type == _node.ExtendValue).OrderBy(it => it.OrderById).ToList();
|
||||
var menu = menuList.Where(it => it.Type == _node.Code).OrderBy(it => it.OrderById).ToList();
|
||||
if (menu?.Count > 0)
|
||||
{
|
||||
RecommendDto<DataListBaseDto> banner = new RecommendDto<DataListBaseDto>();
|
||||
banner.Title = _node.Name;
|
||||
banner.Type = _node.Value;//动作Id
|
||||
var categoryPageRegion = CategoryPageRegionExtend.GetCategoryPageRegion(RecommendTypeEnum.banner, menu, this.MiaoYuCache);
|
||||
var e = Enum.Parse<RecommendTypeEnum>(banner.Type);
|
||||
var categoryPageRegion = CategoryPageRegionExtend.GetCategoryPageRegion(e, menu, this.MiaoYuCache);
|
||||
banner.Data = categoryPageRegion.GetRecommendData();
|
||||
|
||||
recommendDtos.Add(banner);
|
||||
}
|
||||
});
|
||||
#region 假数据
|
||||
RecommendDto<DataListBaseDto> banner = new RecommendDto<DataListBaseDto>();
|
||||
banner.Title = "Banner";
|
||||
banner.Type = RecommendTypeEnum.banner.ToString();
|
||||
banner.Data = new List<DataListBaseDto>();
|
||||
banner.Data.Add(new CommonRecommendData
|
||||
{
|
||||
ActionId = "1",
|
||||
ActionType = RecommendActionTypeEnum.Mall.ToString(),
|
||||
ImageUrl = "https://cos.shhuanmeng.com/banner/20240717214627.png",
|
||||
});
|
||||
banner.Data.Add(new CommonRecommendData
|
||||
{
|
||||
ActionId = "2",
|
||||
ActionType = RecommendActionTypeEnum.Page.ToString(),
|
||||
ImageUrl = "https://cos.shhuanmeng.com/banner/202407172146272.png",
|
||||
});
|
||||
banner.Data.Add(new CommonRecommendData
|
||||
{
|
||||
ActionId = "3",
|
||||
ActionType = RecommendActionTypeEnum.Chat.ToString(),
|
||||
ImageUrl = "https://cos.shhuanmeng.com/banner/20240717214735.png",
|
||||
});
|
||||
recommendDtos.Add(banner);
|
||||
RecommendDto<DataListBaseDto> tuijian = new RecommendDto<DataListBaseDto>();
|
||||
tuijian.Title = "推荐";
|
||||
tuijian.Type = RecommendTypeEnum.tuijian.ToString();
|
||||
tuijian.Data = new List<DataListBaseDto>();
|
||||
//#region 假数据
|
||||
//RecommendDto<DataListBaseDto> banner = new RecommendDto<DataListBaseDto>();
|
||||
//banner.Title = "Banner";
|
||||
//banner.Type = RecommendTypeEnum.banner.ToString();
|
||||
//banner.Data = new List<DataListBaseDto>();
|
||||
//banner.Data.Add(new CommonRecommendData
|
||||
//{
|
||||
// ActionId = "1",
|
||||
// ActionType = RecommendActionTypeEnum.Mall.ToString(),
|
||||
// ImageUrl = "https://cos.shhuanmeng.com/banner/20240717214627.png",
|
||||
//});
|
||||
//banner.Data.Add(new CommonRecommendData
|
||||
//{
|
||||
// ActionId = "2",
|
||||
// ActionType = RecommendActionTypeEnum.Page.ToString(),
|
||||
// ImageUrl = "https://cos.shhuanmeng.com/banner/202407172146272.png",
|
||||
//});
|
||||
//banner.Data.Add(new CommonRecommendData
|
||||
//{
|
||||
// ActionId = "3",
|
||||
// ActionType = RecommendActionTypeEnum.Chat.ToString(),
|
||||
// ImageUrl = "https://cos.shhuanmeng.com/banner/20240717214735.png",
|
||||
//});
|
||||
//recommendDtos.Add(banner);
|
||||
//RecommendDto<DataListBaseDto> tuijian = new RecommendDto<DataListBaseDto>();
|
||||
//tuijian.Title = "推荐";
|
||||
//tuijian.Type = RecommendTypeEnum.tuijian.ToString();
|
||||
//tuijian.Data = new List<DataListBaseDto>();
|
||||
|
||||
|
||||
RecommendDto<DataListBaseDto> xiaoshuo = new RecommendDto<DataListBaseDto>();
|
||||
xiaoshuo.Data = new List<DataListBaseDto>();
|
||||
xiaoshuo.Title = "小说";
|
||||
xiaoshuo.Type = RecommendTypeEnum.xiaoshuo.ToString();
|
||||
int index = 0;
|
||||
MiaoYuCache.CharacterList.ForEach(x =>
|
||||
{
|
||||
if (index > 5)
|
||||
{
|
||||
return;
|
||||
}
|
||||
var data = Mapper.Map<DataListDto>(x);
|
||||
data.ActionType = RecommendActionTypeEnum.Chat.ToString();
|
||||
data.ActionId = data.Id.ToString();
|
||||
data.ImageUrl = x.BgImage;//data.BgImage;
|
||||
//RecommendDto<DataListBaseDto> xiaoshuo = new RecommendDto<DataListBaseDto>();
|
||||
//xiaoshuo.Data = new List<DataListBaseDto>();
|
||||
//xiaoshuo.Title = "小说";
|
||||
//xiaoshuo.Type = RecommendTypeEnum.xiaoshuo.ToString();
|
||||
//int index = 0;
|
||||
//MiaoYuCache.CharacterList.ForEach(x =>
|
||||
//{
|
||||
// if (index > 5)
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
// var data = Mapper.Map<DataListDto>(x);
|
||||
// data.ActionType = RecommendActionTypeEnum.Chat.ToString();
|
||||
// data.ActionId = data.Id.ToString();
|
||||
// data.ImageUrl = x.BgImage;//data.BgImage;
|
||||
|
||||
tuijian.Data.Add(data);
|
||||
xiaoshuo.Data.Add(data);
|
||||
index++;
|
||||
});
|
||||
recommendDtos.Add(tuijian);
|
||||
recommendDtos.Add(xiaoshuo);
|
||||
#endregion
|
||||
// tuijian.Data.Add(data);
|
||||
// xiaoshuo.Data.Add(data);
|
||||
// index++;
|
||||
//});
|
||||
//recommendDtos.Add(tuijian);
|
||||
//recommendDtos.Add(xiaoshuo);
|
||||
//#endregion
|
||||
return new BaseResponse<List<RecommendDto<DataListBaseDto>>>(ResonseCode.Success, "", recommendDtos);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ namespace HuanMeng.MiaoYu.Code.Category
|
|||
{
|
||||
if (recommend == RecommendTypeEnum.tuijian || recommend == RecommendTypeEnum.xiaoshuo)
|
||||
{
|
||||
return new CategoryPageRegionBanner(menu, miaoYuCache);
|
||||
return new CategoryPageRegionChat(menu, miaoYuCache);
|
||||
}
|
||||
if (recommend == RecommendTypeEnum.banner)
|
||||
{
|
||||
|
|
@ -96,7 +96,7 @@ namespace HuanMeng.MiaoYu.Code.Category
|
|||
{
|
||||
d.ImageUrl = character.BgImage;
|
||||
}
|
||||
d.Name = character.Name;
|
||||
d.Name = string.IsNullOrEmpty(m.Name) ? character.Name : m.Name;
|
||||
d.Biography = character.Biography;
|
||||
d.Label = character.Label;
|
||||
d.Gender = character.Gender;
|
||||
|
|
|
|||
|
|
@ -184,12 +184,16 @@ public partial class MiaoYuContext : MultiTenantDbContext//DbContext
|
|||
entity.Property(e => e.ImageUrl)
|
||||
.HasMaxLength(300)
|
||||
.HasComment("图片补位");
|
||||
entity.Property(e => e.IsEnabled).HasComment("是否启用");
|
||||
entity.Property(e => e.Name)
|
||||
.HasMaxLength(100)
|
||||
.HasComment("名称");
|
||||
entity.Property(e => e.OrderById).HasComment("排序");
|
||||
entity.Property(e => e.SubTitle)
|
||||
.HasMaxLength(100)
|
||||
.HasComment("副标题");
|
||||
entity.Property(e => e.Type)
|
||||
.HasMaxLength(20)
|
||||
.HasMaxLength(64)
|
||||
.HasComment("菜单类型(banner,热门推荐,热门小说)");
|
||||
//添加全局筛选器
|
||||
if (this.TenantInfo != null)
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ public partial class T_Category_Child_Menu: MultiTenantEntity
|
|||
/// <summary>
|
||||
/// 名称
|
||||
/// </summary>
|
||||
public string Name { get; set; } = null!;
|
||||
public string? Name { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 动作Id
|
||||
|
|
@ -43,5 +43,14 @@ public partial class T_Category_Child_Menu: MultiTenantEntity
|
|||
/// </summary>
|
||||
public string? ImageUrl { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 是否启用
|
||||
/// </summary>
|
||||
public bool IsEnabled { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 副标题
|
||||
/// </summary>
|
||||
public string? SubTitle { get; set; }
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user