Skip to content

M
mall.oytour.com
Commit d4332e98 authored by 黄奎's avatar 黄奎
Browse files
Options

页面修改

parent a647ee09
Hide whitespace changes
Inline Side-by-side
Showing with 323 additions and 28 deletions
Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs
View file @ d4332e98
...@@ -2140,6 +2140,9 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2140,6 +2140,9 @@ namespace Mall.Model.Extend.MarketingCenter
/// </summary> /// </summary>
public int backgroundWidth { get; set; } public int backgroundWidth { get; set; }
/// <summary>
/// 积分商城商品列表
/// </summary>
public List<integralmallGoodsItem> list { get; set; } public List<integralmallGoodsItem> list { get; set; }
} }
...@@ -2149,7 +2152,7 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2149,7 +2152,7 @@ namespace Mall.Model.Extend.MarketingCenter
public class integralmallGoodsItem public class integralmallGoodsItem
{ {
/// <summary> /// <summary>
/// 编号 /// 商品编号
/// </summary> /// </summary>
public int id { get; set; } public int id { get; set; }
...@@ -2184,46 +2187,78 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2184,46 +2187,78 @@ namespace Mall.Model.Extend.MarketingCenter
/// </summary> /// </summary>
public class lotteryItem public class lotteryItem
{ {
/// <summary>
/// 购买按钮颜色
/// </summary>
public string buttonColor { get; set; } public string buttonColor { get; set; }
/// <summary>
/// 列表样式(-1列表模式,1-一行一个,2-一行两个)
/// </summary>
public int listStyle { get; set; } public int listStyle { get; set; }
/// <summary>
/// 商品封面图填充(1-填充,0-留白)
/// </summary>
public int fill { get; set; } public int fill { get; set; }
/// <summary>
/// 商品封面图宽高比例(1-1,3-2)
/// </summary>
public string goodsCoverProportion { get; set; } public string goodsCoverProportion { get; set; }
/// <summary>
/// 商品样式(1-白底无边框,2-白底有边框,3-无底无边框)
/// </summary>
public int goodsStyle { get; set; } public int goodsStyle { get; set; }
/// <summary>
/// 文本样式(1-左对齐,2-居中)
/// </summary>
public int textStyle { get; set; } public int textStyle { get; set; }
/// <summary>
/// 显示商品名称
/// </summary>
public bool showGoodsName { get; set; } public bool showGoodsName { get; set; }
/// <summary>
/// 显示购买按钮
/// </summary>
public bool showBuyBtn { get; set; } public bool showBuyBtn { get; set; }
/// <summary>
/// 购买按钮样式(1-填充,2-线条,3-圆角填充,4-圆角线条)
/// </summary>
public int buyBtnStyle { get; set; } public int buyBtnStyle { get; set; }
/// <summary> /// <summary>
/// 去参与 /// 购买按钮文字
/// </summary> /// </summary>
public string buyBtnText { get; set; } public string buyBtnText { get; set; }
/// <summary>
/// 显示商品角标
/// </summary>
public bool showGoodsTag { get; set; } public bool showGoodsTag { get; set; }
/// <summary>
/// 自定义商品角标
/// </summary>
public bool customizeGoodsTag { get; set; } public bool customizeGoodsTag { get; set; }
/// <summary> /// <summary>
/// goodsTagPicUrl /// 商品角标图片
/// </summary> /// </summary>
public string goodsTagPicUrl { get; set; } public string goodsTagPicUrl { get; set; }
public bool showImg { get; set; }
/// <summary> /// <summary>
/// backgroundColor /// 背景颜色
/// </summary> /// </summary>
public string backgroundColor { get; set; } public string backgroundColor { get; set; }
/// <summary> /// <summary>
/// backgroundPicUrl /// 背景图片
/// </summary> /// </summary>
public string backgroundPicUrl { get; set; } public string backgroundPicUrl { get; set; }
...@@ -2237,10 +2272,19 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2237,10 +2272,19 @@ namespace Mall.Model.Extend.MarketingCenter
/// </summary> /// </summary>
public int mode { get; set; } public int mode { get; set; }
/// <summary>
/// 背景高度
/// </summary>
public int backgroundHeight { get; set; } public int backgroundHeight { get; set; }
/// <summary>
/// 背景宽度
/// </summary>
public int backgroundWidth { get; set; } public int backgroundWidth { get; set; }
/// <summary>
/// 抽奖商品列表
/// </summary>
public List<bargainGoodsItem> list { get; set; } public List<bargainGoodsItem> list { get; set; }
} }
...@@ -2249,42 +2293,84 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2249,42 +2293,84 @@ namespace Mall.Model.Extend.MarketingCenter
/// </summary> /// </summary>
public class advanceItem public class advanceItem
{ {
/// <summary>
/// 购买按钮颜色
/// </summary>
public string buttonColor { get; set; } public string buttonColor { get; set; }
/// <summary>
/// 预售商品列表
/// </summary>
public List<advanceGoodsItem> list { get; set; } public List<advanceGoodsItem> list { get; set; }
/// <summary>
/// 列表样式(-1列表模式,1-一行一个,2-一行两个)
/// </summary>
public int listStyle { get; set; } public int listStyle { get; set; }
/// <summary>
/// 商品封面图填充(1-填充,0-留白)
/// </summary>
public int fill { get; set; } public int fill { get; set; }
/// <summary>
/// 商品封面图宽高比例(1-1,3-2)
/// </summary>
public string goodsCoverProportion { get; set; } public string goodsCoverProportion { get; set; }
/// <summary>
/// 商品样式(1-白底无边框,2-白底有边框,3-无底无边框)
/// </summary>
public int goodsStyle { get; set; } public int goodsStyle { get; set; }
/// <summary>
/// 文本样式(1-左对齐,2-居中)
/// </summary>
public int textStyle { get; set; } public int textStyle { get; set; }
/// <summary>
/// 显示商品名称
/// </summary>
public bool showGoodsName { get; set; } public bool showGoodsName { get; set; }
/// <summary>
/// 显示购买按钮
/// </summary>
public bool showBuyBtn { get; set; } public bool showBuyBtn { get; set; }
/// <summary>
/// 购买按钮样式(1-填充,2-线条,3-圆角填充,4-圆角线条)
/// </summary>
public int buyBtnStyle { get; set; } public int buyBtnStyle { get; set; }
/// <summary> /// <summary>
/// 抢购 /// 购买按钮文字(抢购)
/// </summary> /// </summary>
public string buyBtnText { get; set; } public string buyBtnText { get; set; }
/// <summary>
/// 显示商品角标
/// </summary>
public bool showGoodsTag { get; set; } public bool showGoodsTag { get; set; }
/// <summary>
/// 自定义商品角标
/// </summary>
public bool customizeGoodsTag { get; set; } public bool customizeGoodsTag { get; set; }
public string goodsTagPicUrl { get; set; }
public int goodsIndex { get; set; }
public int start_x { get; set; } /// <summary>
/// 商品角标图片
public bool showImg { get; set; } /// </summary>
public string goodsTagPicUrl { get; set; }
/// <summary>
/// 背景颜色
/// </summary>
public string backgroundColor { get; set; } public string backgroundColor { get; set; }
/// <summary>
/// 背景图片
/// </summary>
public string backgroundPicUrl { get; set; } public string backgroundPicUrl { get; set; }
/// <summary> /// <summary>
...@@ -2297,13 +2383,25 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2297,13 +2383,25 @@ namespace Mall.Model.Extend.MarketingCenter
/// </summary> /// </summary>
public int mode { get; set; } public int mode { get; set; }
/// <summary>
/// 背景高度
/// </summary>
public int backgroundHeight { get; set; } public int backgroundHeight { get; set; }
/// <summary>
/// 背景宽度
/// </summary>
public int backgroundWidth { get; set; } public int backgroundWidth { get; set; }
} }
/// <summary>
/// 预售商品详情
/// </summary>
public class advanceGoodsItem public class advanceGoodsItem
{ {
/// <summary>
/// 商品编号
/// </summary>
public int id { get; set; } public int id { get; set; }
/// <summary> /// <summary>
...@@ -2312,15 +2410,19 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2312,15 +2410,19 @@ namespace Mall.Model.Extend.MarketingCenter
public string name { get; set; } public string name { get; set; }
/// <summary> /// <summary>
/// CoverImage /// 商品封面图
/// </summary> /// </summary>
public string CoverImage { get; set; } public string CoverImage { get; set; }
/// <summary>
/// 售价
/// </summary>
public decimal price { get; set; } public decimal price { get; set; }
/// <summary>
/// 原价
/// </summary>
public decimal originalPrice { get; set; } public decimal originalPrice { get; set; }
public string deposit { get; set; }
public string swell_deposit { get; set; }
} }
/// <summary> /// <summary>
...@@ -2328,28 +2430,79 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2328,28 +2430,79 @@ namespace Mall.Model.Extend.MarketingCenter
/// </summary> /// </summary>
public class vipcardItem public class vipcardItem
{ {
/// <summary>
/// 背景眼色
/// </summary>
public string background { get; set; } public string background { get; set; }
/// <summary>
/// 使用插件配置
/// </summary>
public bool usePluginConfig { get; set; } public bool usePluginConfig { get; set; }
/// <summary>
/// 上下间距
/// </summary>
public int top_bottom_padding { get; set; } public int top_bottom_padding { get; set; }
/// <summary>
/// 未购买用户背景图
/// </summary>
public string buy_bg { get; set; } public string buy_bg { get; set; }
/// <summary>
/// 已购买用户背景图
/// </summary>
public string renew_bg { get; set; } public string renew_bg { get; set; }
/// <summary>
/// 文字眼色
/// </summary>
public string buy_big_color { get; set; } public string buy_big_color { get; set; }
/// <summary>
/// 小标题文字眼色
/// </summary>
public string buy_small_color { get; set; } public string buy_small_color { get; set; }
/// <summary>
/// 按钮眼色
/// </summary>
public string buy_btn_color { get; set; } public string buy_btn_color { get; set; }
/// <summary>
/// 按钮背景颜色
/// </summary>
public string buy_btn_bg_color { get; set; } public string buy_btn_bg_color { get; set; }
/// <summary>
/// 文字
/// </summary>
public string buy_big { get; set; } public string buy_big { get; set; }
/// <summary>
/// 小标题
/// </summary>
public string buy_small { get; set; } public string buy_small { get; set; }
/// <summary>
/// 按钮文字(按钮文字)
/// </summary>
public string buy_btn_text { get; set; } public string buy_btn_text { get; set; }
/// <summary>
/// 已购买文字标题颜色
/// </summary>
public string renew_text_color { get; set; } public string renew_text_color { get; set; }
/// <summary>
/// 已购买按钮颜色
/// </summary>
public string renew_btn_bg_color { get; set; } public string renew_btn_bg_color { get; set; }
/// <summary>
/// 已购买文字
/// </summary>
public string renew_text { get; set; } public string renew_text { get; set; }
} }
...@@ -2358,11 +2511,24 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2358,11 +2511,24 @@ namespace Mall.Model.Extend.MarketingCenter
/// </summary> /// </summary>
public class liveItem public class liveItem
{ {
/// <summary>
/// 背景颜色
/// </summary>
public string background { get; set; } public string background { get; set; }
/// <summary>
/// 显示商品
/// </summary>
public bool is_show_goods { get; set; } public bool is_show_goods { get; set; }
/// <summary>
/// 卡片样式
/// </summary>
public int style_type { get; set; } public int style_type { get; set; }
/// <summary>
/// 直播间数量
/// </summary>
public int number { get; set; } public int number { get; set; }
} }
...@@ -2371,8 +2537,14 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2371,8 +2537,14 @@ namespace Mall.Model.Extend.MarketingCenter
/// </summary> /// </summary>
public class emptyItem public class emptyItem
{ {
/// <summary>
/// 背景颜色
/// </summary>
public string background { get; set; } public string background { get; set; }
/// <summary>
/// 高度
/// </summary>
public int height { get; set; } public int height { get; set; }
} }
...@@ -2381,22 +2553,49 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2381,22 +2553,49 @@ namespace Mall.Model.Extend.MarketingCenter
/// </summary> /// </summary>
public class adItem public class adItem
{ {
/// <summary>
/// 广告位ID
/// </summary>
public string id { get; set; } public string id { get; set; }
/// <summary>
/// 广告位类型
/// </summary>
public string type { get; set; } public string type { get; set; }
/// <summary>
/// 广告封面
/// </summary>
public string pic_url { get; set; } public string pic_url { get; set; }
public string video { get; set; } /// <summary>
/// 视频链接
/// </summary>
public string video_url { get; set; }
/// <summary>
/// 广告奖励
/// </summary>
public string award_type { get; set; } public string award_type { get; set; }
/// <summary>
/// 积分数量
/// </summary>
public string award_num { get; set; } public string award_num { get; set; }
/// <summary>
/// 奖励发放限制
/// </summary>
public string award_limit_type { get; set; } public string award_limit_type { get; set; }
/// <summary>
/// 限制次数
/// </summary>
public int award_limit { get; set; } public int award_limit { get; set; }
/// <summary>
/// 流量广告列表
/// </summary>
public List<adDetailsItem> award_coupons { get; set; } public List<adDetailsItem> award_coupons { get; set; }
} }
...@@ -2405,6 +2604,9 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2405,6 +2604,9 @@ namespace Mall.Model.Extend.MarketingCenter
/// </summary> /// </summary>
public class adDetailsItem public class adDetailsItem
{ {
/// <summary>
/// 优惠券发放数量
/// </summary>
public int send_num { get; set; } public int send_num { get; set; }
/// <summary> /// <summary>
...@@ -2731,11 +2933,11 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2731,11 +2933,11 @@ namespace Mall.Model.Extend.MarketingCenter
/// </summary> /// </summary>
public class educationItem public class educationItem
{ {
/// <summary> /// <summary>
/// 封面 /// 封面
/// </summary> /// </summary>
public string Cover { get; set; } public string Cover { get; set; }
/// <summary> /// <summary>
/// 课程名称 /// 课程名称
/// </summary> /// </summary>
...@@ -2745,8 +2947,6 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2745,8 +2947,6 @@ namespace Mall.Model.Extend.MarketingCenter
/// </summary> /// </summary>
public decimal showProgress { get; set; } public decimal showProgress { get; set; }
/// <summary> /// <summary>
/// 上边距 /// 上边距
/// </summary> /// </summary>
...@@ -2834,8 +3034,6 @@ namespace Mall.Model.Extend.MarketingCenter ...@@ -2834,8 +3034,6 @@ namespace Mall.Model.Extend.MarketingCenter
set; set;
} }
/// <summary> /// <summary>
/// 自定义列表 /// 自定义列表
/// </summary> /// </summary>
......
Mall.Model/Extend/TradePavilion/RB_Custom_Form_Extend.cs
View file @ d4332e98
...@@ -59,6 +59,16 @@ namespace Mall.Model.Extend.TradePavilion ...@@ -59,6 +59,16 @@ namespace Mall.Model.Extend.TradePavilion
/// 是否必填 /// 是否必填
/// </summary> /// </summary>
public bool IsRequire { get; set; } public bool IsRequire { get; set; }
/// <summary>
/// 文本值
/// </summary>
public string TextValue { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
} }
/// <summary> /// <summary>
...@@ -85,6 +95,32 @@ namespace Mall.Model.Extend.TradePavilion ...@@ -85,6 +95,32 @@ namespace Mall.Model.Extend.TradePavilion
/// 是否必填 /// 是否必填
/// </summary> /// </summary>
public bool IsRequire { get; set; } public bool IsRequire { get; set; }
/// <summary>
/// 选项列表
/// </summary>
public List<SelectOption> OptionList { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
/// <summary>
/// 选项列表
/// </summary>
public class SelectOption
{
/// <summary>
/// 编号
/// </summary>
public string Id { get; set; }
/// <summary>
/// 名称
/// </summary>
public string Name { get; set; }
} }
/// <summary> /// <summary>
...@@ -106,6 +142,16 @@ namespace Mall.Model.Extend.TradePavilion ...@@ -106,6 +142,16 @@ namespace Mall.Model.Extend.TradePavilion
/// 上传文件大小M /// 上传文件大小M
/// </summary> /// </summary>
public int FileSizeLimit { get; set; } public int FileSizeLimit { get; set; }
/// <summary>
/// 上传文件列表
/// </summary>
public List<string> FileList { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
} }
} }
Mall.Module.TradePavilion/CustomFormModule.cs
View file @ d4332e98
...@@ -104,7 +104,7 @@ namespace Mall.Module.TradePavilion ...@@ -104,7 +104,7 @@ namespace Mall.Module.TradePavilion
var extModel = custom_FormRepository.GetEntity<RB_Custom_Form_Extend>(Id); var extModel = custom_FormRepository.GetEntity<RB_Custom_Form_Extend>(Id);
if (extModel != null) if (extModel != null)
{ {
extModel.FormDataList = AnalyzeFormComponent(extModel.FormData); extModel.FormDataList = AnalyzeFormComponent(extModel.FormData, isGetAnswer: true);
} }
return extModel; return extModel;
} }
...@@ -113,13 +113,13 @@ namespace Mall.Module.TradePavilion ...@@ -113,13 +113,13 @@ namespace Mall.Module.TradePavilion
/// 解析表单组件 /// 解析表单组件
/// </summary> /// </summary>
/// <param name="formData"></param> /// <param name="formData"></param>
/// <param name="isGetAnswer"></param>
/// <returns></returns> /// <returns></returns>
public List<FormDataItem> AnalyzeFormComponent(string formData) public List<FormDataItem> AnalyzeFormComponent(string formData,bool isGetAnswer=false)
{ {
List<FormDataItem> dataList = new List<FormDataItem>(); List<FormDataItem> dataList = new List<FormDataItem>();
if (!string.IsNullOrEmpty(formData)) if (!string.IsNullOrEmpty(formData))
{ {
JArray jArray = JArray.Parse(formData); JArray jArray = JArray.Parse(formData);
if (jArray != null && jArray.Count > 0) if (jArray != null && jArray.Count > 0)
{ {
...@@ -144,6 +144,8 @@ namespace Mall.Module.TradePavilion ...@@ -144,6 +144,8 @@ namespace Mall.Module.TradePavilion
Name = singleObj.GetStringValue("Name"), Name = singleObj.GetStringValue("Name"),
WordsLength = singleObj.GetInt("WordsLength"), WordsLength = singleObj.GetInt("WordsLength"),
IsRequire = singleObj.GetBoolValue("IsRequire"), IsRequire = singleObj.GetBoolValue("IsRequire"),
Remark = singleObj.GetStringValue("Remark"),
TextValue = isGetAnswer ? singleObj.GetStringValue("TextValue") : "",
}; };
dataItem.CompData = txtItem; dataItem.CompData = txtItem;
break; break;
...@@ -155,6 +157,8 @@ namespace Mall.Module.TradePavilion ...@@ -155,6 +157,8 @@ namespace Mall.Module.TradePavilion
Name = multiObj.GetStringValue("Name"), Name = multiObj.GetStringValue("Name"),
WordsLength = multiObj.GetInt("WordsLength"), WordsLength = multiObj.GetInt("WordsLength"),
IsRequire = multiObj.GetBoolValue("IsRequire"), IsRequire = multiObj.GetBoolValue("IsRequire"),
Remark = multiObj.GetStringValue("Remark"),
TextValue = isGetAnswer ? multiObj.GetStringValue("TextValue") : "",
}; };
dataItem.CompData = multiItem; dataItem.CompData = multiItem;
break; break;
...@@ -166,8 +170,24 @@ namespace Mall.Module.TradePavilion ...@@ -166,8 +170,24 @@ namespace Mall.Module.TradePavilion
Name = dropdownObj.GetStringValue("Name"), Name = dropdownObj.GetStringValue("Name"),
IsMultiple = dropdownObj.GetBoolValue("IsMultiple"), IsMultiple = dropdownObj.GetBoolValue("IsMultiple"),
IsRequire = dropdownObj.GetBoolValue("IsRequire"), IsRequire = dropdownObj.GetBoolValue("IsRequire"),
OptionValue = "", OptionValue = isGetAnswer ? dropdownObj.GetStringValue("OptionValue") : "",
OptionList = new List<SelectOption>(),
Remark=dropdownObj.GetStringValue("Remark"),
}; };
var optionList = JArray.Parse(dropdownObj.GetStringValue("OptionList"));
if (optionList != null && optionList.Count > 0)
{
foreach (var oItem in optionList)
{
JObject optionObj = JObject.Parse(oItem.ToString());
SelectOption option = new SelectOption()
{
Id= optionObj.GetStringValue("Id"),
Name= optionObj.GetStringValue("Name"),
};
selectItem.OptionList.Add(option);
}
}
dataItem.CompData = selectItem; dataItem.CompData = selectItem;
break; break;
//图片上传组件 //图片上传组件
...@@ -178,7 +198,24 @@ namespace Mall.Module.TradePavilion ...@@ -178,7 +198,24 @@ namespace Mall.Module.TradePavilion
Name = imgObj.GetStringValue("Name"), Name = imgObj.GetStringValue("Name"),
FileCount = imgObj.GetInt("FileCount"), FileCount = imgObj.GetInt("FileCount"),
FileSizeLimit = imgObj.GetInt("FileSizeLimit"), FileSizeLimit = imgObj.GetInt("FileSizeLimit"),
Remark = imgObj.GetStringValue("Remark"),
FileList = new List<string>(),
}; };
if (!string.IsNullOrEmpty(imgObj.GetStringValue("FileList")))
{
try
{
imgItem.FileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(imgObj.GetStringValue("FileList"));
}
catch
{
}
}
if (!isGetAnswer)
{
imgItem.FileList = new List<string>();
}
dataItem.CompData = imgItem; dataItem.CompData = imgItem;
break; break;
//视频上传组件 //视频上传组件
...@@ -189,7 +226,21 @@ namespace Mall.Module.TradePavilion ...@@ -189,7 +226,21 @@ namespace Mall.Module.TradePavilion
Name = videoObj.GetStringValue("Name"), Name = videoObj.GetStringValue("Name"),
FileCount = videoObj.GetInt("FileCount"), FileCount = videoObj.GetInt("FileCount"),
FileSizeLimit = videoObj.GetInt("FileSizeLimit"), FileSizeLimit = videoObj.GetInt("FileSizeLimit"),
Remark=videoObj.GetStringValue("Remark"),
FileList = new List<string>(),
}; };
try
{
videoItem.FileList = Common.Plugin.JsonHelper.DeserializeObject<List<string>>(videoObj.GetStringValue("FileList"));
}
catch
{
}
if (!isGetAnswer)
{
videoItem.FileList = new List<string>();
}
dataItem.CompData = videoItem; dataItem.CompData = videoItem;
break; break;
} }
......
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