Commit 3b90d7be authored by 黄奎's avatar 黄奎

页面修改

parent b6b0e740
...@@ -119,6 +119,9 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -119,6 +119,9 @@ namespace Mall.WebApi.Controllers.MallBase
//小程序 //小程序
var mall = new object(); var mall = new object();
//线下服务小程序配置接口
var offlineServiceSetting = new object();
//直播海报配置 //直播海报配置
var liveConfig = new object(); var liveConfig = new object();
...@@ -129,11 +132,12 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -129,11 +132,12 @@ namespace Mall.WebApi.Controllers.MallBase
miniProgram = programModule.GetMiniProgramModule(new Model.Extend.User.RB_MiniProgram_Extend() { MiniAppId = MiniAppId }, isGetHomeData: true, isGetNav: 1); miniProgram = programModule.GetMiniProgramModule(new Model.Extend.User.RB_MiniProgram_Extend() { MiniAppId = MiniAppId }, isGetHomeData: true, isGetNav: 1);
//基础配置 //基础配置
setting = MallHelper.GetBasicSetting(miniProgram); setting = MallHelper.GetBasicSetting(miniProgram);
//分销基础信息 //分销基础信息
share_setting = MallHelper.GetDistributorBasicsInfo(miniProgram); share_setting = MallHelper.GetDistributorBasicsInfo(miniProgram);
//分销商设置 //分销商设置
share_setting_custom = MallHelper.GetDistributorCustomInfo(miniProgram); share_setting_custom = MallHelper.GetDistributorCustomInfo(miniProgram);
//线下服务配置
offlineServiceSetting = MallHelper.GetOfflineServiceConfig(miniProgram);
} }
#region 首页页面数据解析 #region 首页页面数据解析
...@@ -390,6 +394,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -390,6 +394,7 @@ namespace Mall.WebApi.Controllers.MallBase
expired_at = "0000-00-00 00:00:00", expired_at = "0000-00-00 00:00:00",
option = new List<object>(), option = new List<object>(),
setting, setting,
offlineServiceSetting,
}; };
#region 授权页面热区 #region 授权页面热区
......
...@@ -8,6 +8,7 @@ using Mall.Model.Extend.User; ...@@ -8,6 +8,7 @@ using Mall.Model.Extend.User;
using Mall.Module.BaseSetUp; using Mall.Module.BaseSetUp;
using Mall.Module.MarketingCenter; using Mall.Module.MarketingCenter;
using Mall.Module.Product; using Mall.Module.Product;
using Mall.Module.Reserve;
using Mall.Module.User; using Mall.Module.User;
using Mall.Repository.Product; using Mall.Repository.Product;
using Mall.Repository.User; using Mall.Repository.User;
...@@ -82,6 +83,11 @@ namespace Mall.WebApi.Controllers ...@@ -82,6 +83,11 @@ namespace Mall.WebApi.Controllers
/// </summary> /// </summary>
private static Module.Education.EducationModule educationModule = new Module.Education.EducationModule(); private static Module.Education.EducationModule educationModule = new Module.Education.EducationModule();
/// <summary>
/// 线下服务配置处理类
/// </summary>
private static ReserveModule reserveModule = new ReserveModule();
/// <summary> /// <summary>
/// 解析插件数据为对象 /// 解析插件数据为对象
...@@ -2631,6 +2637,22 @@ namespace Mall.WebApi.Controllers ...@@ -2631,6 +2637,22 @@ namespace Mall.WebApi.Controllers
#endregion #endregion
return share_setting_custom; return share_setting_custom;
} }
/// <summary>
/// 获取线下服务小程序配置
/// </summary>
/// <param name="miniProgram"></param>
/// <returns></returns>
public static object GetOfflineServiceConfig(RB_MiniProgram_Extend miniProgram)
{
var model = reserveModule.GetReserveBaseInfo(Convert.ToInt32(miniProgram.TenantId), miniProgram.MallBaseId);
var obj = new
{
offlineServicePayType = model?.PayTypeList,
offlineServiceOrderStateList = model?.OrderStateList
};
return obj;
}
} }
/// <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