瀏覽代碼

Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

临城职教中职
ndbs 2 年之前
父節點
當前提交
6cfa1cfd88
共有 7 個檔案被更改,包括 14 行新增14 行删除
  1. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs
  2. +3
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/IndexWxLogin.js
  3. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFive/IndexWxLogin.js
  4. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFour/IndexWxLogin.js
  5. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSix/IndexWxLogin.js
  6. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThree/IndexWxLogin.js
  7. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageTwo/IndexWxLogin.js

+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs 查看文件

@@ -552,7 +552,7 @@ namespace Learun.Application.Web.Controllers
/// <returns></returns>
[HttpPost]
[AjaxOnly]
[HandlerValidateAntiForgeryToken]
//[HandlerValidateAntiForgeryToken]
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 查看文件

@@ -151,13 +151,13 @@
success: function (res) {
if (res.code == 200) {
if (source == "noLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
window.location.href ="/SSOSystem/Index";
} else {
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 {
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 查看文件

@@ -151,10 +151,10 @@
success: function (res) {
if (res.code == 200) {
if (source == "noLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
window.location.href = "/SSOSystem/Index";
} else {

window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
window.location.href = "/Home/Index";
}
}
else if (res.code == 400) {


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFour/IndexWxLogin.js 查看文件

@@ -152,10 +152,10 @@
success: function (res) {
if (res.code == 200) {
if (source == "noLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
window.location.href ="/SSOSystem/Index";
} else {

window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
window.location.href = "/Home/Index";
}
}
else if (res.code == 400) {


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSix/IndexWxLogin.js 查看文件

@@ -152,10 +152,10 @@
success: function (res) {
if (res.code == 200) {
if (source == "noLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
window.location.href ="/SSOSystem/Index";
} else {

window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
window.location.href = "/Home/Index";
}
}
else if (res.code == 400) {


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThree/IndexWxLogin.js 查看文件

@@ -152,10 +152,10 @@
success: function (res) {
if (res.code == 200) {
if (source == "noLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
window.location.href = "/SSOSystem/Index";
} else {

window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
window.location.href = "/Home/Index";
}
}
else if (res.code == 400) {


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageTwo/IndexWxLogin.js 查看文件

@@ -152,10 +152,10 @@
if (res.code == 200) {
lrPage.logining(false);
if (source == "noLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
window.location.href = "/SSOSystem/Index";
} else {

window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
window.location.href = "/Home/Index";
}
}
else if (res.code == 400) {


Loading…
取消
儲存