Merge branch 'feature-dgy-系统消息弹窗添加部分推送' into DuGuYang

# Conflicts:
#	Models/WebCMSEntities.cs

Areas/Admin/Controllers/MainServer/MsgAlertController.cs

@@ -95,7 +95,7 @@ namespace MySystem.Areas.Admin.Controllers
                 if (MsgType == 2) dic["MsgType"] = "图片";
                 if (MsgType == 3) dic["MsgType"] = "动图";
                 if (MsgType == 0) dic["MsgType"] = "";
-                dic["StatusName"] = dic["Status"].ToString() == "1" ? "正常" : "关闭";
+                dic["StatusName"] = dic["Status"].ToString() == "1" ? "使用中" : "已关闭";
                 //推送类型
                 int PushType = int.Parse(dic["PushType"].ToString());
                 if (PushType == 0) dic["PushType"] = "不推送";
@@ -186,6 +186,7 @@ namespace MySystem.Areas.Admin.Controllers
                     }
                     else
                     {
+                        new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Delete("MsgAlert", Id);
                         return "创客" + item + "不存在或者已经添加了相关信息";
                     }
                 }
@@ -212,6 +213,17 @@ namespace MySystem.Areas.Admin.Controllers
 
             MsgAlert editData = db.MsgAlert.FirstOrDefault(m => m.Id == Id) ?? new MsgAlert();
             ViewBag.data = editData;
+            var userSwapWhite = db.UserSwapWhite.Where(m => m.QueryCount == Id).ToList();
+            var makerInfo = "";
+            foreach (var item in userSwapWhite)
+            {
+                var user = db.Users.FirstOrDefault(m => m.Id == item.UserId) ?? new Users();
+                if (user.Id > 0)
+                {
+                    makerInfo += user.MakerCode + ",";
+                }
+            }
+            ViewBag.makerInfo = makerInfo.TrimEnd(',');
             return View();
         }
 
@@ -224,7 +236,7 @@ namespace MySystem.Areas.Admin.Controllers
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public string Edit(MsgAlert data)
+        public string Edit(MsgAlert data, string MakerCodes)
         {
             Dictionary<string, object> Fields = new Dictionary<string, object>();
 
@@ -250,6 +262,34 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoTitle", data.SeoTitle);
             Fields.Add("SeoDescription", data.SeoDescription);
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MsgAlert", Fields, data.Id);
+            var duserSwapWhite = db.UserSwapWhite.Where(m => m.QueryCount == data.Id).ToList();
+            foreach (var item in duserSwapWhite)
+            {
+                new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Delete("UserSwapWhite", item.Id);
+            }
+            if (!string.IsNullOrEmpty(MakerCodes))
+            {
+                string[] MakerCodeList = MakerCodes.Replace("\r", "").Replace("\n", ",").Split(',');
+                foreach (var item in MakerCodeList)
+                {
+                    var userForMakerCode = db.UserForMakerCode.FirstOrDefault(m => m.MakerCode == item) ?? new UserForMakerCode();
+                    var userSwapWhite = db.UserSwapWhite.FirstOrDefault(m => m.QueryCount == data.Id && m.UserId == userForMakerCode.UserId) ?? new UserSwapWhite();
+                    if (userForMakerCode.UserId > 0 && userSwapWhite.Id == 0)
+                    {
+                        var userSwapWhiteAdd = db.UserSwapWhite.Add(new UserSwapWhite()
+                        {
+                            QueryCount = data.Id,//弹窗Id
+                            CreateDate = DateTime.Now,
+                            CreateMan = SysUserName + "_" + SysRealName,
+                            UserId = userForMakerCode.UserId,
+                        }).Entity;
+                    }
+                    else
+                    {
+                        return "创客" + item + "不存在或者已经添加了相关信息";
+                    }
+                }
+            }
             AddSysLog(data.Id.ToString(), "MsgAlert", "update");
             db.SaveChanges();
 

Areas/Admin/Views/MainServer/MsgAlert/Add.cshtml

@@ -174,7 +174,7 @@
                                 </div>
                             </div>
                             <div class="layui-form-item" id="MakerCode" style="display: none;">
-                                <label class="layui-form-label">创客编号</label>
+                                <label class="layui-form-label">指定推送创客编号</label>
                                 <div class="layui-input-block">
                                     <textarea class="layui-textarea" lay-verify="" name="MakerCodes" id="MakerCodes" placeholder="请输入创客编号,多个创客编号用回车隔开"></textarea>
                                 </div>
@@ -345,12 +345,12 @@
                     $('#BgPics').hide();
                     $('#Button').show();
                 } else if (data.value == '2') {
-                    $('#Titles').hide();
+                    $('#Titles').show();
                     $('#BgPics').show();
                     $('#Button').hide();
                 }
                 else if (data.value == '3') {
-                    $('#Titles').hide();
+                    $('#Titles').show();
                     $('#BgPics').show();
                     $('#Button').hide();
                 }

Areas/Admin/Views/MainServer/MsgAlert/Edit.cshtml

@@ -5,7 +5,7 @@
 @{
     string RightInfo = ViewBag.RightInfo as string;
     string right = ViewBag.right as string;
-
+    string makerInfo = ViewBag.makerInfo as string;
 }
 <!DOCTYPE html>
 <html>
@@ -56,12 +56,12 @@
                                 </div>
                             </div>
                             @* <div class="layui-form-item layui-form-text">
-                                <label class="layui-form-label">简介</label>
-                                <div class="layui-input-block">
-                                <textarea class="layui-textarea" id="Summary" name="Summary" maxlength="500"
-                                lay-verify="" placeholder="请输入简介">@editData.Summary</textarea>
-                                </div>
-                                </div> *@
+                            <label class="layui-form-label">简介</label>
+                            <div class="layui-input-block">
+                            <textarea class="layui-textarea" id="Summary" name="Summary" maxlength="500"
+                            lay-verify="" placeholder="请输入简介">@editData.Summary</textarea>
+                            </div>
+                            </div> *@
                             <div class="layui-form-item layui-form-text">
                                 <label class="layui-form-label">内容</label>
                                 <div class="layui-input-block">
@@ -97,60 +97,60 @@
                                         @if (!string.IsNullOrEmpty(editData.BgPic))
                                         {
                                             <img src="@(MySystem.OssHelper.Instance.SourceHost)@editData.BgPic"
-                                            class="layui-upload-img" style="max-width:85px; max-height:85px;"
-                                            onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.BgPic')">
+                                                class="layui-upload-img" style="max-width:85px; max-height:85px;"
+                                                onclick="showBigPic('@(MySystem.OssHelper.Instance.SourceHost)@editData.BgPic')">
                                         }
                                     </div>
                                 </div>
                             </div>
                             @* <div class="layui-form-item">
-                                <label class="layui-form-label">推送类型</label>
-                                <div class="layui-input-inline">
-                                <select id="PushType" name="PushType" lay-search="">
-                                <option value="">请选择</option>
-                                <option value="0">不推送</option>
-                                <option value="1">立即推送</option>
-                                <option value="2">定时推送</option>
-                                </select>
-                                <script>$("#PushType").val("@editData.PushType");</script>
-                                </div>
-                                </div>
-                                <div class="layui-form-item">
-                                <label class="layui-form-label">推送标记</label>
-                                <div class="layui-input-inline">
-                                <select id="PushFlag" name="PushFlag" lay-search="">
-                                <option value="">请选择</option>
-                                <option value="0">不推送</option>
-                                <option value="1">未推送</option>
-                                <option value="2">已推送</option>
-                                </select>
-                                <script>$("#PushFlag").val("@editData.PushFlag");</script>
-                                </div>
-                                </div>
-                                <div class="layui-form-item">
-                                <label class="layui-form-label">推送参数</label>
-                                <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="PushParam" name="PushParam"
-                                value="@editData.PushParam" maxlength="255" lay-verify="" autocomplete="off"
-                                placeholder="请输入推送参数">
-                                </div>
-                                </div>
-                                <div class="layui-form-item">
-                                <label class="layui-form-label">推送时间</label>
-                                <div class="layui-input-inline">
-                                <input class="layui-input" type="text" id="PushTime" name="PushTime"
-                                value="@(editData.PushTime == null ? "" : editData.PushTime.Value.ToString("yyyy-MM-dd
-                                HH:mm:ss"))"
-                                lay-verify="" autocomplete="off" placeholder="请输入推送时间">
-                                </div>
-                                </div>
-                                <div class="layui-form-item layui-form-text">
-                                <label class="layui-form-label">扩展字段</label>
-                                <div class="layui-input-block">
-                                <textarea class="layui-textarea" id="ExtendColumn" name="ExtendColumn" maxlength=""
-                                lay-verify="" placeholder="请输入扩展字段">@editData.ExtendColumn</textarea>
-                                </div>
-                                </div> *@
+                            <label class="layui-form-label">推送类型</label>
+                            <div class="layui-input-inline">
+                            <select id="PushType" name="PushType" lay-search="">
+                            <option value="">请选择</option>
+                            <option value="0">不推送</option>
+                            <option value="1">立即推送</option>
+                            <option value="2">定时推送</option>
+                            </select>
+                            <script>$("#PushType").val("@editData.PushType");</script>
+                            </div>
+                            </div>
+                            <div class="layui-form-item">
+                            <label class="layui-form-label">推送标记</label>
+                            <div class="layui-input-inline">
+                            <select id="PushFlag" name="PushFlag" lay-search="">
+                            <option value="">请选择</option>
+                            <option value="0">不推送</option>
+                            <option value="1">未推送</option>
+                            <option value="2">已推送</option>
+                            </select>
+                            <script>$("#PushFlag").val("@editData.PushFlag");</script>
+                            </div>
+                            </div>
+                            <div class="layui-form-item">
+                            <label class="layui-form-label">推送参数</label>
+                            <div class="layui-input-inline">
+                            <input class="layui-input" type="text" id="PushParam" name="PushParam"
+                            value="@editData.PushParam" maxlength="255" lay-verify="" autocomplete="off"
+                            placeholder="请输入推送参数">
+                            </div>
+                            </div>
+                            <div class="layui-form-item">
+                            <label class="layui-form-label">推送时间</label>
+                            <div class="layui-input-inline">
+                            <input class="layui-input" type="text" id="PushTime" name="PushTime"
+                            value="@(editData.PushTime == null ? "" : editData.PushTime.Value.ToString("yyyy-MM-dd
+                            HH:mm:ss"))"
+                            lay-verify="" autocomplete="off" placeholder="请输入推送时间">
+                            </div>
+                            </div>
+                            <div class="layui-form-item layui-form-text">
+                            <label class="layui-form-label">扩展字段</label>
+                            <div class="layui-input-block">
+                            <textarea class="layui-textarea" id="ExtendColumn" name="ExtendColumn" maxlength=""
+                            lay-verify="" placeholder="请输入扩展字段">@editData.ExtendColumn</textarea>
+                            </div>
+                            </div> *@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">跳转Url参数</label>
                                 <div class="layui-input-inline">
@@ -186,22 +186,23 @@
                                 <label class="layui-form-label">是否周末</label>
                                 <div class="layui-input-inline">
                                     <input type="checkbox" id="IsWeekend" name="IsWeekend" value="1"
-                                        @(editData.IsWeekend == 1 ? "checked=checked" : "") lay-skin="switch"
+                                    @(editData.IsWeekend == 1 ? "checked=checked" : "") lay-skin="switch"
                                         lay-filter="switchTest" title="开关">
                                 </div>
                             </div>
-                            <div class="layui-form-item" id="MakerCode" style="display: none;">
-                                <label class="layui-form-label">指定推送</label>
+                            <div class="layui-form-item">
+                                <label class=" layui-form-label">指定推送</label>
                                 <div class="layui-input-inline">
                                     <input type="checkbox" id="AlertFlag" name="AlertFlag" value="1"
-                                        @(editData.AlertFlag == 1 ? "checked=checked" : "") lay-skin="switch"
+                            @(editData.AlertFlag == 1 ? "checked=checked" : "") lay-skin="switch"
                                         lay-filter="AlertFlag" title="开关">
                                 </div>
                             </div>
-                            <div class="layui-form-item">
-                                <label class="layui-form-label">创客编号</label>
+                            <div class="layui-form-item" id="MakerCode" style="display: none;">
+                                <label class="layui-form-label">指定推送创客编号</label>
                                 <div class="layui-input-block">
-                                    <textarea class="layui-textarea" lay-verify="" name="MakerCodes" id="MakerCodes" placeholder="请输入创客编号,多个创客编号用回车隔开"></textarea>
+                                    <textarea class="layui-textarea" lay-verify="" name="MakerCodes"
+                                        id="MakerCodes" placeholder="请输入创客编号,多个创客编号用回车隔开">@makerInfo</textarea>
                                 </div>
                             </div>
 
@@ -223,13 +224,13 @@
     <script src="/other/mybjq/lang/zh_CN.js"></script>
     <script>
         //内容
-        @(Html.Raw(Library.Control.kindeditorVar("Content")))
+                                    @(Html.Raw(Library.Control.kindeditorVar("Content")))
 
 
             //编辑器
             KindEditor.ready(function (K) {
                 //内容
-        @(Html.Raw(Library.Control.kindeditor("Content", 1)))
+                                    @(Html.Raw(Library.Control.kindeditor("Content", 1)))
 
         });
 
@@ -385,11 +386,11 @@
                 $('#BgPics').hide();
                 $('#Button').show();
             } else if (MsgType == '2') {
-                $('#Titles').hide();
+                $('#Titles').show();
                 $('#BgPics').show();
                 $('#Button').hide();
             } else if (MsgType == '3') {
-                $('#Titles').hide();
+                $('#Titles').show();
                 $('#BgPics').show();
                 $('#Button').hide();
             }
@@ -403,6 +404,14 @@
                 }
                 form.render();
             });
+            var AlertFlag = '@editData.AlertFlag';
+            if (AlertFlag == '1') {
+                $('#MakerCode').show();
+            }
+            else
+            {
+                $('#MakerCode').hide();
+            }
 
             //日期
             laydate.render({

Models/LeaderCompTmp.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class LeaderCompTmp
+    {
+        public int Id { get; set; }
+        public string EveryMonthData { get; set; }
+        public string ParentNav { get; set; }
+        public int ParentUserId { get; set; }
+    }
+}

Models/MsgAlertUserList.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+
+namespace MySystem.Models
+{
+    public partial class MsgAlertUserList
+    {
+        public int Id { get; set; }
+        public int Sort { get; set; }
+        public int QueryCount { get; set; }
+        public int Status { get; set; }
+        public int Version { get; set; }
+        public DateTime? CreateDate { get; set; }
+        public DateTime? UpdateDate { get; set; }
+        public string CreateMan { get; set; }
+        public string UpdateMan { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeyword { get; set; }
+        public string SeoDescription { get; set; }
+        public int MsgId { get; set; }
+        public int UserId { get; set; }
+    }
+}

Models/WebCMSEntities.cs

@@ -71,6 +71,7 @@ namespace MySystem.Models
         public virtual DbSet<KqProducts> KqProducts { get; set; }
         public virtual DbSet<LeaderAccountRecord> LeaderAccountRecord { get; set; }
         public virtual DbSet<LeaderCompPrize> LeaderCompPrize { get; set; }
+        public virtual DbSet<LeaderCompTmp> LeaderCompTmp { get; set; }
         public virtual DbSet<LeaderCompTradeStat> LeaderCompTradeStat { get; set; }
         public virtual DbSet<LeaderReserveRecord> LeaderReserveRecord { get; set; }
         public virtual DbSet<Leaders> Leaders { get; set; }
@@ -103,6 +104,7 @@ namespace MySystem.Models
         public virtual DbSet<Merchants> Merchants { get; set; }
         public virtual DbSet<MobileCodeCheck> MobileCodeCheck { get; set; }
         public virtual DbSet<MsgAlert> MsgAlert { get; set; }
+        public virtual DbSet<MsgAlertUserList> MsgAlertUserList { get; set; }
         public virtual DbSet<MsgBlackList> MsgBlackList { get; set; }
         public virtual DbSet<MsgPersonal> MsgPersonal { get; set; }
         public virtual DbSet<MsgPlacard> MsgPlacard { get; set; }
@@ -4260,7 +4262,130 @@ namespace MySystem.Models
                     .HasComment("排序序号");
 
                 entity.Property(e => e.StatMonth)
-                    .HasColumnType("varchar(6)")
+                    .HasColumnType("varchar(20)")
+                    .HasComment("统计月份")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("更新人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("创客");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
+            modelBuilder.Entity<LeaderCompTmp>(entity =>
+            {
+                entity.HasComment("领导人达标奖临时存储");
+
+                entity.Property(e => e.Id)
+                    .HasColumnType("int(11)")
+                    .HasComment("用户Id");
+
+                entity.Property(e => e.EveryMonthData)
+                    .HasColumnType("mediumtext")
+                    .HasComment("每月达标数据")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ParentNav)
+                    .HasColumnType("varchar(1000)")
+                    .HasComment("上级创客集合")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ParentUserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("上级创客");
+            });
+
+            modelBuilder.Entity<LeaderCompTradeStat>(entity =>
+            {
+                entity.HasComment("领导人达标奖交易额统计");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CheckSelfTradeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("个人环比月交易额");
+
+                entity.Property(e => e.CheckTradeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("环比月交易额");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("创建人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ParentNav)
+                    .HasColumnType("varchar(1000)")
+                    .HasComment("上级创客集合")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.ParentUserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("上级创客");
+
+                entity.Property(e => e.QueryCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("点击量");
+
+                entity.Property(e => e.ResultTradeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("增量交易");
+
+                entity.Property(e => e.SelfResultTradeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("个人增量交易");
+
+                entity.Property(e => e.SelfTradeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("个人当月交易额");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.StatMonth)
+                    .HasColumnType("varchar(20)")
                     .HasComment("统计月份")
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
@@ -4269,6 +4394,10 @@ namespace MySystem.Models
                     .HasColumnType("int(11)")
                     .HasComment("状态");
 
+                entity.Property(e => e.TradeAmount)
+                    .HasColumnType("decimal(18,2)")
+                    .HasComment("当月交易额");
+
                 entity.Property(e => e.UpdateDate)
                     .HasColumnType("datetime")
                     .HasComment("更新时间");
@@ -6857,6 +6986,72 @@ namespace MySystem.Models
                 entity.Property(e => e.Version).HasColumnType("int(11)");
             });
 
+            modelBuilder.Entity<MsgAlertUserList>(entity =>
+            {
+                entity.HasComment("系统弹窗消息创客关联表");
+
+                entity.Property(e => e.Id).HasColumnType("int(11)");
+
+                entity.Property(e => e.CreateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("创建时间");
+
+                entity.Property(e => e.CreateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("创建人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.MsgId)
+                    .HasColumnType("int(11)")
+                    .HasComment("弹窗消息");
+
+                entity.Property(e => e.QueryCount)
+                    .HasColumnType("int(11)")
+                    .HasComment("点击量");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasColumnType("varchar(500)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoKeyword)
+                    .HasColumnType("varchar(200)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasColumnType("varchar(100)")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.Sort)
+                    .HasColumnType("int(11)")
+                    .HasComment("排序序号");
+
+                entity.Property(e => e.Status)
+                    .HasColumnType("int(11)")
+                    .HasComment("状态");
+
+                entity.Property(e => e.UpdateDate)
+                    .HasColumnType("datetime")
+                    .HasComment("更新时间");
+
+                entity.Property(e => e.UpdateMan)
+                    .HasColumnType("varchar(50)")
+                    .HasComment("更新人")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
+                entity.Property(e => e.UserId)
+                    .HasColumnType("int(11)")
+                    .HasComment("创客");
+
+                entity.Property(e => e.Version)
+                    .HasColumnType("int(11)")
+                    .HasComment("版本号");
+            });
+
             modelBuilder.Entity<MsgBlackList>(entity =>
             {
                 entity.HasComment("消息黑名单");

wwwroot/layuiadmin/modules_main/MsgAlert_Admin.js

@@ -96,16 +96,17 @@ layui.config({
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
             , { field: 'StatusName', width: 200, title: '状态', sort: true }
             , { field: 'Title', width: 200, title: '标题', sort: true }
-            , { field: 'Summary', width: 200, title: '简介', sort: true }
+            // , { field: 'Summary', width: 200, title: '简介', sort: true }
             // , { field: 'BgPic', width: 200, title: '背景图片', width: 60, templet: '#BgPicTpl', unresize: true }
             // , { field: 'PushType', width: 200, title: '推送类型', sort: true }
             // , { field: 'PushFlag', width: 200, title: '推送标记', sort: true }
             // , { field: 'PushTime', width: 200, title: '推送时间', sort: true }
             // , { field: 'UrlParam', width: 200, title: '跳转Url参数', sort: true }
-            , { field: 'BtnText', width: 200, title: '按钮文字', sort: true }
+            // , { field: 'BtnText', width: 200, title: '按钮文字', sort: true }
             , { field: 'TimeByDay', width: 200, title: '每日次数', sort: true }
             // , { field: 'AlertFlagName', width: 200, title: '弹窗标识', sort: true }
             , { field: 'IsWeekendName', width: 200, title: '是否周末', sort: true }
+            , { field: 'AlertFlagName', width: 200, title: '指定推送', sort: true }
 
             , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
@@ -168,11 +169,6 @@ layui.config({
 
                     //内容
                     iframeWindow.Contentedit.sync();
-
-
-
-
-
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
                         var field = data.field; //获取提交的字段
@@ -191,6 +187,7 @@ layui.config({
                             success: function (data) {
                                 layer.close(index); //关闭弹层
                                 if (data == "success") {
+                                    layer.msg("编辑成功");
                                     table.reload('LAY-list-manage'); //数据刷新
                                 } else {
                                     layer.msg(data);
@@ -287,11 +284,6 @@ layui.config({
 
                     //内容
                     iframeWindow.Contentedit.sync();
-
-
-
-
-
                     //监听提交
                     iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
                         var field = data.field; //获取提交的字段
@@ -310,9 +302,14 @@ layui.config({
                             success: function (data) {
                                 layer.close(index); //关闭弹层
                                 if (data == "success") {
+                                    layer.msg("添加成功");
                                     table.reload('LAY-list-manage'); //数据刷新
                                 } else {
-                                    layer.msg(data);
+                                    layer.msg(data, {
+                                        time: 1500
+                                    }, function () {
+                                        table.reload('LAY-list-manage'); //数据刷新
+                                    });
                                 }
                             }
                         });