解决冲突

Mall.Common/Enum/User/DistributorAuditStatusEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mall.Common.Enum.User
+{
+    /// <summary>
+    /// 分销商审核状态枚举
+    /// </summary>
+    public enum DistributorAuditStatusEnum
+    {
+        /// <summary>
+        /// 审核中
+        /// </summary>
+        [EnumField("未审核")]
+        Auditing = 1,
+        /// <summary>
+        /// 审核通过
+        /// </summary>
+        [EnumField("已通过")]
+        Audited = 2,
+        /// <summary>
+        /// 审核拒绝
+        /// </summary>
+        [EnumField("已拒绝")]
+        Reject = 3
+    }
+}

Mall.Common/Enum/User/DistributorExportEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mall.Common.Enum.User
+{
+    /// <summary>
+    /// 分销商导出选项枚举
+    /// </summary>
+    public enum DistributorExportEnum
+    {
+        /// <summary>
+        /// 所属平台
+        /// </summary>
+        [EnumField("所属平台")]
+        SSPT = 1,
+        /// <summary>
+        /// 用户ID
+        /// </summary>
+        [EnumField("用户ID")]
+        YHID = 2,
+        /// <summary>
+        /// 昵称
+        /// </summary>
+        [EnumField("昵称")]
+        NC = 3,
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        [EnumField("姓名")]
+        Name = 4,
+        /// <summary>
+        /// 绑定手机号
+        /// </summary>
+        [EnumField("手机号")]
+        BDSJH = 5,
+        /// <summary>
+        /// 申请时间
+        /// </summary>
+        [EnumField("申请时间")]
+        Time = 6,
+        /// <summary>
+        /// 审核状态
+        /// </summary>
+        [EnumField("审核状态")]
+        AuditStatus = 7,
+        /// <summary>
+        /// 累计佣金
+        /// </summary>
+        [EnumField("累计佣金")]
+        LJYJ = 8,
+        /// <summary>
+        /// 可提现佣金
+        /// </summary>
+        [EnumField("可提现佣金")]
+        KTXYJ = 9,
+        /// <summary>
+        /// 订单数
+        /// </summary>
+        [EnumField("订单数")]
+        DDS = 10,
+        /// <summary>
+        /// 下级用户
+        /// </summary>
+        [EnumField("下级用户")]
+        XJYH = 11,
+        /// <summary>
+        /// 推荐人
+        /// </summary>
+        [EnumField("推荐人")]
+        TJR = 12,
+        /// <summary>
+        /// 备注信息
+        /// </summary>
+        [EnumField("备注信息")]
+        BZ = 13
+    }
+}

Mall.Common/Enum/User/DistributorRemitAuditStatusEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mall.Common.Enum.User
+{
+    /// <summary>
+    /// 分销商提现审核状态枚举
+    /// </summary>
+    public enum DistributorRemitAuditStatusEnum
+    {
+        /// <summary>
+        /// 未审核
+        /// </summary>
+        [EnumField("未审核")]
+        Auditing = 1,
+        /// <summary>
+        /// 待打款
+        /// </summary>
+        [EnumField("待打款")]
+        ToPlayWith = 2,
+        /// <summary>
+        /// 已打款
+        /// </summary>
+        [EnumField("已打款")]
+        HaveMoney = 3,
+        /// <summary>
+        /// 驳回
+        /// </summary>
+        [EnumField("驳回")]
+        Reject = 4
+    }
+}

Mall.Common/Enum/User/DistributorRemitExportEnum.cs

+using Mall.Common.Plugin;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Mall.Common.Enum.User
+{
+    /// <summary>
+    /// 分销提现导出选项枚举
+    /// </summary>
+    public enum DistributorRemitExportEnum
+    {
+        /// <summary>
+        /// 所属平台
+        /// </summary>
+        [EnumField("所属平台")]
+        SSPT = 1,
+        /// <summary>
+        /// 订单号
+        /// </summary>
+        [EnumField("订单号")]
+        OrderNum = 2,
+        /// <summary>
+        /// 昵称
+        /// </summary>
+        [EnumField("昵称")]
+        NC = 3,
+        /// <summary>
+        /// 提现金额
+        /// </summary>
+        [EnumField("提现金额")]
+        TXJE = 4,
+        /// <summary>
+        /// 申请日期
+        /// </summary>
+        [EnumField("申请日期")]
+        SQRQ = 5,
+        /// <summary>
+        /// 银行名称
+        /// </summary>
+        [EnumField("银行名称")]
+        Bank = 6,
+        /// <summary>
+        /// 打款账户
+        /// </summary>
+        [EnumField("打款账户")]
+        DKZH = 7,
+        /// <summary>
+        /// 真实姓名
+        /// </summary>
+        [EnumField("真实姓名")]
+        ZSXM = 8,
+        /// <summary>
+        /// 状态
+        /// </summary>
+        [EnumField("状态")]
+        Status = 9,
+        /// <summary>
+        /// 打款方式
+        /// </summary>
+        [EnumField("打款方式")]
+        DKFS = 10,
+        /// <summary>
+        /// 打款时间
+        /// </summary>
+        [EnumField("打款时间")]
+        DKSJ = 11
+    }
+}

Mall.Model/Entity/Product/RB_Product_Category.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品分类表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Product_Category
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分类名称
+        /// </summary>        
+        public string Name
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 层级
+        /// </summary>        
+        public int? Tier
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 父级id
+        /// </summary>        
+        public int? ParentId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 根节点id
+        /// </summary>        
+        public int? RootId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 排序
+        /// </summary>        
+        public int? Sort
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分类图标
+        /// </summary>        
+        public int? Icon
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分类大图
+        /// </summary>        
+        public int? BigIcon
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分类广告图
+        /// </summary>        
+        public int? AdvertisingImage
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分类广告链接
+        /// </summary>        
+        public string AdvertisingAddress
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 启用  1是  2否
+        /// </summary>        
+        public int? Enabled
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 是否显示  1是  2否
+        /// </summary>        
+        public int? IsShow
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 删除
+        /// </summary>        
+        public int? Status
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/Product/RB_Product_CategoryStyle.cs

+using Mall.Common.AOP;
+using Mall.Common.Enum.User;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Mall.Model.Entity.Product
+{
+    /// <summary>
+    /// 商品分类样式表实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Product_CategoryStyle
+    {
+
+        /// <summary>
+        /// Id
+        /// </summary>        
+        public int Id
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分类  1一级样式  2二级样式   3三级样式
+        /// </summary>        
+        public int? Type
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 样式id
+        /// </summary>        
+        public int? Style
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 每个分类商品显示总数
+        /// </summary>        
+        public int? CategoryNum
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商品每行显示的数量
+        /// </summary>        
+        public int? RowNum
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 商户号
+        /// </summary>        
+        public int? TenantId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 小程序id
+        /// </summary>        
+        public int MallBaseId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// CreateDate
+        /// </summary>        
+        public DateTime? CreateDate
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// UpdateDate
+        /// </summary>        
+        public DateTime? UpdateDate
+        {
+            get;
+            set;
+        }
+    }
+}

Mall.Model/Entity/User/RB_Distributor_Basics.cs

@@ -107,9 +107,9 @@ namespace Mall.Model.Entity.User
         /// </summary>
         public string GradeEntranceImage { get; set; }
         /// <summary>
-        /// 提现方式  枚举
+        /// 提现方式  枚举 json格式
         /// </summary>        
-        public DistrbutorWithdrawWayEnum? WithdrawWay
+        public string WithdrawWay
         {
             get;
             set;

Mall.Model/Entity/User/RB_Distributor_Info.cs

@@ -65,7 +65,7 @@ namespace Mall.Model.Entity.User
         /// <summary>
         /// 审核状态  1审核中  2通过  3拒绝
         /// </summary>        
-        public int? AuditStatus
+        public DistributorAuditStatusEnum? AuditStatus
         {
             get;
             set;

Mall.Model/Entity/User/RB_Distributor_Remit.cs

@@ -33,7 +33,7 @@ namespace Mall.Model.Entity.User
         /// <summary>
         /// 提现方式  枚举
         /// </summary>        
-        public int? WithdrawalWay
+        public DistrbutorWithdrawWayEnum? WithdrawalWay
         {
             get;
             set;
@@ -65,7 +65,7 @@ namespace Mall.Model.Entity.User
         /// <summary>
         /// 审核状态  1申请中  2同意申请，待打款  3已打款  4拒绝
         /// </summary>        
-        public int? AuditStatus
+        public DistributorRemitAuditStatusEnum? AuditStatus
         {
             get;
             set;
@@ -87,6 +87,10 @@ namespace Mall.Model.Entity.User
             set;
         }
         /// <summary>
+        /// 拒绝时间
+        /// </summary>
+        public DateTime? RejectDate { get; set; }
+        /// <summary>
         /// 审核备注
         /// </summary>        
         public string AuditRemark
@@ -103,6 +107,10 @@ namespace Mall.Model.Entity.User
             set;
         }
         /// <summary>
+        /// 拒绝备注
+        /// </summary>
+        public string RejectRemark { get; set; }
+        /// <summary>
         /// 商户号
         /// </summary>        
         public int TenantId
@@ -127,7 +135,7 @@ namespace Mall.Model.Entity.User
             set;
         }
         /// <summary>
-        /// 账户名称
+        /// 真实名称
         /// </summary>        
         public string AccountName
         {
@@ -142,5 +150,13 @@ namespace Mall.Model.Entity.User
             get;
             set;
         }
+        /// <summary>
+        /// 银行名称
+        /// </summary>
+        public string BankName { get; set; }
+        /// <summary>
+        /// 提现订单号
+        /// </summary>
+        public string OrderNum { get; set; }
     }
 }

Mall.Model/Entity/User/RB_MiniProgram.cs

@@ -91,5 +91,30 @@ namespace Mall.Model.Entity.User
         /// 商城风格
         /// </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_Page.cs

@@ -43,7 +43,7 @@ namespace Mall.Model.Entity.User
         /// <summary>
         /// 自定义页面名称
         /// </summary>        
-        public string SelePageName
+        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/Extend/Product/RB_Product_CategoryStyle_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品分类样式表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Product_CategoryStyle_Extend : RB_Product_CategoryStyle
+    {
+        
+    }
+}

Mall.Model/Extend/Product/RB_Product_Category_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+
+namespace Mall.Model.Extend.Product
+{
+    /// <summary>
+    /// 商品分类表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Product_Category_Extend : RB_Product_Category
+    {
+        /// <summary>
+        /// 分类ids
+        /// </summary>
+        public string CategoryIds { get; set; }
+        /// <summary>
+        /// 分类图标
+        /// </summary>        
+        public string IconPath
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分类大图
+        /// </summary>        
+        public string BigIconPath
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 分类广告图
+        /// </summary>        
+        public string AdvertisingImagePath
+        {
+            get;
+            set;
+        }
+    }
+
+    /// <summary>
+    /// 树形结构
+    /// </summary>
+    public class RB_Product_CategoryTree { 
+        /// <summary>
+        /// id
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 分类名称
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 分类图标
+        /// </summary>
+        public int Icon { get; set; }
+        /// <summary>
+        /// 地址
+        /// </summary>
+        public string IconPath { get; set; }
+        /// <summary>
+        /// 子集列表
+        /// </summary>
+        public List<RB_Product_CategoryTree> ChildList { get; set; }
+    }
+    /// <summary>
+    /// 分类排序
+    /// </summary>
+    public class RB_Product_CategorySort { 
+        /// <summary>
+        /// id
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 排序
+        /// </summary>
+        public int Sort { get; set; }
+    }
+}

Mall.Model/Extend/User/RB_Distributor_Basics_Extend.cs

@@ -21,5 +21,9 @@ namespace Mall.Model.Extend.User
         /// 路径
         /// </summary>
         public string BackgroundImagePath { get; set; }
+        /// <summary>
+        /// 提现方式枚举
+        /// </summary>
+        public List<int> WithdrawWayList { get; set; }
     }
 }

Mall.Model/Extend/User/RB_Distributor_Info_Extend.cs

@@ -63,5 +63,15 @@ namespace Mall.Model.Extend.User
         /// 用户ids
         /// </summary>
         public string UserIds { get; set; }
+
+        /// <summary>
+        /// 订单数量
+        /// </summary>
+        public int? OrderNum { get; set; }
+
+        /// <summary>
+        /// 下载枚举ids
+        /// </summary>
+        public List<int> ExcelEnumIds { get; set; }
     }
 }

Mall.Model/Extend/User/RB_Distributor_Remit_Extend.cs

+using Mall.Common.AOP;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.User;
+using Mall.Common.Enum.User;
+
+namespace Mall.Model.Extend.User
+{
+    /// <summary>
+    /// 商户分销提现表扩展实体
+    /// </summary>
+    [Serializable]
+    [DB(ConnectionName = "DefaultConnection")]
+    public class RB_Distributor_Remit_Extend : RB_Distributor_Remit
+    {
+        /// <summary>
+        /// 用户名称
+        /// </summary>
+        public string UserName { get; set; }
+        /// <summary>
+        /// 头像
+        /// </summary>
+        public string Photo { get; set; }
+        /// <summary>
+        /// 来源
+        /// </summary>
+        public UserSourceEnum? Source { get; set; }
+        /// <summary>
+        /// 下载枚举
+        /// </summary>
+        public List<int> ExcelEnumIds { get; set; }
+    }
+}

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_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

@@ -42,5 +42,15 @@ namespace Mall.Model.Extend.User
                 return str;
             }
         }
+
+        /// <summary>
+        /// 自定义页面标题
+        /// </summary>
+        public string SelfPageName { get; set; }
+
+        /// <summary>
+        /// 小程序页面表Id
+        /// </summary>
+        public int Id { get; set; }
     }
 }

Mall.Module.User/MiniProgramModule.cs

@@ -16,6 +16,11 @@ namespace Mall.Module.User
         /// </summary>
         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>
@@ -171,5 +233,23 @@ namespace Mall.Module.User
             }
             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/MiniProgramPageModule.cs

@@ -60,7 +60,7 @@ namespace Mall.Module.User
                     { nameof(RB_MiniProgram_Page_Extend.Id),extModel.Id},
                     { nameof(RB_MiniProgram_Page_Extend.MallBaseId),extModel.MallBaseId},
                     { nameof(RB_MiniProgram_Page_Extend.PageId),extModel.PageId},
-                    { nameof(RB_MiniProgram_Page_Extend.SelePageName),extModel.SelePageName},
+             
                 };
                 flag = miniProgram_PageRepository.Update(fileds, new WhereHelper(nameof(RB_MiniProgram_Page_Extend.Id), extModel.Id));
             }
@@ -73,6 +73,80 @@ namespace Mall.Module.User
             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>
         /// 根据小程序页面编号获取小程序页面实体(单个)
@@ -89,6 +163,26 @@ namespace Mall.Module.User
             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>

Mall.Module.User/UserCommonModule.cs

@@ -28,6 +28,10 @@ namespace Mall.Module.User
         /// 分销自定义设置
         /// </summary>
         private readonly RB_Distributor_CustomRepository distributor_CustomRepository = new RB_Distributor_CustomRepository();
+        /// <summary>
+        /// 分类样式
+        /// </summary>
+        private readonly RB_Product_CategoryStyleRepository product_CategoryStyleRepository = new RB_Product_CategoryStyleRepository();
 
         /// <summary>
         /// 初始化分销基础配置
@@ -66,7 +70,7 @@ namespace Mall.Module.User
                     UpdateDate = DateTime.Now,
                     UserNotes = "",
                     WithdrawFee = 0,
-                    WithdrawWay = Common.Enum.User.DistrbutorWithdrawWayEnum.ZDDK,
+                    WithdrawWay = "[" + (int)Common.Enum.User.DistrbutorWithdrawWayEnum.ZDDK + "]",
                     IsCommissionResidue = 2
                 }) > 0;
             }
@@ -83,7 +87,7 @@ namespace Mall.Module.User
         public bool InitializeDistributorCustomInfo(int TenantId, int MallBaseId)
         {
             var OModel = distributor_CustomRepository.GetList(new RB_Distributor_Custom_Extend() { TenantId = TenantId, MallBaseId = MallBaseId }).FirstOrDefault();
-            if (OModel != null)
+            if (OModel == null)
             {
                 return distributor_CustomRepository.Insert(new RB_Distributor_Custom()
                 {
@@ -130,5 +134,33 @@ namespace Mall.Module.User
                 return true;
             }
         }
+
+        /// <summary>
+        /// 初始化分类样式
+        /// </summary>
+        /// <param name="TenantId"></param>
+        /// <param name="MallBaseId"></param>
+        /// <returns></returns>
+        public bool InitializeCategoryStyleInfo(int TenantId, int MallBaseId) {
+            var OModel = product_CategoryStyleRepository.GetList(new RB_Product_CategoryStyle_Extend() { TenantId = TenantId, MallBaseId = MallBaseId }).FirstOrDefault();
+            if (OModel == null)
+            {
+                return product_CategoryStyleRepository.Insert(new Model.Entity.Product.RB_Product_CategoryStyle()
+                {
+                    CategoryNum = 1,
+                    CreateDate = DateTime.Now,
+                    Id = 0,
+                    MallBaseId = MallBaseId,
+                    RowNum = 1,
+                    Style = 1,
+                    TenantId = TenantId,
+                    Type = 1,
+                    UpdateDate = DateTime.Now
+                }) > 0;
+            }
+            else {
+                return true;
+            }
+        }
     }
 }

Mall.Repository/Product/RB_Material_InfoRepository.cs

@@ -24,12 +24,17 @@ namespace Mall.Repository.Product
         public List<RB_Material_Info_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Material_Info_Extend dmodel)
         {
             string where = $" 1=1 and {nameof(RB_Material_Info.Status)}=0";
-            if (dmodel.TenantId > 0) {
+            if (dmodel.Id >= 100)
+            {
+                if (dmodel.TenantId > 0)
+                {
                     where += $@" and {nameof(RB_Material_Info.TenantId)}={dmodel.TenantId}";
                 }
-            if (dmodel.MallBaseId > 0) {
+                if (dmodel.MallBaseId > 0)
+                {
                     where += $@" and {nameof(RB_Material_Info.MallBaseId)}={dmodel.MallBaseId}";
                 }
+            }
             if (dmodel.Id > 0) {
                 where += $@" and {nameof(RB_Material_Info.Id)}={dmodel.Id}";
             }

Mall.Repository/Product/RB_Product_CategoryRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System.Linq;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 商品分类仓储层
+    /// </summary>
+    public class RB_Product_CategoryRepository : RepositoryBase<RB_Product_Category>
+    {
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Product_Category_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Product_Category_Extend dmodel)
+        {
+            string where = $" 1=1 and {nameof(RB_Product_Category_Extend.Status)}=0";
+            if (dmodel.TenantId > 0) {
+                where += $@" and {nameof(RB_Product_Category_Extend.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0) {
+                where += $@" and {nameof(RB_Product_Category_Extend.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0) {
+                where += $@" and {nameof(RB_Product_Category_Extend.Id)}={dmodel.Id}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Name)) {
+                where += $@" and {nameof(RB_Product_Category_Extend.Name)} like '%{dmodel.Name}%'";
+            }
+            if (dmodel.Tier > 0) {
+                where += $@" and {nameof(RB_Product_Category_Extend.Tier)}={dmodel.Tier}";
+            }
+            if (dmodel.ParentId > 0) {
+                where += $@" and {nameof(RB_Product_Category_Extend.ParentId)}={dmodel.ParentId}";
+            }
+            if (dmodel.RootId > 0) {
+                where += $@" and {nameof(RB_Product_Category_Extend.RootId)}={dmodel.RootId}";
+            }
+            if (dmodel.Enabled > 0) {
+                where += $@" and {nameof(RB_Product_Category_Extend.Enabled)}={dmodel.Enabled}";
+            }
+            if (dmodel.IsShow > 0) {
+                where += $@" and {nameof(RB_Product_Category_Extend.IsShow)}={dmodel.IsShow}";
+            }
+
+            string sql = $@"select * from RB_Product_Category where {where} order by Id asc";
+            return GetPage<RB_Product_Category_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Product_Category_Extend> GetList(RB_Product_Category_Extend dmodel)
+        {
+            string where = $" 1=1 and {nameof(RB_Product_Category_Extend.Status)}=0";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and {nameof(RB_Product_Category_Extend.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and {nameof(RB_Product_Category_Extend.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0)
+            {
+                where += $@" and {nameof(RB_Product_Category_Extend.Id)}={dmodel.Id}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.CategoryIds)) {
+                where += $@" and {nameof(RB_Product_Category_Extend.Id)} in({dmodel.CategoryIds})";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Name))
+            {
+                where += $@" and {nameof(RB_Product_Category_Extend.Name)} like '%{dmodel.Name}%'";
+            }
+            if (dmodel.Tier > 0)
+            {
+                where += $@" and {nameof(RB_Product_Category_Extend.Tier)}={dmodel.Tier}";
+            }
+            if (dmodel.ParentId > 0)
+            {
+                where += $@" and {nameof(RB_Product_Category_Extend.ParentId)}={dmodel.ParentId}";
+            }
+            if (dmodel.RootId > 0)
+            {
+                where += $@" and {nameof(RB_Product_Category_Extend.RootId)}={dmodel.RootId}";
+            }
+            if (dmodel.Enabled > 0)
+            {
+                where += $@" and {nameof(RB_Product_Category_Extend.Enabled)}={dmodel.Enabled}";
+            }
+            if (dmodel.IsShow > 0)
+            {
+                where += $@" and {nameof(RB_Product_Category_Extend.IsShow)}={dmodel.IsShow}";
+            }
+
+            string sql = $@"select * from RB_Product_Category where {where} order by Id asc";
+            return Get<RB_Product_Category_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/Product/RB_Product_CategoryStyleRepository.cs

+using System;
+using System.Collections.Generic;
+using System.Text;
+using Mall.Model.Entity.Product;
+using Mall.Model.Extend.Product;
+using System.Linq;
+
+namespace Mall.Repository.Product
+{
+    /// <summary>
+    /// 商品分类样式仓储层
+    /// </summary>
+    public class RB_Product_CategoryStyleRepository : RepositoryBase<RB_Product_CategoryStyle>
+    {
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Product_CategoryStyle_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Product_CategoryStyle_Extend dmodel)
+        {
+            string where = $" 1=1 ";
+            if (dmodel.TenantId > 0) {
+                where += $@" and {nameof(RB_Product_CategoryStyle.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0) {
+                where += $@" and {nameof(RB_Product_CategoryStyle.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0) {
+                where += $@" and {nameof(RB_Product_CategoryStyle.Id)}={dmodel.Id}";
+            }
+
+            string sql = $@"select * from RB_Product_CategoryStyle where {where} order by Id asc";
+            return GetPage<RB_Product_CategoryStyle_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Product_CategoryStyle_Extend> GetList(RB_Product_CategoryStyle_Extend dmodel)
+        {
+            string where = $" 1=1 ";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and {nameof(RB_Product_CategoryStyle_Extend.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and {nameof(RB_Product_CategoryStyle_Extend.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0)
+            {
+                where += $@" and {nameof(RB_Product_CategoryStyle_Extend.Id)}={dmodel.Id}";
+            }
+
+            string sql = $@"select * from RB_Product_CategoryStyle where {where} order by Id asc";
+            return Get<RB_Product_CategoryStyle_Extend>(sql).ToList();
+        }
+    }
+}

Mall.Repository/User/RB_Distributor_InfoRepository.cs

@@ -33,6 +33,10 @@ namespace Mall.Repository.User
             if (dmodel.UserId > 0) {
                 where += $@" and di.{nameof(RB_Distributor_Info.UserId)}={dmodel.UserId}";
             }
+            if (dmodel.AuditStatus > 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.AuditStatus)}={(int)dmodel.AuditStatus}";
+            }
             if (dmodel.GradeId >= 0) {
                 where += $@" and di.{nameof(RB_Distributor_Info.GradeId)}={dmodel.GradeId}";
             }
@@ -77,6 +81,10 @@ where {where} order by di.CreateDate desc";
             {
                 where += $@" and di.{nameof(RB_Distributor_Info.UserId)}={dmodel.UserId}";
             }
+            if (dmodel.AuditStatus > 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.AuditStatus)}={(int)dmodel.AuditStatus}";
+            }
             if (!string.IsNullOrEmpty(dmodel.UserIds)) {
                 where += $@" and di.{nameof(RB_Distributor_Info.UserId)} in({dmodel.UserIds})";
             }
@@ -92,5 +100,59 @@ where {where} order by di.CreateDate desc";
             string sql = $@"select di.* from RB_Distributor_Info di where {where} order by di.CreateDate desc";
             return Get<RB_Distributor_Info_Extend>(sql).ToList();
         }
+
+        /// <summary>
+        /// 获取下载列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Distributor_Info_Extend> GetToExcelList(RB_Distributor_Info_Extend dmodel)
+        {
+            string where = $@" 1=1 and di.{nameof(RB_Distributor_Info.Status)}=0";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.UserId > 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.UserId)}={dmodel.UserId}";
+            }
+            if (dmodel.AuditStatus > 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.AuditStatus)}={(int)dmodel.AuditStatus}";
+            }
+            if (dmodel.GradeId >= 0)
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.GradeId)}={dmodel.GradeId}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Name))
+            {
+                where += $@" and di.{nameof(RB_Distributor_Info.Name)} like '%{dmodel.Name}%'";
+            }
+            if (dmodel.Source > 0)
+            {
+                where += $@" and u.{nameof(RB_Member_User.Source)}={dmodel.Source}";
+            }
+            if (!string.IsNullOrEmpty(dmodel.NickName))
+            {
+                where += $@" and u.{nameof(RB_Member_User.Name)} like '%{dmodel.NickName}%'";
+            }
+            if (!string.IsNullOrEmpty(dmodel.Mobile))
+            {
+                where += $@" and u.{nameof(RB_Member_User.Moblie)} like '%{dmodel.Mobile}%'";
+            }
+
+            string sql = $@"select di.*,u.Name as NickName,u.Photo,u.Source,u.Moblie as Mobile,u.OrderNum from RB_Distributor_Info di
+inner join rb_member_user u on di.UserId=u.Id
+where {where} order by di.CreateDate desc";
+            return Get<RB_Distributor_Info_Extend>(sql).ToList();
+        }
     }
 }

Mall.Repository/User/RB_Distributor_RemitRepository.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_Distributor_RemitRepository : RepositoryBase<RB_Distributor_Remit>
+    {
+
+        /// <summary>
+        /// 分页列表
+        /// </summary>
+        /// <param name="pageIndex">页码</param>
+        /// <param name="pageSize">每页显示条数</param>
+        /// <param name="rowCount">总条数</param>
+        /// <param name="dmodel">查询条件</param>
+        /// <returns></returns>
+        public List<RB_Distributor_Remit_Extend> GetPageList(int pageIndex, int pageSize, out long rowCount, RB_Distributor_Remit_Extend dmodel)
+        {
+            string where = $@" 1=1 ";
+            if (dmodel.TenantId > 0) {
+                where += $@" and r.{nameof(RB_Distributor_Remit.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0) {
+                where += $@" and r.{nameof(RB_Distributor_Remit.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0) {
+                where += $@" and r.{nameof(RB_Distributor_Remit.Id)}={dmodel.Id}";
+            }
+            if (dmodel.AuditStatus > 0) {
+                where += $@" and r.{nameof(RB_Distributor_Remit.AuditStatus)}={(int)dmodel.AuditStatus}";
+            }
+            
+            string sql = $@"select r.*,u.Name as UserName,u.Photo,u.Source from RB_Distributor_Remit r
+left join rb_member_user u on r.UserId = u.Id
+where {where} order by r.Id desc";
+            return GetPage<RB_Distributor_Remit_Extend>(pageIndex, pageSize, out rowCount, sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Distributor_Remit_Extend> GetList(RB_Distributor_Remit_Extend dmodel)
+        {
+            string where = $@" 1=1 ";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and {nameof(RB_Distributor_Remit.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and {nameof(RB_Distributor_Remit.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0)
+            {
+                where += $@" and {nameof(RB_Distributor_Remit.Id)}={dmodel.Id}";
+            }
+            if (dmodel.AuditStatus > 0)
+            {
+                where += $@" and {nameof(RB_Distributor_Remit.AuditStatus)}={dmodel.AuditStatus}";
+            }
+
+            string sql = $@"select * from RB_Distributor_Remit where {where} order by Id desc";
+            return Get<RB_Distributor_Remit_Extend>(sql).ToList();
+        }
+
+        /// <summary>
+        /// 获取导出列表
+        /// </summary>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_Distributor_Remit_Extend> GetDistributorRemitList(RB_Distributor_Remit_Extend dmodel)
+        {
+            string where = $@" 1=1 ";
+            if (dmodel.TenantId > 0)
+            {
+                where += $@" and r.{nameof(RB_Distributor_Remit.TenantId)}={dmodel.TenantId}";
+            }
+            if (dmodel.MallBaseId > 0)
+            {
+                where += $@" and r.{nameof(RB_Distributor_Remit.MallBaseId)}={dmodel.MallBaseId}";
+            }
+            if (dmodel.Id > 0)
+            {
+                where += $@" and r.{nameof(RB_Distributor_Remit.Id)}={dmodel.Id}";
+            }
+            if (dmodel.AuditStatus > 0)
+            {
+                where += $@" and r.{nameof(RB_Distributor_Remit.AuditStatus)}={(int)dmodel.AuditStatus}";
+            }
+
+            string sql = $@"select r.*,u.Name as UserName,u.Photo,u.Source from RB_Distributor_Remit r
+left join rb_member_user u on r.UserId = u.Id
+where {where} order by r.Id desc";
+            return Get<RB_Distributor_Remit_Extend>(sql).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_PageRepository.cs

@@ -52,5 +52,17 @@ namespace Mall.Repository.User
             }
             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

@@ -70,5 +70,27 @@ namespace Mall.Repository.User
             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/BaseController.cs

@@ -38,6 +38,7 @@ namespace Mall.WebApi.Controllers
                 {
                     JObject parms = JObject.Parse(Request.HttpContext.Items[GlobalKey.TokenUserInfo].ToString());
                     requestParm.uid = parms.GetStringValue("uid");
+                    requestParm.TenantId = Convert.ToInt32(requestParm.uid);
                 }
                 #endregion
                 //根据token 获取uid

Mall.WebApi/Controllers/Product/ProductController.cs

@@ -40,6 +40,7 @@ namespace Mall.WebApi.Controllers.MallBase
             RB_Material_Info_Extend demodel = JsonConvert.DeserializeObject<RB_Material_Info_Extend>(parms.msg.ToString());
 
             demodel.TenantId = Convert.ToInt32(parms.uid);
+            demodel.MallBaseId = parms.MallBaseId;
             var list = productModule.GetMaterialInfoPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new
@@ -113,6 +114,7 @@ namespace Mall.WebApi.Controllers.MallBase
             RB_Material_Group_Extend demodel = JsonConvert.DeserializeObject<RB_Material_Group_Extend>(parms.msg.ToString());
 
             demodel.TenantId = Convert.ToInt32(parms.uid);
+            demodel.MallBaseId = parms.MallBaseId;
             var list = productModule.GetMaterialGroupList(demodel);
             return ApiResult.Success("", list.Select(x => new
             {
@@ -345,5 +347,242 @@ namespace Mall.WebApi.Controllers.MallBase
         }
 
         #endregion
+
+        #region 商品分类
+
+        /// <summary>
+        /// 获取商品分类树形列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetProductCategoryPageList()
+        {
+            var parms = RequestParm;
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(parms.msg.ToString());
+            RB_Product_Category_Extend demodel = JsonConvert.DeserializeObject<RB_Product_Category_Extend>(parms.msg.ToString());
+
+            demodel.TenantId = Convert.ToInt32(parms.uid);
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = productModule.GetProductCategoryPageList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
+            pagelist.count = Convert.ToInt32(count);
+            pagelist.pageData = list.Select(x => new
+            {
+                x.Id,
+                x.Name,
+                x.Tier,
+                x.ParentId,
+                x.Sort,
+                x.Icon,
+                x.IconPath,
+                x.BigIcon,
+                x.BigIconPath,
+                x.AdvertisingImage,
+                x.AdvertisingImagePath,
+                x.AdvertisingAddress,
+                x.Enabled,
+                x.IsShow,
+                x.TenantId,
+                x.MallBaseId,
+                CreateDate = x.CreateDate.HasValue ? x.CreateDate.Value.ToString("yyyy-MM-dd") : ""
+            });
+            return ApiResult.Success("", pagelist);
+        }
+
+        /// <summary>
+        /// 获取分类树形结构
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetProductCategoryTreeList() {
+            var parms = RequestParm;
+            RB_Product_Category_Extend demodel = JsonConvert.DeserializeObject<RB_Product_Category_Extend>(parms.msg.ToString());
+
+            demodel.TenantId = Convert.ToInt32(parms.uid);
+            demodel.MallBaseId = parms.MallBaseId;
+            var list = productModule.GetProductCategoryTreeList(demodel);
+            return ApiResult.Success("", list);
+        }
+
+        /// <summary>
+        /// 保存分类
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetProductCategoryInfo() {
+            var req = RequestParm;
+            RB_Product_Category_Extend demodel = JsonConvert.DeserializeObject<RB_Product_Category_Extend>(req.msg.ToString());
+            if ((demodel.Tier ?? 0) <= 0) {
+                return ApiResult.ParamIsNull("请选择层级");
+            }
+            if (string.IsNullOrEmpty(demodel.Name)) {
+                return ApiResult.ParamIsNull("请输入分类名称");
+            }
+            if (!demodel.Sort.HasValue) {
+                return ApiResult.ParamIsNull("请输入排序");
+            }
+            if (demodel.Tier == 1)
+            {
+                demodel.ParentId = 0;
+            }
+            else if (demodel.Tier > 1) {
+                if ((demodel.ParentId ?? 0) <= 0) {
+                    return ApiResult.ParamIsNull("请选择上级");
+                }
+            }
+
+            demodel.TenantId = Convert.ToInt32(req.uid);
+            demodel.MallBaseId = req.MallBaseId;
+            demodel.Icon ??= 0;
+            demodel.BigIcon ??= 0;
+            demodel.AdvertisingImage ??= 0;
+            demodel.AdvertisingAddress ??= "";
+            demodel.Enabled ??= 1;
+            demodel.IsShow ??= 1;
+            demodel.Status ??= 0;
+            demodel.CreateDate = DateTime.Now;
+            demodel.UpdateDate = DateTime.Now;
+            bool flag= productModule.SetProductCategoryInfo(demodel);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed();
+            }
+
+        }
+
+        /// <summary>
+        /// 删除分类
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult DelProductCategoryInfo() {
+            var req = RequestParm;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            int CategoryId = parms.GetInt("CategoryId", 0);
+            if (CategoryId <= 0)
+            {
+                return ApiResult.ParamIsNull("请选择需删除分类id");
+            }
+
+            bool flag = productModule.DelProductCategoryInfo(CategoryId, req.TenantId, req.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 保存分类转移
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetProductCategoryTransfer() {
+            var req = RequestParm;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            int CategoryId = parms.GetInt("CategoryId", 0);
+            int ParentId = parms.GetInt("ParentId", 0);
+            if (CategoryId <= 0) {
+                return ApiResult.ParamIsNull("请选择需转移分类id");
+            }
+            if (ParentId < 0) {
+                return ApiResult.ParamIsNull("请选择转入分类id");
+            }
+            if (CategoryId == ParentId) {
+                return ApiResult.ParamIsNull("不能转入同一分类下");
+            }
+
+            var list = productModule.GetProductCategoryForALLChlid(CategoryId, Convert.ToInt32(req.uid), req.MallBaseId);
+            if (list.Where(x => x.Id == ParentId).Any()) {
+                return ApiResult.ParamIsNull("不能转入当前分类的子集分类");
+            }
+            var model = list.Where(x => x.Id == CategoryId).FirstOrDefault();
+            if (model == null) {
+                return ApiResult.ParamIsNull("分类不存在，请核实后再试");
+            }
+            if (model.ParentId == ParentId) {
+                return ApiResult.ParamIsNull("已在当前分类下，未转移");
+            }
+
+            bool flag = productModule.SetProductCategoryTransfer(model, ParentId, list);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 保存分类排序
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetProductCategorySort() {
+            var req = RequestParm;
+            List<RB_Product_CategorySort> delist = JsonConvert.DeserializeObject<List<RB_Product_CategorySort>>(req.msg.ToString());
+            if (delist == null || !delist.Any()) {
+                return ApiResult.ParamIsNull();
+            }
+
+            bool flag = productModule.SetProductCategorySort(delist, req.TenantId, req.MallBaseId);
+            if (flag)
+            {
+                return ApiResult.Success();
+            }
+            else
+            {
+                return ApiResult.Failed();
+            }
+        }
+
+        /// <summary>
+        /// 获取分类样式
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetProductCategoryStyleInfo() {
+            var parms = RequestParm;
+
+            var model = productModule.GetProductCategoryStyleInfo(parms.TenantId, parms.MallBaseId);
+            return ApiResult.Success("", new
+            {
+                model.Id,
+                model.Type,
+                model.Style,
+                model.CategoryNum,
+                model.RowNum,
+                UpdateDate = model.UpdateDate.Value.ToString("yyyy-MM-dd HH:mm:ss")
+            });
+        }
+
+        /// <summary>
+        /// 保存分类样式
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult SetProductCategoryStyleInfo() {
+            var req = RequestParm;
+            RB_Product_CategoryStyle_Extend demodel = JsonConvert.DeserializeObject<RB_Product_CategoryStyle_Extend>(req.msg.ToString());
+
+            demodel.CategoryNum ??= 1;
+            demodel.CreateDate = DateTime.Now;
+            demodel.MallBaseId = req.MallBaseId;
+            demodel.RowNum ??= 1;
+            demodel.Style ??= 1;
+            demodel.TenantId = req.TenantId;
+            demodel.Type ??= 1;
+            demodel.UpdateDate = DateTime.Now;
+            bool flag = productModule.SetProductCategoryStyleInfo(demodel);
+            return flag ? ApiResult.Success() : ApiResult.Failed();
+        }
+
+        #endregion
     }
 }
\ No newline at end of file

Mall.WebApi/Controllers/User/TenantController.cs

@@ -185,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();
@@ -219,13 +277,39 @@ namespace Mall.WebApi.Controllers.User
             int MallShopStyle = parms.GetInt("MallShopStyle");
             var extModel = new RB_MiniProgram_Extend()
             {
-                MallBaseId=MallBaseId,
-               MallShopStyle=(MallShopStyleEnum)MallShopStyle
+                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>
@@ -492,6 +576,104 @@ namespace Mall.WebApi.Controllers.User
             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
 
     }

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",