解决冲突

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

 using VT.FW.DB;
-using Mall.Model.Entity.MarketingCenter;
 using System;
 using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Text;
+using Mall.Model.Entity.MarketingCenter;
 
 namespace Mall.Model.Extend.MarketingCenter
 {
@@ -12,7 +10,7 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     [Serializable]
     [DB(ConnectionName = "DefaultConnection")]
-    public class RB_Miniprogram_Template_Extend : Model.Entity.MarketingCenter.RB_Miniprogram_Template
+    public class RB_Miniprogram_Template_Extend : RB_Miniprogram_Template
     {
         /// <summary>
         /// 自定义模板编号【查询使用】
@@ -374,7 +372,7 @@ namespace Mall.Model.Extend.MarketingCenter
         public string url { get; set; }
 
         /// <summary>
-        /// navigate
+        /// 打开方式(默认新页面打开)
         /// </summary>
         public string openType { get; set; }
 
@@ -593,8 +591,14 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public string name { get; set; }
 
+        /// <summary>
+        ///  自定义专题(1-是)
+        /// </summary>
         public int custom { get; set; }
 
+        /// <summary>
+        /// 专题数量
+        /// </summary>
         public int number { get; set; }
 
         /// <summary>
@@ -624,7 +628,7 @@ namespace Mall.Model.Extend.MarketingCenter
         public int read_count { get; set; }
 
         /// <summary>
-        /// 
+        /// layout
         /// </summary>
         public int layout { get; set; }
 
@@ -829,6 +833,9 @@ namespace Mall.Model.Extend.MarketingCenter
 
         public string backgroundSize { get; set; }
 
+        /// <summary>
+        /// 背景图片位置
+        /// </summary>
         public string backgroundPosition { get; set; }
 
         public int zIndex { get; set; }
@@ -1098,13 +1105,13 @@ namespace Mall.Model.Extend.MarketingCenter
         public string backgroundPicUrl { get; set; }
 
         /// <summary>
-        ///  
+        ///  背景图片位置
         /// </summary>
         public int position { get; set; }
 
 
         /// <summary>
-        ///  图片位置
+        ///  填充方式
         /// </summary>
         public int mode { get; set; }
 
@@ -1142,7 +1149,6 @@ namespace Mall.Model.Extend.MarketingCenter
         /// <summary>
         /// 商品名称
         /// </summary>
-
         public string name { get; set; }
 
         /// <summary>
@@ -1311,7 +1317,6 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public string textPosition { get; set; }
 
-
         /// <summary>
         /// 文本颜色
         /// </summary>
@@ -1328,16 +1333,34 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class checkInHotSpot
     {
+        /// <summary>
+        /// 高度
+        /// </summary>
         public int height { get; set; }
 
+        /// <summary>
+        /// 宽度
+        /// </summary>
         public int width { get; set; }
 
+        /// <summary>
+        /// 左边距
+        /// </summary>
         public int left { get; set; }
 
+        /// <summary>
+        /// 上边距
+        /// </summary>
         public int top { get; set; }
 
+        /// <summary>
+        /// 起始点X坐标
+        /// </summary>
         public int defaultX { get; set; }
 
+        /// <summary>
+        /// 起始点Y坐标
+        /// </summary>
         public int defaultY { get; set; }
 
         /// <summary>
@@ -1346,12 +1369,12 @@ namespace Mall.Model.Extend.MarketingCenter
         public bool is_close { get; set; }
 
         /// <summary>
-        /// link
+        /// 链接地址
         /// </summary>
         public string link { get; set; }
 
         /// <summary>
-        /// open_type
+        /// 页面打开方式
         /// </summary>
         public string open_type { get; set; }
     }
@@ -1361,11 +1384,19 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class userinfoItem
     {
-
+        /// <summary>
+        /// 样式
+        /// </summary>
         public int style { get; set; }
 
+        /// <summary>
+        /// 背景图片
+        /// </summary>
         public string backgroundPicUrl { get; set; }
 
+        /// <summary>
+        /// 背景颜色
+        /// </summary>
         public string backgroundColor { get; set; }
     }
 
@@ -1421,26 +1452,38 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public string location { get; set; }
 
+        /// <summary>
+        /// 地图高度
+        /// </summary>
         public int height { get; set; }
 
+        /// <summary>
+        /// 上下边距
+        /// </summary>
         public int paddingY { get; set; }
 
+        /// <summary>
+        /// 左右边距
+        /// </summary>
         public int paddingX { get; set; }
 
+        /// <summary>
+        /// 顶部外边距
+        /// </summary>
         public int marginTop { get; set; }
 
         /// <summary>
-        ///  marginTopColor
+        ///  外边距颜色
         /// </summary>
         public string marginTopColor { get; set; }
 
         /// <summary>
-        ///  backgroundColor
+        ///  背景颜色
         /// </summary>
         public string backgroundColor { get; set; }
 
         /// <summary>
-        ///  backgroundPicUrl
+        ///  背景图片
         /// </summary>
         public string backgroundPicUrl { get; set; }
     }
@@ -1498,16 +1541,28 @@ namespace Mall.Model.Extend.MarketingCenter
         public string backgroundColor { get; set; }
 
         /// <summary>
-        /// backgroundPicUrl
+        /// 背景图片
         /// </summary>
         public string backgroundPicUrl { get; set; }
 
+        /// <summary>
+        /// 背景图片位置
+        /// </summary>
         public int position { get; set; }
 
+        /// <summary>
+        /// 填充方式
+        /// </summary>
         public int mode { get; set; }
 
+        /// <summary>
+        /// 背景高度
+        /// </summary>
         public int backgroundHeight { get; set; }
 
+        /// <summary>
+        /// 背景宽度
+        /// </summary>
         public int backgroundWidth { get; set; }
     }
 
@@ -1559,84 +1614,140 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class pintuanItem
     {
+        /// <summary>
+        /// 按钮颜色
+        /// </summary>
         public string buttonColor { get; set; }
 
+        /// <summary>
+        /// 列表样式(-1-列表模式,1-一行一个,2-一行两个)
+        /// </summary>
         public int listStyle { get; set; }
 
+        /// <summary>
+        /// 文本样式(1-左对齐,2-居中)
+        /// </summary>
         public int textStyle { get; set; }
 
+        /// <summary>
+        /// 商品封面图填充(1-填充,2-留白)
+        /// </summary>
         public int fill { get; set; }
 
+        /// <summary>
+        /// 商品封面图宽高比例(1-1;3-2)
+        /// </summary>
         public string goodsCoverProportion { get; set; }
 
+        /// <summary>
+        /// 商品样式(1-白底无边框,2-白底有边框,3-无底无边框)
+        /// </summary>
         public int goodsStyle { get; set; }
 
+        /// <summary>
+        /// 显示商品名称
+        /// </summary>
         public bool showGoodsName { get; set; }
 
+        /// <summary>
+        /// 显示购买按钮
+        /// </summary>
         public bool showBuyBtn { get; set; }
 
+        /// <summary>
+        /// 购买按钮样式(1-填充,2-线条,3-圆角填充,4-圆角线条)
+        /// </summary>
         public int buyBtnStyle { get; set; }
 
         /// <summary>
-        /// 去拼团
+        /// 购买按钮文字
         /// </summary>
         public string buyBtnText { get; set; }
 
+        /// <summary>
+        /// 显示商品角标
+        /// </summary>
         public bool showGoodsTag { get; set; }
 
+        /// <summary>
+        /// 自定义商品角标
+        /// </summary>
         public bool customizeGoodsTag { get; set; }
 
-
+        /// <summary>
+        /// 商品角标图片
+        /// </summary>
         public string goodsTagPicUrl { get; set; }
 
-        public bool showImg { get; set; }
-
         /// <summary>
-        /// backgroundColor
+        /// 背景颜色
         /// </summary>
         public string backgroundColor { get; set; }
 
         /// <summary>
-        /// backgroundPicUrl
+        /// 背景图
         /// </summary>
         public string backgroundPicUrl { get; set; }
 
+        /// <summary>
+        /// 图片位置
+        /// </summary>
         public int position { get; set; }
 
+        /// <summary>
+        /// 填充方式
+        /// </summary>
         public int mode { get; set; }
 
+        /// <summary>
+        /// 背景高度
+        /// </summary>
         public int backgroundHeight { get; set; }
 
+        /// <summary>
+        /// 背景宽度
+        /// </summary>
         public int backgroundWidth { get; set; }
 
+        /// <summary>
+        /// 拼团商品列表
+        /// </summary>
         public List<pingtuanGoodsItem> list { get; set; }
-
     }
 
+    /// <summary>
+    /// 拼图商品详情
+    /// </summary>
     public class pingtuanGoodsItem
     {
+        /// <summary>
+        /// 商品编号
+        /// </summary>
         public int id { get; set; }
 
         /// <summary>
-        /// 演示商品名称
+        /// 商品名称
         /// </summary>
         public string name { get; set; }
 
         /// <summary>
-        /// CoverImage
+        /// 封面图
         /// </summary>
         public string CoverImage { get; set; }
 
         /// <summary>
-        /// price
+        /// 价格
         /// </summary>
         public decimal price { get; set; }
 
         /// <summary>
-        /// pintuanPrice
+        /// 拼团价格
         /// </summary>
         public decimal pintuanPrice { get; set; }
 
+        /// <summary>
+        /// 拼团人数
+        /// </summary>
         public int peopleNum { get; set; }
     }
 
@@ -1645,61 +1756,105 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class bookingItem
     {
+        /// <summary>
+        ///购买按钮颜色
+        /// </summary>
         public string buttonColor { get; set; }
 
+        /// <summary>
+        /// 预约商品列表
+        /// </summary>
         public List<bookingGoodsItem> list { get; set; }
 
+        /// <summary>
+        /// 列表样式(-1列表模式,1-一行一个,2-一行两个)
+        /// </summary>
         public int listStyle { get; set; }
 
+        /// <summary>
+        /// 商品封面图填充(1-填充,0-留白)
+        /// </summary>
         public int fill { get; set; }
 
+        /// <summary>
+        /// 商品封面图宽高比例(1-1,3-2)
+        /// </summary>
         public string goodsCoverProportion { get; set; }
 
-
+        /// <summary>
+        /// 商品样式(1-白底无边框,2-白底有边框,3-无底无边框)
+        /// </summary>
         public int goodsStyle { get; set; }
 
+        /// <summary>
+        /// 文本样式(1-左对齐,2-居中)
+        /// </summary>
         public int textStyle { get; set; }
 
+        /// <summary>
+        /// 显示商品名称
+        /// </summary>
         public bool showGoodsName { get; set; }
 
+        /// <summary>
+        /// 显示购买按钮
+        /// </summary>
         public bool showBuyBtn { get; set; }
 
+        /// <summary>
+        /// 购买按钮样式(1-填充,2-线条,3-圆角填充,4-圆角线条)
+        /// </summary>
         public int buyBtnStyle { get; set; }
 
         /// <summary>
-        /// 预约
+        /// 购买按钮文字
         /// </summary>
         public string buyBtnText { get; set; }
 
+        /// <summary>
+        /// 显示商品角标
+        /// </summary>
         public bool showGoodsTag { get; set; }
 
+        /// <summary>
+        /// 自定义商品角标
+        /// </summary>
         public bool customizeGoodsTag { get; set; }
 
         /// <summary>
-        /// goodsTagPicUrl
+        /// 商品角标图片
         /// </summary>
         public string goodsTagPicUrl { get; set; }
 
-        public bool showImg { get; set; }
-
         /// <summary>
-        /// backgroundColor
+        /// 背景颜色
         /// </summary>
         public string backgroundColor { get; set; }
 
         /// <summary>
-        /// backgroundPicUrl
+        /// 背景图片
         /// </summary>
         public string backgroundPicUrl { get; set; }
 
+        /// <summary>
+        /// 图片位置
+        /// </summary>
         public int position { get; set; }
 
+        /// <summary>
+        /// 填充方式
+        /// </summary>
         public int mode { get; set; }
 
+        /// <summary>
+        /// 背景高度
+        /// </summary>
         public int backgroundHeight { get; set; }
 
+        /// <summary>
+        /// 背景宽度
+        /// </summary>
         public int backgroundWidth { get; set; }
-
     }
 
     /// <summary>
@@ -1707,6 +1862,9 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class bookingGoodsItem
     {
+        /// <summary>
+        /// 商品编号
+        /// </summary>
         public int id { get; set; }
 
         /// <summary>
@@ -1715,12 +1873,12 @@ namespace Mall.Model.Extend.MarketingCenter
         public string name { get; set; }
 
         /// <summary>
-        /// CoverImage
+        /// 商品封面图
         /// </summary>
         public string CoverImage { get; set; }
 
         /// <summary>
-        /// price
+        /// 商品价格
         /// </summary>
         public decimal price { get; set; }
     }
@@ -1730,67 +1888,103 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class bargainItem
     {
+        /// <summary>
+        /// 按钮颜色
+        /// </summary>
         public string buttonColor { get; set; }
 
+        /// <summary>
+        /// 砍价商品列表
+        /// </summary>
         public List<bargainGoodsItem> list { get; set; }
 
+        /// <summary>
+        /// 列表样式(-1列表模式,1-一行一个,2-一行两个)
+        /// </summary>
         public int listStyle { get; set; }
 
+        /// <summary>
+        /// 商品封面图填充(1-填充,0-留白)
+        /// </summary>
         public int fill { get; set; }
 
+        /// <summary>
+        /// 商品封面图宽高比例(1-1,3-2)
+        /// </summary>
         public string goodsCoverProportion { get; set; }
 
+        /// <summary>
+        /// 商品样式(1-白底无边框,2-白底有边框,3-无底无边框)
+        /// </summary>
         public int goodsStyle { get; set; }
 
+        /// <summary>
+        /// 文本样式(1-左对齐,2-居中)
+        /// </summary>
         public int textStyle { get; set; }
 
+        /// <summary>
+        /// 显示商品名称
+        /// </summary>
         public bool showGoodsName { get; set; }
 
+        /// <summary>
+        /// 显示购买按钮
+        /// </summary>
         public bool showBuyBtn { get; set; }
 
+        /// <summary>
+        /// 购买按钮样式(1-填充,2-线条,3-圆角填充,4-圆角线条)
+        /// </summary>
         public int buyBtnStyle { get; set; }
 
         /// <summary>
-        /// 去参与
+        /// 按钮文字
         /// </summary>
         public string buyBtnText { get; set; }
 
+        /// <summary>
+        /// 显示商品角标
+        /// </summary>
         public bool showGoodsTag { get; set; }
 
+        /// <summary>
+        /// 自定义商品角标
+        /// </summary>
         public bool customizeGoodsTag { get; set; }
 
         /// <summary>
-        /// goodsTagPicUrl
+        /// 商品角标图片
         /// </summary>
         public string goodsTagPicUrl { get; set; }
 
-        public bool showImg { get; set; }
-
         /// <summary>
-        /// backgroundColor
+        /// 背景颜色
         /// </summary>
         public string backgroundColor { get; set; }
 
-
         /// <summary>
-        /// backgroundPicUrl
+        /// 背景图片
         /// </summary>
         public string backgroundPicUrl { get; set; }
 
+        /// <summary>
+        /// 图片位置
+        /// </summary>
         public int position { get; set; }
 
         /// <summary>
-        /// mode
+        /// 填充方式
         /// </summary>
         public int mode { get; set; }
 
         /// <summary>
-        /// backgroundHeight
+        /// 背景高度
         /// </summary>
         public int backgroundHeight { get; set; }
 
         /// <summary>
-        /// backgroundWidth
+        /// 背景宽度
         /// </summary>
         public int backgroundWidth { get; set; }
     }
@@ -1800,20 +1994,29 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class bargainGoodsItem
     {
+        /// <summary>
+        /// 商品编号
+        /// </summary>
         public int id { get; set; }
 
         /// <summary>
-        /// 演示商品名称
+        /// 商品名称
         /// </summary>
         public string name { get; set; }
 
         /// <summary>
-        /// CoverImage
+        /// 封面图
         /// </summary>
         public string CoverImage { get; set; }
 
+        /// <summary>
+        /// 售价
+        /// </summary>
         public decimal price { get; set; }
 
+        /// <summary>
+        /// 原价
+        /// </summary>
         public decimal originalPrice { get; set; }
     }
 
@@ -1822,54 +2025,124 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class integralmallItem
     {
+        /// <summary>
+        /// 显示优惠券
+        /// </summary>
         public bool showCoupon { get; set; }
 
+        /// <summary>
+        /// 显示商品
+        /// </summary>
         public bool showGoods { get; set; }
 
+        /// <summary>
+        /// 优惠券文字颜色
+        /// </summary>
         public string couponColor { get; set; }
 
+        /// <summary>
+        /// 优惠券背景图片
+        /// </summary>
         public string couponPicUrl { get; set; }
 
+        /// <summary>
+        /// 购买按钮颜色
+        /// </summary>
         public string buttonColor { get; set; }
 
+        /// <summary>
+        /// 列表样式(-1列表模式,1-一行一个,2-一行两个)
+        /// </summary>
         public int listStyle { get; set; }
 
-
+        /// <summary>
+        /// 商品封面图填充(1-填充,0-留白)
+        /// </summary>
         public int fill { get; set; }
 
+        /// <summary>
+        /// 商品封面图宽高比例(1-1,3-2)
+        /// </summary>
         public string goodsCoverProportion { get; set; }
 
+        /// <summary>
+        /// 商品样式(1-白底无边框,2-白底有边框,3-无底无边框)
+        /// </summary>
         public int goodsStyle { get; set; }
 
+        /// <summary>
+        /// 文本样式(1-左对齐,2-居中)
+        /// </summary>
         public int textStyle { get; set; }
 
+        /// <summary>
+        /// 显示商品名称
+        /// </summary>
         public bool showGoodsName { get; set; }
 
+        /// <summary>
+        /// 显示购买按钮
+        /// </summary>
         public bool showBuyBtn { get; set; }
 
+        /// <summary>
+        /// 购买按钮样式(1-填充,2-线条,3-圆角填充,4-圆角线条)
+        /// </summary>
         public int buyBtnStyle { get; set; }
 
+        /// <summary>
+        /// 购买按钮文字
+        /// </summary>
         public string buyBtnText { get; set; }
 
+        /// <summary>
+        /// 显示商品角标
+        /// </summary>
         public bool showGoodsTag { get; set; }
 
+        /// <summary>
+        /// 自定义商品角标
+        /// </summary>
         public bool customizeGoodsTag { get; set; }
 
+        /// <summary>
+        /// 商品角标图片
+        /// </summary>
         public string goodsTagPicUrl { get; set; }
 
-        public bool showImg { get; set; }
-
+        /// <summary>
+        /// 背景颜色
+        /// </summary>
         public string backgroundColor { get; set; }
 
+        /// <summary>
+        /// 背景图片
+        /// </summary>
         public string backgroundPicUrl { get; set; }
 
+        /// <summary>
+        /// 图片位置
+        /// </summary>
         public int position { get; set; }
+
+        /// <summary>
+        /// 填充方式
+        /// </summary>
         public int mode { get; set; }
 
+        /// <summary>
+        /// 背景高度
+        /// </summary>
         public int backgroundHeight { get; set; }
 
+        /// <summary>
+        /// 背景宽度
+        /// </summary>
         public int backgroundWidth { get; set; }
 
+        /// <summary>
+        /// 积分商城商品列表
+        /// </summary>
         public List<integralmallGoodsItem> list { get; set; }
     }
 
@@ -1878,17 +2151,29 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class integralmallGoodsItem
     {
+        /// <summary>
+        /// 商品编号
+        /// </summary>
         public int id { get; set; }
 
         /// <summary>
-        /// 演示商品名称
+        /// 商品名称
         /// </summary>
         public string name { get; set; }
 
+        /// <summary>
+        /// 封面图
+        /// </summary>
         public string CoverImage { get; set; }
 
+        /// <summary>
+        /// 售价
+        /// </summary>
         public decimal price { get; set; }
 
+        /// <summary>
+        /// 原价
+        /// </summary>
         public decimal originalPrice { get; set; }
 
         /// <summary>
@@ -1902,57 +2187,104 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class lotteryItem
     {
+        /// <summary>
+        /// 购买按钮颜色
+        /// </summary>
         public string buttonColor { get; set; }
 
+        /// <summary>
+        /// 列表样式(-1列表模式,1-一行一个,2-一行两个)
+        /// </summary>
         public int listStyle { get; set; }
 
+        /// <summary>
+        /// 商品封面图填充(1-填充,0-留白)
+        /// </summary>
         public int fill { get; set; }
 
+        /// <summary>
+        /// 商品封面图宽高比例(1-1,3-2)
+        /// </summary>
         public string goodsCoverProportion { get; set; }
 
-
+        /// <summary>
+        /// 商品样式(1-白底无边框,2-白底有边框,3-无底无边框)
+        /// </summary>
         public int goodsStyle { get; set; }
 
+        /// <summary>
+        /// 文本样式(1-左对齐,2-居中)
+        /// </summary>
         public int textStyle { get; set; }
 
+        /// <summary>
+        /// 显示商品名称
+        /// </summary>
         public bool showGoodsName { get; set; }
 
+        /// <summary>
+        /// 显示购买按钮
+        /// </summary>
         public bool showBuyBtn { get; set; }
 
+        /// <summary>
+        /// 购买按钮样式(1-填充,2-线条,3-圆角填充,4-圆角线条)
+        /// </summary>
         public int buyBtnStyle { get; set; }
 
         /// <summary>
-        /// 去参与
+        /// 购买按钮文字
         /// </summary>
         public string buyBtnText { get; set; }
+
+        /// <summary>
+        /// 显示商品角标
+        /// </summary>
         public bool showGoodsTag { get; set; }
+
+        /// <summary>
+        /// 自定义商品角标
+        /// </summary>
         public bool customizeGoodsTag { get; set; }
 
         /// <summary>
-        /// goodsTagPicUrl
+        /// 商品角标图片
         /// </summary>
         public string goodsTagPicUrl { get; set; }
 
-        public bool showImg { get; set; }
-
         /// <summary>
-        /// backgroundColor
+        /// 背景颜色
         /// </summary>
         public string backgroundColor { get; set; }
 
         /// <summary>
-        /// backgroundPicUrl
+        /// 背景图片
         /// </summary>
         public string backgroundPicUrl { get; set; }
 
+        /// <summary>
+        /// 图片位置
+        /// </summary>
         public int position { get; set; }
 
+        /// <summary>
+        /// 填充方式
+        /// </summary>
         public int mode { get; set; }
 
+        /// <summary>
+        /// 背景高度
+        /// </summary>
         public int backgroundHeight { get; set; }
 
+        /// <summary>
+        /// 背景宽度
+        /// </summary>
         public int backgroundWidth { get; set; }
 
+        /// <summary>
+        /// 抽奖商品列表
+        /// </summary>
         public List<bargainGoodsItem> list { get; set; }
     }
 
@@ -1961,72 +2293,136 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class advanceItem
     {
+        /// <summary>
+        /// 购买按钮颜色
+        /// </summary>
         public string buttonColor { get; set; }
+
+        /// <summary>
+        /// 预售商品列表
+        /// </summary>
         public List<advanceGoodsItem> list { get; set; }
 
+        /// <summary>
+        /// 列表样式(-1列表模式,1-一行一个,2-一行两个)
+        /// </summary>
         public int listStyle { get; set; }
+
+        /// <summary>
+        /// 商品封面图填充(1-填充,0-留白)
+        /// </summary>
         public int fill { get; set; }
 
+        /// <summary>
+        /// 商品封面图宽高比例(1-1,3-2)
+        /// </summary>
         public string goodsCoverProportion { get; set; }
 
+        /// <summary>
+        /// 商品样式(1-白底无边框,2-白底有边框,3-无底无边框)
+        /// </summary>
         public int goodsStyle { get; set; }
 
+        /// <summary>
+        ///  文本样式(1-左对齐,2-居中)
+        /// </summary>
         public int textStyle { get; set; }
 
+        /// <summary>
+        /// 显示商品名称
+        /// </summary>
         public bool showGoodsName { get; set; }
 
+        /// <summary>
+        /// 显示购买按钮
+        /// </summary>
         public bool showBuyBtn { get; set; }
 
+        /// <summary>
+        /// 购买按钮样式(1-填充,2-线条,3-圆角填充,4-圆角线条)
+        /// </summary>
         public int buyBtnStyle { get; set; }
 
         /// <summary>
-        /// 抢购
+        /// 购买按钮文字(抢购)
         /// </summary>
         public string buyBtnText { get; set; }
 
+        /// <summary>
+        /// 显示商品角标
+        /// </summary>
         public bool showGoodsTag { get; set; }
 
+        /// <summary>
+        /// 自定义商品角标
+        /// </summary>
         public bool customizeGoodsTag { get; set; }
-        public string goodsTagPicUrl { get; set; }
-
-        public int goodsIndex { get; set; }
-
-        public int start_x { get; set; }
 
-        public bool showImg { get; set; }
+        /// <summary>
+        /// 商品角标图片
+        /// </summary>
+        public string goodsTagPicUrl { get; set; }
 
+        /// <summary>
+        /// 背景颜色
+        /// </summary>
         public string backgroundColor { get; set; }
 
+        /// <summary>
+        /// 背景图片
+        /// </summary>
         public string backgroundPicUrl { get; set; }
 
+        /// <summary>
+        /// 图片位置
+        /// </summary>
         public int position { get; set; }
 
+        /// <summary>
+        /// 填充方式
+        /// </summary>
         public int mode { get; set; }
 
+        /// <summary>
+        /// 背景高度
+        /// </summary>
         public int backgroundHeight { get; set; }
 
+        /// <summary>
+        /// 背景宽度
+        /// </summary>
         public int backgroundWidth { get; set; }
     }
 
+    /// <summary>
+    /// 预售商品详情
+    /// </summary>
     public class advanceGoodsItem
     {
+        /// <summary>
+        /// 商品编号
+        /// </summary>
         public int id { get; set; }
 
         /// <summary>
-        /// 演示商品名称
+        /// 商品名称
         /// </summary>
         public string name { get; set; }
 
         /// <summary>
-        /// CoverImage
+        /// 商品封面图
         /// </summary>
         public string CoverImage { get; set; }
 
+        /// <summary>
+        /// 售价
+        /// </summary>
         public decimal price { get; set; }
 
+        /// <summary>
+        /// 原价
+        /// </summary>
         public decimal originalPrice { get; set; }
-        public string deposit { get; set; }
-        public string swell_deposit { get; set; }
     }
 
     /// <summary>
@@ -2034,28 +2430,79 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class vipcardItem
     {
+        /// <summary>
+        /// 背景眼色
+        /// </summary>
         public string background { get; set; }
+
+        /// <summary>
+        /// 使用插件配置
+        /// </summary>
         public bool usePluginConfig { get; set; }
 
+        /// <summary>
+        /// 上下间距
+        /// </summary>
         public int top_bottom_padding { get; set; }
 
+        /// <summary>
+        /// 未购买用户背景图
+        /// </summary>
         public string buy_bg { get; set; }
+
+        /// <summary>
+        /// 已购买用户背景图
+        /// </summary>
         public string renew_bg { get; set; }
 
+        /// <summary>
+        /// 文字眼色
+        /// </summary>
         public string buy_big_color { get; set; }
+
+        /// <summary>
+        /// 小标题文字眼色
+        /// </summary>
         public string buy_small_color { get; set; }
+
+        /// <summary>
+        /// 按钮眼色
+        /// </summary>
         public string buy_btn_color { get; set; }
+
+        /// <summary>
+        /// 按钮背景颜色
+        /// </summary>
         public string buy_btn_bg_color { get; set; }
 
+        /// <summary>
+        /// 文字
+        /// </summary>
         public string buy_big { get; set; }
 
+        /// <summary>
+        /// 小标题
+        /// </summary>
         public string buy_small { get; set; }
 
+        /// <summary>
+        /// 按钮文字(按钮文字)
+        /// </summary>
         public string buy_btn_text { get; set; }
 
+        /// <summary>
+        /// 已购买文字标题颜色
+        /// </summary>
         public string renew_text_color { get; set; }
 
+        /// <summary>
+        /// 已购买按钮颜色
+        /// </summary>
         public string renew_btn_bg_color { get; set; }
+
+        /// <summary>
+        /// 已购买文字
+        /// </summary>
         public string renew_text { get; set; }
     }
 
@@ -2064,11 +2511,24 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class liveItem
     {
+        /// <summary>
+        /// 背景颜色
+        /// </summary>
         public string background { get; set; }
+
+        /// <summary>
+        /// 显示商品
+        /// </summary>
         public bool is_show_goods { get; set; }
 
+        /// <summary>
+        /// 卡片样式
+        /// </summary>
         public int style_type { get; set; }
 
+        /// <summary>
+        /// 直播间数量
+        /// </summary>
         public int number { get; set; }
     }
 
@@ -2077,8 +2537,14 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class emptyItem
     {
+        /// <summary>
+        /// 背景颜色
+        /// </summary>
         public string background { get; set; }
 
+        /// <summary>
+        /// 高度
+        /// </summary>
         public int height { get; set; }
     }
 
@@ -2087,22 +2553,49 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class adItem
     {
+        /// <summary>
+        /// 广告位ID
+        /// </summary>
         public string id { get; set; }
 
+        /// <summary>
+        /// 广告位类型
+        /// </summary>
         public string type { get; set; }
 
+        /// <summary>
+        /// 广告封面
+        /// </summary>
         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; }
 
+        /// <summary>
+        /// 积分数量
+        /// </summary>
         public string award_num { get; set; }
 
+        /// <summary>
+        /// 奖励发放限制
+        /// </summary>
         public string award_limit_type { get; set; }
 
+        /// <summary>
+        /// 限制次数
+        /// </summary>
         public int award_limit { get; set; }
 
+        /// <summary>
+        /// 流量广告列表
+        /// </summary>
         public List<adDetailsItem> award_coupons { get; set; }
     }
 
@@ -2111,6 +2604,9 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class adDetailsItem
     {
+        /// <summary>
+        /// 优惠券发放数量
+        /// </summary>
         public int send_num { get; set; }
 
         /// <summary>
@@ -2129,89 +2625,174 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class modalItem
     {
+        /// <summary>
+        /// 是否开启(弹窗广告)
+        /// </summary>
         public bool opened { get; set; }
+
+        /// <summary>
+        /// 弹窗次数(0-每次,1-仅首次)
+        /// </summary>
         public int times { get; set; }
 
+        /// <summary>
+        /// 弹窗详细列表
+        /// </summary>
         public List<modalDetailsItem> list { get; set; }
-
     }
 
+    /// <summary>
+    /// 弹窗详情
+    /// </summary>
     public class modalDetailsItem
     {
+        /// <summary>
+        /// 图片地址
+        /// </summary>
         public string picUrl { get; set; }
 
+        /// <summary>
+        /// 链接详情
+        /// </summary>
         public modalLinkItem link { get; set; }
     }
 
+    /// <summary>
+    /// 弹窗链接详情
+    /// </summary>
     public class modalLinkItem
     {
+        /// <summary>
+        /// 跳转地址
+        /// </summary>
         public string url { get; set; }
 
+        /// <summary>
+        /// 打开方式
+        /// </summary>
         public string openType { get; set; }
     }
 
     /// <summary>
-    /// 导航项
+    /// 快捷导航
     /// </summary>
-    public class quicknavDetailsItem
+    public class quicknavItem
     {
-        public bool opened { get; set; }
-
-        public string picUrl { get; set; }
-
-
-        public string number { get; set; }
-
-
-        public string appId { get; set; }
+        /// <summary>
+        /// 快捷导航开关
+        /// </summary>
+        public int navSwitch { get; set; }
 
-        public string page { get; set; }
+        /// <summary>
+        /// 使用商城配置
+        /// </summary>
+        public bool useMallConfig { get; set; }
 
+        /// <summary>
+        /// 导航样式(1-样式1(点击收起),2-样式2(全部展示))
+        /// </summary>
+        public int navStyle { get; set; }
 
-        public string address { get; set; }
+        /// <summary>
+        /// 收起图标
+        /// </summary>
+        public string closedPicUrl { get; set; }
 
-        public string location { get; set; }
+        /// <summary>
+        /// 展开图标
+        /// </summary>
+        public string openedPicUrl { get; set; }
 
+        /// <summary>
+        /// 首页详情
+        /// </summary>
+        public quicknavDetailsItem home { get; set; }
 
-        public string open_type { get; set; }
+        /// <summary>
+        /// 小程序客服详情
+        /// </summary>
+        public quicknavDetailsItem customerService { get; set; }
 
-        public string link_url { get; set; }
+        /// <summary>
+        /// 一键拨号详情
+        /// </summary>
+        public quicknavDetailsItem tel { get; set; }
 
-        public string key { get; set; }
+        /// <summary>
+        /// 网页链接
+        /// </summary>
+        public quicknavDetailsItem web { get; set; }
 
         /// <summary>
-        /// 网站链接
+        /// 跳转小程序
         /// </summary>
-        public string url { get; set; }
+        public quicknavDetailsItem mApp { get; set; }
 
-        //public string @params { get; set; }
+        /// <summary>
+        /// 地图导航
+        /// </summary>
+        public quicknavDetailsItem mapNav { get; set; }
 
+        /// <summary>
+        /// 自定义按钮
+        /// </summary>
+        public quicknavDetailsItem customize { get; set; }
     }
 
     /// <summary>
-    /// 快捷导航
+    /// 快捷导航详情
     /// </summary>
-    public class quicknavItem
+    public class quicknavDetailsItem
     {
-        public int navSwitch { get; set; }
-        public bool useMallConfig { get; set; }
+        /// <summary>
+        /// 是否开启返回首页
+        /// </summary>
+        public bool opened { get; set; }
 
-        public int navStyle { get; set; }
+        /// <summary>
+        /// 图片地址
+        /// </summary>
+        public string picUrl { get; set; }
 
-        public string closedPicUrl { get; set; }
+        /// <summary>
+        /// 电话号码
+        /// </summary>
+        public string number { get; set; }
 
-        public string openedPicUrl { get; set; }
+        /// <summary>
+        /// appId
+        /// </summary>
+        public string appId { get; set; }
 
-        public quicknavDetailsItem home { get; set; }
+        /// <summary>
+        /// 页面路径
+        /// </summary>
+        public string page { get; set; }
 
-        public quicknavDetailsItem customerService { get; set; }
+        /// <summary>
+        /// 详细地址
+        /// </summary>
+        public string address { get; set; }
 
-        public quicknavDetailsItem tel { get; set; }
+        /// <summary>
+        /// 经纬度
+        /// </summary>
+        public string location { get; set; }
 
-        public quicknavDetailsItem web { get; set; }
-        public quicknavDetailsItem mApp { get; set; }
-        public quicknavDetailsItem mapNav { get; set; }
-        public quicknavDetailsItem customize { get; set; }
+        /// <summary>
+        /// 跳转链接
+        /// </summary>
+        public string link_url { get; set; }
+
+        /// <summary>
+        /// key
+        /// </summary>
+        public string key { get; set; }
+
+        /// <summary>
+        /// 网站链接
+        /// </summary>
+        public string url { get; set; }
     }
 
     /// <summary>
@@ -2340,47 +2921,27 @@ namespace Mall.Model.Extend.MarketingCenter
         /// <summary>
         /// 搜索圆角像素
         /// </summary>        
-        public int SearchFilletPX
-        {
-            get;
-            set;
-        }
+        public int SearchFilletPX { get; set; }
 
         /// <summary>
         /// 按钮圆角像素
         /// </summary>        
-        public int ButtonFilletPX
-        {
-            get;
-            set;
-        }
+        public int ButtonFilletPX { get; set; }
 
         /// <summary>
         /// 按钮文本
         /// </summary>        
-        public string ButtonText
-        {
-            get;
-            set;
-        }
+        public string ButtonText { get; set; }
 
         /// <summary>
         /// 按钮颜色
         /// </summary>        
-        public string ButtonColor
-        {
-            get;
-            set;
-        }
+        public string ButtonColor { get; set; }
 
         /// <summary>
         /// 按钮文字颜色
         /// </summary>        
-        public string ButtonTextColor
-        {
-            get;
-            set;
-        }
+        public string ButtonTextColor { get; set; }
 
         /// <summary>
         /// 上边距
@@ -2403,29 +2964,27 @@ namespace Mall.Model.Extend.MarketingCenter
         public string PaddingRight { get; set; }
     }
 
-
     #region 教育模块
     /// <summary>
     /// 教育模块-最近学习组件
     /// </summary>
     public class educationItem
     {
-
         /// <summary>
         /// 封面
         /// </summary>
         public string Cover { get; set; }
+
         /// <summary>
         /// 课程名称
         /// </summary>
         public string Name { get; set; }
+
         /// <summary>
         /// 显示进度
         /// </summary>
         public decimal showProgress { get; set; }
 
-
-
         /// <summary>
         /// 上边距
         /// </summary>
@@ -2446,7 +3005,6 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public string PaddingRight { get; set; }
 
-
         /// <summary>
         /// 按钮位置
         /// </summary>
@@ -2469,7 +3027,15 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public int listStyle { get; set; }
 
+        /// <summary>
+        /// 类型(1-载体，2-品牌)
+        /// </summary>
+        public int goodType { get; set; }
 
+        /// <summary>
+        /// 添加方式【0-自动添加,1-手动添加】
+        /// </summary>
+        public int addGoodsType { get; set; }
 
         /// <summary>
         /// 背景颜色
@@ -2505,8 +3071,6 @@ namespace Mall.Model.Extend.MarketingCenter
             set;
         }
 
-
-
         /// <summary>
         /// 自定义列表
         /// </summary>
@@ -2527,7 +3091,6 @@ namespace Mall.Model.Extend.MarketingCenter
         /// <summary>
         /// 标题
         /// </summary>
-
         public string name { get; set; }
 
         /// <summary>
@@ -2539,7 +3102,6 @@ namespace Mall.Model.Extend.MarketingCenter
         /// <summary>
         /// 副标题
         /// </summary>
-
         public List<string> lableNameList { get; set; }
 
         /// <summary>
@@ -2547,22 +3109,10 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public string picUrl { get; set; }
 
-
-
         /// <summary>
         /// 链接
         /// </summary>
         public string linkUrl { get; set; }
-
-        ///// <summary>
-        ///// 售价
-        ///// </summary>
-        //public decimal price { get; set; }
-
-        ///// <summary>
-        ///// 【原价】前端使用
-        ///// </summary>
-        //public decimal OriginalPrice { get; set; }
     }
 
 
@@ -2571,8 +3121,6 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class educationArticleItem
     {
-
-
         /// <summary>
         /// 商品数量
         /// </summary>
@@ -2583,14 +3131,11 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public int addGoodsType { get; set; }
 
-
-
         /// <summary>
         /// 列表样式[-1-列表模式,0-左右滑动,1-一行一个]
         /// </summary>
         public int listStyle { get; set; }
 
-
         /// <summary>
         /// 背景颜色
         /// </summary>
@@ -2616,15 +3161,10 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public string PaddingRight { get; set; }
 
-
         /// <summary>
         /// 搜索圆角像素
         /// </summary>        
-        public int SearchFilletPX
-        {
-            get;
-            set;
-        }
+        public int SearchFilletPX { get; set; }
 
         /// <summary>
         /// 自定义列表
@@ -2632,9 +3172,6 @@ namespace Mall.Model.Extend.MarketingCenter
         public List<CustomDetailsItem2> list { get; set; }
     }
 
-
-
-
     /// <summary>
     /// 老师
     /// </summary>
@@ -2665,19 +3202,15 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public int listStyle { get; set; }
 
-
         /// <summary>
         /// 背景颜色
         /// </summary>
         public string backgroundColor { get; set; }
+
         /// <summary>
         /// 圆角像素
         /// </summary>        
-        public int SearchFilletPX
-        {
-            get;
-            set;
-        }
+        public int SearchFilletPX { get; set; }
 
         /// <summary>
         /// 老师列表
@@ -2685,8 +3218,6 @@ namespace Mall.Model.Extend.MarketingCenter
         public List<TeacherDetailsItem> TeacherList { get; set; }
     }
 
-
-
     /// <summary>
     /// 老师详情项
     /// </summary>
@@ -2700,17 +3231,13 @@ namespace Mall.Model.Extend.MarketingCenter
         /// <summary>
         /// 老师名称
         /// </summary>
-
         public string name { get; set; }
 
-
         /// <summary>
         /// 老师国籍
         /// </summary>
-
         public string nationality { get; set; }
 
-
         /// <summary>
         /// 是否外国人0-否，1-是
         /// </summary>
@@ -2719,26 +3246,22 @@ namespace Mall.Model.Extend.MarketingCenter
         /// <summary>
         /// 标签
         /// </summary>
-
         public string lableName { get; set; }
 
         /// <summary>
         /// 标签
         /// </summary>
-
         public List<string> lableNameList { get; set; }
 
         /// <summary>
         /// 老师头像
         /// </summary>
         public string picUrl { get; set; }
-
     }
 
     #endregion
 
 
-
     #region 门店
     /// <summary>
     /// 门店
@@ -2871,13 +3394,12 @@ namespace Mall.Model.Extend.MarketingCenter
         public string backgroundPicUrl { get; set; }
 
         /// <summary>
-        ///  
+        ///  图片位置
         /// </summary>
         public int position { get; set; }
 
-
         /// <summary>
-        ///  图片位置
+        ///  填充方式
         /// </summary>
         public int mode { get; set; }
 
@@ -2987,8 +3509,6 @@ namespace Mall.Model.Extend.MarketingCenter
         public decimal DepositMoney { get; set; }
     }
 
-
-
     /// <summary>
     /// 门店
     /// </summary>
@@ -3018,11 +3538,8 @@ namespace Mall.Model.Extend.MarketingCenter
         /// <summary>
         /// 圆角像素
         /// </summary>        
-        public int SearchFilletPX
-        {
-            get;
-            set;
-        }
+        public int SearchFilletPX { get; set; }
+
         /// <summary>
         /// 是否显示封面图
         /// </summary>
@@ -3033,9 +3550,12 @@ namespace Mall.Model.Extend.MarketingCenter
 
 
     #region 相亲- 人物插件
+
+    /// <summary>
+    /// 人物插件
+    /// </summary>
     public class MiAiUserItem
     {
-
         /// <summary>
         /// 人数数量
         /// </summary>
@@ -3046,14 +3566,11 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public int listStyle { get; set; }
 
-
-
         /// <summary>
         /// 用户添加方式（0-自定义，1-按照匹配度【规则未确定】，2-按照热度【被浏览数据，被关注数据】，3-按照最新,4-每日随机）
         /// </summary>
         public int addUserType { get; set; }
 
-
         /// <summary>
         /// 用户添加方式（0-默认，1-男神，2-女神）
         /// </summary>
@@ -3064,13 +3581,11 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public decimal BrowseRate { get; set; }
 
-
         /// <summary>
         /// 关注权重
         /// </summary>
         public decimal FollowRate { get; set; }
 
-
         /// <summary>
         /// 背景颜色
         /// </summary>
@@ -3099,13 +3614,7 @@ namespace Mall.Model.Extend.MarketingCenter
         /// <summary>
         /// 搜索圆角像素
         /// </summary>        
-        public int SearchFilletPX
-        {
-            get;
-            set;
-        }
-
-
+        public int SearchFilletPX { get; set; }
 
         /// <summary>
         /// 自定义列表
@@ -3113,6 +3622,7 @@ namespace Mall.Model.Extend.MarketingCenter
         public List<miaiUserDetail> list { get; set; }
     }
 
+
     /// <summary>
     /// 详情
     /// </summary>
@@ -3126,7 +3636,6 @@ namespace Mall.Model.Extend.MarketingCenter
         /// <summary>
         /// 标题
         /// </summary>
-
         public string name { get; set; }
 
         /// <summary>
@@ -3139,7 +3648,6 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public string SexStr { get; set; }
 
-
         /// <summary>
         /// 年龄
         /// </summary>
@@ -3155,11 +3663,6 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public string Marriage { get; set; }
 
-        /// <summary>
-        /// 匹配度
-        /// </summary>
-       // public int MatchingRate { get; set; }
-
         /// <summary>
         /// 分数
         /// </summary>
@@ -3170,7 +3673,9 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public string Album { get; set; }
 
-
+        /// <summary>
+        /// AlbumList
+        /// </summary>
         public List<string> AlbumList { get; set; }
     }
     #endregion
@@ -3182,14 +3687,11 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class MiAiActivityTypeItem
     {
-
-
         /// <summary>
         /// 列表样式[-1-列表模式,0-左右滑动,1-一行一个]
         /// </summary>
         public int listStyle { get; set; }
 
-
         /// <summary>
         /// 背景颜色
         /// </summary>
@@ -3215,15 +3717,10 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public string PaddingRight { get; set; }
 
-
         /// <summary>
         /// 搜索圆角像素
         /// </summary>        
-        public int SearchFilletPX
-        {
-            get;
-            set;
-        }
+        public int SearchFilletPX { get; set; }
 
         /// <summary>
         /// 自定义列表
@@ -3231,8 +3728,6 @@ namespace Mall.Model.Extend.MarketingCenter
         public List<MiAiActivityTypeModel> list { get; set; }
     }
 
-
-
     /// <summary>
     /// 商品详情项
     /// </summary>
@@ -3246,47 +3741,34 @@ namespace Mall.Model.Extend.MarketingCenter
         /// <summary>
         /// 标题
         /// </summary>
-
         public string name { get; set; }
 
         /// <summary>
         /// 副标题
         /// </summary>
-
         public string lableName { get; set; }
 
         /// <summary>
         /// 副标题
         /// </summary>
-
         public List<string> lableNameList { get; set; }
 
         /// <summary>
         /// 商品图片
         /// </summary>
         public string picUrl { get; set; }
-
     }
 
-
-
-
-
-
-
     /// <summary>
     ///新增相亲星球大事件-自定义列表
     /// </summary>
     public class MiAiActivityTypeCustomItem
     {
-
         /// <summary>
         /// 列表样式[-1-列表模式,0-左右滑动,1-一行一个,2-一行两个3-一行三个]
         /// </summary>
         public int listStyle { get; set; }
 
-
-
         /// <summary>
         /// 背景颜色
         /// </summary>
@@ -3315,13 +3797,7 @@ namespace Mall.Model.Extend.MarketingCenter
         /// <summary>
         /// 搜索圆角像素
         /// </summary>        
-        public int SearchFilletPX
-        {
-            get;
-            set;
-        }
-
-
+        public int SearchFilletPX { get; set; }
 
         /// <summary>
         /// 自定义列表
@@ -3335,24 +3811,19 @@ namespace Mall.Model.Extend.MarketingCenter
     /// </summary>
     public class MiAiActivityTypeCusModel
     {
-
-
         /// <summary>
         /// 标题
         /// </summary>
-
         public string name { get; set; }
 
         /// <summary>
         /// 副标题
         /// </summary>
-
         public string lableName { get; set; }
 
         /// <summary>
         /// 副标题
         /// </summary>
-
         public List<string> lableNameList { get; set; }
 
         /// <summary>
@@ -3360,18 +3831,12 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public string picUrl { get; set; }
 
-
-
         /// <summary>
         /// 链接
         /// </summary>
         public string linkUrl { get; set; }
-
     }
 
-
-
-
     /// <summary>
     /// 相亲ppplus (招募贴)插件
     /// </summary>
@@ -3407,7 +3872,6 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public int listStyle { get; set; }
 
-
         /// <summary>
         /// 背景色
         /// </summary>
@@ -3418,8 +3882,6 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public int activityStyle { get; set; }
 
-
-
         /// <summary>
         /// 分类列表
         /// </summary>
@@ -3457,9 +3919,6 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public string CreateBy { get; set; }
 
-
-
-
         /// <summary>
         /// 发帖人
         /// </summary>
@@ -3480,7 +3939,6 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public int IsDianZan { get; set; }
 
-
         /// <summary>
         /// 是否是帖子，0-活动，1-帖子
         /// </summary>
@@ -3532,6 +3990,5 @@ namespace Mall.Model.Extend.MarketingCenter
         /// </summary>
         public List<ActivityDetailsItem> goodsList { get; set; }
     }
-
     #endregion
 }
\ No newline at end of file

Mall.Model/Extend/TradePavilion/RB_Brand_Extend.cs

@@ -28,11 +28,6 @@ namespace Mall.Model.Extend.TradePavilion
         public string QBrandIds { get; set; }
         public List<string> BannerList { get; set; }
 
-        /// <summary>
-        /// 商铺性质
-        /// </summary>
-        //public string ProjectName { get { return Common.Plugin.EnumHelper.GetEnumName(this.ProjectType); } }
-
 
 
         /// <summary>
@@ -84,5 +79,13 @@ namespace Mall.Model.Extend.TradePavilion
         /// </summary>
         public List<RB_FirstShop_ListEnroll_Extend> ListEnroll { get; set; }
 
+        /// 排序(1-默认，2主键倒序)
+        /// </summary>
+        public int QOrderBy { get; set; }
+
+        /// <summary>
+        /// 取几天数据
+        /// </summary>
+        public int QTop { get; set; }
     }
 }

Mall.Model/Extend/TradePavilion/RB_Carrier_Extend.cs

@@ -30,7 +30,7 @@ namespace Mall.Model.Extend.TradePavilion
         public List<string> BannerList { get; set; }
 
         /// <summary>
-        /// 排序
+        /// 排序(1-创建时间倒序，2-开业时间倒序)
         /// </summary>
         public int OrderBy { get; set; }
 
@@ -74,6 +74,10 @@ namespace Mall.Model.Extend.TradePavilion
         public string UserIcon { get; set; }
 
         /// <summary>
+        /// 查询多少条数据
+        /// </summary>
+        public int QTop { get; set; }
+
         /// 载体ids
         /// </summary>
         public string QCarrierIds { get; set; }

Mall.Model/Extend/TradePavilion/RB_Custom_Form_Extend.cs

@@ -59,6 +59,16 @@ namespace Mall.Model.Extend.TradePavilion
         /// 是否必填
         /// </summary>
         public bool IsRequire { get; set; }
+
+        /// <summary>
+        /// 文本值
+        /// </summary>
+        public string TextValue { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 
     /// <summary>
@@ -85,6 +95,32 @@ namespace Mall.Model.Extend.TradePavilion
         /// 是否必填
         /// </summary>
         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>
@@ -106,6 +142,16 @@ namespace Mall.Model.Extend.TradePavilion
         /// 上传文件大小M
         /// </summary>
         public int FileSizeLimit { get; set; }
+
+        /// <summary>
+        /// 上传文件列表
+        /// </summary>
+        public List<string> FileList { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 }
 

Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs

@@ -937,6 +937,33 @@ namespace Mall.Module.MarketingCenter
                 //导航-页面
                 case "nav-page": item.data = JsonHelper.DeserializeObject<navPageItem>(item.data.ToString()); break;
 
+                //首店-自定义列表
+                case "tradePavilionCustom":
+                    educationCustomItem tradePavilionCustomModel = new educationCustomItem();
+                    try
+                    {
+                        var tradeData = JsonHelper.DeserializeObject<educationCustomItem>(item.data.ToString());
+                        if (tradeData != null)
+                        {
+                            tradePavilionCustomModel.goodsLength = tradeData?.goodsLength ?? 1;
+                            tradePavilionCustomModel.addGoodsType = tradeData?.addGoodsType ?? 1;
+                            tradePavilionCustomModel.goodType = tradeData?.goodType ?? 1;
+                            tradePavilionCustomModel.listStyle = tradeData?.listStyle ?? 1;
+                            tradePavilionCustomModel.backgroundColor = tradeData?.backgroundColor ?? "";
+                            tradePavilionCustomModel.PaddingTop = tradeData?.PaddingTop ?? "0";
+                            tradePavilionCustomModel.PaddingBottom = tradeData?.PaddingBottom ?? "0";
+                            tradePavilionCustomModel.PaddingLeft = tradeData?.PaddingLeft ?? "0";
+                            tradePavilionCustomModel.PaddingRight = tradeData?.PaddingRight ?? "0";
+                            tradePavilionCustomModel.SearchFilletPX = tradeData?.SearchFilletPX ?? 0;
+                            tradePavilionCustomModel.list = new List<CustomDetailsItem2>();
+                            tradePavilionCustomModel.list = tradeData.list;
+                        }
+                    }
+                    catch
+                    {
+                    }
+                    item.data = tradePavilionCustomModel;
+                    break;
             }
         }
 

Mall.Module.TradePavilion/CarrierModule.cs

@@ -10,6 +10,9 @@ using Mall.Common.Plugin;
 
 namespace Mall.Module.TradePavilion
 {
+    /// <summary>
+    /// 载体处理类
+    /// </summary>
     public class CarrierModule
     {
         /// <summary>

Mall.Module.TradePavilion/CustomFormModule.cs

@@ -62,7 +62,6 @@ namespace Mall.Module.TradePavilion
                 list.Add(new WhereHelper(nameof(RB_Custom_Form_Extend.Id), model.Id, OperatorEnum.NotEqual));
             }
             return custom_FormRepository.Exists(list);
-
         }
 
         /// <summary>
@@ -105,7 +104,7 @@ namespace Mall.Module.TradePavilion
             var extModel = custom_FormRepository.GetEntity<RB_Custom_Form_Extend>(Id);
             if (extModel != null)
             {
-                extModel.FormDataList = AnalyzeFormComponent(extModel.FormData);
+                extModel.FormDataList = AnalyzeFormComponent(extModel.FormData, isGetAnswer: true);
             }
             return extModel;
         }
@@ -114,13 +113,13 @@ namespace Mall.Module.TradePavilion
         /// 解析表单组件
         /// </summary>
         /// <param name="formData"></param>
+        /// <param name="isGetAnswer"></param>
         /// <returns></returns>
-        public List<FormDataItem> AnalyzeFormComponent(string formData)
+        public List<FormDataItem> AnalyzeFormComponent(string formData,bool isGetAnswer=false)
         {
             List<FormDataItem> dataList = new List<FormDataItem>();
             if (!string.IsNullOrEmpty(formData))
             {
-
                 JArray jArray = JArray.Parse(formData);
                 if (jArray != null && jArray.Count > 0)
                 {
@@ -145,6 +144,8 @@ namespace Mall.Module.TradePavilion
                                         Name = singleObj.GetStringValue("Name"),
                                         WordsLength = singleObj.GetInt("WordsLength"),
                                         IsRequire = singleObj.GetBoolValue("IsRequire"),
+                                        Remark = singleObj.GetStringValue("Remark"),
+                                        TextValue = isGetAnswer ? singleObj.GetStringValue("TextValue") : "",
                                     };
                                     dataItem.CompData = txtItem;
                                     break;
@@ -156,6 +157,8 @@ namespace Mall.Module.TradePavilion
                                         Name = multiObj.GetStringValue("Name"),
                                         WordsLength = multiObj.GetInt("WordsLength"),
                                         IsRequire = multiObj.GetBoolValue("IsRequire"),
+                                        Remark = multiObj.GetStringValue("Remark"),
+                                        TextValue = isGetAnswer ? multiObj.GetStringValue("TextValue") : "",
                                     };
                                     dataItem.CompData = multiItem;
                                     break;
@@ -167,8 +170,24 @@ namespace Mall.Module.TradePavilion
                                         Name = dropdownObj.GetStringValue("Name"),
                                         IsMultiple = dropdownObj.GetBoolValue("IsMultiple"),
                                         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;
                                     break;
                                 //图片上传组件
@@ -179,7 +198,24 @@ namespace Mall.Module.TradePavilion
                                         Name = imgObj.GetStringValue("Name"),
                                         FileCount = imgObj.GetInt("FileCount"),
                                         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;
                                     break;
                                 //视频上传组件
@@ -190,7 +226,21 @@ namespace Mall.Module.TradePavilion
                                         Name = videoObj.GetStringValue("Name"),
                                         FileCount = videoObj.GetInt("FileCount"),
                                         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;
                                     break;
                             }

Mall.Repository/TradePavilion/RB_BrandRepository.cs

@@ -300,6 +300,16 @@ WHERE 1=1
                 {
                     builder.AppendFormat(" AND a.{0}={1} ", nameof(RB_Brand_Extend.ProjectType), (int)query.ProjectType);
                 }
+               
+
+            }
+            if (query.QOrderBy == 2)
+            {
+                builder.AppendFormat(" ORDER BY a.{0} DESC  ", nameof(RB_Brand_Extend.ID));
+            }
+            if (query.QTop > 0)
+            {
+                builder.AppendFormat(" LIMIT {0}  ", query.QTop);
             }
             return Get<RB_Brand_Extend>(builder.ToString(), parameters).ToList();
         }

Mall.Repository/TradePavilion/RB_CarrierRepository.cs

@@ -174,6 +174,11 @@ namespace Mall.Repository.TradePavilion
                 {
                     builder.Append($" order by {nameof(RB_Carrier_Extend.OpenTime)} desc");
                 }
+
+                if (query.QTop > 0)
+                {
+                    builder.Append($" LIMIT {query.QTop} ");
+                }
             }
             return Get<RB_Carrier_Extend>(builder.ToString()).ToList();
         }

Mall.WebApi/Controllers/Mall/MallHelper.cs

 using Mall.Common.Enum.MallBase;
+using Mall.Common.Plugin;
 using Mall.Model.Entity.BaseSetUp;
 using Mall.Model.Entity.MarketingCenter;
 using Mall.Model.Extend.BaseSetUp;
 using Mall.Model.Extend.MarketingCenter;
 using Mall.Model.Extend.Miai;
 using Mall.Model.Extend.Product;
+using Mall.Model.Extend.TradePavilion;
 using Mall.Model.Extend.User;
 using Mall.Module.BaseSetUp;
 using Mall.Module.MarketingCenter;
 using Mall.Module.Product;
 using Mall.Module.Reserve;
+using Mall.Module.TradePavilion;
 using Mall.Module.User;
 using Mall.Repository.Miai;
 using Mall.Repository.Product;
@@ -101,7 +104,12 @@ namespace Mall.WebApi.Controllers
         private static Module.Miai.MiaiModule miaiModule = new Module.Miai.MiaiModule();
 
 
-        private static Module.TradePavilion.CommerceActivityModule commerceActivityModule = new Module.TradePavilion.CommerceActivityModule();
+        private static CommerceActivityModule commerceActivityModule = new CommerceActivityModule();
+
+        /// <summary>
+        /// 载体处理类对象
+        /// </summary>
+        private static CarrierModule carrierModule = new CarrierModule();
 
 
 
@@ -1922,6 +1930,74 @@ namespace Mall.WebApi.Controllers
                         data = blindDatePPPlusData
                     };
                     break;
+                    //首店-自定义列表插件
+                case "tradePavilionCustom":
+                    var tradeData = subItem.data as educationCustomItem;
+                    if (tradeData != null)
+                    {
+                        //自动添加
+                        if (tradeData.addGoodsType == 0)
+                        {
+                            tradeData.list = new List<CustomDetailsItem2>();
+                            //载体
+                            if (tradeData.goodType == 1)
+                            {
+                                var carrierList = carrierModule.GetCarrierList(new RB_Carrier_Extend()
+                                {
+                                    TenantId = TenantId,
+                                    OrderBy = 1,
+                                    QTop = tradeData.goodsLength
+                                });
+                                foreach (var cItem in carrierList)
+                                {
+                                    var dModel = new CustomDetailsItem2()
+                                    {
+                                        id = cItem.ID,
+                                        name = cItem.CarrierName,
+                                        picUrl = cItem.Logo,
+                                        lableName = cItem.CarrierPlan,
+                                        lableNameList = new List<string>(),
+                                        linkUrl = string.Format("/pages/kotra/carrier/detail?id={0}&&type={1}", cItem.ID,cItem.ProjectType.GetEnumName())
+                                    };
+                                    tradeData.list.Add(dModel);
+                                }
+                            }
+                            //品牌
+                            else if (tradeData.goodType == 2)
+                            {
+                                var brandList = carrierModule.GetBrandList_V2(new RB_Brand_Extend()
+                                {
+                                    TenantId = TenantId,
+                                    QOrderBy = 2,
+                                    QTop = tradeData.goodsLength
+                                });
+                                foreach (var cItem in brandList)
+                                {
+                                    var dModel = new CustomDetailsItem2()
+                                    {
+                                        id = cItem.ID,
+                                        name = cItem.BrandName,
+                                        picUrl = cItem.Logo,
+                                        lableName = cItem.BrandType,
+                                        lableNameList = new List<string>(),
+                                        linkUrl = string.Format("/pages/kotra/brand/detail?id={0}",cItem.ID),
+                                    };
+                                    tradeData.list.Add(dModel);
+                                }
+                            }
+                        }
+                        //手动添加
+                        else
+                        { 
+                        
+                        }
+                    }
+                    obj = new
+                    {
+                        id = subItem.Id,
+                        data = tradeData
+                    };
+                    break;
             }
             return obj;
         }