Explorar el Código
Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职
临城职教中职
ndbs
hace 2 años
Se han modificado 7 ficheros con 14 adiciones y 14 borrados
Unificar vista
Opciones de diferencias
-
+1 -1Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs
-
+3 -3Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/IndexWxLogin.js
-
+2 -2Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFive/IndexWxLogin.js
-
+2 -2Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFour/IndexWxLogin.js
-
+2 -2Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSix/IndexWxLogin.js
-
+2 -2Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThree/IndexWxLogin.js
-
+2 -2Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageTwo/IndexWxLogin.js
+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs
Ver fichero
| @@ -552,7 +552,7 @@ namespace Learun.Application.Web.Controllers | |||||
| /// <returns></returns> | /// <returns></returns> | ||||
| [HttpPost] | [HttpPost] | ||||
| [AjaxOnly] | [AjaxOnly] | ||||
| [HandlerValidateAntiForgeryToken] | |||||
| //[HandlerValidateAntiForgeryToken] | |||||
| public ActionResult CheckLogin(string username, string password, string verifycode, string up, string defaultPwdTip) | public ActionResult CheckLogin(string username, string password, string verifycode, string up, string defaultPwdTip) | ||||
| { | { | ||||
+ 3
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/IndexWxLogin.js
Ver fichero
| @@ -151,13 +151,13 @@ | |||||
| success: function (res) { | success: function (res) { | ||||
| if (res.code == 200) { | if (res.code == 200) { | ||||
| if (source == "noLogin") { | if (source == "noLogin") { | ||||
| window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index"; | |||||
| window.location.href ="/SSOSystem/Index"; | |||||
| } else { | } else { | ||||
| if (res.data.pwd == true) { | if (res.data.pwd == true) { | ||||
| window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true"; | |||||
| window.location.href ="/Home/Index?pwd=true"; | |||||
| } | } | ||||
| else { | else { | ||||
| window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index"; | |||||
| window.location.href = "/Home/Index"; | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFive/IndexWxLogin.js
Ver fichero
| @@ -151,10 +151,10 @@ | |||||
| success: function (res) { | success: function (res) { | ||||
| if (res.code == 200) { | if (res.code == 200) { | ||||
| if (source == "noLogin") { | if (source == "noLogin") { | ||||
| window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index"; | |||||
| window.location.href = "/SSOSystem/Index"; | |||||
| } else { | } else { | ||||
| window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index"; | |||||
| window.location.href = "/Home/Index"; | |||||
| } | } | ||||
| } | } | ||||
| else if (res.code == 400) { | else if (res.code == 400) { | ||||
+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFour/IndexWxLogin.js
Ver fichero
| @@ -152,10 +152,10 @@ | |||||
| success: function (res) { | success: function (res) { | ||||
| if (res.code == 200) { | if (res.code == 200) { | ||||
| if (source == "noLogin") { | if (source == "noLogin") { | ||||
| window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index"; | |||||
| window.location.href ="/SSOSystem/Index"; | |||||
| } else { | } else { | ||||
| window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index"; | |||||
| window.location.href = "/Home/Index"; | |||||
| } | } | ||||
| } | } | ||||
| else if (res.code == 400) { | else if (res.code == 400) { | ||||
+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSix/IndexWxLogin.js
Ver fichero
| @@ -152,10 +152,10 @@ | |||||
| success: function (res) { | success: function (res) { | ||||
| if (res.code == 200) { | if (res.code == 200) { | ||||
| if (source == "noLogin") { | if (source == "noLogin") { | ||||
| window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index"; | |||||
| window.location.href ="/SSOSystem/Index"; | |||||
| } else { | } else { | ||||
| window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index"; | |||||
| window.location.href = "/Home/Index"; | |||||
| } | } | ||||
| } | } | ||||
| else if (res.code == 400) { | else if (res.code == 400) { | ||||
+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThree/IndexWxLogin.js
Ver fichero
| @@ -152,10 +152,10 @@ | |||||
| success: function (res) { | success: function (res) { | ||||
| if (res.code == 200) { | if (res.code == 200) { | ||||
| if (source == "noLogin") { | if (source == "noLogin") { | ||||
| window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index"; | |||||
| window.location.href = "/SSOSystem/Index"; | |||||
| } else { | } else { | ||||
| window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index"; | |||||
| window.location.href = "/Home/Index"; | |||||
| } | } | ||||
| } | } | ||||
| else if (res.code == 400) { | else if (res.code == 400) { | ||||
+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageTwo/IndexWxLogin.js
Ver fichero
| @@ -152,10 +152,10 @@ | |||||
| if (res.code == 200) { | if (res.code == 200) { | ||||
| lrPage.logining(false); | lrPage.logining(false); | ||||
| if (source == "noLogin") { | if (source == "noLogin") { | ||||
| window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index"; | |||||
| window.location.href = "/SSOSystem/Index"; | |||||
| } else { | } else { | ||||
| window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index"; | |||||
| window.location.href = "/Home/Index"; | |||||
| } | } | ||||
| } | } | ||||
| else if (res.code == 400) { | else if (res.code == 400) { | ||||