商品修改

Mall.Model/Extend/MarketingCenter/RB_Miniprogram_Template_Extend.cs

@@ -883,45 +883,22 @@ namespace Mall.Model.Extend.MarketingCenter
         /// <summary>
         /// 商品编号
         /// </summary>
-        public int Id { get; set; }
+        public int id { get; set; }
 
         /// <summary>
         /// 商品名称
         /// </summary>
-        public string Name { get; set; }
+        public string name { get; set; }
 
         /// <summary>
         /// 商品图片
         /// </summary>
-        public string CoverImage { get; set; }
+        public string picUrl { get; set; }
 
         /// <summary>
         /// 售价
         /// </summary>
-        public decimal SellingPrice { get; set; }
-
-        public int SalesNum { get; set; }
-
-        /// <summary>
-        /// 商品分类列表
-        /// </summary>
-        public List<CategoryItem> CategoryList { get; set; }
-    }
-
-    /// <summary>
-    /// 商品分类
-    /// </summary>
-    public class CategoryItem
-    { 
-        /// <summary>
-        /// 商品分类编号
-        /// </summary>
-        public int Id { get; set; }
-
-        /// <summary>
-        /// 商品分类名称
-        /// </summary>
-        public string CategoryName { get; set; }
+        public decimal price { get; set; }
     }
 
     /// <summary>
@@ -935,12 +912,12 @@ namespace Mall.Model.Extend.MarketingCenter
         public int id { get; set; }
 
         /// <summary>
-        /// 分类名称
+        /// 商品分类
         /// </summary>
         public string name { get; set; }
 
         /// <summary>
-        /// 分类名称
+        /// 菜单名称
         /// </summary>
         public string menuName { get; set; }
 
@@ -950,36 +927,16 @@ namespace Mall.Model.Extend.MarketingCenter
         public int goodsNum { get; set; }
 
         /// <summary>
-        /// 商品列表
-        /// </summary>
-        public List<GoodsDetailsItem> goodsList { get; set; }
-    }
-
-    /// <summary>
-    /// 商品详情项
-    /// </summary>
-    public class GoodsDetailsItem
-    {
-        /// <summary>
-        /// 商品编号
-        /// </summary>
-        public int id { get; set; }
-
-        /// <summary>
-        /// 商品名称
+        /// 是否显示自定义商品
         /// </summary>
-        public string Name { get; set; }
+        public bool staticGoods { get; set; }
 
         /// <summary>
-        /// 商品图片
-        /// </summary>
-        public string picUrl { get; set; }
-
-        /// <summary>
-        /// 售价
+        /// 商品列表
         /// </summary>
-        public decimal SellingPrice { get; set; }
+        public List<GoodsDetailsItem2> goodsList { get; set; }
     }
+ 
 
     /// <summary>
     /// 门店插件

Mall.WebApi/Controllers/Mall/MallController.cs

@@ -400,6 +400,29 @@ namespace Mall.WebApi.Controllers.MallBase
                 //商品插件
                 case "goods":
                     var goodsData = subItem.data as goodsItem;
+                    if (goodsData != null)
+                    {
+                        if (goodsData.list != null && goodsData.list.Count > 0)
+                        {
+                            foreach (var childItem in goodsData.list)
+                            {
+                                childItem.picUrl = Common.Config.GetFileUrl(childItem.picUrl);
+                            }
+                        }
+                        if (goodsData.catList != null && goodsData.catList.Count > 0)
+                        {
+                            foreach (var childItem in goodsData.catList)
+                            {
+                                if (childItem.goodsList != null && childItem.goodsList.Count > 0)
+                                {
+                                    foreach (var lastItem in childItem.goodsList)
+                                    {
+                                        lastItem.picUrl = Common.Config.GetFileUrl(lastItem.picUrl);
+                                    }
+                                }
+                            }
+                        }
+                    }
                     obj = new
                     {
                         id = subItem.Id,

Mall.WebApi/Startup.cs

@@ -47,7 +47,8 @@ namespace Mall.WebApi
                 "http://localhost:8081",
                 "http://localhost:8080",
                 "http://localhost:8082",
-                "http://127.0.0.1:50512"
+                "http://127.0.0.1:50512",
+                "http://127.0.0.1:20224"
             };
             services.AddCors(options => options.AddPolicy("AllowCors", policy => policy.AllowAnyHeader().AllowAnyMethod().AllowCredentials().WithOrigins(corsArray.ToArray())));
         }