Skip to content

M
mall.oytour.com
Commit 77124b0a authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent 7ad755af
Hide whitespace changes
Inline Side-by-side
Showing with 63 additions and 22 deletions
Mall.Model/Entity/User/RB_MiniProgram.cs
View file @ 77124b0a
......@@ -468,6 +468,12 @@ namespace Mall.Model.Entity.User
/// 普通用户会员Vip购买图片
/// </summary>
public string MemberBuyVipImg { get; set; }
/// <summary>
/// 1-大图，2-小图
/// </summary>
public int ActivityStyle { get; set; }
}
......
Mall.Module.User/MiniProgramModule.cs
View file @ 77124b0a
......@@ -486,7 +486,7 @@ namespace Mall.Module.User
}
else
{
extModel.NavMoreList = new List<MenuNavMoreModel>()
extModel.NavMoreList = new List<MenuNavMoreModel>()
{
new MenuNavMoreModel()
{
......@@ -790,7 +790,8 @@ namespace Mall.Module.User
})
}));
}
else {
else
{
extModel.MenuNavJson = "[]";
}
#endregion
......@@ -942,7 +943,24 @@ namespace Mall.Module.User
return flag;
}
/// <summary>
/// 修改相亲小程序活动样式
/// </summary>
/// <param name="extModel"></param>
/// <returns></returns>
public bool SetMiniProgramActivityStyleModule(RB_MiniProgram_Extend extModel)
{
bool flag = false;
if (extModel.MallBaseId > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{ nameof(RB_MiniProgram_Extend.ActivityStyle),extModel.ActivityStyle},
};
flag = programRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_Extend.MallBaseId), extModel.MallBaseId));
}
return flag;
}
#endregion
......@@ -1964,12 +1982,12 @@ namespace Mall.Module.User
{
return liveHouseRepository.GetLiveHouseExtensionPageList(pageIndex, pageSize, out rowCount, query);
}
public List<RB_Live_HouseExtension_Extend> GetLiveHousePageList( RB_Live_HouseExtension_Extend query)
public List<RB_Live_HouseExtension_Extend> GetLiveHousePageList(RB_Live_HouseExtension_Extend query)
{
return liveHouseRepository.GetLiveHousePageList( query);
return liveHouseRepository.GetLiveHousePageList(query);
}
/// <summary>
/// 获取直播房间信息
......@@ -2225,9 +2243,9 @@ namespace Mall.Module.User
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public object MallDistributorDayStatisticsModule(int pageIndex, int pageSize, out long rowsCount,StatisticsQuery query)
public object MallDistributorDayStatisticsModule(int pageIndex, int pageSize, out long rowsCount, StatisticsQuery query)
{
return mallStatisticsRepository.MallDistributorDayStatisticsRepository(pageIndex, pageSize, out rowsCount,query);
return mallStatisticsRepository.MallDistributorDayStatisticsRepository(pageIndex, pageSize, out rowsCount, query);
}
#region 直播配置
......
Mall.WebApi/Controllers/Mall/MallController.cs
View file @ 77124b0a
......@@ -92,12 +92,12 @@ namespace Mall.WebApi.Controllers.MallBase
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex,"MallController_GetHome");
Common.Plugin.LogHelper.Write(ex, "MallController_GetHome");
}
int page_id = parms.GetInt("page_id");
//是否开启校园版【1-是】
int isOpenSchool = parms.GetInt("open_school",0);
int isOpenSchool = parms.GetInt("open_school", 0);
//店铺id
int storeId = parms.GetInt("StoreId", 0);
......@@ -142,7 +142,7 @@ namespace Mall.WebApi.Controllers.MallBase
}
#region 首页页面数据解析
if (page_id > 0)
{
var targetPage = miniprogramPageTemplModule.GetMiniprogramPageTemplModule(new RB_Miniprogram_Page_Templ_Extend()
......@@ -150,7 +150,7 @@ namespace Mall.WebApi.Controllers.MallBase
MallBaseId = miniProgram.MallBaseId,
TenantId = miniProgram.TenantId,
Id = page_id
}, isGetHome: false,isGetSchoolPage:false);
}, isGetHome: false, isGetSchoolPage: false);
List<object> list = new List<object>();
//自定义首页
if (targetPage != null && targetPage.Id > 0)
......@@ -212,10 +212,10 @@ namespace Mall.WebApi.Controllers.MallBase
{
MallBaseId = miniProgram.MallBaseId,
TenantId = miniProgram.TenantId,
}, isGetHome: false,isGetSchoolPage:true);
}, isGetHome: false, isGetSchoolPage: true);
}
//判断是否存在校园版首页
if (selfHomePage == null||(selfHomePage!=null && selfHomePage.Id<=0))
if (selfHomePage == null || (selfHomePage != null && selfHomePage.Id <= 0))
{
selfHomePage = miniprogramPageTemplModule.GetMiniprogramPageTemplModule(new RB_Miniprogram_Page_Templ_Extend()
{
......@@ -306,7 +306,7 @@ namespace Mall.WebApi.Controllers.MallBase
}
}
}
#endregion
#region 底部导航
......@@ -538,7 +538,7 @@ namespace Mall.WebApi.Controllers.MallBase
{
var memberModel = userModule.GetAppletUserCenterStatistics(RequestParm.OpenId, miniProgram);
user_info = memberModel;
}
var data = new object();
......@@ -569,7 +569,8 @@ namespace Mall.WebApi.Controllers.MallBase
is_foot_bar_status = (miniProgram.IsShowFavorite == 0 ? 1 : 0),
//是否显示约课
is_point_status = miniProgram.PointStatus,
is_ppenmiai= miniProgram.IsOpenMiAi,
is_ppenmiai = miniProgram.IsOpenMiAi,
is_activitystyle = miniProgram.ActivityStyle == 0 ? 1 : miniProgram.ActivityStyle,
//菜单样式
menu_style = (miniProgram.MenuNavStyle == 0 ? 1 : 2),
//头像样式
......@@ -602,12 +603,14 @@ namespace Mall.WebApi.Controllers.MallBase
open_type = "navigate",
@params = "",
}),
nar_menus = miniProgram?.NavMoreList?.Select(x => new {
nar_menus = miniProgram?.NavMoreList?.Select(x => new
{
x.Sort,
x.MenuNavTitle,
x.TitleStyle,
x.MenuNavStyle,
MeunList = x.MeunList.OrderBy(qitem => qitem.PageSort).Select(qitem => new {
MeunList = x.MeunList.OrderBy(qitem => qitem.PageSort).Select(qitem => new
{
icon_url = qitem.MenuIcon,
name = qitem.MenuName,
link_url = qitem.MenuUrl.Trim(),
......@@ -646,7 +649,7 @@ namespace Mall.WebApi.Controllers.MallBase
{
pic_url = miniProgram.CopyRightImg,
description = miniProgram.CopyRightWord,
link_url =!string.IsNullOrWhiteSpace(miniProgram.CopyRightLink) ? miniProgram.CopyRightLink.Trim():"",
link_url = !string.IsNullOrWhiteSpace(miniProgram.CopyRightLink) ? miniProgram.CopyRightLink.Trim() : "",
}
}
};
......@@ -771,8 +774,8 @@ namespace Mall.WebApi.Controllers.MallBase
int goodsId = parms.GetInt("goodsId");
string path = parms.GetStringValue("path");
//HK 2020-09-22新增【是否开启校园版分享-(1-开启)】
int IsOpenSchool = parms.GetInt("IsOpenSchool",0);
var obj = productModule.GetAppletGoodsShareInfo(goodsId, RequestParm.UserId, path, (miniProgram?.MallBaseId ?? 0),IsOpenSchool:IsOpenSchool);
int IsOpenSchool = parms.GetInt("IsOpenSchool", 0);
var obj = productModule.GetAppletGoodsShareInfo(goodsId, RequestParm.UserId, path, (miniProgram?.MallBaseId ?? 0), IsOpenSchool: IsOpenSchool);
return ApiResult.Success(data: obj);
}
}
......
Mall.WebApi/Controllers/User/TenantController.cs
View file @ 77124b0a
......@@ -442,6 +442,20 @@ namespace Mall.WebApi.Controllers.User
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 修改微信相亲小程序活动样式信息
/// </summary>
/// <returns></returns>
public ApiResult SetMiniProgramActivityStyleModule()
{
var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_Extend>(RequestParm.msg.ToString());
extModel.MallBaseId = RequestParm.MallBaseId;
extModel.TenantId = RequestParm.TenantId;
var flag = programModule.SetMiniProgramActivityStyleModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 修改微信小程序分销订阅配置信息
/// </summary>
......
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