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

页面修改

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