页面修改

Mall.Model/Entity/User/RB_MiniProgram.cs

@@ -377,5 +377,10 @@ namespace Mall.Model.Entity.User
         /// </summary>
         public string Version { get; set; }
 
+        /// <summary>
+        /// 小程序首页配置
+        /// </summary>
+        public string MallHomeData { get; set; }
+
     }
 }

Mall.Model/Extend/User/RB_MiniProgram_Extend.cs

@@ -93,6 +93,112 @@ namespace Mall.Model.Extend.User
         /// </summary>
         public string[] JumpAppIdList { get; set; }
 
-     
+        /// <summary>
+        /// 小程序首页数据
+        /// </summary>
+        public List<HomeItem> HomeDataList { get; set; }
+    }
+
+    /// <summary>
+    /// 首页数据项
+    /// </summary>
+    public class HomeItem
+    { 
+        /// <summary>
+        /// 插件Key
+        /// </summary>
+       public string key { get; set; }
+
+        /// <summary>
+        /// 插件名称
+        /// </summary>
+        public string name { get; set; }
+
+        /// <summary>
+        /// 关系Id
+        /// </summary>
+        public int relation_id { get; set; }
+
+        /// <summary>
+        /// 是否可编辑[0-不可编辑,1-可编辑]
+        /// </summary>
+        public int is_edit { get; set; }
+
+        /// <summary>
+        /// 图片地址
+        /// </summary>
+        public string imgBg { get; set; }
+
+        /// <summary>
+        /// 图标一行显示个数【导航图标插件】
+        /// </summary>
+        public int row_num { get; set; }
+
+        /// <summary>
+        /// 插件permission_key【video、topic、coupon】
+        /// </summary>
+        public string permission_key { get; set; }
+
+        /// <summary>
+        /// 视频地址【视频插件、】
+        /// </summary>
+        public string video_url { get; set; }
+
+        /// <summary>
+        /// 视频封面图【视频插件、】
+        /// </summary>
+        public string video_pic_url { get; set; }
+
+        /// <summary>
+        /// 公告图片地址【公告插件】
+        /// </summary>
+        public string notice_url { get; set; }
+
+        /// <summary>
+        /// 公告背景颜色【公告插件】
+        /// </summary>
+        public string notice_bg_color { get; set; }
+
+        /// <summary>
+        /// 公告文字颜色【公告插件】
+        /// </summary>
+        public string notice_text_color { get; set; }
+
+        /// <summary>
+        /// 专题显示数量【专题插件】
+        /// </summary>
+        public int topic_num { get; set; }
+
+        /// <summary>
+        /// 图标(1个专题)【专题插件】
+        /// </summary>
+        public string topic_url { get; set; }
+
+        /// <summary>
+        /// 图标(2个专题)【专题插件】
+        /// </summary>
+        public string topic_url_2 { get; set; }
+
+        /// <summary>
+        /// 专题标签图片【专题插件】
+        /// </summary>
+        public string label_url { get; set; }
+
+        /// <summary>
+        /// 已领取图
+        /// </summary>
+        public string coupon_url { get; set; }
+
+        /// <summary>
+        /// 未领取图（满减券）
+        /// </summary>
+        public string coupon_not_url { get; set; }
+
+        /// <summary>
+        /// 打折券未认领
+        /// </summary>
+        public string discount_not_url { get; set; }
+
     }
+ 
 }

Mall.Module.User/MiniProgramModule.cs

@@ -401,8 +401,9 @@ namespace Mall.Module.User
         /// <param name="MallBaseId">小程序Id</param>
         /// <param name="isGetNav">是否获取顶部底部配置+底部标签导航(0-不获取,1-获取)</param>
         /// <param name="isGetUserCenterMenu">是否获取用户中心菜单</param>
+        /// <param name="isGetHomeData">是否获取首页配置数据</param>
         /// <returns></returns>
-        public RB_MiniProgram_Extend GetMiniProgramModule(object MallBaseId, int isGetNav = 0, bool isGetUserCenterMenu = false)
+        public RB_MiniProgram_Extend GetMiniProgramModule(object MallBaseId, int isGetNav = 0, bool isGetUserCenterMenu = false,bool isGetHomeData=false)
         {
             RB_MiniProgram_Extend extModel = programRepository.GetEntity<RB_MiniProgram_Extend>(MallBaseId);
             if (extModel == null)
@@ -428,6 +429,13 @@ namespace Mall.Module.User
                     extModel.SelfMenuList = menuList?.Where(qitem => qitem.MenuType == 4)?.ToList();
                 }
             }
+            if (isGetHomeData)
+            {
+                if (extModel.MallHomeData != null && !string.IsNullOrEmpty(extModel.MallHomeData))
+                {
+                    extModel.HomeDataList = Common.Plugin.JsonHelper.DeserializeObject<List<HomeItem>>(extModel.MallHomeData);
+                }
+            }
             return extModel;
         }
 
@@ -467,6 +475,24 @@ namespace Mall.Module.User
             return flag;
         }
 
+        /// <summary>
+        /// 修改小程序首页布局
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetMiniProgramMallHomeModule(RB_MiniProgram_Extend extModel)
+        {
+            bool flag = false;
+            if (extModel.MallBaseId > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(RB_MiniProgram_Extend.MallHomeData),extModel.MallHomeData},
+                };
+                flag = programRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_Extend.MallBaseId), extModel.MallBaseId));
+            }
+            return flag;
+        }
 
 
         /// <summary>

Mall.WebApi/Controllers/User/TenantController.cs

@@ -423,13 +423,14 @@ namespace Mall.WebApi.Controllers.User
         }
 
         /// <summary>
-        /// 默认小程序首页配置
+        /// 获取小程序首页配置
         /// </summary>
         /// <returns></returns>
         public ApiResult GetMiniProgramMallIndex()
         {
-            List<object> resultList = new List<object>();
+            var data = programModule.GetMiniProgramModule(RequestParm.MallBaseId, isGetHomeData: true);
 
+            List<object> resultList = new List<object>();
             List<object> normalList = new List<object>();
             normalList.Add(new
             {
@@ -437,7 +438,7 @@ namespace Mall.WebApi.Controllers.User
                 name = "搜索框",
                 relation_id = 0,
                 is_edit = 0,
-                imgBg=Common.Config.GetOssFileUrl+ "/Static/search-bg.png"
+                imgBg = Common.Config.GetOssFileUrl + "/Static/search-bg.png"
             });
             normalList.Add(new
             {
@@ -453,7 +454,7 @@ namespace Mall.WebApi.Controllers.User
                 name = "导航图标",
                 relation_id = 0,
                 is_edit = 1,
-                row_num=4,
+                row_num = 4,
                 imgBg = Common.Config.GetOssFileUrl + "/Static/home-nav-bg.png"
             });
             normalList.Add(new
@@ -506,13 +507,12 @@ namespace Mall.WebApi.Controllers.User
 
             resultList.Add(new
             {
-                key="normal",
-                name="常用",
-                list= normalList
+                key = "normal",
+                name = "常用",
+                list = normalList
             });
-            var categoryList= productModule.GetCategoryListModule(new Model.Extend.Product.RB_Product_Category_Extend() {
-                MallBaseId = RequestParm.MallBaseId, TenantId = RequestParm.TenantId, Tier = 1,IsShow=1,
-            
+            var categoryList = productModule.GetCategoryListModule(new Model.Extend.Product.RB_Product_Category_Extend() {
+                MallBaseId = RequestParm.MallBaseId, TenantId = RequestParm.TenantId, Tier = 1, IsShow = 1, Enabled = 1
             });
             List<object> catList = new List<object>();
             catList.Add(new
@@ -542,8 +542,18 @@ namespace Mall.WebApi.Controllers.User
                 list = catList
             });
 
+            var magicList = programModule.GetMallMagicListModule(new RB_Mall_Magic_Extend() { MallBaseId = RequestParm.MallBaseId, TenantId = RequestParm.TenantId });
             List<object> blockList = new List<object>();
-
+            foreach (var item in magicList)
+            {
+                blockList.Add(new
+                {
+                    key = "block",
+                    name = item.Name,
+                    relation_id = item.Id,
+                    imgBg = Common.Config.GetOssFileUrl + "/Static/block-bg.png"
+                });
+            }
             resultList.Add(new
             {
                 key = "block",
@@ -559,7 +569,7 @@ namespace Mall.WebApi.Controllers.User
                 name = "预约",
                 relation_id = 0,
                 is_edit = 0,
-                permission_key= "booking",
+                permission_key = "booking",
                 imgBg = Common.Config.GetOssFileUrl + "/Static/yuyue-bg.png"
             });
             pluginList.Add(new
@@ -586,10 +596,29 @@ namespace Mall.WebApi.Controllers.User
                 name = "插件",
                 list = pluginList
             });
-
-            return ApiResult.Success(data: resultList);
+            var obj = new
+            {
+                PlusInData = resultList,
+                HomeDataList = data.HomeDataList
+            };
+            return ApiResult.Success(data: obj);
         }
 
+        /// <summary>
+        /// 添加修改小程序首页配置
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMiniProgramMallHome()
+        {
+            var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_Extend>(RequestParm.msg.ToString());
+            if (extModel.HomeDataList != null && extModel.HomeDataList.Count > 0)
+            {
+                extModel.MallHomeData = JsonConvert.SerializeObject(extModel.HomeDataList);
+            }
+            var flag = programModule.SetMiniProgramMallHomeModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+ 
+        }
 
         #region 设置可跳转小程序 OR  是否开启直播
         /// <summary>