From b0f81c4a7c044440dc217c4dd1687382c7cf1c5f Mon Sep 17 00:00:00 2001 From: dathlin Date: Sun, 27 Aug 2017 08:41:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E6=B6=88=E6=81=AF=E7=9A=84?= =?UTF-8?q?=E5=AD=90=E7=95=8C=E9=9D=A2=E6=96=B9=E6=B3=95=E6=8F=90=E7=82=BC?= =?UTF-8?q?=E5=88=B0=E5=85=B1=E4=BA=AB=E6=8E=A7=E5=88=B6=E5=99=A8=EF=BC=8C?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA=E6=96=B0=E5=A2=9E=E6=8F=90?= =?UTF-8?q?=E4=BA=A4id=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/AccountController.cs | 9 +--- .../Controllers/HomeController.cs | 44 ++++++++----------- .../Controllers/ShareController.cs | 1 + .../Views/Shared/_MessageDangerPartial.cshtml | 2 +- .../Views/Shared/_MessageInfoPartial.cshtml | 2 +- .../Views/Shared/_MessageSuccessPartial.cshtml | 2 +- .../Views/Shared/_MessageWarningPartial.cshtml | 2 +- 7 files changed, 25 insertions(+), 37 deletions(-) diff --git a/软件系统浏览器模版/Controllers/AccountController.cs b/软件系统浏览器模版/Controllers/AccountController.cs index 24a47f8..66577c5 100644 --- a/软件系统浏览器模版/Controllers/AccountController.cs +++ b/软件系统浏览器模版/Controllers/AccountController.cs @@ -302,14 +302,7 @@ namespace 软件系统浏览器模版.Controllers private ActionResult PartialViewMessage(MessageBoxStyle style, string message) { - ViewData["alertMessage"] = message; - switch(style) - { - case MessageBoxStyle.success:return PartialView("_MessageSuccessPartial"); - case MessageBoxStyle.info: return PartialView("_MessageInfoPartial"); - case MessageBoxStyle.warning: return PartialView("_MessageWarningPartial"); - default: return PartialView("_MessageDangerPartial"); - } + return RedirectToAction("Message", "Share", new { style = style, message = message }); } } } \ No newline at end of file diff --git a/软件系统浏览器模版/Controllers/HomeController.cs b/软件系统浏览器模版/Controllers/HomeController.cs index 43c4164..1800f3a 100644 --- a/软件系统浏览器模版/Controllers/HomeController.cs +++ b/软件系统浏览器模版/Controllers/HomeController.cs @@ -108,16 +108,16 @@ namespace 软件系统浏览器模版.Controllers HslCommunication.OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.意见反馈, UserClient.UserAccount.UserName + ":" + advice); if (result.IsSuccess) { - return Content("
成功提交数据
", "text/html"); + return PartialViewMessage(MessageBoxStyle.success, "建议提交成功！"); } else { - return Content("
建议提交失败，请稍后再试！错误信息：" + result.Message + "
", "text/html"); + return PartialViewMessage(MessageBoxStyle.danger, result.Message); } } else { - return Content("
这是一个错误的请求！
", "text/html"); + return PartialViewMessage(MessageBoxStyle.danger, "请求无效！"); } } @@ -150,28 +150,24 @@ namespace 软件系统浏览器模版.Controllers if (announcement.Length > 1000) { - ViewData["alertMessage"] = "公告的字数超过了1000字！"; - return PartialView("_MessageDangerPartial"); + return PartialViewMessage(MessageBoxStyle.warning, "公告的字数超过了1000字！"); } OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.更新公告, announcement); if (result.IsSuccess) { - ViewData["alertMessage"] = "公告更改成功！"; UserClient.Announcement = announcement; - return PartialView("_MessageSuccessPartial"); + return PartialViewMessage(MessageBoxStyle.success, "公告更改成功！"); } else { - ViewData["alertMessage"] = result.Message; - return PartialView("_MessageDangerPartial"); + return PartialViewMessage(MessageBoxStyle.danger, result.Message); } } else { - ViewData["alertMessage"] = "请求无效！"; - return PartialView("_MessageDangerPartial"); + return PartialViewMessage(MessageBoxStyle.danger, "请求无效！"); } } @@ -217,19 +213,16 @@ namespace 软件系统浏览器模版.Controllers OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.更细账户, Accounts); if (result.IsSuccess) { - ViewData["alertMessage"] = "账户更改成功！"; - return PartialView("_MessageSuccessPartial"); + return PartialViewMessage(MessageBoxStyle.success, "账户更改成功！"); } else { - ViewData["alertMessage"] = result.Message; - return PartialView("_MessageDangerPartial"); + return PartialViewMessage(MessageBoxStyle.danger, result.Message); } } else { - ViewData["alertMessage"] = "请求无效！"; - return PartialView("_MessageDangerPartial"); + return PartialViewMessage(MessageBoxStyle.danger, "请求无效！"); } } @@ -263,32 +256,33 @@ namespace 软件系统浏览器模版.Controllers if (SendMessage.Length > 1000) { - ViewData["alertMessage"] = "需要发送的字数超过了1000字！"; - return PartialView("_MessageDangerPartial"); + return PartialViewMessage(MessageBoxStyle.warning, "需要发送的字数超过了1000字！"); } OperateResultString result = UserClient.Net_simplify_client.ReadFromServer(CommonHeadCode.SimplifyHeadCode.群发消息, SendMessage); if (result.IsSuccess) { - ViewData["alertMessage"] = "消息群发成功！"; UserClient.Announcement = SendMessage; - return PartialView("_MessageSuccessPartial"); + return PartialViewMessage(MessageBoxStyle.success, "消息群发成功！"); } else { - ViewData["alertMessage"] = result.Message; - return PartialView("_MessageDangerPartial"); + return PartialViewMessage(MessageBoxStyle.danger, result.Message); } } else { - ViewData["alertMessage"] = "请求无效！"; - return PartialView("_MessageDangerPartial"); + return PartialViewMessage(MessageBoxStyle.danger, "请求无效！"); } } + private ActionResult PartialViewMessage(MessageBoxStyle style, string message) + { + return RedirectToAction("Message", "Share", new { style = style, message = message }); + } + } } \ No newline at end of file diff --git a/软件系统浏览器模版/Controllers/ShareController.cs b/软件系统浏览器模版/Controllers/ShareController.cs index 8ea398d..00dd9ae 100644 --- a/软件系统浏览器模版/Controllers/ShareController.cs +++ b/软件系统浏览器模版/Controllers/ShareController.cs @@ -26,6 +26,7 @@ namespace 软件系统浏览器模版.Controllers public ActionResult Message(MessageBoxStyle style, string message) { ViewData["alertMessage"] = message; + ViewData["Guid"] = Guid.NewGuid().ToString("N"); switch (style) { case MessageBoxStyle.success: return PartialView("_MessageSuccessPartial"); diff --git a/软件系统浏览器模版/Views/Shared/_MessageDangerPartial.cshtml b/软件系统浏览器模版/Views/Shared/_MessageDangerPartial.cshtml index b305a43..955aef0 100644 --- a/软件系统浏览器模版/Views/Shared/_MessageDangerPartial.cshtml +++ b/软件系统浏览器模版/Views/Shared/_MessageDangerPartial.cshtml @@ -1,6 +1,6 @@ 
-

错误信息

+

错误信息请求ID：@ViewData["GUID"]

@ViewData["alertMessage"]

diff --git a/软件系统浏览器模版/Views/Shared/_MessageInfoPartial.cshtml b/软件系统浏览器模版/Views/Shared/_MessageInfoPartial.cshtml index 3bd847a..d3761c0 100644 --- a/软件系统浏览器模版/Views/Shared/_MessageInfoPartial.cshtml +++ b/软件系统浏览器模版/Views/Shared/_MessageInfoPartial.cshtml @@ -2,6 +2,6 @@
-

一般信息

+

一般信息请求ID：@ViewData["GUID"]

@ViewData["alertMessage"]

diff --git a/软件系统浏览器模版/Views/Shared/_MessageSuccessPartial.cshtml b/软件系统浏览器模版/Views/Shared/_MessageSuccessPartial.cshtml index 220a39a..ba73620 100644 --- a/软件系统浏览器模版/Views/Shared/_MessageSuccessPartial.cshtml +++ b/软件系统浏览器模版/Views/Shared/_MessageSuccessPartial.cshtml @@ -2,6 +2,6 @@
-

成功信息

+

成功信息请求ID：@ViewData["GUID"]

@ViewData["alertMessage"]

diff --git a/软件系统浏览器模版/Views/Shared/_MessageWarningPartial.cshtml b/软件系统浏览器模版/Views/Shared/_MessageWarningPartial.cshtml index c646e66..a7ae0a1 100644 --- a/软件系统浏览器模版/Views/Shared/_MessageWarningPartial.cshtml +++ b/软件系统浏览器模版/Views/Shared/_MessageWarningPartial.cshtml @@ -2,6 +2,6 @@
-

警告信息

+

警告信息请求ID：@ViewData["GUID"]

@ViewData["alertMessage"]