Commit 13157878 authored by 黄奎's avatar 黄奎

页面修改

parent 063e1208
...@@ -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)
{ {
......
...@@ -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
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