Commit 78e60038 authored by 黄奎's avatar 黄奎

新增字段

parent 37f3a742
...@@ -48,5 +48,10 @@ namespace Mall.Model.Entity.MarketingCenter ...@@ -48,5 +48,10 @@ namespace Mall.Model.Entity.MarketingCenter
get; get;
set; set;
} }
/// <summary>
/// 模板显示名称
/// </summary>
public string TemplateShowName { get; set; }
} }
} }
...@@ -382,5 +382,19 @@ namespace Mall.Model.Entity.User ...@@ -382,5 +382,19 @@ namespace Mall.Model.Entity.User
/// </summary> /// </summary>
public string MallHomeData { get; set; } public string MallHomeData { get; set; }
/// <summary>
/// 是否开启授权(1-开启)
/// </summary>
public int IsOpenAuth { get; set; }
/// <summary>
/// 授权图片
/// </summary>
public string AuthUrl { get; set; }
/// <summary>
/// 授权数据
/// </summary>
public string AuthData { get; set; }
} }
} }
...@@ -97,6 +97,62 @@ namespace Mall.Model.Extend.User ...@@ -97,6 +97,62 @@ namespace Mall.Model.Extend.User
/// 小程序首页数据 /// 小程序首页数据
/// </summary> /// </summary>
public List<HomeItem> HomeDataList { get; set; } public List<HomeItem> HomeDataList { get; set; }
/// <summary>
/// 授权热区
/// </summary>
public List<AuthItem> AuthDataList { get; set; }
}
/// <summary>
/// 授权热区
/// </summary>
public class AuthItem
{
/// <summary>
/// 起点X坐标
/// </summary>
public int defaultX { get; set; }
/// <summary>
/// 起点Y坐标
/// </summary>
public int defaultY { get; set; }
/// <summary>
/// 热区高度
/// </summary>
public int height { get; set; }
/// <summary>
/// 是否关闭
/// </summary>
public bool is_close { get; set; }
/// <summary>
/// 距离左边位置
/// </summary>
public int left { get; set; }
/// <summary>
/// 链接
/// </summary>
public string link { get; set; }
/// <summary>
/// 取消或确认
/// </summary>
public string open_type { get; set; }
/// <summary>
/// 距离顶部距离
/// </summary>
public int top { get; set; }
/// <summary>
/// 宽度
/// </summary>
public int width { get; set; }
} }
/// <summary> /// <summary>
......
...@@ -436,6 +436,10 @@ namespace Mall.Module.User ...@@ -436,6 +436,10 @@ namespace Mall.Module.User
extModel.HomeDataList = Common.Plugin.JsonHelper.DeserializeObject<List<HomeItem>>(extModel.MallHomeData); extModel.HomeDataList = Common.Plugin.JsonHelper.DeserializeObject<List<HomeItem>>(extModel.MallHomeData);
} }
} }
if (extModel.AuthData != null && !string.IsNullOrEmpty(extModel.AuthData))
{
extModel.AuthDataList = Common.Plugin.JsonHelper.DeserializeObject<List<AuthItem>>(extModel.AuthData);
}
return extModel; return extModel;
} }
...@@ -494,6 +498,26 @@ namespace Mall.Module.User ...@@ -494,6 +498,26 @@ namespace Mall.Module.User
return flag; return flag;
} }
/// <summary>
/// 修改小程序首页布局
/// </summary>
/// <param name="extModel"></param>
/// <returns></returns>
public bool SetMiniProgramMallAuthModule(RB_MiniProgram_Extend extModel)
{
bool flag = false;
if (extModel.MallBaseId > 0)
{
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{ nameof(RB_MiniProgram_Extend.IsOpenAuth),extModel.IsOpenAuth},
{ nameof(RB_MiniProgram_Extend.AuthUrl),extModel.AuthUrl},
{ nameof(RB_MiniProgram_Extend.AuthData),extModel.AuthData},
};
flag = programRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_Extend.MallBaseId), extModel.MallBaseId));
}
return flag;
}
/// <summary> /// <summary>
/// 删除小程序底部导航 /// 删除小程序底部导航
......
...@@ -617,7 +617,26 @@ namespace Mall.WebApi.Controllers.User ...@@ -617,7 +617,26 @@ namespace Mall.WebApi.Controllers.User
} }
var flag = programModule.SetMiniProgramMallHomeModule(extModel); var flag = programModule.SetMiniProgramMallHomeModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
}
/// <summary>
/// 添加修改小程序授权页面
/// </summary>
/// <returns></returns>
public ApiResult SetMiniProgramMallAuth()
{
var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_Extend>(RequestParm.msg.ToString());
if (extModel.AuthDataList != null && extModel.AuthDataList.Count > 0)
{
extModel.AuthData = JsonConvert.SerializeObject(extModel.AuthDataList);
}
else
{
extModel.AuthData = "";
}
var flag = programModule.SetMiniProgramMallAuthModule(extModel);
return flag ? ApiResult.Success() : ApiResult.Failed();
} }
#region 设置可跳转小程序 OR 是否开启直播 #region 设置可跳转小程序 OR 是否开启直播
......
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