Commit 4beb7fc7 authored by 吴春's avatar 吴春

1

parent bbf3b6b5
...@@ -763,6 +763,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -763,6 +763,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取新闻前几条 /// 获取新闻前几条
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet]
[HttpPost]
public ApiResult GetNewsPage() public ApiResult GetNewsPage()
{ {
ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString()); ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
...@@ -772,9 +774,13 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -772,9 +774,13 @@ namespace Mall.WebApi.Controllers.TradePavilion
Title = parms.GetStringValue("Title"), Title = parms.GetStringValue("Title"),
Type = parms.GetInt("Type") Type = parms.GetInt("Type")
}; };
var userInfo = AppletUserInfo; // var userInfo = AppletUserInfo;
// query.MallBaseId = RequestParm.MallBaseId;
// query.TenantId = userInfo?.TenantId ?? 0;
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = userInfo?.TenantId ?? 0; query.TenantId = RequestParm.TenantId;
var list = commerceNewsModule.GetCommerceNewsPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query); var list = commerceNewsModule.GetCommerceNewsPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
pageModel.count = Convert.ToInt32(rowsCount); pageModel.count = Convert.ToInt32(rowsCount);
pageModel.pageData = list; pageModel.pageData = list;
...@@ -785,6 +791,8 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -785,6 +791,8 @@ namespace Mall.WebApi.Controllers.TradePavilion
/// 获取新闻信息详情 /// 获取新闻信息详情
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
[HttpGet]
[HttpPost]
public ApiResult GetCommerceNews() public ApiResult GetCommerceNews()
{ {
JObject parms = JObject.Parse(RequestParm.msg.ToString()); JObject parms = JObject.Parse(RequestParm.msg.ToString());
......
...@@ -252,7 +252,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -252,7 +252,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
[HttpPost] [HttpPost]
public ApiResult GetBuildingExportEnumList() public ApiResult GetBuildingExportEnumList()
{ {
var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.SZTCarrierExportEnum)); var list = EnumHelper.GetEnumList(typeof(Common.Enum.TradePavilion.SZTBuildExportEnum));
return ApiResult.Success("", list.Select(x => new return ApiResult.Success("", list.Select(x => new
{ {
Name = x.Key, Name = x.Key,
......
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