Commit 8f743aad authored by 黄奎's avatar 黄奎

页面修改

parent a48f2f0e
...@@ -106,5 +106,10 @@ namespace Mall.Model.Entity.User ...@@ -106,5 +106,10 @@ namespace Mall.Model.Entity.User
/// 排序 /// 排序
/// </summary> /// </summary>
public int TagSort { get; set; } public int TagSort { get; set; }
/// <summary>
/// 标签模式(0-全部,1-电商,2-教育)
/// </summary>
public int TagType { get; set; }
} }
} }
...@@ -400,6 +400,7 @@ namespace Mall.Module.User ...@@ -400,6 +400,7 @@ namespace Mall.Module.User
{ nameof(RB_Miniprogram_Bottomnav_Extend.CheckedColor),item.CheckedColor}, { nameof(RB_Miniprogram_Bottomnav_Extend.CheckedColor),item.CheckedColor},
{ nameof(RB_Miniprogram_Bottomnav_Extend.TagLink),item.TagLink}, { nameof(RB_Miniprogram_Bottomnav_Extend.TagLink),item.TagLink},
{ nameof(RB_Miniprogram_Bottomnav_Extend.TagSort),item.TagSort}, { nameof(RB_Miniprogram_Bottomnav_Extend.TagSort),item.TagSort},
{ nameof(RB_Miniprogram_Bottomnav_Extend.TagType),item.TagType},
}; };
flag = bottomnavRepository.Update(tagfileds, new WhereHelper(nameof(RB_Miniprogram_Bottomnav_Extend.TagId), item.TagId)); flag = bottomnavRepository.Update(tagfileds, new WhereHelper(nameof(RB_Miniprogram_Bottomnav_Extend.TagId), item.TagId));
} }
......
...@@ -304,6 +304,36 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -304,6 +304,36 @@ namespace Mall.WebApi.Controllers.MallBase
#region 底部导航 #region 底部导航
if (miniProgram != null && miniProgram.MallBaseId > 0) if (miniProgram != null && miniProgram.MallBaseId > 0)
{ {
object navList = null;
//开启校园
if (isOpenSchool == 1)
{
navList = miniProgram.BottomTagList.Where(qitem => qitem.TagType != 1).Select(qitem => new
{
active_color = qitem.CheckedColor,
active_icon = qitem.CheckedIcon,
color = qitem.DefaultColor,
text = qitem.TagName,
icon = qitem.DefaultIcon,
url = qitem.TagLink,
open_type = "redirect",
key = qitem.TagLink == "/pages/live/index" ? "live" : "",
});
}
else
{
navList = miniProgram.BottomTagList.Where(qitem => qitem.TagType != 2).Select(qitem => new
{
active_color = qitem.CheckedColor,
active_icon = qitem.CheckedIcon,
color = qitem.DefaultColor,
text = qitem.TagName,
icon = qitem.DefaultIcon,
url = qitem.TagLink,
open_type = "redirect",
key = qitem.TagLink == "/pages/live/index" ? "live" : "",
});
}
//底部导航 //底部导航
navbar = new navbar = new
{ {
...@@ -316,17 +346,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -316,17 +346,7 @@ namespace Mall.WebApi.Controllers.MallBase
//导航底部是否开启阴影效果(0-未开启,1-开启) //导航底部是否开启阴影效果(0-未开启,1-开启)
shadow = miniProgram.BottomNavIsShadow, shadow = miniProgram.BottomNavIsShadow,
//导航栏 //导航栏
navs = miniProgram.BottomTagList.Select(qitem => new navs = navList,
{
active_color = qitem.CheckedColor,
active_icon = qitem.CheckedIcon,
color = qitem.DefaultColor,
text = qitem.TagName,
icon = qitem.DefaultIcon,
url = qitem.TagLink,
open_type = "redirect",
key = qitem.TagLink == "/pages/live/index" ? "live" : "",
}),
}; };
} }
#endregion #endregion
......
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