Browse Source

办事大厅拖拽版修改地址DragNoLogin

金隅分支
zhangli 3 years ago
parent
commit
e4172f3fe8
12 changed files with 20 additions and 20 deletions
  1. +5
    -5
      Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs
  2. +3
    -3
      Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs
  3. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js
  4. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/LoginForWeixin.cshtml
  5. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFive/Index.js
  6. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFour/Index.js
  7. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageOne/Index.js
  8. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSix/Index.js
  9. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThree/Index.js
  10. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageTwo/Index.js
  11. +2
    -2
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml
  12. +1
    -1
      Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoWxLogin.cshtml

+ 5
- 5
Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/LoginController.cs View File

@@ -901,11 +901,11 @@ namespace Learun.Application.Web.Controllers
string secret = weichatdevelop.secret;
ViewBag.login = Request.QueryString["login"];
ViewBag.CODE = Request.QueryString["CODE"];
//页面来源(source=DragNoLogin为网上办事大厅拖拽版)
//页面来源(source=NoLogin为网上办事大厅拖拽版)
ViewBag.source = Request.QueryString["source"];
if (!string.IsNullOrEmpty(ViewBag.login))
{
if (ViewBag.source == "DragNoLogin")
if (ViewBag.source == "NoLogin")
{
var aa = HttpUtility.UrlEncode("/Login/LoginForWeixin?source=" + ViewBag.source);
return Redirect("https://open.weixin.qq.com/connect/qrconnect?appid=" + appid + "&redirect_uri=" + redirect_url + aa + "&response_type=code&scope=snsapi_login&state=one#wechat_redirect");
@@ -931,7 +931,7 @@ namespace Learun.Application.Web.Controllers
public ActionResult DoWeixinLogin()
{
string openId = Request["openId"];
//页面来源(source=DragNoLogin为网上办事大厅拖拽版)
//页面来源(source=NoLogin为网上办事大厅拖拽版)
string source = Request["source"];
var userEntity = userBll.GetEntityByWeixinOpenIdPC(openId);
if (userEntity != null)
@@ -963,7 +963,7 @@ namespace Learun.Application.Web.Controllers
{
string QQOpenId = Request["QQOpenId"];
string WeixinOpenId = Request["WeixinOpenId"];
//页面来源(source=DragNoLogin为网上办事大厅拖拽版)
//页面来源(source=NoLogin为网上办事大厅拖拽版)
string source = Request["source"];
ViewBag.WeixinOpenId = WeixinOpenId;
ViewBag.QQOpenId = QQOpenId;
@@ -984,7 +984,7 @@ namespace Learun.Application.Web.Controllers
ViewBag.ACIp = ConfigurationManager.AppSettings["ACIp"] ?? "";
ViewBag.ACIp2 = ConfigurationManager.AppSettings["ACIp2"] ?? "";
//判断页面来源
if (source == "DragNoLogin")
if (source == "NoLogin")
{
return Redirect("/SSOSystem/DragNoWxLogin?QQOpenId=" + QQOpenId + "&WeixinOpenId=" + WeixinOpenId + "");
}


+ 3
- 3
Learun.Framework.Ultimate V7/Learun.Application.Web/Controllers/SSOSystemController.cs View File

@@ -932,7 +932,7 @@ namespace Learun.Application.Web.Controllers
var result = helper.IsOnLine(account);
if (result.stateCode != 1)
{
return Redirect("DragNoLogin");
return Redirect("NoLogin");
}
//登录用户
var userInfo = LoginUserInfo.Get();
@@ -1253,7 +1253,7 @@ namespace Learun.Application.Web.Controllers
var result = helper.IsOnLine(account);
if (result.stateCode != 1)
{
return Redirect("DragNoLogin");
return Redirect("NoLogin");
}
//登录用户
var userInfo = LoginUserInfo.Get();
@@ -1582,7 +1582,7 @@ namespace Learun.Application.Web.Controllers
var result = helper.IsOnLine(account);
if (result.stateCode != 1)
{
return Redirect("DragNoLogin");
return Redirect("NoLogin");
}
//登录用户
var userInfo = LoginUserInfo.Get();


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/Default/Index.js View File

@@ -177,7 +177,7 @@
if (res.code == 200) {
if (source == "noLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
} else if (source == "DragNoLogin") {
} else if (source == "NoLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
} else {
if (res.data.pwd == true) {


+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/LoginForWeixin.cshtml View File

@@ -32,7 +32,7 @@
location.href = result.data.returnurl;
}
else {
if (source == "DragNoLogin") {
if (source == "NoLogin") {
location.href = "/SSOSystem/DragModelOne";
} else {
location.href = "/Home/Index";
@@ -41,7 +41,7 @@
}
else
{
if (source == "DragNoLogin") {
if (source == "NoLogin") {
location.href = "/SSOSystem/DragModelOne";
} else {
location.href = "/Home/Index";


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFive/Index.js View File

@@ -163,7 +163,7 @@
if (res.code == 200) {
if (source == "noLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
} else if (source == "DragNoLogin") {
} else if (source == "NoLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
} else {



+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageFour/Index.js View File

@@ -164,7 +164,7 @@
if (res.code == 200) {
if (source == "noLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
} else if (source == "DragNoLogin") {
} else if (source == "NoLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
} else {



+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageOne/Index.js View File

@@ -164,7 +164,7 @@
if (res.code == 200) {
if (source == "noLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
} else if (source == "DragNoLogin") {
} else if (source == "NoLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
} else {



+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageSix/Index.js View File

@@ -163,7 +163,7 @@
if (res.code == 200) {
if (source == "noLogin") {
//window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
} else if (source == "DragNoLogin") {
} else if (source == "NoLogin") {
window.location.href = "/Home/Index";
//window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
} else {


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageThree/Index.js View File

@@ -164,7 +164,7 @@
if (res.code == 200) {
if (source == "noLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
} else if (source == "DragNoLogin") {
} else if (source == "NoLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
} else {



+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/Login/PageTwo/Index.js View File

@@ -164,7 +164,7 @@
lrPage.logining(false);
if (source == "noLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/Index";
} else if (source == "DragNoLogin") {
} else if (source == "NoLogin") {
window.location.href = DigitalschoolMisLoginurl + "?F_Account=" + username + "&returnurl=" + Returnurl + "/SSOSystem/DragModelOne";
} else {



+ 2
- 2
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoLogin.cshtml View File

@@ -100,7 +100,7 @@
}
@if (loginInfo == null)
{
@*<a href="/Login/Index?source=DragNoLogin" class="headLogin">登录</a>*@
@*<a href="/Login/Index?source=NoLogin" class="headLogin">登录</a>*@
<a href="/SSOSystem/NoLogin" class="headLogin">登录</a>
}
else
@@ -1033,7 +1033,7 @@
</div>
@if (ViewBag.WeixinLoginSwitch)
{
<a class="wx" href="/Login/LoginForWeixin?login=one&source=DragNoLogin">
<a class="wx" href="/Login/LoginForWeixin?login=one&source=NoLogin">
<img src="/Content/images/DragSSO/weixin.png" alt="" />
<span>微信登录</span>
</a>


+ 1
- 1
Learun.Framework.Ultimate V7/Learun.Application.Web/Views/SSOSystem/DragNoWxLogin.cshtml View File

@@ -97,7 +97,7 @@
}
@if (loginInfo == null)
{
@*<a href="/Login/Index?source=DragNoLogin" class="headLogin">登录</a>*@
@*<a href="/Login/Index?source=NoLogin" class="headLogin">登录</a>*@
<a href="/SSOSystem/NoLogin" class="headLogin">登录</a>
}
else


Loading…
Cancel
Save