Просмотр исходного кода

调整,放开标题填写显示,修改状态名

DuGuYang 3 лет назад
Родитель
Сommit
de4696a5dc

+ 1 - 1
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"] = "不推送";

+ 2 - 2
Areas/Admin/Views/MainServer/MsgAlert/Add.cshtml

@@ -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();
                 }

+ 2 - 2
Areas/Admin/Views/MainServer/MsgAlert/Edit.cshtml

@@ -386,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();
             }

+ 3 - 2
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' }