Commit c19bf777 authored by 黄奎's avatar 黄奎

页面修改

parent 09f491a6
...@@ -2,39 +2,5 @@ ...@@ -2,39 +2,5 @@
namespace Mall.Common.Enum.TradePavilion namespace Mall.Common.Enum.TradePavilion
{ {
/// <summary>
///自定义表单枚举
/// </summary>
public enum CustomFormTypeEnum
{
/// <summary>
/// 招引贡献
/// </summary>
[EnumField("招引贡献")]
ZYGX = 1,
/// <summary>
/// 首展
/// </summary>
[EnumField("首展")]
SZ = 2,
/// <summary>
/// 首秀
/// </summary>
[EnumField("首秀")]
SX = 3,
/// <summary>
/// 首发
/// </summary>
[EnumField("首发")]
SF = 4,
/// <summary>
/// 品牌
/// </summary>
[EnumField("品牌")]
PingPai = 5,
}
} }
...@@ -27,7 +27,7 @@ namespace Mall.Model.Entity.TradePavilion ...@@ -27,7 +27,7 @@ namespace Mall.Model.Entity.TradePavilion
/// <summary> /// <summary>
/// 表单类型(见枚举) /// 表单类型(见枚举)
/// </summary> /// </summary>
public CustomFormTypeEnum FormType { get; set; } public ListTypeEnum FormType { get; set; }
/// <summary> /// <summary>
/// 表单内容 /// 表单内容
......
...@@ -37,7 +37,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -37,7 +37,7 @@ namespace Mall.WebApi.Controllers.MallBase
var query = new RB_Custom_Form_Extend() var query = new RB_Custom_Form_Extend()
{ {
FormName = parms.GetStringValue("FormName"), FormName = parms.GetStringValue("FormName"),
FormType = (Common.Enum.TradePavilion.CustomFormTypeEnum)parms.GetInt("FormType") FormType = (Common.Enum.TradePavilion.ListTypeEnum)parms.GetInt("FormType")
}; };
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId; query.TenantId = RequestParm.TenantId;
...@@ -66,7 +66,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -66,7 +66,7 @@ namespace Mall.WebApi.Controllers.MallBase
var query = new RB_Custom_Form_Extend() var query = new RB_Custom_Form_Extend()
{ {
FormName = parms.GetStringValue("FormName"), FormName = parms.GetStringValue("FormName"),
FormType = (Common.Enum.TradePavilion.CustomFormTypeEnum)parms.GetInt("FormType") FormType = (Common.Enum.TradePavilion.ListTypeEnum)parms.GetInt("FormType")
}; };
query.MallBaseId = RequestParm.MallBaseId; query.MallBaseId = RequestParm.MallBaseId;
query.TenantId = RequestParm.TenantId; query.TenantId = RequestParm.TenantId;
...@@ -86,7 +86,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -86,7 +86,7 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
Id=parms.GetInt("Id"), Id=parms.GetInt("Id"),
FormName = parms.GetStringValue("FormName"), FormName = parms.GetStringValue("FormName"),
FormType = (Common.Enum.TradePavilion.CustomFormTypeEnum)parms.GetInt("FormType") FormType = (Common.Enum.TradePavilion.ListTypeEnum)parms.GetInt("FormType")
}; };
var formData = parms.GetStringValue("FormData"); var formData = parms.GetStringValue("FormData");
List<FormDataItem> dataList = customFormModule.AnalyzeFormComponent(formData,isGetAnswer:true); List<FormDataItem> dataList = customFormModule.AnalyzeFormComponent(formData,isGetAnswer:true);
...@@ -146,7 +146,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -146,7 +146,7 @@ namespace Mall.WebApi.Controllers.MallBase
[HttpPost] [HttpPost]
public ApiResult GetCustomType() public ApiResult GetCustomType()
{ {
var list = EnumHelper.EnumToList(typeof(Common.Enum.TradePavilion.CustomFormTypeEnum)); var list = EnumHelper.EnumToList(typeof(Common.Enum.TradePavilion.ListTypeEnum));
return ApiResult.Success(data:list); return ApiResult.Success(data:list);
} }
} }
......
...@@ -47,7 +47,7 @@ namespace Mall.WebApi.Controllers.TradePavilion ...@@ -47,7 +47,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
} }
else else
{ {
query.FormType = (Common.Enum.TradePavilion.CustomFormTypeEnum)formType; query.FormType = (Common.Enum.TradePavilion.ListTypeEnum)formType;
} }
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
query.MallBaseId = userInfo.MallBaseId; query.MallBaseId = userInfo.MallBaseId;
......
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