Skip to content

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

页面修改

parent 9d70489b
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 49 deletions
Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs
View file @ ac98a2c9
...@@ -654,6 +654,11 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -654,6 +654,11 @@ namespace Mall.Model.Extend.MarketingCenter
/// 页面名称 /// 页面名称
/// </summary> /// </summary>
public string PageName { get; set; } public string PageName { get; set; }
/// <summary>
/// App前端使用
/// </summary>
public string new_link_url { get; set; }
} }
/// <summary> /// <summary>
......
Mall.Module.User/MiniProgramModule.cs
View file @ ac98a2c9
...@@ -162,7 +162,18 @@ namespace Mall.Module.User ...@@ -162,7 +162,18 @@ namespace Mall.Module.User
/// <returns></returns> /// <returns></returns>
public List<RB_Mall_Magic_Extend> GetMallMagicListModule(RB_Mall_Magic_Extend query) public List<RB_Mall_Magic_Extend> GetMallMagicListModule(RB_Mall_Magic_Extend query)
{ {
return magicRepository.GetMallMagicListRepository(query); var list= magicRepository.GetMallMagicListRepository(query);
if (list != null && list.Count > 0)
{
foreach (var item in list)
{
if (item.MagicData != null && !string.IsNullOrEmpty(item.MagicData))
{
item.MagicDataList = Common.Plugin.JsonHelper.DeserializeObject<List<MagicItem>>(item.MagicData);
}
}
}
return list;
} }
/// <summary> /// <summary>
......
Mall.WebApi/Controllers/Mall/MallController.cs
View file @ ac98a2c9
...@@ -95,7 +95,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -95,7 +95,7 @@ namespace Mall.WebApi.Controllers.MallBase
}, isGetHome: true); }, isGetHome: true);
List<object> list = new List<object>(); List<object> list = new List<object>();
//测试使用 //测试使用
selfHomePage.Id = 0; // selfHomePage.Id = 0;
//自定义首页 //自定义首页
if (selfHomePage != null && selfHomePage.Id > 0) if (selfHomePage != null && selfHomePage.Id > 0)
{ {
...@@ -154,7 +154,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -154,7 +154,7 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
id = 0, id = 0,
name = "", name = "",
data = new List<ComponentItem>() data = new List<object>()
}; };
foreach (var subitem in miniProgram.HomeDataList) foreach (var subitem in miniProgram.HomeDataList)
{ {
...@@ -162,9 +162,9 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -162,9 +162,9 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
//搜索框 //搜索框
case "search": case "search":
ComponentItem searchData = new ComponentItem() templateData.data.Add(new
{ {
Id = subitem.key, id = subitem.key,
data = new searchItem() data = new searchItem()
{ {
color = "#FFFFFF", color = "#FFFFFF",
...@@ -174,8 +174,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -174,8 +174,7 @@ namespace Mall.WebApi.Controllers.MallBase
textColor = "#555555", //文字颜色 textColor = "#555555", //文字颜色
textPosition = "left" //文字位置 textPosition = "left" //文字位置
} }
}; });
templateData.data.Add(searchData);
break; break;
//轮播图 //轮播图
...@@ -189,13 +188,13 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -189,13 +188,13 @@ namespace Mall.WebApi.Controllers.MallBase
detailsBannerList.Add(new bannerDetailItem() detailsBannerList.Add(new bannerDetailItem()
{ {
url = bItem.NavLink, url = bItem.NavLink,
picUrl = bItem.NavImg picUrl = Common.Config.GetFileUrl(bItem.NavImg)
}); });
} }
} }
ComponentItem bannerData = new ComponentItem() templateData.data.Add(new
{ {
Id = subitem.key, id = subitem.key,
data = new bannerItem() data = new bannerItem()
{ {
style = 1, //样式 style = 1, //样式
...@@ -203,8 +202,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -203,8 +202,7 @@ namespace Mall.WebApi.Controllers.MallBase
height = 450, //默认高度 height = 450, //默认高度
banners = detailsBannerList banners = detailsBannerList
} }
}; });
templateData.data.Add(bannerData);
break; break;
//导航图标 //导航图标
case "home_nav": case "home_nav":
...@@ -219,7 +217,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -219,7 +217,7 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
navs.Add(new navIconItem() navs.Add(new navIconItem()
{ {
icon = nItem.NavIconImg, icon = Common.Config.GetFileUrl(nItem.NavIconImg),
url = nItem.NavIconUrl, url = nItem.NavIconUrl,
key = "", key = "",
name = nItem.NavIconName, name = nItem.NavIconName,
...@@ -227,9 +225,9 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -227,9 +225,9 @@ namespace Mall.WebApi.Controllers.MallBase
}); });
} }
} }
ComponentItem navData = new ComponentItem() templateData.data.Add(new
{ {
Id = subitem.key, id = "nav",
data = new navItem() data = new navItem()
{ {
color = "#353535", color = "#353535",
...@@ -245,33 +243,31 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -245,33 +243,31 @@ namespace Mall.WebApi.Controllers.MallBase
backgroundWidth = 100, //背景图高 backgroundWidth = 100, //背景图高
navs = navs, //导航图标 navs = navs, //导航图标
} }
}; });
templateData.data.Add(navData);
break; break;
//视频插件 //视频插件
case "video": case "video":
ComponentItem videoData = new ComponentItem() templateData.data.Add(new
{ {
Id = subitem.key, id = subitem.key,
data = new videoItem() data = new videoItem()
{ {
pic_url = subitem.video_pic_url, pic_url = Common.Config.GetFileUrl(subitem.video_pic_url),
url = subitem.video_url, url = subitem.video_url,
} }
}; });
templateData.data.Add(videoData);
break; break;
//公告 //公告
case "notice": case "notice":
ComponentItem noticeData = new ComponentItem() templateData.data.Add(new
{ {
Id = subitem.key, id = subitem.key,
data = new noticeItem() data = new noticeItem()
{ {
name= subitem.NoticeName, //公告名称 name = subitem.NoticeName, //公告名称
content = subitem.NoticeContent, //公告内容 content = subitem.NoticeContent, //公告内容
icon = subitem.notice_url, //公告图标 icon = Common.Config.GetFileUrl(subitem.notice_url), //公告图标
textColor = subitem.notice_text_color, //文字颜色 textColor = subitem.notice_text_color, //文字颜色
background = subitem.notice_bg_color, //背景颜色 background = subitem.notice_bg_color, //背景颜色
headerUrl = "", //头部图片 headerUrl = "", //头部图片
...@@ -282,8 +278,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -282,8 +278,7 @@ namespace Mall.WebApi.Controllers.MallBase
btnText = "我知道了", //按钮文本内容 btnText = "我知道了", //按钮文本内容
btnTextColor = "#ffffff" //按钮文本颜色 btnTextColor = "#ffffff" //按钮文本颜色
} }
}; });
templateData.data.Add(noticeData);
break; break;
//专题 //专题
case "topic": case "topic":
...@@ -299,7 +294,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -299,7 +294,7 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
topic_list.Add(new topicDetailsItem() topic_list.Add(new topicDetailsItem()
{ {
cover_pic = tItem.CoverImg, cover_pic = Common.Config.GetFileUrl(tItem.CoverImg) ,
read_count = 0, read_count = 0,
title = tItem.Title, title = tItem.Title,
id = tItem.Id, id = tItem.Id,
...@@ -307,22 +302,22 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -307,22 +302,22 @@ namespace Mall.WebApi.Controllers.MallBase
}); });
} }
} }
ComponentItem topicData = new ComponentItem()
templateData.data.Add(new
{ {
Id = subitem.key, id = subitem.key,
data = new topicItem() data = new topicItem()
{ {
style = "normal", style = "normal",
count = subitem.topic_num, count = subitem.topic_num,
logo_1 = subitem.topic_url, logo_1 = Common.Config.GetFileUrl(subitem.topic_url),
logo_2 = subitem.topic_url_2, logo_2 = Common.Config.GetFileUrl(subitem.topic_url_2),
icon = subitem.label_url, icon = Common.Config.GetFileUrl(subitem.label_url) ,
cat_show = false, cat_show = false,
list = new List<topicTypeItem>(), list = new List<topicTypeItem>(),
topic_list = topic_list topic_list = topic_list
} }
}; });
templateData.data.Add(topicData);
break; break;
//领劵中心 //领劵中心
case "coupon": case "coupon":
...@@ -330,7 +325,6 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -330,7 +325,6 @@ namespace Mall.WebApi.Controllers.MallBase
break; break;
//商品分类 //商品分类
case "cat": case "cat":
var tempGoodsList = new List<GoodsDetailsItem2>(); var tempGoodsList = new List<GoodsDetailsItem2>();
if (subitem.relation_id == 0) if (subitem.relation_id == 0)
{ {
...@@ -360,7 +354,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -360,7 +354,7 @@ namespace Mall.WebApi.Controllers.MallBase
TenantId = Convert.ToInt32(miniProgram.TenantId), TenantId = Convert.ToInt32(miniProgram.TenantId),
MallBaseId = miniProgram.MallBaseId, MallBaseId = miniProgram.MallBaseId,
CategoryIds = subitem.relation_id.ToString() CategoryIds = subitem.relation_id.ToString()
}) ; });
if (goodsList != null && goodsList.Count > 0) if (goodsList != null && goodsList.Count > 0)
{ {
foreach (var gItem in goodsList) foreach (var gItem in goodsList)
...@@ -375,9 +369,9 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -375,9 +369,9 @@ namespace Mall.WebApi.Controllers.MallBase
} }
} }
} }
ComponentItem goodsData = new ComponentItem() templateData.data.Add(new
{ {
Id = subitem.key, id = subitem.key,
data = new goodsItem() data = new goodsItem()
{ {
showCat = false, showCat = false,
...@@ -407,24 +401,121 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -407,24 +401,121 @@ namespace Mall.WebApi.Controllers.MallBase
mode = 1, mode = 1,
backgroundHeight = 100, backgroundHeight = 100,
backgroundWidth = 100, backgroundWidth = 100,
list= tempGoodsList list = tempGoodsList
} }
}; });
templateData.data.Add(goodsData);
break; break;
//图片魔方 //图片魔方
case "block": case "block":
var blockSourceList = programModule.GetMallMagicListModule(new Model.Entity.User.RB_Mall_Magic_Extend()
var blockSource = programModule.GetMallMagicListModule(new Model.Entity.User.RB_Mall_Magic_Extend()
{ {
MallBaseId = miniProgram.MallBaseId, MallBaseId = miniProgram.MallBaseId,
TenantId = Convert.ToInt32(miniProgram.TenantId) TenantId = Convert.ToInt32(miniProgram.TenantId)
}).FirstOrDefault(); }).FirstOrDefault();
ComponentItem blockData = new ComponentItem()
if (blockSource!=null && blockSource.Id>0)
{ {
Id = subitem.key, var rubikData = new rubikItem()
data = blockSourceList {
}; style = Convert.ToInt32(blockSource.Style),
templateData.data.Add(blockData); space=0,
list = new List<rubikDetailItem>(),
};
switch (rubikData.style)
{
//1张图
case 0:
rubikData.height = "360";
rubikData.w ="1";
rubikData.h = 1;
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor="",
numberX=0,
numberY=0,
w = 1,
h = 1,
x = 0,
y = 0,
link=new rubikLinkItem() {
new_link_url= blockSource.MagicDataList[0].Link
},
width= "calc(40%)",
height= "calc(100%)",
left= "0%",
top= "0%",
pic_url=Common.Config.GetFileUrl(blockSource.MagicDataList[0].ImgUrl),
backgroundImage="",
backgroundRepeat= "no-repeat",
backgroundSize= "cover",
backgroundPosition= "center"
});
break;
//两张图
case 1:
rubikData.height = "360";
rubikData.w = "25";
rubikData.h = 12;
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 10,
h = 12,
x = 0,
y = 0,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[0].Link
},
width = "calc(40%)",
height = "calc(100%)",
left = "0%",
top = "0%",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[0].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
rubikData.list.Add(new rubikDetailItem()
{
backgroundColor = "",
numberX = 0,
numberY = 0,
w = 15,
h = 12,
x = 10,
y = 0,
link = new rubikLinkItem()
{
new_link_url = blockSource.MagicDataList[1].Link
},
width = "calc(40%)",
height = "calc(100%)",
left = "0%",
top = "0%",
pic_url = Common.Config.GetFileUrl(blockSource.MagicDataList[1].ImgUrl),
backgroundImage = "",
backgroundRepeat = "no-repeat",
backgroundSize = "cover",
backgroundPosition = "center"
});
break;
}
templateData.data.Add(new
{
id = "rubik",
data = rubikData
}); ;
}
break; break;
} }
} }
......
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