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
13157878
Commit
13157878
authored
Jun 01, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
063e1208
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
1 deletion
+25
-1
RB_Member_UserRepository.cs
Mall.Repository/User/RB_Member_UserRepository.cs
+5
-0
MallController.cs
Mall.WebApi/Controllers/Mall/MallController.cs
+20
-1
No files found.
Mall.Repository/User/RB_Member_UserRepository.cs
View file @
13157878
...
@@ -55,6 +55,11 @@ namespace Mall.Repository.User
...
@@ -55,6 +55,11 @@ namespace Mall.Repository.User
if
(
dmodel
.
IsEmptyUserPhoto
==
1
)
{
if
(
dmodel
.
IsEmptyUserPhoto
==
1
)
{
where
+=
$@" and IFNULL(
{
nameof
(
RB_Member_User
.
Photo
)}
,'')=''"
;
where
+=
$@" and IFNULL(
{
nameof
(
RB_Member_User
.
Photo
)}
,'')=''"
;
}
}
//HK06-01新增查询条件
if
(
dmodel
.
OpenId
!=
null
&&
!
string
.
IsNullOrWhiteSpace
(
dmodel
.
OpenId
))
{
where
+=
$@" and
{
nameof
(
RB_Member_User
.
OpenId
)}
= '%
{
dmodel
.
OpenId
}
%'"
;
}
string
orderBy
=
"CreateDate desc"
;
string
orderBy
=
"CreateDate desc"
;
if
(
dmodel
.
MinUserId
>
0
)
if
(
dmodel
.
MinUserId
>
0
)
{
{
...
...
Mall.WebApi/Controllers/Mall/MallController.cs
View file @
13157878
...
@@ -70,6 +70,11 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -70,6 +70,11 @@ namespace Mall.WebApi.Controllers.MallBase
/// </summary>
/// </summary>
private
readonly
ContentModule
contentModule
=
new
ContentModule
();
private
readonly
ContentModule
contentModule
=
new
ContentModule
();
/// <summary>
/// 用户处理类
/// </summary>
private
readonly
UserModule
userModule
=
new
UserModule
();
/// <summary>
/// <summary>
/// 小程序首页
/// 小程序首页
/// </summary>
/// </summary>
...
@@ -1654,7 +1659,7 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -1654,7 +1659,7 @@ namespace Mall.WebApi.Controllers.MallBase
account
=
miniProgram
?.
AccountMenuList
.
Select
(
qitem
=>
new
account
=
miniProgram
?.
AccountMenuList
.
Select
(
qitem
=>
new
{
{
icon_url
=
qitem
.
MenuIcon
,
icon_url
=
qitem
.
MenuIcon
,
name
=
qitem
.
MenuName
,
name
=
qitem
.
MenuName
.
Replace
(
"我的"
,
""
).
Replace
(
"明细"
,
""
).
Replace
(
"记录"
,
""
)
,
is_show
=
1
,
is_show
=
1
,
link_url
=
qitem
.
MenuUrl
.
Trim
(),
link_url
=
qitem
.
MenuUrl
.
Trim
(),
}),
}),
...
@@ -1704,5 +1709,19 @@ namespace Mall.WebApi.Controllers.MallBase
...
@@ -1704,5 +1709,19 @@ namespace Mall.WebApi.Controllers.MallBase
}
}
return
ApiResult
.
Success
(
data
:
mall
);
return
ApiResult
.
Success
(
data
:
mall
);
}
}
/// <summary>
/// 获取用户信息
/// </summary>
/// <returns></returns>
[
HttpGet
]
[
HttpPost
]
[
AllowAnonymous
]
public
ApiResult
GetUserInfo
()
{
var
obj
=
new
{
};
return
ApiResult
.
Success
();
}
}
}
}
}
\ No newline at end of file
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