Merge branch '新疆体育高职分支' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 新疆体育高职分支

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js

@@ -69,6 +69,7 @@
                 $("#lr_verifycode_input").val('');
                 $("#lr_verifycode_img").attr("src", $.rootUrl + "/Login/VerifyCode?time=" + Math.random());
             });
+            //错误次数
             //var errornum = $('#errornum').val();
             //if (errornum >= 3) {
 
@@ -160,16 +161,31 @@
                 success: function (res) {
                     if (res.code == 200) {
                         if (source == "noLogin") {
-                            window.location.href = "/SSOSystem/Index";
+                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
+                            //window.location.href = "/SSOSystem/Index";
+                        } else if (source == "NoLogin") {
+                            window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
+                            //window.location.href = "/SSOSystem/DragModelOne";
                         } else {
                             if (res.data.pwd == true) {
-                                window.location.href = "/Home/Index?pwd=true";
-                            } else if (res.data.pwdtip == true) {
-                                window.location.href = "/Home/Index?pwd=true";
+                                if (res.data.pwdtip == true) {
+                                    window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdpwdtip=true";
+                                    //window.location.href = "/Home/Index?pwdpwdtip=true";
+                                } else {
+                                    window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwd=true";
+                                    //window.location.href ="/Home/Index?pwd=true";
+                                }
+                            }
+                            else {
+                                if (res.data.pwdtip == true) {
+                                    window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index?pwdtip=true";
+                                    //window.location.href ="/Home/Index?pwdtip=true";
+                                } else {
+                                    window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/Home/Index";
+                                    //window.location.href =  "/Home/Index";
+                                }
+                                //window.location.href = "/Home/Index";
                             }
-                            else
-                                window.location.href = "/Home/Index";
-                            //window.location.href = "/Home/Index";
                         }
                     }
                     else if (res.code == 400) {