页面修改

Mall.Module.User/MiniProgramPageModule.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using Mall.Model.Extend.User;
 using Mall.Repository;
+using Mall.Repository.MarketingCenter;
 using Mall.Repository.User;
 
 namespace Mall.Module.User
@@ -22,6 +23,12 @@ namespace Mall.Module.User
         /// </summary>
         private readonly RB_Miniprogram_PageManageRepository miniprogram_PageManageRepository = new RB_Miniprogram_PageManageRepository();
 
+        /// <summary>
+        /// 自定义页面仓储层
+        /// </summary>
+        private readonly RB_Miniprogram_Page_TemplRepository miniprogram_Page_TemplRepository = new RB_Miniprogram_Page_TemplRepository();
+
+
         /// <summary>
         /// 根据查询条件获取小程序列表(单个)
         /// </summary>
@@ -180,7 +187,33 @@ namespace Mall.Module.User
         /// <returns></returns>
         public List<RB_Miniprogram_PageManage_Extend> GetMiniprogram_Page_ListExtModule(RB_MiniProgram_Page_Extend query)
         {
-            return miniprogram_PageManageRepository.GetListExtRepository(query);
+            var list= miniprogram_PageManageRepository.GetListExtRepository(query);
+            if (list == null)
+            {
+                list = new List<RB_Miniprogram_PageManage_Extend>();
+            }
+            //DIY页面
+            var selfPageList = miniprogram_Page_TemplRepository.GetMiniprogramPageTemplListRepository(new Model.Entity.MarketingCenter.RB_Miniprogram_Page_Templ_Extend()
+            {
+                 MallBaseId=query.MallBaseId,
+            });
+            if (selfPageList != null&& selfPageList.Count>0)
+            {
+                foreach (var item in selfPageList)
+                {
+                    list.Add(new RB_Miniprogram_PageManage_Extend()
+                    {
+                        PageId = item.Id,
+                        PageName = item.PageName,
+                        PageUrl = "/pages/index/index?page_id=" + item.Id,
+                        PageType = Common.Enum.MallBase.PageTypeEnum.DiyPage,
+                        IsParameter = 0,
+                        SelfPageName = item.PageName,
+                        ParameterValue = "",
+                    });
+                }
+            }
+            return list;
         }
 
         /// <summary>
@@ -223,8 +256,8 @@ namespace Mall.Module.User
                 Dictionary<string, object> fileds = new Dictionary<string, object>()
                 {
                     { nameof(RB_Miniprogram_PageManage_Extend.PageType),extModel.PageType},
-                    { nameof(RB_Miniprogram_PageManage_Extend.PageName),extModel.PageName},
-                    { nameof(RB_Miniprogram_PageManage_Extend.PageUrl),extModel.PageUrl},
+                    { nameof(RB_Miniprogram_PageManage_Extend.PageName),extModel.PageName.Trim()},
+                    { nameof(RB_Miniprogram_PageManage_Extend.PageUrl),extModel.PageUrl.Trim()},
                     { nameof(RB_Miniprogram_PageManage_Extend.PageSort),extModel.PageSort},
                     { nameof(RB_Miniprogram_PageManage_Extend.IsParameter),extModel.IsParameter},
                     { nameof(RB_Miniprogram_PageManage_Extend.ParameterValue),extModel.ParameterValue},