指定弹窗添加和编辑调整

查询机具信息，调整机具服务费显示，删除冗余代码

Areas/Admin/Controllers/MainServer/MsgAlertController.cs

@@ -167,6 +167,7 @@ namespace MySystem.Areas.Admin.Controllers
             Fields.Add("SeoKeyword", DateTime.Now.ToString("yyyyMMddHHmmssfff") + function.get_Random(8));
             Fields.Add("SeoDescription", data.SeoDescription);
             int Id = new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Add("MsgAlert", Fields, 0);
+            string error = "";
             if (!string.IsNullOrEmpty(MakerCodes))
             {
                 string[] MakerCodeList = MakerCodes.Replace("\r", "").Replace("\n", ",").Split(',');
@@ -187,10 +188,14 @@ namespace MySystem.Areas.Admin.Controllers
                     else
                     {
                         new AdminContentOther(_accessor.HttpContext, PublicFunction.MainTables).Delete("MsgAlert", Id);
-                        return "创客" + item + "不存在或者已经添加了相关信息";
+                        error += "创客" + item + "不存在或者已经添加了相关信息" + '\n';
                     }
                 }
             }
+            if (!string.IsNullOrEmpty(error))
+            {
+                return "Warning|" + error;
+            }
             AddSysLog(data.Id.ToString(), "MsgAlert", "add");
             db.SaveChanges();
 
@@ -262,6 +267,7 @@ 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);
+            string error = "";
             var duserSwapWhite = db.UserSwapWhite.Where(m => m.QueryCount == data.Id).ToList();
             foreach (var item in duserSwapWhite)
             {
@@ -286,10 +292,14 @@ namespace MySystem.Areas.Admin.Controllers
                     }
                     else
                     {
-                        return "创客" + item + "不存在或者已经添加了相关信息";
+                        error += "创客" + item + "不存在或者已经添加了相关信息" + '\n';
                     }
                 }
             }
+            if (!string.IsNullOrEmpty(error))
+            {
+                return "Warning|" + error;
+            }
             AddSysLog(data.Id.ToString(), "MsgAlert", "update");
             db.SaveChanges();
 

Areas/Admin/Controllers/MainServer/SysToolsController.cs

@@ -1360,10 +1360,6 @@ namespace MySystem.Areas.Admin.Controllers
             {
                 Deposit = Deposit / 100;
             }
-            if (pos.BrandId != 2 && pos.BrandId != 7 && pos.BrandId != 10 && pos.BrandId != 11 && pos.BrandId != 12)
-            {
-                Deposit = Deposit / 100;
-            }
 
             string DepositGet = "未领取";
             string DepositUser = "";

wwwroot/layuiadmin/modules_main/MsgAlert_Admin.js

@@ -189,8 +189,17 @@ layui.config({
                                 if (data == "success") {
                                     layer.msg("编辑成功");
                                     table.reload('LAY-list-manage'); //数据刷新
+                                } else if (data.indexOf("Warning") == 0) {
+                                    var datalist = data.split('|');
+                                    layer.alert(datalist[1], { time: 20000 }, function () {
+                                        window.location.reload();
+                                    });
                                 } else {
-                                    layer.msg(data);
+                                    layer.msg(data, {
+                                        time: 1500
+                                    }, function () {
+                                        table.reload('LAY-list-manage'); //数据刷新
+                                    });
                                 }
                             }
                         });
@@ -304,6 +313,11 @@ layui.config({
                                 if (data == "success") {
                                     layer.msg("添加成功");
                                     table.reload('LAY-list-manage'); //数据刷新
+                                } else if (data.indexOf("Warning") == 0) {
+                                    var datalist = data.split('|');
+                                    layer.alert(datalist[1], { time: 20000 }, function () {
+                                        window.location.reload();
+                                    });
                                 } else {
                                     layer.msg(data, {
                                         time: 1500