Skip to content

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

页面修改

parent b13b3ca2
Hide whitespace changes
Inline Side-by-side
Showing with 383 additions and 9 deletions
Mall.WebApi/Controllers/Mall/MallController.cs
View file @ d4c3c25a
...@@ -11,6 +11,7 @@ using Mall.Model.Extend.MarketingCenter; ...@@ -11,6 +11,7 @@ using Mall.Model.Extend.MarketingCenter;
using Mall.Module.BaseSetUp; using Mall.Module.BaseSetUp;
using Mall.Module.MarketingCenter; using Mall.Module.MarketingCenter;
using Mall.WebApi.Filter; using Mall.WebApi.Filter;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Cors; using Microsoft.AspNetCore.Cors;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json; using Newtonsoft.Json;
...@@ -56,6 +57,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -56,6 +57,7 @@ namespace Mall.WebApi.Controllers.MallBase
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
[HttpPost] [HttpPost]
[AllowAnonymous]
public ApiResult GetHome() public ApiResult GetHome()
{ {
JObject parms = JObject.Parse(RequestParm.msg.ToString()); JObject parms = JObject.Parse(RequestParm.msg.ToString());
...@@ -127,6 +129,153 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -127,6 +129,153 @@ namespace Mall.WebApi.Controllers.MallBase
//配置了首页 //配置了首页
if (miniProgram.HomeDataList != null && miniProgram.HomeDataList.Count > 0) if (miniProgram.HomeDataList != null && miniProgram.HomeDataList.Count > 0)
{ {
var templateData = new
{
id = 0,
name = "",
data = new List<object>()
};
foreach (var subitem in miniProgram.HomeDataList)
{
switch (subitem.key)
{
//搜索框
case "search":
templateData.data.Add(new
{
subitem.key,
subitem.name,
subitem.relation_id,
subitem.is_edit,
subitem.imgBg
});
break;
//轮播图
case "banner":
templateData.data.Add(new
{
subitem.key,
subitem.name,
subitem.relation_id,
subitem.is_edit,
subitem.row_num,
subitem.imgBg
});
break;
//导航图标
case "home_nav":
templateData.data.Add(new
{
subitem.key,
subitem.name,
subitem.relation_id,
subitem.is_edit,
subitem.row_num,
subitem.imgBg
});
break;
//视频
case "video":
templateData.data.Add(new
{
subitem.key,
subitem.name,
subitem.relation_id,
subitem.is_edit,
subitem.video_url,
subitem.video_pic_url,
subitem.imgBg
});
break;
//公告
case "notice":
templateData.data.Add(new
{
subitem.key,
subitem.name,
subitem.relation_id,
subitem.is_edit,
subitem.notice_url,
subitem.notice_bg_color,
subitem.notice_text_color,
subitem.imgBg
});
break;
//专题
case "topic":
templateData.data.Add(new
{
subitem.key,
subitem.name,
subitem.relation_id,
subitem.is_edit,
subitem.topic_num,
subitem.topic_url,
subitem.topic_url_2,
subitem.label_url,
subitem.imgBg
});
break;
//领券中心
case "coupon":
templateData.data.Add(new
{
subitem.key,
subitem.name,
subitem.relation_id,
subitem.is_edit,
subitem.coupon_url,
subitem.coupon_not_url,
subitem.imgBg
});
break;
//所有分类
case "cat":
break;
//图片魔方
case "block":
break;
//预约
case "booking":
templateData.data.Add(new
{
subitem.key,
subitem.name,
subitem.relation_id,
subitem.is_edit,
subitem.imgBg
});
break;
//拼团
case "pintuan":
templateData.data.Add(new
{
subitem.key,
subitem.name,
subitem.relation_id,
subitem.is_edit,
subitem.imgBg
});
break;
//预售
case "advance":
templateData.data.Add(new
{
subitem.key,
subitem.name,
subitem.relation_id,
subitem.is_edit,
subitem.imgBg
});
break;
}
}
homePage = new homePage = new
{ {
id = 0, id = 0,
...@@ -209,16 +358,25 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -209,16 +358,25 @@ namespace Mall.WebApi.Controllers.MallBase
data = noticeData data = noticeData
}; };
break; break;
//专题组件
//空组件 case "topic":
case "empty": var topicData = subItem.data as topicItem;
var emptyData = subItem.data as emptyItem;
obj = new obj = new
{ {
id = subItem.Id, id = subItem.Id,
data = emptyData data = topicData
}; };
break; break;
//标题组件
case "link":
var linkData = subItem.data as linkItem;
obj = new
{
id = subItem.Id,
data = linkData
};
break;
//图片广告插件
case "rubik": case "rubik":
var rubikData = subItem.data as rubikItem; var rubikData = subItem.data as rubikItem;
obj = new obj = new
...@@ -227,7 +385,16 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -227,7 +385,16 @@ namespace Mall.WebApi.Controllers.MallBase
data = rubikData data = rubikData
}; };
break; break;
//视频插件
case "video":
var videoData = subItem.data as videoItem;
obj = new
{
id = subItem.Id,
data = videoData
};
break;
//商品插件
case "goods": case "goods":
var goodsData = subItem.data as goodsItem; var goodsData = subItem.data as goodsItem;
obj = new obj = new
...@@ -236,8 +403,212 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -236,8 +403,212 @@ namespace Mall.WebApi.Controllers.MallBase
data = goodsData data = goodsData
}; };
break; break;
} //门店插件
case "store":
var storeData = subItem.data as storeItem;
obj = new
{
id = subItem.Id,
data = storeData
};
break;
//版权插件
case "copyright":
var copyrightData = subItem.data as copyrightItem;
obj = new
{
id = subItem.Id,
data = copyrightData
};
break;
//签到插件
case "check-in":
var checkinData = subItem.data as checkinItem;
obj = new
{
id = subItem.Id,
data = checkinData
};
break;
//用户信息插件
case "user-info":
var userinfoData = subItem.data as userinfoItem;
obj = new
{
id = subItem.Id,
data = userinfoData
};
break;
//用户订单插件
case "user-order":
var userorderData = subItem.data as userorderItem;
obj = new
{
id = subItem.Id,
data = userorderData
};
break;
//地图插件
case "map":
var mapData = subItem.data as mapItem;
obj = new
{
id = subItem.Id,
data = mapData
};
break;
//微信公众号插件
case "mp-link":
var mplinkData = subItem.data as mplinkItem;
obj = new
{
id = subItem.Id,
data = mplinkData
};
break;
//图文插件
case "image-text":
var imagetextData = subItem.data as imagetextItem;
obj = new
{
id = subItem.Id,
data = imagetextData
};
break;
//优惠券插件
case "coupon":
var couponData = subItem.data as couponItem;
obj = new
{
id = subItem.Id,
data = couponData
};
break;
//倒计时插件
case "timer":
var timerData = subItem.data as timerItem;
obj = new
{
id = subItem.Id,
data = timerData
};
break;
//拼团插件
case "pintuan":
var pintuanData = subItem.data as pintuanItem;
obj = new
{
id = subItem.Id,
data = pintuanData
};
break;
//预约插件
case "booking":
var bookingData = subItem.data as bookingItem;
obj = new
{
id = subItem.Id,
data = bookingData
};
break;
//砍价插件
case "bargain":
var bargainData = subItem.data as bargainItem;
obj = new
{
id = subItem.Id,
data = bargainData
};
break;
//积分商城插件
case "integral-mall":
var integralmallData = subItem.data as integralmallItem;
obj = new
{
id = subItem.Id,
data = integralmallData
};
break;
//抽奖插件
case "lottery":
var lotteryData = subItem.data as lotteryItem;
obj = new
{
id = subItem.Id,
data = lotteryData
};
break;
//预售
case "advance":
var advanceData = subItem.data as advanceItem;
obj = new
{
id = subItem.Id,
data = advanceData
};
break;
//超级会员卡
case "vip-card":
var vipcardData = subItem.data as vipcardItem;
obj = new
{
id = subItem.Id,
data = vipcardData
};
break;
//直播组件
case "live":
var liveData = subItem.data as liveItem;
obj = new
{
id = subItem.Id,
data = liveData
};
break;
//空组件
case "empty":
var emptyData = subItem.data as emptyItem;
obj = new
{
id = subItem.Id,
data = emptyData
};
break;
//流量主广告
case "ad":
var adData = subItem.data as adItem;
obj = new
{
id = subItem.Id,
data = adData
};
break;
//弹窗广告
case "modal":
var modalData = subItem.data as modalItem;
obj = new
{
id = subItem.Id,
data = modalData
};
break;
//弹窗广告
case "quick-nav":
var quicknavData = subItem.data as quicknavItem;
obj = new
{
id = subItem.Id,
data = quicknavData
};
break;
}
return obj; return obj;
} }
...@@ -289,7 +660,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -289,7 +660,7 @@ namespace Mall.WebApi.Controllers.MallBase
member_pic_url = miniProgram.MemberBgImg, member_pic_url = miniProgram.MemberBgImg,
//会员中心背景图 //会员中心背景图
member_bg_pic_url = miniProgram.VipBgImg, member_bg_pic_url = miniProgram.VipBgImg,
//头像内嵌背景图 //头像内嵌背景图[暂无]
style_bg_pic_url = "", style_bg_pic_url = "",
//账户相关菜单 //账户相关菜单
......
Mall.WebApi/Controllers/User/TenantController.cs
View file @ d4c3c25a
...@@ -27,6 +27,7 @@ namespace Mall.WebApi.Controllers.User ...@@ -27,6 +27,7 @@ namespace Mall.WebApi.Controllers.User
[ApiExceptionFilter] [ApiExceptionFilter]
[ApiController] [ApiController]
[EnableCors("AllowCors")] [EnableCors("AllowCors")]
public class TenantController : BaseController public class TenantController : BaseController
{ {
/// <summary> /// <summary>
......
Mall.WebApi/Filter/ApiFilterAttribute.cs
View file @ d4c3c25a
...@@ -46,6 +46,7 @@ namespace Mall.WebApi.Filter ...@@ -46,6 +46,7 @@ namespace Mall.WebApi.Filter
"/api/Tenant/SetTenantFirst",//用户注册第一步 "/api/Tenant/SetTenantFirst",//用户注册第一步
"/api/Tenant/SetTenantSecond",//用户注册第二步 "/api/Tenant/SetTenantSecond",//用户注册第二步
"/api/Tenant/UpdateTenantPwd",//忘记密码 "/api/Tenant/UpdateTenantPwd",//忘记密码
"/api/Mall/GetHome",//
}; };
bool isCheckToken = true; bool isCheckToken = true;
foreach (var item in notValidatList) foreach (var item in notValidatList)
......
Mall.WebApi/Startup.cs
View file @ d4c3c25a
...@@ -44,7 +44,8 @@ namespace Mall.WebApi ...@@ -44,7 +44,8 @@ namespace Mall.WebApi
{ {
"http://localhost:8081", "http://localhost:8081",
"http://localhost:8080", "http://localhost:8080",
"http://localhost:8082" "http://localhost:8082",
"http://127.0.0.1:50512"
}; };
services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(corsArray.ToArray()))); services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(corsArray.ToArray())));
} }
......
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