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

Mall.Common/Enum/MallBase/MallShopStyleEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Common.Enum.MallBase
+{
+    /// <summary>
+    /// 商城风格类型(0-默认，1活力黄，2浪漫粉,3-流光金，4-优雅紫，5-品味红，6-清新绿，7商务蓝，8纯粹黑，9-热情红)
+    /// </summary>
+    public enum MallShopStyleEnum
+    {
+        /// <summary>
+        /// 默认
+        /// </summary>
+        [EnumField("默认")]
+        Default = 0,
+
+        /// <summary>
+        /// 1活力黄
+        /// </summary>
+        [EnumField("活力黄")]
+        VibrantYellow = 1,
+
+        /// <summary>
+        /// 2浪漫粉
+        /// </summary>
+        [EnumField("浪漫粉")]
+        RomanticPowder = 2,
+
+        /// <summary>
+        /// 流光金
+        /// </summary>
+        [EnumField("流光金")]
+        StreamerGold = 3,
+
+        /// <summary>
+        /// 优雅紫
+        /// </summary>
+        [EnumField("优雅紫")]
+        ElegantPurple = 4,
+
+        /// <summary>
+        /// 优雅紫
+        /// </summary>
+        [EnumField("品味红")]
+        TasteRed = 5,
+
+        /// <summary>
+        /// 清新绿
+        /// </summary>
+        [EnumField("清新绿")]
+        FreshGreen = 6,
+
+        /// <summary>
+        /// 商务蓝
+        /// </summary>
+        [EnumField("商务蓝")]
+        BusinessBlue = 7,
+        /// <summary>
+        /// 纯粹黑
+        /// </summary>
+        [EnumField("纯粹黑")]
+        PureBlack = 8,
+
+        /// <summary>
+        /// 热情红
+        /// </summary>
+        [EnumField("热情红")]
+        PassionateRed = 9,
+    }
+}

Mall.Common/Enum/MallBase/PageTypeEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Common.Enum.MallBase
+{
+    /// <summary>
+    /// 页面类型枚举  (1-基础页面,2-营销页面，3-订单页面，4-插件页面，5-diy页面
+    /// </summary>
+    public enum PageTypeEnum
+    {
+        /// <summary>
+        /// 基础页面
+        /// </summary>
+        [EnumField("基础页面")]
+        BasicPage = 1,
+
+        /// <summary>
+        /// 营销页面
+        /// </summary>
+        [EnumField("营销页面")]
+        MarketingPage = 2,
+
+
+        /// <summary>
+        /// 订单页面
+        /// </summary>
+        [EnumField("订单页面")]
+        OrderPage = 3,
+
+        /// <summary>
+        /// 插件页面
+        /// </summary>
+        [EnumField("插件页面")]
+        PluginPage = 4,
+
+        /// <summary>
+        /// diy页面
+        /// </summary>
+        [EnumField("diy页面")]
+        DiyPage = 5,
+    }
+}

Mall.Common/Enum/MallBase/StoreTypeEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Common.Enum.MallBase
+{
+    public enum StoreTypeEnum
+    {
+        /// <summary>
+        /// 腾讯云COS
+        /// </summary>
+        [EnumField("腾讯云COS")]
+        Tencent = 1,
+        /// <summary>
+        /// 七牛云存储
+        /// </summary>
+        [EnumField("七牛云存储")]
+        QiNiu = 2,
+        /// <summary>
+        /// 自定义存储
+        /// </summary>
+        [EnumField("自定义存储")]
+        Other = 3
+    }
+}

Mall.Model/Entity/BaseSetUp/RB_File_Store.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.MallBase;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.BaseSetUp
+{
+    /// <summary>
+    /// 文件上传位置
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_File_Store
+    {
+
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+        /// <summary>
+        /// 0-否1-是
+        /// </summary>
+        public int IsDefault { get; set; }
+
+        public int Status { get; set; }
+
+        public DateTime CreateDate { get; set; }
+        public DateTime UpdateDate { get; set; }
+
+        /// <summary>
+        /// 空间名称
+        /// </summary>
+        public string Bucket { get; set; }
+
+        /// <summary>
+        /// 存储位置，1-腾讯云，2-七牛，3-其他
+        /// </summary>
+        public StoreTypeEnum StoreType { get; set; }
+
+        /// <summary>
+        /// 所属区域
+        /// </summary>
+        public string Region { get; set; }
+
+        /// <summary>
+        /// 自定义域名
+        /// </summary>
+        public string CustomDomain { get; set; }
+
+
+        /// <summary>
+        /// 自定义域名
+        /// </summary>
+        public string SecretKey { get; set; }
+        /// <summary>
+        /// 自定义域名
+        /// </summary>
+        public string SecretId { get; set; }
+        /// <summary>
+        /// 图片样式接口（七牛）
+        /// </summary>
+        public string ImgStyle { get; set; }
+
+    }
+}

Mall.Model/Entity/MarketingCenter/RB_Recharge_Rules.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.MarketingCenter
+{
+    /// <summary>
+    /// 充值实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Recharge_Rules
+    {
+
+        public int ID { get; set; }
+
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public int TenantId { get; set; }
+
+        /// <summary>
+        /// 小程序id
+        /// </summary>
+        public int MallBaseId { get; set; }
+
+
+        public int Status { get; set; }
+
+        public DateTime CreateDate { get; set; }
+        public DateTime UpdateDate { get; set; }
+
+
+        /// <summary>
+        /// 充值名称
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 充值金额
+        /// </summary>
+        public int Money { get; set; }
+
+
+        /// <summary>
+        /// 赠送金额
+        /// </summary>
+        public int GiveMoney { get; set; }
+
+
+        /// <summary>
+        /// 赠送积分
+        /// </summary>
+        public int GiveIntegral { get; set; }
+    }
+}

Mall.Model/Entity/User/RB_MiniProgram.cs

 using Mall.Common.AOP;
+using Mall.Common.Enum.MallBase;
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -85,5 +86,35 @@ namespace Mall.Model.Entity.User
         /// 版权链接页面
         /// </summary>
         public string CopyRightLink { get; set; }
+
+        /// <summary>
+        /// 商城风格
+        /// </summary>
+        public MallShopStyleEnum MallShopStyle { get; set; }
+
+        /// <summary>
+        /// 顶部标题文件颜色类型(0-白色，1-黑色)
+        /// </summary>
+        public int TopNavWordType { get; set; }
+
+        /// <summary>
+        /// 顶部标题文字颜色
+        /// </summary>
+        public string TopNavWordColor { get; set; }
+
+        /// <summary>
+        /// 顶部导航栏背景颜色
+        /// </summary>
+        public string TopNavBgColor { get; set; }
+
+        /// <summary>
+        /// 底部导航栏背景颜色
+        /// </summary>
+        public string BottomNavBgColor { get; set; }
+
+        /// <summary>
+        /// 导航底部是否开启阴影效果(0-未开启，1-开启)
+        /// </summary>
+        public int BottomNavIsShadow { get; set; }
     }
 }

Mall.Model/Entity/User/RB_MiniProgram_Navicon.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 导航图标实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_MiniProgram_Navicon
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>        
+        public int NavIconId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 小程序Id
+        /// </summary>        
+        public int? MallBaseId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 导航名称
+        /// </summary>        
+        public string NavIconName
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 导航图标
+        /// </summary>        
+        public string NavIconImg
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 导航链接
+        /// </summary>        
+        public string NavIconUrl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 导航排序
+        /// </summary>        
+        public int? NavIconSort
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 导航是否显示(0-显示，1-不显示)
+        /// </summary>        
+        public int? NavIconIsShow
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 状态(0-正常，1-删除)
+        /// </summary>
+        public int NavIconStatus { get; set; }
+    }
+}

Mall.Model/Entity/User/RB_MiniProgram_Page.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.MallBase;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 小程序页面实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_MiniProgram_Page
+    {
+        /// <summary>
+        /// 主键编号
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 页面Id
+        /// </summary>        
+        public int? PageId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 小程序Id
+        /// </summary>        
+        public int? MallBaseId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 自定义页面名称
+        /// </summary>        
+        public string SelfPageName
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/User/RB_Miniprogram_Bottomnav.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 底部导航标签实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Miniprogram_Bottomnav
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>        
+        public int TagId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 商户号Id
+        /// </summary>        
+        public int? TenantId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 小程序Id
+        /// </summary>        
+        public int? MallBaseId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 默认图标
+        /// </summary>        
+        public string DefaultIcon
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 选中图标
+        /// </summary>        
+        public string CheckedIcon
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 标签名称
+        /// </summary>        
+        public string TagName
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 默认文字颜色
+        /// </summary>        
+        public string DefaultColor
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 选择文字颜色
+        /// </summary>        
+        public string CheckedColor
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 标签链接
+        /// </summary>        
+        public string TagLink
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/User/RB_Miniprogram_PageManage.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.MallBase;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.User
+{
+    /// <summary>
+    /// 小程序页面管理实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Miniprogram_PageManage
+    {
+        /// <summary>
+        /// 页面编号
+        /// </summary>        
+        public int PageId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 页面类型(1-基础页面,2-营销页面，3-订单页面，4-插件页面，5-diy页面
+        /// </summary>        
+        public PageTypeEnum PageType
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 页面名称
+        /// </summary>        
+        public string PageName
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 页面地址
+        /// </summary>        
+        public string PageUrl
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 页面排序
+        /// </summary>        
+        public int? PageSort
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 是否有参数(0-无参数，1-有参数)
+        /// </summary>        
+        public int? IsParameter
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 参数值
+        /// </summary>        
+        public string ParameterValue
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 状态
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Extend/BaseSetUp/RB_Logistics_RulesRegion_Extend.cs

@@ -19,5 +19,11 @@ namespace Mall.Model.Extend.BaseSetUp
         public string RegionName { get; set; }
 
         public string PriceIds { get; set; }
+
+
+        /// <summary>
+        /// 地区父级id
+        /// </summary>
+        public int ParentID { get; set; }
     }
 }

Mall.Model/Extend/MarketingCenter/RB_Recharge_Rules_Extend.cs

+using Mall.Common.AOP;
+using Mall.Model.Entity.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.MarketingCenter
+{
+    /// <summary>
+    /// 充值扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Recharge_Rules_Extend : RB_Recharge_Rules
+    {
+
+    }
+}

Mall.Model/Extend/User/RB_MiniProgram_Extend.cs

@@ -60,5 +60,10 @@ namespace Mall.Model.Extend.User
                 return str;
             }
         }
+
+        /// <summary>
+        /// 底部导航列表
+        /// </summary>
+        public List<RB_Miniprogram_Bottomnav_Extend> BottomTagList { get; set; }
     }
 }

Mall.Model/Extend/User/RB_MiniProgram_Navicon_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.User
+{
+    /// <summary>
+    /// 导航图标扩展实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_MiniProgram_Navicon_Extend : Model.Entity.User.RB_MiniProgram_Navicon
+    {
+        /// <summary>
+        /// 导航是否显示字符串
+        /// </summary>
+        public string NavIconIsShowStr
+        {
+            get
+            {
+                string str = "显示";
+                if (this.NavIconIsShow > 0 && this.NavIconIsShow == 1)
+                {
+                    str = "不显示";
+                }
+                return str;
+            }
+        }
+    }
+}

Mall.Model/Extend/User/RB_MiniProgram_Page_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.User
+{
+    /// <summary>
+    /// 小程序页面扩展实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_MiniProgram_Page_Extend : Model.Entity.User.RB_MiniProgram_Page
+    {
+       
+    }
+}

Mall.Model/Extend/User/RB_Miniprogram_Bottomnav_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.User
+{
+    /// <summary>
+    /// 底部导航标签扩展实体类
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Miniprogram_Bottomnav_Extend:Model.Entity.User.RB_Miniprogram_Bottomnav
+    {
+
+    }
+}

Mall.Model/Extend/User/RB_Miniprogram_PageManage_Extend.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Extend.User
+{
+    /// <summary>
+    /// 小程序页面管理扩展实体类
+    /// </summary>
+    public class RB_Miniprogram_PageManage_Extend : Model.Entity.User.RB_Miniprogram_PageManage
+    {
+        /// <summary>
+        /// 页面类型字符串
+        /// </summary>
+        public string PageTypeStr
+        {
+            get
+            {
+                string str = "";
+                str = Common.Plugin.EnumHelper.GetEnumName(this.PageType);
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 页面类型【查询使用】
+        /// </summary>
+        public int QPageType { get; set; }
+
+        /// <summary>
+        /// 状态字符串
+        /// </summary>
+        public string StatusStr
+        {
+            get
+            {
+                string str = "正常";
+                if (this.Status > 0 && this.Status == 1)
+                {
+                    str = "禁用";
+                }
+                return str;
+            }
+        }
+
+        /// <summary>
+        /// 自定义页面标题
+        /// </summary>
+        public string SelfPageName { get; set; }
+
+        /// <summary>
+        /// 小程序页面表Id
+        /// </summary>
+        public int Id { get; set; }
+    }
+}

Mall.Module.BaseSetUp/MallBaseModule.cs

@@ -23,6 +23,8 @@ namespace Mall.Module.BaseSetUp
         private RB_Logistics_DeliveryRepository deliveryRepository = new RB_Logistics_DeliveryRepository();
         private RB_Logistics_ExpressRepository expressRepository = new RB_Logistics_ExpressRepository();
         private RB_ElectronicSheetRepository electronicSheetRepository = new RB_ElectronicSheetRepository();
+
+        private RB_File_StoreRepository storeRepository = new RB_File_StoreRepository();
         #region 基础设置
         /// <summary>
         /// 获取小程序列表
@@ -877,5 +879,35 @@ namespace Mall.Module.BaseSetUp
         }
         #endregion
 
+        #region 上传设置
+        /// <summary>
+        /// 获取上传存储信息
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_File_Store> GetFileStoreList(RB_File_Store query)
+        {
+            return storeRepository.GetListRepository(query);
+        }
+
+
+        /// <summary>
+        /// 新增/修改存储位置
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        public bool AddOrUpdateFileStore(RB_File_Store model)
+        {
+            if (model.ID == 0)
+            {
+                return storeRepository.Insert(model) > 0;
+            }
+            else
+            {
+                return storeRepository.Update(model);
+            }
+        }
+        #endregion
+
     }
 }

Mall.Module.MarketingCenter/Mall.Module.MarketingCenter.csproj

+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Mall.Common\Mall.Common.csproj" />
+    <ProjectReference Include="..\Mall.Model\Mall.Model.csproj" />
+    <ProjectReference Include="..\Mall.Repository\Mall.Repository.csproj" />
+  </ItemGroup>
+
+</Project>

Mall.Module.MarketingCenter/RechargeModule.cs

+using Mall.Model.Extend.MarketingCenter;
+using Mall.Repository.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Module.MarketingCenter
+{
+    public class RechargeModule
+    {
+        private RB_Recharge_RulesRepository rulesRepository = new RB_Recharge_RulesRepository();
+
+
+        #region 充值信息
+        /// <summary>
+        /// 充值信息列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Recharge_Rules_Extend> GetRechargeRulesPageList(int pageIndex, int pageSize, out long rowCount, RB_Recharge_Rules_Extend query)
+        {
+            return rulesRepository.GetRechargeRulesPageList(pageIndex, pageSize, out rowCount, query);
+        }
+
+
+        /// <summary>
+        /// 充值信息列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Recharge_Rules_Extend> GetRechargeRulesList(RB_Recharge_Rules_Extend query)
+        {
+            return rulesRepository.GetRechargeRulesList(query);
+        }
+
+
+        public bool AddOrUpdateRechargeRules(RB_Recharge_Rules_Extend model)
+        {
+            if (model.ID == 0)
+            {
+                return rulesRepository.Insert(model) > 0;
+            }
+            else
+            {
+                return rulesRepository.Update(model);
+            }
+        }
+
+        #endregion
+
+    }
+}

Mall.Module.User/MiniProgramModule.cs

@@ -14,7 +14,12 @@ namespace Mall.Module.User
         /// <summary>
         /// 商户仓储层对象
         /// </summary>
-        private Mall.Repository.User.RB_MiniProgramRepository  programRepository = new Repository.User.RB_MiniProgramRepository();
+        private Mall.Repository.User.RB_MiniProgramRepository programRepository = new Repository.User.RB_MiniProgramRepository();
+
+        /// <summary>
+        /// 底部导航仓储层对象
+        /// </summary>
+        private Repository.User.RB_Miniprogram_BottomnavRepository bottomnavRepository = new Repository.User.RB_Miniprogram_BottomnavRepository();
 
 
         /// <summary>
@@ -93,11 +98,68 @@ namespace Mall.Module.User
                 extModel.CreateDate = DateTime.Now;
                 int NewId = programRepository.Insert(extModel);
                 extModel.MallBaseId = NewId;
+                if (extModel.BottomTagList != null)
+                {
+                    SetMiniProgramMallTagModule(extModel, isUpdateBasic: false);
+                }
                 flag = NewId > 0;
             }
             return flag;
         }
 
+        /// <summary>
+        /// 设置顶部和底部导航配置
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetMiniProgramMallTagModule(RB_MiniProgram_Extend extModel,bool isUpdateBasic=true)
+        {
+            bool flag = false;
+            if (extModel.MallBaseId > 0)
+            {
+                if (isUpdateBasic)
+                {
+                    Dictionary<string, object> fileds = new Dictionary<string, object>()
+                    {
+                        { nameof(RB_MiniProgram_Extend.TopNavWordType),extModel.TopNavWordType},
+                        { nameof(RB_MiniProgram_Extend.TopNavWordColor),extModel.TopNavWordColor},
+                        { nameof(RB_MiniProgram_Extend.TopNavBgColor),extModel.TopNavBgColor},
+                        { nameof(RB_MiniProgram_Extend.BottomNavBgColor),extModel.BottomNavBgColor},
+                        { nameof(RB_MiniProgram_Extend.BottomNavIsShadow),extModel.BottomNavIsShadow},
+                    };
+                    flag = programRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_Extend.MallBaseId), extModel.MallBaseId));
+                }
+         
+                if (extModel.BottomTagList != null && extModel.BottomTagList.Count > 0)
+                {
+                    foreach (var item in extModel.BottomTagList)
+                    {
+                        if (item.TagId > 0)
+                        {
+                            Dictionary<string, object> tagfileds = new Dictionary<string, object>()
+                            {
+                                { nameof(RB_Miniprogram_Bottomnav_Extend.DefaultIcon),item.DefaultIcon},
+                                { nameof(RB_Miniprogram_Bottomnav_Extend.CheckedIcon),item.CheckedIcon},
+                                { nameof(RB_Miniprogram_Bottomnav_Extend.TagName),item.TagName},
+                                { nameof(RB_Miniprogram_Bottomnav_Extend.DefaultColor),item.DefaultColor},
+                                { nameof(RB_Miniprogram_Bottomnav_Extend.CheckedColor),item.CheckedColor},
+                                { nameof(RB_Miniprogram_Bottomnav_Extend.TagLink),item.TagLink},
+                            };
+                            flag = bottomnavRepository.Update(tagfileds, new WhereHelper(nameof(RB_Miniprogram_Bottomnav_Extend.TagId), item.TagId));
+                        }
+                        else
+                        {
+                            item.MallBaseId = extModel.MallBaseId;
+                            item.TenantId = extModel.TenantId;
+                            item.Status = 0;
+                            flag = bottomnavRepository.Insert(item) > 0;
+                        }
+                    }
+                }
+            }
+            return flag;
+        }
+
         /// <summary>
         /// 修改小程序版权信息
         /// </summary>
@@ -152,5 +214,42 @@ namespace Mall.Module.User
             flag = programRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_Extend.MallBaseId), MallBaseId));
             return flag;
         }
+
+        /// <summary>
+        /// 修改小程序商城风格信息
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetMiniProgramMallShopStyleModule(RB_MiniProgram_Extend extModel)
+        {
+            bool flag = false;
+            if (extModel.MallBaseId > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(RB_MiniProgram_Extend.MallShopStyle),extModel.MallShopStyle},
+                };
+                flag = programRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_Extend.MallBaseId), extModel.MallBaseId));
+            }
+            return flag;
+        }
+
+        
+
+        /// <summary>
+        /// 删除小程序底部导航
+        /// </summary>
+        /// <param name="TagId"></param>
+        /// <returns></returns>
+        public bool RemoveMiniProgramMallTagModule(object TagId)
+        {
+            var flag = false;
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                { nameof(RB_Miniprogram_Bottomnav_Extend.Status),1},
+            };
+            flag = programRepository.Update(fileds, new WhereHelper(nameof(RB_Miniprogram_Bottomnav_Extend.TagId), TagId));
+            return flag;
+        }
     }
 }

Mall.Module.User/MiniProgramNaviconModule.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Extend.User;
+using Mall.Repository;
+
+namespace Mall.Module.User
+{
+    /// <summary>
+    /// 导航图标处理类
+    /// </summary>
+    public class MiniProgramNaviconModule
+    {
+        /// <summary>
+        /// 导航图标仓储层对象
+        /// </summary>
+        private Mall.Repository.User.RB_MiniProgram_NaviconRepository  naviconRepository = new Repository.User.RB_MiniProgram_NaviconRepository();
+
+        /// <summary>
+        /// 根据查询条件获取小程序导航图标列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_MiniProgram_Navicon_Extend> GetMiniProgramNaviconListModule(RB_MiniProgram_Navicon_Extend query)
+        {
+            return naviconRepository.GetListRepository(query);
+        }
+
+
+        /// <summary>
+        /// 获取小程序导航图标分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_MiniProgram_Navicon_Extend> GetMiniProgramNaviconPageListModule(int pageIndex, int pageSize, out long rowCount, RB_MiniProgram_Navicon_Extend query)
+        {
+            return naviconRepository.GetPageListRepository(pageIndex, pageSize, out rowCount, query);
+        }
+
+        /// <summary>
+        /// 添加修改小程序导航图标
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetMiniProgramNaviconModule(RB_MiniProgram_Navicon_Extend extModel)
+        {
+            bool flag = false;
+          
+            if (extModel.NavIconId > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(RB_MiniProgram_Navicon_Extend.NavIconName),extModel.NavIconName},
+                    { nameof(RB_MiniProgram_Navicon_Extend.NavIconImg),extModel.NavIconImg},
+                    { nameof(RB_MiniProgram_Navicon_Extend.NavIconUrl),extModel.NavIconUrl},
+                    { nameof(RB_MiniProgram_Navicon_Extend.NavIconSort),extModel.NavIconSort},
+                    { nameof(RB_MiniProgram_Navicon_Extend.NavIconIsShow),extModel.NavIconIsShow},
+                };
+                flag = naviconRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_Navicon_Extend.NavIconId), extModel.NavIconId));
+            }
+            else
+            {
+                int NewId = naviconRepository.Insert(extModel);
+                extModel.NavIconId = NewId;
+                flag = NewId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 删除小程序导航图标
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool RemoveMiniProgramNaviconModule(object NavIconId)
+        {
+            bool flag = false;
+
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                { nameof(RB_MiniProgram_Navicon_Extend.NavIconStatus),1},
+            };
+            flag = naviconRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_Navicon_Extend.NavIconId), NavIconId));
+            return flag;
+        }
+
+        /// <summary>
+        /// 根据编号获取小程序导航
+        /// </summary>
+        /// <param name="NavIconId"></param>
+        /// <returns></returns>
+        public RB_MiniProgram_Navicon_Extend GetMiniProgramNaviconModule(object NavIconId)
+        {
+            RB_MiniProgram_Navicon_Extend extModel = naviconRepository.GetEntity<RB_MiniProgram_Navicon_Extend>(NavIconId);
+            if (extModel == null)
+            {
+                extModel = new RB_MiniProgram_Navicon_Extend();
+            }
+            return extModel;
+        } 
+    }
+}

Mall.Module.User/MiniProgramPageModule.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Extend.User;
+using Mall.Repository;
+using Mall.Repository.User;
+
+namespace Mall.Module.User
+{
+    /// <summary>
+    /// 小程序页面处理类
+    /// </summary>
+    public class MiniProgramPageModule
+    {
+        /// <summary>
+        /// 小程序页面仓储层对象
+        /// </summary>
+        private readonly RB_MiniProgram_PageRepository miniProgram_PageRepository = new RB_MiniProgram_PageRepository();
+
+        /// <summary>
+        /// 小程序页面管理仓储层对象
+        /// </summary>
+        private readonly RB_Miniprogram_PageManageRepository miniprogram_PageManageRepository = new RB_Miniprogram_PageManageRepository();
+
+        /// <summary>
+        /// 根据查询条件获取小程序列表(单个)
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_MiniProgram_Page_Extend> GetMiniProgramPage_ListModule(RB_MiniProgram_Page_Extend query)
+        {
+            return miniProgram_PageRepository.GetListRepository(query);
+        }
+
+        /// <summary>
+        /// 获取小程序分页列表(单个)
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_MiniProgram_Page_Extend> GetMiniProgramPage_PageListModule(int pageIndex, int pageSize, out long rowCount, RB_MiniProgram_Page_Extend query)
+        {
+            return miniProgram_PageRepository.GetPageListRepository(pageIndex, pageSize, out rowCount, query);
+        }
+
+        /// <summary>
+        /// 新增修改小程序页面(单个)
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetMiniProgram_Page_Module(RB_MiniProgram_Page_Extend extModel)
+        {
+            bool flag = false;
+            if (extModel.Id > 0)
+            {
+                Dictionary<string, object> fileds = new Dictionary<string, object>()
+                {
+                    { nameof(RB_MiniProgram_Page_Extend.Id),extModel.Id},
+                    { nameof(RB_MiniProgram_Page_Extend.MallBaseId),extModel.MallBaseId},
+                    { nameof(RB_MiniProgram_Page_Extend.PageId),extModel.PageId},
+             
+                };
+                flag = miniProgram_PageRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_Page_Extend.Id), extModel.Id));
+            }
+            else
+            {
+                int NewId = miniProgram_PageRepository.Insert(extModel);
+                extModel.Id = NewId;
+                flag = NewId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 判断小程序是否存在页面
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public int CheckMiniProgram_Page(RB_MiniProgram_Page_Extend query)
+        {
+            List<WhereHelper> list = new List<WhereHelper>()
+            {
+             new WhereHelper (nameof(RB_MiniProgram_Page_Extend.PageId),query.PageId),
+             new WhereHelper (nameof(RB_MiniProgram_Page_Extend.MallBaseId),query.MallBaseId),
+            };
+            return miniProgram_PageRepository.Exists("Id", list);
+        }
+
+        /// <summary>
+        /// 批量添加页面到小程序
+        /// </summary>
+        /// <param name="list"></param>
+        /// <returns></returns>
+        public bool SetMiniProgram_Page_ByListModule(List<RB_MiniProgram_Page_Extend> list)
+        {
+            bool flag = false;
+            foreach (var item in list)
+            {
+                var Id = CheckMiniProgram_Page(item);
+                item.Id = Id;
+                if (item.Id > 0)
+                {
+                    Dictionary<string, object> fileds = new Dictionary<string, object>()
+                    {
+                        { nameof(RB_MiniProgram_Page_Extend.Id),item.Id},
+                        { nameof(RB_MiniProgram_Page_Extend.MallBaseId),item.MallBaseId},
+                        { nameof(RB_MiniProgram_Page_Extend.PageId),item.PageId},
+             
+                    };
+                    flag = miniProgram_PageRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_Page_Extend.Id), item.Id));
+                }
+                else
+                {
+                    int NewId = miniProgram_PageRepository.Insert(item);
+                    item.Id = NewId;
+                    flag = NewId > 0;
+                }
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 批量设置小程序页面标题
+        /// </summary>
+        /// <param name="list"></param>
+        /// <returns></returns>
+        public bool SetMiniProgram_PageTitle_ByListModule(List<RB_MiniProgram_Page_Extend> list)
+        {
+            bool flag = false;
+            foreach (var item in list)
+            {
+                if (item.SelfPageName == null)
+                {
+                    item.SelfPageName = "";
+                }
+                if (item.Id > 0)
+                {
+                    Dictionary<string, object> fileds = new Dictionary<string, object>()
+                    {
+                        { nameof(RB_MiniProgram_Page_Extend.SelfPageName),item.SelfPageName},
+                    };
+                    flag = miniProgram_PageRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_Page_Extend.Id), item.Id));
+                }
+            }
+            return flag;
+        }
+
+
+        /// <summary>
+        /// 根据小程序页面编号获取小程序页面实体(单个)
+        /// </summary>
+        /// <param name="PageId"></param>
+        /// <returns></returns>
+        public RB_MiniProgram_Page_Extend GetMiniprogram_Page_Module(object Id)
+        {
+            RB_MiniProgram_Page_Extend extModel = miniProgram_PageRepository.GetEntity<RB_MiniProgram_Page_Extend>(Id);
+            if (extModel == null)
+            {
+                extModel = new RB_MiniProgram_Page_Extend();
+            }
+            return extModel;
+        }
+
+        /// <summary>
+        /// 根据Id批量删除
+        /// </summary>
+        /// <param name="Ids"></param>
+        /// <returns></returns>
+        public bool RemoveBeatchMiniprogram_Page_Module(string Ids)
+        {
+            return miniProgram_PageRepository.RemoveBeatchMiniprogram_Page_Repository(Ids);
+        }
+
+        /// <summary>
+        /// 根据条件获取小程序页面列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Miniprogram_PageManage_Extend> GetMiniprogram_Page_ListExtModule(RB_MiniProgram_Page_Extend query)
+        {
+            return miniprogram_PageManageRepository.GetListExtRepository(query);
+        }
+
+        /// <summary>
+        /// 根据查询条件获取小程序页面管理列表【管理页面】
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Miniprogram_PageManage_Extend> GetMiniprogram_PageManage_ListModule(RB_Miniprogram_PageManage_Extend query)
+        {
+            return miniprogram_PageManageRepository.GetListRepository(query);
+        }
+
+        /// <summary>
+        /// 获取小程序页面管理分页列表【管理页面】
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Miniprogram_PageManage_Extend> GetMiniprogram_PageManage_PageListModule(int pageIndex, int pageSize, out long rowCount, RB_Miniprogram_PageManage_Extend query)
+        {
+            return miniprogram_PageManageRepository.GetPageListRepository(pageIndex, pageSize, out rowCount, query);
+        }
+
+        /// <summary>
+        /// 新增修改小程序管理页面【管理页面】
+        /// </summary>
+        /// <param name="extModel"></param>
+        /// <returns></returns>
+        public bool SetMiniprogram_PageManage_Module(RB_Miniprogram_PageManage_Extend extModel)
+        {
+            bool flag = false;
+            if (extModel.IsParameter == 0)
+            {
+                extModel.ParameterValue = "";
+            }
+            if (extModel.PageId > 0)
+            {
+                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.PageSort),extModel.PageSort},
+                    { nameof(RB_Miniprogram_PageManage_Extend.IsParameter),extModel.IsParameter},
+                    { nameof(RB_Miniprogram_PageManage_Extend.ParameterValue),extModel.ParameterValue},
+                };
+                flag = miniprogram_PageManageRepository.Update(fileds, new WhereHelper(nameof(RB_Miniprogram_PageManage_Extend.PageId), extModel.PageId));
+            }
+            else
+            {
+                int NewId = miniprogram_PageManageRepository.Insert(extModel);
+                extModel.PageId = NewId;
+                flag = NewId > 0;
+            }
+            return flag;
+        }
+
+        /// <summary>
+        /// 更新菜单状态【管理页面】
+        /// </summary>
+        /// <param name="PageId">页面Id</param>
+        /// <param name="Status">页面状态(0-正常,1-删除)</param>
+        /// <returns></returns>
+        public bool RemoveMiniprogram_PageManage_Module(object PageId, int Status)
+        {
+            bool flag = false;
+            Dictionary<string, object> fileds = new Dictionary<string, object>()
+            {
+                { nameof(RB_Miniprogram_PageManage_Extend.Status),Status},
+            };
+            flag = miniprogram_PageManageRepository.Update(fileds, new WhereHelper(nameof(RB_Miniprogram_PageManage_Extend.PageId), PageId));
+            return flag;
+        }
+
+        /// <summary>
+        /// 根据页面编号获取页面实体【管理页面】
+        /// </summary>
+        /// <param name="PageId"></param>
+        /// <returns></returns>
+        public RB_Miniprogram_PageManage_Extend GetMiniprogram_PageManage_Module(object PageId)
+        {
+            RB_Miniprogram_PageManage_Extend extModel = miniprogram_PageManageRepository.GetEntity<RB_Miniprogram_PageManage_Extend>(PageId);
+            if (extModel == null)
+            {
+                extModel = new RB_Miniprogram_PageManage_Extend();
+            }
+            return extModel;
+        }
+    }
+}

Mall.Repository/BaseSetUp/RB_File_StoreRepository.cs

+using Mall.Model.Entity.BaseSetUp;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.BaseSetUp
+{
+    /// <summary>
+    /// 上传设置仓储层
+    /// </summary>
+    public class RB_File_StoreRepository : RepositoryBase<RB_File_Store>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_File_Store); } }
+
+        /// <summary>
+        /// 获取上传存储信息
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_File_Store> GetListRepository(RB_File_Store query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_File_Store.Status)}=0");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_File_Store.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_File_Store.MallBaseId)}={query.MallBaseId}");
+                }
+                if (query.StoreType > 0)
+                {
+                    builder.Append($" AND {nameof(RB_File_Store.StoreType)}={(int)query.StoreType}");
+                }
+            }
+            return Get<RB_File_Store>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/BaseSetUp/RB_Logistics_RulesRegionRepository.cs

@@ -27,7 +27,7 @@ namespace Mall.Repository.BaseSetUp
         public List<RB_Logistics_RulesRegion_Extend> GetListRepository(RB_Logistics_RulesRegion_Extend query)
         {
             StringBuilder builder = new StringBuilder();
-            builder.Append($" SELECT a.*,b.`Name` as RegionName FROM {TableName} as a LEFT JOIN {DestinationTableName} as b on a.RegionId=b.ID WHERE   a.{nameof(RB_Logistics_RulesRegion_Extend.Status)}=0");
+            builder.Append($" SELECT a.*,b.`Name` as RegionName,b.ParentID FROM {TableName} as a LEFT JOIN {DestinationTableName} as b on a.RegionId=b.ID WHERE   a.{nameof(RB_Logistics_RulesRegion_Extend.Status)}=0");
             if (query != null)
             {
                 if (query.TenantId > 0)

Mall.Repository/MarketingCenter/RB_Recharge_RulesRepository.cs

+using Mall.Model.Entity.MarketingCenter;
+using Mall.Model.Extend.MarketingCenter;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Mall.Repository.MarketingCenter
+{
+    /// <summary>
+    /// 充值仓储层
+    /// </summary>
+    public class RB_Recharge_RulesRepository : RepositoryBase<RB_Recharge_Rules>
+    {
+        /// <summary>
+        /// 表名称
+        /// </summary>
+        public string TableName { get { return nameof(RB_Recharge_Rules); } }
+        /// <summary>
+        /// 充值信息列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Recharge_Rules_Extend> GetRechargeRulesPageList(int pageIndex, int pageSize, out long rowCount, RB_Recharge_Rules_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE  {nameof(RB_Recharge_Rules_Extend.Status)}=0");
+            if (query != null)
+            {
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Recharge_Rules_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Recharge_Rules_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.Append($" AND {nameof(RB_Recharge_Rules_Extend.Name)} like '%{query.Name}%'");
+                }
+            }
+            return GetPage<RB_Recharge_Rules_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 充值信息列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Recharge_Rules_Extend> GetRechargeRulesList(RB_Recharge_Rules_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append($" SELECT * FROM {TableName} WHERE {nameof(RB_Recharge_Rules_Extend.Status)}=0 ");
+            if (query != null)
+            {
+                if (query.ID > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Recharge_Rules_Extend.ID)}={query.ID}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Recharge_Rules_Extend.TenantId)}={query.TenantId}");
+                }
+                if (query.TenantId > 0)
+                {
+                    builder.Append($" AND {nameof(RB_Recharge_Rules_Extend.MallBaseId)}={query.MallBaseId}");
+                }
+                if (!string.IsNullOrWhiteSpace(query.Name))
+                {
+                    builder.Append($" AND {nameof(RB_Recharge_Rules_Extend.Name)} like '%{query.Name}%'");
+                }
+            }
+            return Get<RB_Recharge_Rules_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/User/RB_MiniProgramRepository.cs

@@ -26,7 +26,7 @@ namespace Mall.Repository.User
             {
                 if (query.TenantId != null && query.TenantId > 0)
                 {
-                    builder.AppendFormat(" AND TenantId='{0}' ", query.TenantId);
+                    builder.AppendFormat(" AND TenantId={0} ", query.TenantId);
                 }
             }
             return Get<RB_MiniProgram_Extend>(builder.ToString()).ToList();
@@ -56,7 +56,7 @@ WHERE 1=1 ");
                 }
                 if (query.TenantId != null && query.TenantId > 0)
                 {
-                    builder.AppendFormat(" AND A.TenantId='{0}' ", query.TenantId);
+                    builder.AppendFormat(" AND A.TenantId={0} ", query.TenantId);
                 }
                 if (query.MallName != null && !string.IsNullOrEmpty(query.MallName.Trim()))
                 {
@@ -76,7 +76,7 @@ WHERE 1=1 ");
             int Num = 0;
             StringBuilder builder = new StringBuilder();
             builder.Append("SELECT  COUNT(*) FROM RB_MiniProgram WHERE 1=1 ");
-            builder.AppendFormat(" AND TenantId='{0}' ", TenantId);
+            builder.AppendFormat(" AND TenantId={0} ", TenantId);
             object obj = base.ExecuteScalar(builder.ToString());
             if (obj != null)
             {

Mall.Repository/User/RB_MiniProgram_NaviconRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.User;
+using System.Linq;
+namespace Mall.Repository.User
+{
+    /// <summary>
+    /// 导航图标仓储层对象
+    /// </summary>
+    public class RB_MiniProgram_NaviconRepository : RepositoryBase<RB_MiniProgram_Navicon>
+    {
+        /// <summary>
+        /// 根据查询条件获取小程序导航图标列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_MiniProgram_Navicon_Extend> GetListRepository(RB_MiniProgram_Navicon_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(" SELECT * FROM RB_MiniProgram_Navicon WHERE 1=1 AND NavIconStatus=0 ");
+            if (query != null)
+            {
+                if (query.MallBaseId != null && query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND MallBaseId={0} ", query.MallBaseId);
+                }
+            }
+            builder.Append(" ORDER BY NavIconSort ASC ");
+            return Get<RB_MiniProgram_Navicon_Extend>(builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 获取小程序导航图标分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_MiniProgram_Navicon_Extend> GetPageListRepository(int pageIndex, int pageSize, out long rowCount, RB_MiniProgram_Navicon_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(" SELECT * FROM RB_MiniProgram_Navicon WHERE 1=1 AND NavIconStatus=0 ");
+            if (query != null)
+            {
+                if (query.MallBaseId != null && query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND MallBaseId={0} ", query.MallBaseId);
+                }
+                if (query.NavIconName != null && !string.IsNullOrEmpty(query.NavIconName.Trim()))
+                {
+                    builder.AppendFormat(" AND NavIconName LIKE '{0}%' ", query.NavIconName.Trim());
+                }
+            }
+            builder.Append(" ORDER BY NavIconSort ASC ");
+            return GetPage<RB_MiniProgram_Navicon_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/User/RB_MiniProgram_PageRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.User;
+using System.Linq;
+
+namespace Mall.Repository.User
+{
+    /// <summary>
+    /// 小程序页面仓储层
+    /// </summary>
+    public class RB_MiniProgram_PageRepository : RepositoryBase<RB_MiniProgram_Page>
+    {
+        /// <summary>
+        /// 根据查询条件获取小程序列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_MiniProgram_Page_Extend> GetListRepository(RB_MiniProgram_Page_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(" SELECT * FROM RB_MiniProgram_Page WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ",nameof(RB_MiniProgram_Page_Extend.MallBaseId),query.MallBaseId);
+                }
+            }
+            return Get<RB_MiniProgram_Page_Extend>(builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 获取小程序分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_MiniProgram_Page_Extend> GetPageListRepository(int pageIndex, int pageSize, out long rowCount, RB_MiniProgram_Page_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(" SELECT * FROM RB_MiniProgram_Page WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_MiniProgram_Page_Extend.MallBaseId), query.MallBaseId);
+                }
+            }
+            return GetPage<RB_MiniProgram_Page_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 根据Id批量删除
+        /// </summary>
+        /// <param name="Ids"></param>
+        /// <returns></returns>
+        public bool RemoveBeatchMiniprogram_Page_Repository(string Ids)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.AppendFormat(" DELETE  FROM RB_MiniProgram_Page WHERE Id IN ({0}) ", Ids);
+            return base.Execute(builder.ToString()) > 0;
+        }
+    }
+}

Mall.Repository/User/RB_Miniprogram_BottomnavRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.User;
+using System.Linq;
+namespace Mall.Repository.User
+{
+    /// <summary>
+    /// 底部导航标签仓储层
+    /// </summary>
+    public class RB_Miniprogram_BottomnavRepository : RepositoryBase<RB_Miniprogram_Bottomnav>
+    {
+        /// <summary>
+        /// 根据查询条件获取小程序列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Miniprogram_Bottomnav_Extend> GetListRepository(RB_Miniprogram_Bottomnav_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(" SELECT * FROM RB_Miniprogram_Bottomnav WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.TenantId != null && query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND TenantId={0} ", query.TenantId);
+                }
+                if (query.MallBaseId != null && query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND MallBaseId={0} ", query.MallBaseId);
+                }
+            }
+            return Get<RB_Miniprogram_Bottomnav_Extend>(builder.ToString()).ToList();
+        }
+
+
+        /// <summary>
+        /// 获取小程序分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Miniprogram_Bottomnav_Extend> GetPageListRepository(int pageIndex, int pageSize, out long rowCount, RB_Miniprogram_Bottomnav_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(@" 
+SELECT A.*,B.Account,B.MobilePhone
+FROM RB_Miniprogram_Bottomnav AS A LEFT JOIN RB_Tenant AS B ON A.TenantId=B.TenantId
+WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.Status >= 0)
+                {
+                    builder.AppendFormat(" AND A.Status={0} ", query.Status);
+                }
+                if (query.TenantId != null && query.TenantId > 0)
+                {
+                    builder.AppendFormat(" AND A.TenantId={0} ", query.TenantId);
+                }
+            }
+            return GetPage<RB_Miniprogram_Bottomnav_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+    }
+}

Mall.Repository/User/RB_Miniprogram_PageManageRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.User;
+using Mall.Model.Extend.User;
+using System.Linq;
+namespace Mall.Repository.User
+{
+    /// <summary>
+    /// 小程序页面管理仓储层
+    /// </summary>
+    public class RB_Miniprogram_PageManageRepository : RepositoryBase<RB_Miniprogram_PageManage>
+    {
+
+        /// <summary>
+        /// 根据查询条件获取小程序页面管理列表
+        /// </summary>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Miniprogram_PageManage_Extend> GetListRepository(RB_Miniprogram_PageManage_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(" SELECT * FROM RB_Miniprogram_PageManage WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.QPageType > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Miniprogram_PageManage_Extend.PageType), query.QPageType);
+                }
+                if (query.PageName != null && !string.IsNullOrEmpty(query.PageName.Trim()))
+                {
+                    builder.AppendFormat(" AND {0} LIKE '%{1}%' ", nameof(RB_Miniprogram_PageManage_Extend.PageName), query.PageName);
+                }
+                if (query.Status >= 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Miniprogram_PageManage_Extend.Status), query.Status);
+                }
+            }
+            builder.Append(" ORDER BY PageSort ");
+            return Get<RB_Miniprogram_PageManage_Extend>(builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 获取小程序页面管理分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="query">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Miniprogram_PageManage_Extend> GetPageListRepository(int pageIndex, int pageSize, out long rowCount, RB_Miniprogram_PageManage_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(" SELECT * FROM RB_Miniprogram_PageManage WHERE 1=1 ");
+            if (query != null)
+            {
+                if (query.QPageType > 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Miniprogram_PageManage_Extend.PageType), query.QPageType);
+                }
+                if (query.PageName != null && !string.IsNullOrEmpty(query.PageName.Trim()))
+                {
+                    builder.AppendFormat(" AND {0} LIKE '%{1}%' ", nameof(RB_Miniprogram_PageManage_Extend.PageName), query.PageName);
+                }
+                if (query.Status >= 0)
+                {
+                    builder.AppendFormat(" AND {0}={1} ", nameof(RB_Miniprogram_PageManage_Extend.Status), query.Status);
+                }
+            }
+            builder.Append(" ORDER BY PageSort ");
+            return GetPage<RB_Miniprogram_PageManage_Extend>(pageIndex, pageSize, out rowCount, builder.ToString()).ToList();
+        }
+
+        /// <summary>
+        /// 根据条件获取小程序页面列表
+        /// </summary>
+        /// <param name="query"></param>
+        /// <returns></returns>
+        public List<RB_Miniprogram_PageManage_Extend> GetListExtRepository(RB_MiniProgram_Page_Extend query)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append(@"
+SELECT B.PageId, B.PageName,B.PageType,B.PageUrl,B.PageSort,B.IsParameter,B.ParameterValue,IFNULL(A.SelfPageName,'') AS SelfPageName,A.Id
+FROM rb_miniprogram_page AS A INNER JOIN rb_miniprogram_pagemanage AS B ON A.PageId = B.PageId
+WHERE B.`Status`= 0 ");
+            if (query != null)
+            {
+                if (query.MallBaseId > 0)
+                {
+                    builder.AppendFormat(" AND A.{0}={1} ", nameof(RB_MiniProgram_Page_Extend.MallBaseId), query.MallBaseId);
+                }
+            }
+            return Get<RB_Miniprogram_PageManage_Extend>(builder.ToString()).ToList();
+        }
+    }
+}

Mall.WebApi/Controllers/MallBase/DestinationController.cs

@@ -29,9 +29,9 @@ namespace Mall.WebApi.Controllers.MallBase
         /// </summary>
         /// <param name="ParentID">父节点编号</param>
         /// <returns></returns>
-        public virtual ApiResult GetChildList(RequestParm request)
+        public  ApiResult GetChildList()
         {
-            JObject parm = JObject.Parse(request.msg.ToString());
+            JObject parm = JObject.Parse(RequestParm.msg.ToString());
             int ID = parm.GetInt("Id");
             if (ID > 0)
             {

Mall.WebApi/Controllers/MallBase/MallBaseController.cs

@@ -148,6 +148,22 @@ namespace Mall.WebApi.Controllers.MallBase
             }
         }
 
+
+
+        /// <summary>
+        /// 获取用户下载枚举列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetLogisticsEnumList()
+        {
+            var list = EnumHelper.GetEnumList(typeof(Mall.Common.Enum.MallBase.LogisticsTypeEnum));
+            return ApiResult.Success("", list.Select(x => new
+            {
+                Name = x.Key,
+                Id = Convert.ToInt32(x.Value)
+            }));
+        }
         #endregion
 
         #region 运费规则
@@ -885,5 +901,79 @@ namespace Mall.WebApi.Controllers.MallBase
             }
         }
         #endregion
+
+        #region 上传设置
+        public ApiResult GetFileStoreList()
+        {
+            var parms = RequestParm;
+            var query = new RB_File_Store();
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            var list = mallBaseModule.GetFileStoreList(query);
+
+            return ApiResult.Success("获取成功", list);
+        }
+
+        /// <summary>
+        /// 新增/修改上传设置
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult AddOrUpdateFileStore()
+        {
+            var parms = RequestParm;
+            var query = JsonConvert.DeserializeObject<RB_File_Store>(RequestParm.msg.ToString());
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+
+            if (query == null)
+            {
+                return ApiResult.Failed("请传入上传设置信息");
+            }
+            else
+            {
+                if ((int)query.StoreType == 0)
+                {
+
+                    return ApiResult.Failed("请选择存储位置");
+
+                }
+
+                if (query.ID == 0)
+                {
+                    query.CreateDate = System.DateTime.Now;
+                }
+                query.UpdateDate = System.DateTime.Now;
+                bool result = mallBaseModule.AddOrUpdateFileStore(query);
+                if (result)
+                {
+                    return ApiResult.Success("上传设置保存成功");
+                }
+                else
+                {
+                    return ApiResult.Failed("上传设置保存失败");
+                }
+            }
+        }
+
+
+        /// <summary>
+        /// 获取上传信息的详情
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetFileStoreDetail()
+        {
+            var parms = RequestParm;
+            var query = new RB_File_Store();
+            query.TenantId = UserInfo.TenantId;
+            query.MallBaseId = parms.MallBaseId;
+            var model = mallBaseModule.GetFileStoreList(query).FirstOrDefault();
+            if (model == null)
+            {
+                model = new RB_File_Store();
+            }
+            return ApiResult.Success("获取成功", model);
+        }
+
+        #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/User/TenantController.cs

@@ -17,6 +17,7 @@ using Mall.Common.Enum;
 using Mall.CacheManager.User;
 using Mall.CacheKey;
 using Mall.Common.Plugin;
+using Mall.Common.Enum.MallBase;
 
 namespace Mall.WebApi.Controllers.User
 {
@@ -41,6 +42,16 @@ namespace Mall.WebApi.Controllers.User
         /// </summary>
         private Module.User.MenuModule menuModule = new Module.User.MenuModule();
 
+        /// <summary>
+        /// 小程序图标处理类对象
+        /// </summary>
+        private Module.User.MiniProgramNaviconModule naviconModule = new Module.User.MiniProgramNaviconModule();
+
+        /// <summary>
+        /// 小程序页面处理类
+        /// </summary>
+        private Module.User.MiniProgramPageModule programPageModule = new Module.User.MiniProgramPageModule();
+
         #region 商户信息
         /// <summary>
         /// 用户登录
@@ -174,11 +185,69 @@ namespace Mall.WebApi.Controllers.User
             Int32.TryParse(RequestParm.uid.ToString(), out int TenantId);
             var programNum = programModule.CheckMallNumModule(TenantId);
             var createMiniPrograme = TenantModule.GetTenantModule(TenantId)?.CreateMiniPrograme ?? 0;
-            if (extModel.MallBaseId==0 && programNum >= createMiniPrograme)
+            if (extModel.MallBaseId == 0 && programNum >= createMiniPrograme)
             {
                 return ApiResult.Failed(message: "只能创建" + createMiniPrograme + "个小程序");
             }
             extModel.TenantId = TenantId;
+            if (extModel.MallBaseId <= 0)
+            {
+                extModel.BottomTagList = new List<RB_Miniprogram_Bottomnav_Extend>()
+                {
+                     new RB_Miniprogram_Bottomnav_Extend ()
+                     {
+                         TenantId=TenantId,
+                         DefaultIcon =Common.Config.GetOssFileUrl+"/Static/"+ "nav-icon-user.png",
+                         CheckedIcon =Common.Config.GetOssFileUrl+"/Static/"+"nav-icon-user.active.png",
+                         CheckedColor="rgb(255, 69, 68)",
+                         DefaultColor="rgb(136, 136, 136)",
+                         Status=0,
+                         TagLink="",
+                         TagName="我",
+                         TagId=0,
+                         MallBaseId=0,
+                     },
+                     new RB_Miniprogram_Bottomnav_Extend ()
+                     {
+                        TenantId=TenantId,
+                        DefaultIcon =Common.Config.GetOssFileUrl+"/Static/"+ "nav-icon-index.png",
+                        CheckedIcon =Common.Config.GetOssFileUrl+"/Static/"+ "nav-icon-index.active.png",
+                        CheckedColor="rgb(255, 69, 68)",
+                        DefaultColor="rgb(136, 136, 136)",
+                        Status=0,
+                        TagLink="",
+                        TagName="首页",
+                        TagId=0,
+                        MallBaseId=0,
+                     },
+                    new RB_Miniprogram_Bottomnav_Extend ()
+                    {
+                        TenantId=TenantId,
+                        DefaultIcon =Common.Config.GetOssFileUrl+"/Static/"+ "nav-icon-cart.png",
+                        CheckedIcon =Common.Config.GetOssFileUrl+"/Static/"+ "nav-icon-cart.active.png",
+                        CheckedColor="rgb(255, 69, 68)",
+                        DefaultColor="rgb(136, 136, 136)",
+                        Status=0,
+                        TagLink="",
+                        TagName="购物车",
+                        TagId=0,
+                        MallBaseId=0,
+                    },
+                     new RB_Miniprogram_Bottomnav_Extend ()
+                    {
+                        TenantId=TenantId,
+                        DefaultIcon =Common.Config.GetOssFileUrl+"/Static/"+ "nav-icon-cat.png",
+                        CheckedIcon =Common.Config.GetOssFileUrl+"/Static/"+ "nav-icon-cat.active.png",
+                        CheckedColor="rgb(255, 69, 68)",
+                        DefaultColor="rgb(136, 136, 136)",
+                        Status=0,
+                        TagLink="",
+                        TagName="分类",
+                        TagId=0,
+                        MallBaseId=0,
+                    },
+                };
+            }
             var flag = programModule.SetMiniProgramModule(extModel);
 
             return flag ? ApiResult.Success(data: extModel) : ApiResult.Failed();
@@ -197,6 +266,50 @@ namespace Mall.WebApi.Controllers.User
             return flag ? ApiResult.Success() : ApiResult.Failed();
         }
 
+        /// <summary>
+        /// 更新小程序商城风格
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMiniProgrameShopStyle()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var MallBaseId = parms.GetInt("MallBaseId", 0);
+            int MallShopStyle = parms.GetInt("MallShopStyle");
+            var extModel = new RB_MiniProgram_Extend()
+            {
+                MallBaseId = MallBaseId,
+                MallShopStyle = (MallShopStyleEnum)MallShopStyle
+            };
+            var flag = programModule.SetMiniProgramMallShopStyleModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 新增修改底部导航
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMiniProgramMallTag()
+        {
+            var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_Extend>(RequestParm.msg.ToString());
+            extModel.MallBaseId = RequestParm.MallBaseId;
+            extModel.TenantId = RequestParm.TenantId;
+            var flag = programModule.SetMiniProgramMallTagModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+
+        }
+
+        /// <summary>
+        /// 删除底部导航
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult RemoveMiniProgramMallTag()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var TagId = parms.GetInt("TagId", 0);
+            var flag = programModule.RemoveMiniProgramMallTagModule(TagId);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
         /// <summary>
         /// 根据小程序编号获取小程序信息
         /// </summary>
@@ -346,5 +459,222 @@ namespace Mall.WebApi.Controllers.User
         }
 
         #endregion
+
+        #region 小程序图标
+
+        /// <summary>
+        /// 获取小程序分页列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetMiniProgrameNaviconPage()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            var query = JsonConvert.DeserializeObject<RB_MiniProgram_Navicon_Extend>(RequestParm.msg.ToString());
+            var list = naviconModule.GetMiniProgramNaviconPageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
+        /// <summary>
+        /// 添加修改小程序图标
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMiniProgrameNavicon()
+        {
+            var extModel = JsonConvert.DeserializeObject<RB_MiniProgram_Navicon_Extend>(RequestParm.msg.ToString());
+            var flag = naviconModule.SetMiniProgramNaviconModule(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 删除小程序图标
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult RemoveMiniProgrameNavicon()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var NavIconId = parms.GetInt("NavIconId", 0);
+            var flag = naviconModule.RemoveMiniProgramNaviconModule(NavIconId);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 根据小程序图标编号获取实体信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetMiniProgrameNavicon()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var NavIconId = parms.GetInt("NavIconId", 0);
+            var extModel = naviconModule.GetMiniProgramNaviconModule(NavIconId);
+            return ApiResult.Success(data: extModel);
+        }
+
+        #endregion
+
+        #region 小程序页面管理
+
+        /// <summary>
+        /// 获取小程序页面管理分页列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetMiniProgramePageType()
+        {
+            var list = Common.Plugin.EnumHelper.EnumToList(typeof(PageTypeEnum));
+            return ApiResult.Success(data: list);
+        }
+
+        /// <summary>
+        /// 获取小程序页面管理分页列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetMiniProgramePageManage_Page()
+        {
+            ResultPageModel pageModel = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
+            var query = JsonConvert.DeserializeObject<RB_Miniprogram_PageManage_Extend>(RequestParm.msg.ToString());
+            var list = programPageModule.GetMiniprogram_PageManage_PageListModule(pageModel.pageIndex, pageModel.pageSize, out long rowsCount, query);
+            pageModel.count = Convert.ToInt32(rowsCount);
+            pageModel.pageData = list;
+            return ApiResult.Success(data: pageModel);
+        }
+
+        /// <summary>
+        /// 添加修改小程序菜单管理
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMiniProgramePageManage()
+        {
+            var extModel = JsonConvert.DeserializeObject<RB_Miniprogram_PageManage_Extend>(RequestParm.msg.ToString());
+            extModel.Status = 0;
+            var flag = programPageModule.SetMiniprogram_PageManage_Module(extModel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 根据小程序菜单管理编号获取实体信息
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetMiniProgramePageManage()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var PageId = parms.GetInt("PageId", 0);
+            var extModel = programPageModule.GetMiniprogram_PageManage_Module(PageId);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 删除、恢复 小程序菜单管理
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMiniProgramePageManageStatus()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+            var PageId = parms.GetInt("PageId", 0);
+            int Status = parms.GetInt("Status", 0);
+            var extModel = programPageModule.RemoveMiniprogram_PageManage_Module(PageId, Status);
+            return ApiResult.Success(data: extModel);
+        }
+
+        /// <summary>
+        /// 获取小程序菜单管理
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetMiniProgramePageManageList()
+        {
+            List<object> resultList = new List<object>();
+            var list = programPageModule.GetMiniprogram_PageManage_ListModule(new RB_Miniprogram_PageManage_Extend() { Status = 0 });
+            var mimiPageList = programPageModule.GetMiniProgramPage_ListModule(new RB_MiniProgram_Page_Extend() { MallBaseId = UserInfo.MallBaseId });
+            var pageTypeList = Common.Plugin.EnumHelper.EnumToList(typeof(PageTypeEnum));
+            foreach (var item in pageTypeList)
+            {
+                List<object> SubMenuList = new List<object>();
+                var subList = list.Where(qitem => qitem.PageType == (PageTypeEnum)item.Id).OrderBy(qitem => qitem.PageSort).ToList();
+                foreach (var subItem in subList)
+                {
+                    var pageItem = mimiPageList?.Where(qitem => qitem.PageId == subItem.PageId)?.FirstOrDefault();
+                    SubMenuList.Add(new
+                    {
+                        subItem.PageId,
+                        subItem.PageName,
+                        Id = pageItem?.Id ?? 0,
+                        IsChecked = (pageItem?.Id ?? 0) > 0,
+                    });
+                }
+                resultList.Add(new
+                {
+                    IsChecked = false,
+                    PageTypeName = item.Name,
+                    PageTypeId = item.Id,
+                    SubMenuList
+                });
+            }
+            return ApiResult.Success(data: resultList);
+        }
+
+        /// <summary>
+        /// 批量添加页面到小程序
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMiniProgram_Page()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+
+            var pageList = JsonConvert.DeserializeObject<List<RB_MiniProgram_Page_Extend>>(parms.GetStringValue("setMsg"));
+            var deleteList = JsonConvert.DeserializeObject<List<RB_MiniProgram_Page_Extend>>(parms.GetStringValue("delMsg"));
+            if (deleteList != null && deleteList.Count > 0)
+            {
+                var isDeleteFlag = programPageModule.RemoveBeatchMiniprogram_Page_Module(string.Join(",", deleteList.Select(qitem => qitem.Id)));
+            }
+            var flag = programPageModule.SetMiniProgram_Page_ByListModule(pageList);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        /// <summary>
+        /// 获取根据小程序编号获取小程序页面列表
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult GetMiniprogramPageListExt()
+        {
+            List<object> resultList = new List<object>();
+            var pageList = programPageModule.GetMiniprogram_Page_ListExtModule(new RB_MiniProgram_Page_Extend() { MallBaseId = RequestParm.MallBaseId });
+            var pageTypeList = Common.Plugin.EnumHelper.EnumToList(typeof(PageTypeEnum));
+            foreach (var item in pageTypeList)
+            {
+                resultList.Add(new
+                {
+                    PageTypeName = item.Name,
+                    PageTypeId = item.Id,
+                    SubMenuList = pageList.Where(qitem => qitem.PageType == (PageTypeEnum)item.Id).OrderBy(qitem => qitem.PageSort)
+                    .Select(qitem => new
+                    {
+                        qitem.PageId,
+                        qitem.PageName,
+                        qitem.PageUrl,
+                        qitem.IsParameter,
+                        qitem.ParameterValue,
+                        qitem.Id,
+                        qitem.SelfPageName
+                    })
+                    .ToList()
+                });
+            }
+            return ApiResult.Success(data: resultList);
+        }
+
+        /// <summary>
+        /// 保存小程序页面自定义标题
+        /// </summary>
+        /// <returns></returns>
+        public ApiResult SetMiniprogramPageTitle()
+        {
+            JObject parms = JObject.Parse(RequestParm.msg.ToString());
+
+            var pageList = JsonConvert.DeserializeObject<List<RB_MiniProgram_Page_Extend>>(parms.GetStringValue("setMsg"));
+            var flag = programPageModule.SetMiniProgram_PageTitle_ByListModule(pageList);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+        #endregion
+
     }
 }
\ No newline at end of file

Mall.WebApi/Filter/ApiFilterAttribute.cs

@@ -96,7 +96,7 @@ namespace Mall.WebApi.Filter
             string controllerName = actionContext.ActionDescriptor.RouteValues["controller"].ToString().ToLower();
             string actionName = actionContext.ActionDescriptor.RouteValues["action"].ToString().ToLower();
             //string areaName = actionContext.ActionDescriptor.RouteValues["area"].ToString().ToLower();
-            if (!actionName.Contains("get"))
+            if (!actionName.ToLower().Contains("get"))
             {
                 string cachedKey = SecurityHelper.MD5(string.Format("cmd={0}&token={1}", controllerName + "/" + actionName, token));
                 try

Mall.WebApi/appsettings.json

@@ -16,7 +16,7 @@
   "AllowedHosts": "*",
   "OpenValidation": "False",
   "UploadSiteUrl": "http://192.168.2.214:8120",
-  "ViewFileSiteUrl": "http://192.168.2.214:8130",
+  "ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
   "ImKey": "b612b31e837c79c68f141aeb719d2b20",
   "ImSecret": "66000451fb72",
   "Mongo": "mongodb://192.168.2.214:27017",

Mall.sln

@@ -33,7 +33,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mall.Module.User", "Mall.Mo
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mall.Module.BaseSetUp", "Mall.Module.BaseSetUp\Mall.Module.BaseSetUp.csproj", "{9C400D7F-2BE2-40E7-B179-498097AA00AB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mall.Module.Product", "Mall.Module.Product\Mall.Module.Product.csproj", "{D0386A52-CAFD-40B3-A515-9A9241189FBA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mall.Module.Product", "Mall.Module.Product\Mall.Module.Product.csproj", "{D0386A52-CAFD-40B3-A515-9A9241189FBA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mall.Module.MarketingCenter", "Mall.Module.MarketingCenter\Mall.Module.MarketingCenter.csproj", "{339DE5B1-FA62-4B3D-80D4-0C50398D2848}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -89,6 +91,10 @@ Global
 		{D0386A52-CAFD-40B3-A515-9A9241189FBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D0386A52-CAFD-40B3-A515-9A9241189FBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D0386A52-CAFD-40B3-A515-9A9241189FBA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{339DE5B1-FA62-4B3D-80D4-0C50398D2848}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{339DE5B1-FA62-4B3D-80D4-0C50398D2848}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{339DE5B1-FA62-4B3D-80D4-0C50398D2848}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{339DE5B1-FA62-4B3D-80D4-0C50398D2848}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -105,6 +111,7 @@ Global
 		{E56423C0-5AC2-48D8-88BE-5435EF6ADB3F} = {034DEA5B-083C-46EC-9D3F-C8273C59C218}
 		{9C400D7F-2BE2-40E7-B179-498097AA00AB} = {034DEA5B-083C-46EC-9D3F-C8273C59C218}
 		{D0386A52-CAFD-40B3-A515-9A9241189FBA} = {034DEA5B-083C-46EC-9D3F-C8273C59C218}
+		{339DE5B1-FA62-4B3D-80D4-0C50398D2848} = {034DEA5B-083C-46EC-9D3F-C8273C59C218}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {450F460D-A6AE-4FE3-948A-34E5FB8DBD7C}