Skip to content

M
mall.oytour.com
Commit a963b588 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent 8a298f46
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 25 deletions
Mall.WebApi/Controllers/Mall/MallController.cs
View file @ a963b588
......@@ -7,6 +7,7 @@ using Mall.Common.Plugin;
using Mall.Model.Entity.BaseSetUp;
using Mall.Model.Entity.MarketingCenter;
using Mall.Model.Extend.BaseSetUp;
using Mall.Model.Extend.MarketingCenter;
using Mall.Module.BaseSetUp;
using Mall.Module.MarketingCenter;
using Mall.WebApi.Filter;
......@@ -14,7 +15,7 @@ using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace Mall.WebApi.Controllers.MallBase
{
......@@ -25,8 +26,8 @@ namespace Mall.WebApi.Controllers.MallBase
[ApiExceptionFilter]
[ApiController]
[EnableCors("AllowCors")]
public class MallController : BaseController
public class MallController : BaseController
{
/// <summary>
/// 商户账号处理类
......@@ -57,12 +58,12 @@ namespace Mall.WebApi.Controllers.MallBase
[HttpPost]
public ApiResult GetHome()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
//小程序Id
var MiniAppId = RequestParm.MiniAppId;
MiniAppId = "wxacd9f8cc3480d29e";
var MiniAppId = parms.GetStringValue("MiniAppId");
var homePage = new object();
//获取小程序信息
var miniProgram = programModule.GetMiniProgramModule(new Model.Extend.User.RB_MiniProgram_Extend() { MiniAppId = MiniAppId },isGetHomeData:true);
var miniProgram = programModule.GetMiniProgramModule(new Model.Extend.User.RB_MiniProgram_Extend() { MiniAppId = MiniAppId }, isGetHomeData: true);
if (miniProgram != null && miniProgram.MallBaseId > 0)
{
var selfHomePage = miniprogramPageTemplModule.GetMiniprogramPageTemplModule(new RB_Miniprogram_Page_Templ_Extend()
......@@ -85,14 +86,83 @@ namespace Mall.WebApi.Controllers.MallBase
//解析模板
foreach (var item in templateList)
{
var detailsModel = selfHomePage?.DetailsList?.Where(qitem => qitem.TemplateId == item.Id)?.FirstOrDefault();
var templateData = new
{
id = detailsModel?.Id??0,
name = detailsModel?.NavName??"",
data = new List<object>()
};
if (item.ComponentDataList != null && item.ComponentDataList.Count() > 0)
{
foreach (var subItem in item.ComponentDataList)
{
switch (subItem.Id)
{
case "search":
var searchData = subItem.data as searchItem;
templateData.data.Add(new
{
id = subItem.Id,
data = searchData
});
break;
var tempObj = new {
id=item.Id,
name=item.TemplateName,
page_id=0,
case "background":
var backgroundData = subItem.data as backgroundItem;
templateData.data.Add(new
{
id = subItem.Id,
data = backgroundData
});
break;
case "banner":
var bannerData = subItem.data as bannerItem;
templateData.data.Add(new
{
id = subItem.Id,
data = bannerData
});
break;
case "empty":
var emptyData = subItem.data as emptyItem;
templateData.data.Add(new
{
id = subItem.Id,
data = emptyData
});
break;
case "rubik":
var rubikData = subItem.data as rubikItem;
templateData.data.Add(new
{
id = subItem.Id,
data = rubikData
});
break;
case "goods":
var goodsData = subItem.data as goodsItem;
templateData.data.Add(new
{
id = subItem.Id,
data = goodsData
});
break;
}
}
}
var tempObj = new
{
id = item.Id,
name = item.TemplateName,
page_id = 0,
template_id = item.Id,
template = templateData
};
list.Add(tempObj);
}
homePage = new
......@@ -101,7 +171,7 @@ namespace Mall.WebApi.Controllers.MallBase
title = selfHomePage.PageName,
show_navs = selfHomePage.IsShowNav,
is_home_page = selfHomePage.IsHome,
navs= list
navs = list
};
}
//默认首页
......@@ -145,9 +215,9 @@ namespace Mall.WebApi.Controllers.MallBase
[HttpPost]
public ApiResult GetUserCenter()
{
JObject parms = JObject.Parse(RequestParm.msg.ToString());
//小程序Id
var MiniAppId = RequestParm.MiniAppId;
MiniAppId = "wxacd9f8cc3480d29e";
var MiniAppId = parms.GetStringValue("MiniAppId");
//获取小程序信息
var miniProgram = programModule.GetMiniProgramModule(new Model.Extend.User.RB_MiniProgram_Extend() { MiniAppId = MiniAppId }, isGetUserCenterMenu: true);
var mall = new object();
......@@ -164,28 +234,28 @@ namespace Mall.WebApi.Controllers.MallBase
color = miniProgram.TopNavWordColor,
},
//用户中心
user_center = new
user_center = new
{
//是否显示账户栏
is_account_status=(miniProgram.IsShowAccountNav==0?1:0),
is_account_status = (miniProgram.IsShowAccountNav == 0 ? 1 : 0),
//是否显示菜单栏
is_menu_status=(miniProgram.IsShowMenuNav==0?1:0),
is_menu_status = (miniProgram.IsShowMenuNav == 0 ? 1 : 0),
//是否显示菜单栏
is_order_bar_status=(miniProgram.IsShowOrderNav==0?1:0),
is_order_bar_status = (miniProgram.IsShowOrderNav == 0 ? 1 : 0),
//是否显示收藏夹
is_foot_bar_status=(miniProgram.IsShowFavorite==0?1:0),
is_foot_bar_status = (miniProgram.IsShowFavorite == 0 ? 1 : 0),
//菜单样式
menu_style=(miniProgram.MenuNavStyle==0?1:2),
menu_style = (miniProgram.MenuNavStyle == 0 ? 1 : 2),
//头像样式
top_style=(miniProgram.HeadStyle),
top_style = (miniProgram.HeadStyle),
//顶部默认背景图
top_pic_url=miniProgram.DefaultBgImg,
top_pic_url = miniProgram.DefaultBgImg,
//普通用户背景图
member_pic_url = miniProgram.MemberBgImg,
//会员中心背景图
member_bg_pic_url = miniProgram.VipBgImg,
//头像内嵌背景图
style_bg_pic_url="",
style_bg_pic_url = "",
//账户相关菜单
account = miniProgram?.AccountMenuList.Select(qitem => new
......@@ -232,8 +302,8 @@ namespace Mall.WebApi.Controllers.MallBase
};
mall = new
{
id=miniProgram.MallBaseId,
name=miniProgram.MallName,
id = miniProgram.MallBaseId,
name = miniProgram.MallName,
//配置信息
config
};
......
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