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
00aee436
Commit
00aee436
authored
Apr 01, 2022
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
5ba531c3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
40 additions
and
9 deletions
+40
-9
ConvertHelper.cs
Mall.Common/Plugin/ConvertHelper.cs
+30
-0
AppletEducationController.cs
...WebApi/Controllers/Education/AppletEducationController.cs
+4
-3
TradeController.cs
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
+6
-6
No files found.
Mall.Common/Plugin/ConvertHelper.cs
View file @
00aee436
...
...
@@ -263,6 +263,36 @@ namespace Mall.Common
return
timeStr
;
}
/// <summary>
/// 格式化时间【yyyy-MM-dd】
/// </summary>
/// <param name="time"></param>
/// <returns></returns>
public
static
string
FormatDate2
(
this
object
time
)
{
string
timeStr
=
""
;
if
(
time
!=
null
)
{
try
{
timeStr
=
Convert
.
ToDateTime
(
time
.
ToString
()).
ToString
(
"yyyy-MM-dd"
);
if
(
timeStr
==
"0001-01-01"
)
{
timeStr
=
""
;
}
else
{
timeStr
=
Convert
.
ToDateTime
(
time
.
ToString
()).
ToString
(
"yyyy-MM-dd HH:mm"
);
}
}
catch
{
}
}
return
timeStr
;
}
/// <summary>
/// 字符串转List
/// </summary>
...
...
Mall.WebApi/Controllers/Education/AppletEducationController.cs
View file @
00aee436
...
...
@@ -1708,7 +1708,8 @@ namespace Mall.WebApi.Controllers.Education
/// </summary>
/// <returns></returns>
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
public
ApiResult
GetActivityTypeList
(
object
requestMsg
)
{
var
parms
=
JsonConvert
.
DeserializeObject
<
RequestParm
>(
requestMsg
.
ToString
());
...
...
@@ -2564,7 +2565,7 @@ namespace Mall.WebApi.Controllers.Education
/// </summary>
/// <returns></returns>
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
public
ApiResult
GetUserActivityListJXH
()
{
// var parms = JsonConvert.DeserializeObject<RequestParm>(requestMsg.ToString());
...
...
@@ -2626,7 +2627,7 @@ namespace Mall.WebApi.Controllers.Education
/// <param name="request"></param>
/// <returns></returns>
[
HttpPost
]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
[
AllowAnonymous
]
[
RateValve
(
Policy
=
Policy
.
Ip
,
Limit
=
10
,
Duration
=
60
)]
public
ApiResult
GetActivityDetialJXH
()
{
var
req
=
RequestParm
;
...
...
Mall.WebApi/Controllers/TradePavilion/TradeController.cs
View file @
00aee436
...
...
@@ -1461,7 +1461,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
x
.
Address
,
x
.
LatAndLon
,
x
.
Developers
,
OpenTime
=
x
.
OpenTime
.
HasValue
?
x
.
OpenTime
.
Value
.
ToString
(
"yyyy-MM-dd HH:mm"
)
:
""
,
OpenTime
=
Common
.
ConvertHelper
.
FormatDate2
(
x
.
OpenTime
)
,
x
.
ProjectType
,
ProjectTypeName
=
x
.
ProjectType
.
GetEnumName
(),
x
.
CarrierSize
,
...
...
@@ -1476,7 +1476,7 @@ namespace Mall.WebApi.Controllers.TradePavilion
x
.
UserName
,
x
.
UserIcon
,
x
.
CarrierMetroList
});
});
return
ApiResult
.
Success
(
data
:
pageModel
);
}
...
...
@@ -1622,10 +1622,10 @@ namespace Mall.WebApi.Controllers.TradePavilion
{
return
ApiResult
.
Failed
(
"请上传介绍图"
);
}
if
(!
query
.
OpenTime
.
HasValue
)
{
return
ApiResult
.
Failed
(
"请输入开业时间"
);
}
//
if (!query.OpenTime.HasValue)
//
{
//
return ApiResult.Failed("请输入开业时间");
//
}
if
(!
query
.
ProjectType
.
HasValue
)
{
return
ApiResult
.
Failed
(
"请选择项目类型"
);
...
...
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