新增参数

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_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/User/RB_MiniProgram_Extend.cs

@@ -60,5 +60,7 @@ namespace Mall.Model.Extend.User
                 return str;
             }
         }
+
+        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.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_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();
+        }
+    }
+}