Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -137,6 +137,26 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 文字位置
         /// </summary>
         public string textPosition { get; set; }
+
+        /// <summary>
+        /// 左边距
+        /// </summary>
+        public string left { get; set; }
+
+        /// <summary>
+        /// 右边距
+        /// </summary>
+        public string right { get; set; }
+
+        /// <summary>
+        /// 上边距
+        /// </summary>
+        public string top { get; set; }
+
+        /// <summary>
+        /// 下边距
+        /// </summary>
+        public string bottom { get; set; }
     }
 
     /// <summary>
@@ -587,6 +607,26 @@ namespace Mall.Model.Extend.MarketingCenter
         /// 选中的第几张图的小区域对应的数据
         /// </summary>
         public List<rubikDetailItem> list { get; set; }
+
+        /// <summary>
+        /// 左边距
+        /// </summary>
+        public string left { get; set; }
+
+        /// <summary>
+        /// 右边距
+        /// </summary>
+        public string right { get; set; }
+
+        /// <summary>
+        /// 上边距
+        /// </summary>
+        public string top { get; set; }
+
+        /// <summary>
+        /// 下边距
+        /// </summary>
+        public string bottom { get; set; }
     }
 
     /// <summary>

Mall.Module.Product/ProductModule.cs

@@ -3461,7 +3461,7 @@ namespace Mall.Module.Product
                             {
                                 PageId = thirdItem.Id + 100000,
                                 PageName = thirdItem.Name,
-                                PageUrl = "/pages/cats/cats?cat_id=" + thirdItem.Id,
+                                PageUrl = "/pages/goods/list?cat_id=" + thirdItem.Id,
                                 PageType = Common.Enum.MallBase.PageTypeEnum.DiyPage,
                                 IsParameter = 0,
                                 TipText = "",
@@ -3498,7 +3498,7 @@ namespace Mall.Module.Product
                         {
                             PageId = secondItem.Id + 100000,
                             PageName = secondItem.Name,
-                            PageUrl = "/pages/cats/cats?cat_id=" + secondItem.Id,
+                            PageUrl = "/pages/goods/list?cat_id=" + secondItem.Id,
                             PageType = Common.Enum.MallBase.PageTypeEnum.DiyPage,
                             IsParameter = 0,
                             TipText = "",
@@ -3526,7 +3526,7 @@ namespace Mall.Module.Product
                     {
                         PageId = firstItem.Id + 100000,
                         PageName = firstItem.Name,
-                        PageUrl = "/pages/cats/cats?cat_id=" + firstItem.Id,
+                        PageUrl = "/pages/cats/cats?cat_type=1&cat_id=" + firstItem.Id,
                         PageType = Common.Enum.MallBase.PageTypeEnum.DiyPage,
                         IsParameter = 0,
                         TipText = "",