Merge branch 'feature-dgy-弹窗配置' into feature-dgy-后台测试

Areas/Admin/Controllers/HomeController.cs

@@ -75,7 +75,7 @@ namespace MySystem.Areas.Admin.Controllers
                     int count = 0;
                     DataTable dt = dbconn.dtable("select count(Id) from " + table);
                     if (dt.Rows.Count > 0)
-                    { 
+                    {
                         count = int.Parse(dt.Rows[0][0].ToString());
                     }
                     item.Add("Count", count);
@@ -149,35 +149,59 @@ namespace MySystem.Areas.Admin.Controllers
         [HttpPost]
         public string Login(string UserName, string Pwd, string CheckCode)
         {
+            // string result = "";
+            // if (function.GetCookie(_accessor.HttpContext, "checkcode") != CheckCode)
+            // {
+            //     result = "验证码错误!!";
+            // }
+            // else
+            // {
+            //     Pwd = function.MD5_32(Pwd);
+            //     var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
+            //     if (user != null)
+            //     {
+            //         user.LastLoginDate = DateTime.Now;
+            //         db.SaveChanges();
+            //         function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
+            //         function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
+            //         function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
+            //         int RoleId = int.Parse(function.CheckInt(user.Role));
+            //         BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
+            //         string RightInfo = function.CheckNull(Role.RightInfo);
+            //         function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
+            //         string UserId = user.Id.ToString();
+            //         function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
+            //         function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
+            //         result = "success";
+            //     }
+            //     else
+            //     {
+            //         result = "用户名或密码错误";
+            //     }
+            // }
+
             string result = "";
-            if (function.GetCookie(_accessor.HttpContext, "checkcode") != CheckCode)
+            Pwd = function.MD5_32(Pwd);
+            var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
+            if (user != null)
             {
-                result = "验证码错误!!";
+                user.LastLoginDate = DateTime.Now;
+                db.SaveChanges();
+                function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
+                function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
+                function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
+                int RoleId = int.Parse(function.CheckInt(user.Role));
+                BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
+                string RightInfo = function.CheckNull(Role.RightInfo);
+                function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
+                string UserId = user.Id.ToString();
+                function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
+                function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
+                result = "success";
             }
             else
             {
-                Pwd = function.MD5_32(Pwd);
-                var user = db.SysAdmin.FirstOrDefault(m => m.AdminName == UserName && m.Password == Pwd);
-                if (user != null)
-                {
-                    user.LastLoginDate = DateTime.Now;
-                    db.SaveChanges();
-                    function.WriteCookie(_accessor.HttpContext, "SysUserName", user.AdminName);
-                    function.WriteCookie(_accessor.HttpContext, "SysRealName", user.RealName);
-                    function.WriteCookie(_accessor.HttpContext, "SysRealRole", user.Role);
-                    int RoleId = int.Parse(function.CheckInt(user.Role));
-                    BsModels.SysAdminRole Role = db.SysAdminRole.FirstOrDefault(m => m.Id == RoleId) ?? new BsModels.SysAdminRole();
-                    string RightInfo = function.CheckNull(Role.RightInfo);
-                    function.WriteSession(_accessor.HttpContext, "RightInfo", RightInfo);
-                    string UserId = user.Id.ToString();
-                    function.WriteCookie(_accessor.HttpContext, "SysId", UserId);
-                    function.WriteSession(_accessor.HttpContext, "IsLogin", "1");
-                    result = "success";
-                }
-                else
-                {
-                    result = "用户名或密码错误";
-                }
+                result = "用户名或密码错误";
             }
             return result;
         }

Areas/Admin/Controllers/MainServer/MsgAlertController.cs

@@ -51,12 +51,12 @@ namespace MySystem.Areas.Admin.Controllers
         /// 弹窗消息列表
         /// </summary>
         /// <returns></returns>
-        public JsonResult IndexData(MsgAlert data, string MsgTypeSelect, string PushTypeSelect, string PushFlagSelect, int page = 1, int limit = 30)
+        public JsonResult IndexData(MsgAlert data, string MsgTypeSelect, string PushTypeSelect, string PushFlagSelect, string CreateDateData, int page = 1, int limit = 30)
         {
 
             Dictionary<string, string> Fields = new Dictionary<string, string>();
 
-            Fields.Add("CreateDate", "3"); //时间
+            // Fields.Add("CreateDate", "3"); //时间
             Fields.Add("Title", "1"); //标题
 
 
@@ -76,6 +76,14 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 condition += " and PushFlag=" + PushFlagSelect;
             }
+            //创建时间
+            if(!string.IsNullOrEmpty(CreateDateData))
+            {
+                string[] datelist = CreateDateData.Split(new string[] { " - " }, StringSplitOptions.None);
+                string start = datelist[0];
+                string end = datelist[1];
+                condition += " and CreateDate>='" + start + " 00:00:00' and CreateDate<='" + end + " 23:59:59'";
+            }
 
 
             Dictionary<string, object> obj = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).IndexData("MsgAlert", Fields, "Id desc", "0", page, limit, condition);
@@ -86,6 +94,7 @@ namespace MySystem.Areas.Admin.Controllers
                 int MsgType = int.Parse(dic["MsgType"].ToString());
                 if (MsgType == 1) dic["MsgType"] = "文本";
                 if (MsgType == 2) dic["MsgType"] = "图片";
+                if (MsgType == 3) dic["MsgType"] = "动图";
                 if (MsgType == 0) dic["MsgType"] = "";
                 dic["StatusName"] = dic["Status"].ToString() == "1" ? "正常" : "关闭";
                 //推送类型
@@ -136,6 +145,7 @@ namespace MySystem.Areas.Admin.Controllers
             Dictionary<string, object> Fields = new Dictionary<string, object>();
 
             Fields.Add("MsgType", data.MsgType); //消息类型
+            Fields.Add("Status", 1); //默认开启
             Fields.Add("Title", data.Title); //标题
             Fields.Add("Summary", data.Summary); //简介
             Fields.Add("Content", data.Content); //内容
@@ -216,7 +226,6 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("IsWeekend", data.IsWeekend); //是否周末
 
             Fields.Add("SeoTitle", data.SeoTitle);
-            Fields.Add("SeoKeyword", data.SeoKeyword);
             Fields.Add("SeoDescription", data.SeoDescription);
             new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Edit("MsgAlert", Fields, data.Id);
             AddSysLog(data.Id.ToString(), "MsgAlert", "update");

Areas/Admin/Views/Home/Login.cshtml

@@ -26,11 +26,11 @@
                     <label for="password">密码 / Password</label>
                     <input class="form-input" type="password" name="Pwd" id="Pwd" onKeyUp="if(event.keyCode==13){$('#CheckCode').focus();}" placeholder="请填写密码">
                 </div>
-                <div class="form-group pb10">
+                @* <div class="form-group pb10">
                     <label for="password">验证码 / Verification</label>
                     <input class="form-input" type="text" name="CheckCode" id="CheckCode" onkeyup="if(event.keyCode==13){syslogin();}" placeholder="请填写验证码" style="width: 70%; display: inline-block; margin-right: 2%">
                     <img src="/Api/PublicMethod/CheckCode" onclick="$(this).attr('src','/Api/PublicMethod/CheckCode?r='+Math.random())" style="width: 26%; height:38px;" />
-                </div>
+                </div> *@
                 @*<div class="form-group pb10 cf">
                         <label class="remembermetext fl" for="rememberme">
                             <input type="checkbox" checked name="rememberme">&nbsp;记住我的登录

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

@@ -37,6 +37,7 @@
                                         <option value="">请选择</option>
                                         <option value="1" selected="selected">文本</option>
                                         <option value="2">图片</option>
+                                        <option value="3">动图</option>
                                     </select>
                                 </div>
                             </div>
@@ -91,46 +92,46 @@
                             @* <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>
+                                <select id="PushType" name="PushType" lay-search="">
+                                <option value="">请选择</option>
+                                <option value="0">不推送</option>
+                                <option value="1">立即推送</option>
+                                <option value="2">定时推送</option>
+                                </select>
                                 </div>
-                            </div>
-                            <div class="layui-form-item">
+                                </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>
+                                <select id="PushFlag" name="PushFlag" lay-search="">
+                                <option value="">请选择</option>
+                                <option value="0">不推送</option>
+                                <option value="1">未推送</option>
+                                <option value="2">已推送</option>
+                                </select>
                                 </div>
-                            </div>
-                            <div class="layui-form-item">
+                                </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"
-                                        maxlength="255" lay-verify="" autocomplete="off" placeholder="请输入推送参数">
+                                <input class="layui-input" type="text" id="PushParam" name="PushParam"
+                                maxlength="255" lay-verify="" autocomplete="off" placeholder="请输入推送参数">
                                 </div>
-                            </div>
-                            <div class="layui-form-item">
+                                </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" lay-verify=""
-                                        autocomplete="off" placeholder="请输入推送时间">
+                                <input class="layui-input" type="text" id="PushTime" name="PushTime" lay-verify=""
+                                autocomplete="off" placeholder="请输入推送时间">
                                 </div>
-                            </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="请输入扩展字段"></textarea>
+                                <textarea class="layui-textarea" id="ExtendColumn" name="ExtendColumn" maxlength=""
+                                lay-verify="" placeholder="请输入扩展字段"></textarea>
                                 </div>
-                            </div> *@
+                                </div> *@
                             <div class="layui-form-item">
                                 <label class="layui-form-label">跳转Url参数</label>
                                 <div class="layui-input-inline">
@@ -343,6 +344,11 @@
                     $('#BgPics').show();
                     $('#Button').hide();
                 }
+                else if (data.value == '3') {
+                    $('#Titles').hide();
+                    $('#BgPics').show();
+                    $('#Button').hide();
+                }
                 form.render();
             });
 

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

@@ -42,6 +42,7 @@
                                         <option value="">请选择</option>
                                         <option value="1">文本</option>
                                         <option value="2">图片</option>
+                                        <option value="3">动图</option>
                                     </select>
                                     <script>$("#MsgType").val("@editData.MsgType");</script>
                                 </div>
@@ -366,6 +367,10 @@
                     $('#Titles').hide();
                     $('#BgPics').show();
                     $('#Button').hide();
+                }else if (data.value == '3') {
+                    $('#Titles').hide();
+                    $('#BgPics').show();
+                    $('#Button').hide();
                 }
                 form.render();
             });
@@ -378,6 +383,10 @@
                 $('#Titles').hide();
                 $('#BgPics').show();
                 $('#Button').hide();
+            } else if (MsgType == '3') {
+                $('#Titles').hide();
+                $('#BgPics').show();
+                $('#Button').hide();
             }
 
             //日期

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

@@ -51,6 +51,7 @@
                                 <option value="">全部...</option>
                                 <option value="1">文本</option>
                                 <option value="2">图片</option>
+                                <option value="3">动图</option>
                             </select>
                         </div>
                     </div>

wwwroot/layuiadmin/modules_main/MsgAlert_Admin.js

@@ -32,7 +32,7 @@ layui.config({
     var laydate = layui.laydate;
     var layCreateDate = laydate.render({
         elem: '#CreateDate',
-        type: 'datetime',
+        type: 'date',
         range: true,
         trigger: 'click',
         change: function (value, date, endDate) {
@@ -94,7 +94,7 @@ layui.config({
             , { field: 'Id', fixed: 'left', title: 'ID', width: 80, sort: true, unresize: true }
             , { field: 'MsgType', width: 200, title: '消息类型', sort: true }
             , { field: 'CreateDate', width: 200, title: '创建时间', sort: true }
-            // , { field: 'StatusName', 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: 'BgPic', width: 200, title: '背景图片', width: 60, templet: '#BgPicTpl', unresize: true }
@@ -107,7 +107,7 @@ layui.config({
             // , { field: 'AlertFlagName', width: 200, title: '弹窗标识', sort: true }
             , { field: 'IsWeekendName', width: 200, title: '是否周末', sort: true }
 
-            // , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
+            , { field: 'Sort', fixed: 'right', title: '排序', width: 80, edit: 'text' }
             , { title: '操作', align: 'center', fixed: 'right', toolbar: '#table-list-tools' }
         ]]
         , where: {