From 5fd07d18427f70891d0b2634d8f04dd8858652a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=C2=B7=C3=A6?= <279202647@qq.com> Date: Sun, 28 Nov 2021 18:34:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=8E=B7=E5=8F=96=E5=9B=A2?= =?UTF-8?q?=E9=98=9FID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../齐越慧眼/齐越慧眼/ApiHelper.cs | 16 +++ .../齐越慧眼/齐越慧眼/App.xaml.cs | 5 + .../齐越慧眼/LoginWindowViewModel.cs | 14 +++ .../齐越慧眼/Models/UserInfo.cs | 100 ++++++++++++++++++ .../UserControls/ItemControl.xaml.cs | 2 +- 5 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 客户端/齐越慧眼/齐越慧眼/Models/UserInfo.cs diff --git a/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs b/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs index 2af30be..f4a0db6 100644 --- a/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs +++ b/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs @@ -108,7 +108,23 @@ namespace 齐越慧眼 } } + public static (bool isOk, UserInfo user) GetUserInfo() + { + var result = Http("http://mdsapi.qiyue666.com/TaskList/User/GetUserInfo"); + + var data = Newtonsoft.Json.JsonConvert.DeserializeObject(result); + + bool isSuccess = data.Success; + if (isSuccess) + { + string json=data.Data.ToString(); + UserInfo u= Newtonsoft.Json.JsonConvert.DeserializeObject(json); + return (true, u); + } + + return (false, null); + } /// /// 设置商品标签 diff --git a/客户端/齐越慧眼/齐越慧眼/App.xaml.cs b/客户端/齐越慧眼/齐越慧眼/App.xaml.cs index d4a4b32..f8b3c2b 100644 --- a/客户端/齐越慧眼/齐越慧眼/App.xaml.cs +++ b/客户端/齐越慧眼/齐越慧眼/App.xaml.cs @@ -18,6 +18,11 @@ namespace 齐越慧眼 /// public partial class App : Application { + /// + /// 是否比价用户 + /// + public static bool IsPriceTaskUser { get; set; } + public App() { diff --git a/客户端/齐越慧眼/齐越慧眼/LoginWindowViewModel.cs b/客户端/齐越慧眼/齐越慧眼/LoginWindowViewModel.cs index 7ef9179..c39bc22 100644 --- a/客户端/齐越慧眼/齐越慧眼/LoginWindowViewModel.cs +++ b/客户端/齐越慧眼/齐越慧眼/LoginWindowViewModel.cs @@ -80,6 +80,20 @@ namespace 齐越慧眼 if (res.isOk) { + + var u = ApiHelper.GetUserInfo(); + + if (u.isOk) + { + if (u.user.DepartmentId == "1463029355104964608") + { + App.IsPriceTaskUser = true; + } + } + else { + App.IsPriceTaskUser = true; + } + Application.Current.Dispatcher.Invoke(() => { MainWindow mainWindow = new MainWindow(); diff --git a/客户端/齐越慧眼/齐越慧眼/Models/UserInfo.cs b/客户端/齐越慧眼/齐越慧眼/Models/UserInfo.cs new file mode 100644 index 0000000..7724c31 --- /dev/null +++ b/客户端/齐越慧眼/齐越慧眼/Models/UserInfo.cs @@ -0,0 +1,100 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace 齐越慧眼.Models +{ + public class User + { + public String Id { get; set; } + + /// + /// 创建时间 + /// + public DateTime CreateTime { get; set; } + + /// + /// 创建人Id + /// + public String CreatorId { get; set; } + + /// + /// 否已删除 + /// + public Boolean Deleted { get; set; } + + /// + /// 用户名 + /// + public String UserName { get; set; } + + /// + /// 用户密码 + /// + public String UserPwd { get; set; } + + /// + /// 用户积分 + /// + public int? UserIntegral { get; set; } + + /// + /// 用户经验值 + /// + public int? UserExp { get; set; } + + /// + /// 角色ID + /// + public string RoleId { get; set; } + + /// + /// 花名 + /// + public string UserNick { get; set; } + + /// + /// 当天冻结的积分 + /// + public int? FreezeIntegral { get; set; } + + /// + /// 即将过期积分 + /// + public int? FailureIntegral { get; set; } + + + public DateTime? LastIntegralDate { get; set; } + + /// + /// 业务ID + /// + public string BusinessIds { get; set; } + + /// + /// 当前登录IP + /// + public string LoginIp { get; set; } + } + + + public class UserInfo : User + { + /// + /// 部门名称 + /// + public String DepartmentName { get; set; } + + public String DepartmentId { get; set; } + + /// + /// 角色名称 + /// + public string RoleName { get; set; } + + /// + /// 上级部门ID + /// + public string ParentDepartmentId { get; set; } + } +} diff --git a/客户端/齐越慧眼/齐越慧眼/UserControls/ItemControl.xaml.cs b/客户端/齐越慧眼/齐越慧眼/UserControls/ItemControl.xaml.cs index 5e77f87..71b900f 100644 --- a/客户端/齐越慧眼/齐越慧眼/UserControls/ItemControl.xaml.cs +++ b/客户端/齐越慧眼/齐越慧眼/UserControls/ItemControl.xaml.cs @@ -29,7 +29,7 @@ namespace 齐越慧眼.UserControls public ItemControl() { InitializeComponent(); - web = new ExtChromiumBrowser("nacollector://home/item") + web = new ExtChromiumBrowser(App.IsPriceTaskUser? "nacollector://home/task" : "nacollector://home/item") { BrowserSettings = {