Commit 6e17e6c3 authored by 黄奎's avatar 黄奎

页面修改

parent 9acfd90b
...@@ -484,14 +484,17 @@ namespace Mall.Module.User ...@@ -484,14 +484,17 @@ namespace Mall.Module.User
{ {
extModel.NavMoreList = JsonConvert.DeserializeObject<List<MenuNavMoreModel>>(extModel.MenuNavJson); extModel.NavMoreList = JsonConvert.DeserializeObject<List<MenuNavMoreModel>>(extModel.MenuNavJson);
} }
else { else
extModel.NavMoreList = new List<MenuNavMoreModel>() { {
new MenuNavMoreModel(){ extModel.NavMoreList = new List<MenuNavMoreModel>()
{
new MenuNavMoreModel()
{
Sort=1, Sort=1,
MenuNavTitle="", MenuNavTitle="",
MenuNavStyle=0, MenuNavStyle=0,
TitleStyle=1, TitleStyle=1,
MeunList=new List<RB_MiniProgram_UserCenterMenu>() MeunList=new List<RB_MiniProgram_UserCenterMenu>()
} }
}; };
} }
......
...@@ -4472,7 +4472,7 @@ namespace Mall.Module.User ...@@ -4472,7 +4472,7 @@ namespace Mall.Module.User
/// <param name="tenantId"></param> /// <param name="tenantId"></param>
/// <param name="mallBaseId"></param> /// <param name="mallBaseId"></param>
/// <returns></returns> /// <returns></returns>
public object GetAppletUserCenterStatistics(string openId) public object GetAppletUserCenterStatistics(string openId, RB_MiniProgram_Extend miniConfig=null)
{ {
var objData = new object(); var objData = new object();
var umodel = member_UserRepository.GetMemberUserEntityRepository(new RB_Member_User_Extend() { OpenId = openId }); var umodel = member_UserRepository.GetMemberUserEntityRepository(new RB_Member_User_Extend() { OpenId = openId });
...@@ -4537,19 +4537,28 @@ namespace Mall.Module.User ...@@ -4537,19 +4537,28 @@ namespace Mall.Module.User
var couponList = memberCouponRepository.GetAllMemberCouponPageList(new RB_Member_DiscountCoupon_Extend { TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId, UseState = 0, UserId = umodel.Id }); var couponList = memberCouponRepository.GetAllMemberCouponPageList(new RB_Member_DiscountCoupon_Extend { TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId, UseState = 0, UserId = umodel.Id });
var MemberGrade = "普通用户"; var MemberGrade = "普通用户";
string MemberGradeIcon = ""; string MemberGradeIcon = "";
if (umodel.MemberGrade > 0) if (IsHpFX == 1)
{ {
var mgModel = member_GradeRepository.GetEntity(umodel.MemberGrade); if (umodel.MemberGrade > 0)
if (mgModel != null)
{ {
MemberGrade = mgModel.Name; var mgModel = member_GradeRepository.GetEntity(umodel.MemberGrade);
if (mgModel.Icon > 0) if (mgModel != null)
{ {
MemberGradeIcon = material_InfoRepository.GetEntity(mgModel.Icon)?.Path ?? ""; MemberGrade = mgModel.Name;
if (mgModel.Icon > 0)
{
MemberGradeIcon = material_InfoRepository.GetEntity(mgModel.Icon)?.Path ?? "";
}
} }
} }
} }
else
{
MemberGradeIcon = miniConfig?.MemberBgImg ?? "";
}
objData = new objData = new
{ {
//昵称 //昵称
......
...@@ -535,7 +535,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -535,7 +535,7 @@ namespace Mall.WebApi.Controllers.MallBase
var user_info = new object(); var user_info = new object();
if (RequestParm.OpenId != null && !string.IsNullOrWhiteSpace(RequestParm.OpenId)) if (RequestParm.OpenId != null && !string.IsNullOrWhiteSpace(RequestParm.OpenId))
{ {
var memberModel = userModule.GetAppletUserCenterStatistics(RequestParm.OpenId); var memberModel = userModule.GetAppletUserCenterStatistics(RequestParm.OpenId, miniProgram);
user_info = memberModel; user_info = memberModel;
} }
...@@ -595,7 +595,6 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -595,7 +595,6 @@ namespace Mall.WebApi.Controllers.MallBase
link_url = qitem.MenuUrl.Trim(), link_url = qitem.MenuUrl.Trim(),
open_type = "navigate", open_type = "navigate",
@params = "", @params = "",
}), }),
nar_menus = miniProgram?.NavMoreList?.Select(x => new { nar_menus = miniProgram?.NavMoreList?.Select(x => new {
x.Sort, x.Sort,
......
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