From ed3bfb7462d44747230437717e8673a5192f833f Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 20:34:51 +0800
Subject: [PATCH] 2020-11-30-2
---
HDL_ON/UI/UI1-Login/LoginPageBLL.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
index 5e78b81..eac7338 100644
--- a/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
+++ b/HDL_ON/UI/UI1-Login/LoginPageBLL.cs
@@ -5,7 +5,6 @@
using HDL_ON.UI.CSS;
using Shared;
using HDL_ON.Entity;
-using HDL_ON.DAL.Server;
namespace HDL_ON.UI.UI1Login
{
@@ -90,7 +89,7 @@
{
//鑾峰彇楠岃瘉鐮�
var result = pm.GetLoginVerCode(phoneNumber);
- if (result.StateCode.ToUpper() == HttpUtil.SUCCESS_CODE)
+ if (result.StateCode.ToUpper() == "SUCCESS")
{
}
//鐧诲綍澶辫触
@@ -859,7 +858,7 @@
bool LoadMethod_Login()
{
var result = false;
- ResponsePackNew loginResult;
+ ResponsePack loginResult;
if (logintMode == 0 || loginType == 1)
{
//璋冪敤鐧诲綍鎺ュ彛
@@ -870,19 +869,21 @@
//璋冪敤楠岃瘉鐮佺櫥褰曟帴鍙�
loginResult = pm.LoginValidCode(account, password);
}
- if (loginResult.Code == HttpUtil.SUCCESS_CODE)
+ if (loginResult.StateCode.ToUpper() == "SUCCESS")
{
- var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<UserLoginRes>(loginResult.Data.ToString());
+ var loginDataStr = Newtonsoft.Json.Linq.JObject.FromObject(loginResult.ResponseData);
+
+ //璁板綍鐢ㄦ埛鏁版嵁
MainPage.LoginUser = new UserInfo
{
- userType = revertData.userType,
+ ID = (int)loginDataStr.GetValue("UserID"),
+ masterID = (int)loginDataStr.GetValue("MainUserID"),
+ accountType = (int)loginDataStr.GetValue("UserType"),
+ loginTokenString = loginDataStr.GetValue("Token").ToString(),
accountString = account,
password = password,
lastTime = DateTime.Now,
- ID = revertData.userId,
- loginTokenString = revertData.headerPrefix + revertData.accessToken,
- refreshToken = revertData.refreshToken,
- userName = revertData.name
+ userName = loginDataStr.GetValue("Remark").ToString(),
};
MainPage.LoginUser.SaveUserInfo();
MainPage.Log("鐧诲綍鎴愬姛銆�");
@@ -897,9 +898,8 @@
//鐧诲綍澶辫触
else
{
- //2020-11-12 寰呬慨鏀�
string tipStr = "Sever erorr";
- switch (loginResult.Code)
+ switch (loginResult.StateCode)
{
case "ValidCodeAndPhoneNoEqual":
tipStr = Language.StringByID(StringId.VerificationCodeError);
@@ -957,7 +957,7 @@
var result = false;
var responsePack = pm.GetHomePager();
- if (responsePack == HttpUtil.SUCCESS_CODE)
+ if (responsePack == "Success")
{
result = true;
}
--
Gitblit v1.8.0