Skip to content

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

页面修改

parent a963b588
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 57 deletions
Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs
View file @ 07c8335b
...@@ -129,39 +129,69 @@ namespace Mall.Module.MarketingCenter ...@@ -129,39 +129,69 @@ namespace Mall.Module.MarketingCenter
{ {
switch (item.Id) switch (item.Id)
{ {
//背景组件
case "background":item.data = JsonHelper.DeserializeObject<backgroundItem>(item.data.ToString()); break; case "background":item.data = JsonHelper.DeserializeObject<backgroundItem>(item.data.ToString()); break;
//查找组件
case "search": item.data = JsonHelper.DeserializeObject<searchItem>(item.data.ToString()); break; case "search": item.data = JsonHelper.DeserializeObject<searchItem>(item.data.ToString()); break;
//导航组件
case "nav": item.data = JsonHelper.DeserializeObject<navItem>(item.data.ToString()); break; case "nav": item.data = JsonHelper.DeserializeObject<navItem>(item.data.ToString()); break;
//轮播广告插件
case "banner": item.data = JsonHelper.DeserializeObject<bannerItem>(item.data.ToString()); break; case "banner": item.data = JsonHelper.DeserializeObject<bannerItem>(item.data.ToString()); break;
//公告组件
case "notice": item.data = JsonHelper.DeserializeObject<noticeItem>(item.data.ToString()); break; case "notice": item.data = JsonHelper.DeserializeObject<noticeItem>(item.data.ToString()); break;
//专题 //专题
case "topic": item.data = JsonHelper.DeserializeObject<topicItem>(item.data.ToString()); break; case "topic": item.data = JsonHelper.DeserializeObject<topicItem>(item.data.ToString()); break;
//标题组件
case "link": item.data = JsonHelper.DeserializeObject<linkItem>(item.data.ToString()); break; case "link": item.data = JsonHelper.DeserializeObject<linkItem>(item.data.ToString()); break;
//图片广告插件
case "rubik": item.data = JsonHelper.DeserializeObject<rubikItem>(item.data.ToString()); break; case "rubik": item.data = JsonHelper.DeserializeObject<rubikItem>(item.data.ToString()); break;
//视频插件
case "video": item.data = JsonHelper.DeserializeObject<videoItem>(item.data.ToString()); break; case "video": item.data = JsonHelper.DeserializeObject<videoItem>(item.data.ToString()); break;
//商品插件
case "goods": item.data = JsonHelper.DeserializeObject<goodsItem>(item.data.ToString()); break; case "goods": item.data = JsonHelper.DeserializeObject<goodsItem>(item.data.ToString()); break;
//门店插件
case "store": item.data = JsonHelper.DeserializeObject<storeItem>(item.data.ToString()); break; case "store": item.data = JsonHelper.DeserializeObject<storeItem>(item.data.ToString()); break;
//版权插件
case "copyright": item.data = JsonHelper.DeserializeObject<copyrightItem>(item.data.ToString()); break; case "copyright": item.data = JsonHelper.DeserializeObject<copyrightItem>(item.data.ToString()); break;
//签到插件
case "check-in": item.data = JsonHelper.DeserializeObject<checkinItem>(item.data.ToString()); break; case "check-in": item.data = JsonHelper.DeserializeObject<checkinItem>(item.data.ToString()); break;
//用户信息插件
case "user-info": item.data = JsonHelper.DeserializeObject<userinfoItem>(item.data.ToString()); break; case "user-info": item.data = JsonHelper.DeserializeObject<userinfoItem>(item.data.ToString()); break;
//用户订单插件
case "user-order": item.data = JsonHelper.DeserializeObject<userorderItem>(item.data.ToString()); break; case "user-order": item.data = JsonHelper.DeserializeObject<userorderItem>(item.data.ToString()); break;
//地图插件
case "map": item.data = JsonHelper.DeserializeObject<mapItem>(item.data.ToString()); break; case "map": item.data = JsonHelper.DeserializeObject<mapItem>(item.data.ToString()); break;
//微信公众号插件
case "mp-link": item.data = JsonHelper.DeserializeObject<mplinkItem>(item.data.ToString()); break; case "mp-link": item.data = JsonHelper.DeserializeObject<mplinkItem>(item.data.ToString()); break;
//图文插件
case "image-text": item.data = JsonHelper.DeserializeObject<imagetextItem>(item.data.ToString()); break; case "image-text": item.data = JsonHelper.DeserializeObject<imagetextItem>(item.data.ToString()); break;
//优惠券插件
case "coupon": item.data = JsonHelper.DeserializeObject<couponItem>(item.data.ToString()); break; case "coupon": item.data = JsonHelper.DeserializeObject<couponItem>(item.data.ToString()); break;
//倒计时插件
case "timer": item.data = JsonHelper.DeserializeObject<timerItem>(item.data.ToString()); break; case "timer": item.data = JsonHelper.DeserializeObject<timerItem>(item.data.ToString()); break;
//拼团插件
case "pintuan": item.data = JsonHelper.DeserializeObject<pintuanItem>(item.data.ToString()); break; case "pintuan": item.data = JsonHelper.DeserializeObject<pintuanItem>(item.data.ToString()); break;
//预约插件
case "booking": item.data = JsonHelper.DeserializeObject<bookingItem>(item.data.ToString()); break; case "booking": item.data = JsonHelper.DeserializeObject<bookingItem>(item.data.ToString()); break;
//砍价插件
case "bargain": item.data = JsonHelper.DeserializeObject<bargainItem>(item.data.ToString()); break; case "bargain": item.data = JsonHelper.DeserializeObject<bargainItem>(item.data.ToString()); break;
//积分商城插件
case "integral-mall": item.data = JsonHelper.DeserializeObject<integralmallItem>(item.data.ToString()); break; case "integral-mall": item.data = JsonHelper.DeserializeObject<integralmallItem>(item.data.ToString()); break;
//抽奖插件
case "lottery": item.data = JsonHelper.DeserializeObject<lotteryItem>(item.data.ToString()); break; case "lottery": item.data = JsonHelper.DeserializeObject<lotteryItem>(item.data.ToString()); break;
//预售
case "advance": item.data = JsonHelper.DeserializeObject<advanceItem>(item.data.ToString()); break; case "advance": item.data = JsonHelper.DeserializeObject<advanceItem>(item.data.ToString()); break;
//超级会员卡
case "vip-card": item.data = JsonHelper.DeserializeObject<vipcardItem>(item.data.ToString()); break; case "vip-card": item.data = JsonHelper.DeserializeObject<vipcardItem>(item.data.ToString()); break;
//直播组件
case "live": item.data = JsonHelper.DeserializeObject<liveItem>(item.data.ToString()); break; case "live": item.data = JsonHelper.DeserializeObject<liveItem>(item.data.ToString()); break;
//空白块组件
case "empty": item.data = JsonHelper.DeserializeObject<emptyItem>(item.data.ToString()); break; case "empty": item.data = JsonHelper.DeserializeObject<emptyItem>(item.data.ToString()); break;
//流量主广告
case "ad": item.data = JsonHelper.DeserializeObject<adItem>(item.data.ToString()); break; case "ad": item.data = JsonHelper.DeserializeObject<adItem>(item.data.ToString()); break;
//弹窗广告
case "modal": item.data = JsonHelper.DeserializeObject<modalItem>(item.data.ToString()); break; case "modal": item.data = JsonHelper.DeserializeObject<modalItem>(item.data.ToString()); break;
//快捷导航
case "quick-nav": item.data = JsonHelper.DeserializeObject<quicknavItem>(item.data.ToString()); break; case "quick-nav": item.data = JsonHelper.DeserializeObject<quicknavItem>(item.data.ToString()); break;
} }
} }
......
Mall.Module.User/ContentModule.cs
View file @ 07c8335b
...@@ -183,6 +183,7 @@ namespace Mall.Module.User ...@@ -183,6 +183,7 @@ namespace Mall.Module.User
{ nameof(RB_Topic_Extend.TopicTypeId),extModel.TopicTypeId}, { nameof(RB_Topic_Extend.TopicTypeId),extModel.TopicTypeId},
{ nameof(RB_Topic_Extend.ReadNum),extModel.ReadNum}, { nameof(RB_Topic_Extend.ReadNum),extModel.ReadNum},
{ nameof(RB_Topic_Extend.SortNum),extModel.SortNum}, { nameof(RB_Topic_Extend.SortNum),extModel.SortNum},
{ nameof(RB_Topic_Extend.TemplateData),extModel.TemplateData},
}; };
flag = topicRepository.Update(fileds, new WhereHelper(nameof(RB_Topic_Extend.Id), extModel.Id)); flag = topicRepository.Update(fileds, new WhereHelper(nameof(RB_Topic_Extend.Id), extModel.Id));
} }
...@@ -219,6 +220,10 @@ namespace Mall.Module.User ...@@ -219,6 +220,10 @@ namespace Mall.Module.User
} }
} }
} }
else
{
extModel.ComponentDataList = new List<ComponentItem>();
}
return extModel; return extModel;
} }
......
Mall.WebApi/Controllers/Mall/MallController.cs
View file @ 07c8335b
...@@ -89,68 +89,15 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -89,68 +89,15 @@ namespace Mall.WebApi.Controllers.MallBase
var detailsModel = selfHomePage?.DetailsList?.Where(qitem => qitem.TemplateId == item.Id)?.FirstOrDefault(); var detailsModel = selfHomePage?.DetailsList?.Where(qitem => qitem.TemplateId == item.Id)?.FirstOrDefault();
var templateData = new var templateData = new
{ {
id = detailsModel?.Id??0, id = detailsModel?.Id ?? 0,
name = detailsModel?.NavName??"", name = detailsModel?.NavName ?? "",
data = new List<object>() data = new List<object>()
}; };
if (item.ComponentDataList != null && item.ComponentDataList.Count() > 0) if (item.ComponentDataList != null && item.ComponentDataList.Count() > 0)
{ {
foreach (var subItem in item.ComponentDataList) foreach (var subItem in item.ComponentDataList)
{ {
switch (subItem.Id) templateData.data.Add(PlusDataToObject(subItem));
{
case "search":
var searchData = subItem.data as searchItem;
templateData.data.Add(new
{
id = subItem.Id,
data = searchData
});
break;
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;
}
} }
} }
...@@ -207,6 +154,94 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -207,6 +154,94 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.Success(data: homePage); return ApiResult.Success(data: homePage);
} }
/// <summary>
/// 解析插件数据为对象
/// </summary>
/// <param name="item"></param>
/// <returns></returns>
public object PlusDataToObject(ComponentItem subItem)
{
var obj = new object();
switch (subItem.Id)
{
//背景插件
case "background":
var backgroundData = subItem.data as backgroundItem;
obj = new
{
id = subItem.Id,
data = backgroundData
};
break;
//搜索插件
case "search":
var searchData = subItem.data as searchItem;
obj = new
{
id = subItem.Id,
data = searchData
};
break;
//导航组件
case "nav":
var navData = subItem.data as navItem;
obj = new
{
id = subItem.Id,
data = navData
};
break;
//轮播广告插件
case "banner":
var bannerData = subItem.data as bannerItem;
obj = new
{
id = subItem.Id,
data = bannerData
};
break;
//公告组件
case "notice":
var noticeData = subItem.data as noticeItem;
obj = new
{
id = subItem.Id,
data = noticeData
};
break;
//空组件
case "empty":
var emptyData = subItem.data as emptyItem;
obj = new
{
id = subItem.Id,
data = emptyData
};
break;
case "rubik":
var rubikData = subItem.data as rubikItem;
obj = new
{
id = subItem.Id,
data = rubikData
};
break;
case "goods":
var goodsData = subItem.data as goodsItem;
obj = new
{
id = subItem.Id,
data = goodsData
};
break;
}
return obj;
}
/// <summary> /// <summary>
/// 用户中心 /// 用户中心
/// </summary> /// </summary>
......
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