Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
mall.oytour.com
Commits
c19bf777
Commit
c19bf777
authored
Sep 06, 2021
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
09f491a6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
41 deletions
+7
-41
CustomFormTypeEnum.cs
Mall.Common/Enum/TradePavilion/CustomFormTypeEnum.cs
+1
-35
RB_Custom_Form.cs
Mall.Model/Entity/TradePavilion/RB_Custom_Form.cs
+1
-1
CustomFormController.cs
Mall.WebApi/Controllers/MallBase/CustomFormController.cs
+4
-4
AppletCustomFormController.cs
...i/Controllers/TradePavilion/AppletCustomFormController.cs
+1
-1
No files found.
Mall.Common/Enum/TradePavilion/CustomFormTypeEnum.cs
View file @
c19bf777
...
...
@@ -2,39 +2,5 @@
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
,
}
}
Mall.Model/Entity/TradePavilion/RB_Custom_Form.cs
View file @
c19bf777
...
...
@@ -27,7 +27,7 @@ namespace Mall.Model.Entity.TradePavilion
/// <summary>
/// 表单类型(见枚举)
/// </summary>
public
CustomForm
TypeEnum
FormType
{
get
;
set
;
}
public
List
TypeEnum
FormType
{
get
;
set
;
}
/// <summary>
/// 表单内容
...
...
Mall.WebApi/Controllers/MallBase/CustomFormController.cs
View file @
c19bf777
...
...
@@ -37,7 +37,7 @@ namespace Mall.WebApi.Controllers.MallBase
var
query
=
new
RB_Custom_Form_Extend
()
{
FormName
=
parms
.
GetStringValue
(
"FormName"
),
FormType
=
(
Common
.
Enum
.
TradePavilion
.
CustomForm
TypeEnum
)
parms
.
GetInt
(
"FormType"
)
FormType
=
(
Common
.
Enum
.
TradePavilion
.
List
TypeEnum
)
parms
.
GetInt
(
"FormType"
)
};
query
.
MallBaseId
=
RequestParm
.
MallBaseId
;
query
.
TenantId
=
RequestParm
.
TenantId
;
...
...
@@ -66,7 +66,7 @@ namespace Mall.WebApi.Controllers.MallBase
var
query
=
new
RB_Custom_Form_Extend
()
{
FormName
=
parms
.
GetStringValue
(
"FormName"
),
FormType
=
(
Common
.
Enum
.
TradePavilion
.
CustomForm
TypeEnum
)
parms
.
GetInt
(
"FormType"
)
FormType
=
(
Common
.
Enum
.
TradePavilion
.
List
TypeEnum
)
parms
.
GetInt
(
"FormType"
)
};
query
.
MallBaseId
=
RequestParm
.
MallBaseId
;
query
.
TenantId
=
RequestParm
.
TenantId
;
...
...
@@ -86,7 +86,7 @@ namespace Mall.WebApi.Controllers.MallBase
{
Id
=
parms
.
GetInt
(
"Id"
),
FormName
=
parms
.
GetStringValue
(
"FormName"
),
FormType
=
(
Common
.
Enum
.
TradePavilion
.
CustomForm
TypeEnum
)
parms
.
GetInt
(
"FormType"
)
FormType
=
(
Common
.
Enum
.
TradePavilion
.
List
TypeEnum
)
parms
.
GetInt
(
"FormType"
)
};
var
formData
=
parms
.
GetStringValue
(
"FormData"
);
List
<
FormDataItem
>
dataList
=
customFormModule
.
AnalyzeFormComponent
(
formData
,
isGetAnswer
:
true
);
...
...
@@ -146,7 +146,7 @@ namespace Mall.WebApi.Controllers.MallBase
[
HttpPost
]
public
ApiResult
GetCustomType
()
{
var
list
=
EnumHelper
.
EnumToList
(
typeof
(
Common
.
Enum
.
TradePavilion
.
CustomForm
TypeEnum
));
var
list
=
EnumHelper
.
EnumToList
(
typeof
(
Common
.
Enum
.
TradePavilion
.
List
TypeEnum
));
return
ApiResult
.
Success
(
data
:
list
);
}
}
...
...
Mall.WebApi/Controllers/TradePavilion/AppletCustomFormController.cs
View file @
c19bf777
...
...
@@ -47,7 +47,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
}
else
{
query
.
FormType
=
(
Common
.
Enum
.
TradePavilion
.
CustomForm
TypeEnum
)
formType
;
query
.
FormType
=
(
Common
.
Enum
.
TradePavilion
.
List
TypeEnum
)
formType
;
}
var
userInfo
=
AppletUserInfo
;
query
.
MallBaseId
=
userInfo
.
MallBaseId
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment