From a4c387d747e68e053a1fe3969bd251400b0da5db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=C2=B7=C3=A6?= <279202647@qq.com> Date: Thu, 21 Oct 2021 21:01:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E7=94=A8=E6=88=B7=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=92=8C=E5=9B=A2=E9=98=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/HuiYan/catsController.cs | 15 ++- .../HuiYan/itemlabelsController.cs | 4 +- .../Controllers/HuiYan/teamitemsController.cs | 8 +- .../DependencyInjection/Operator.cs | 15 +++ .../HuiYan/catsBusiness.cs | 25 +++- .../HuiYan/itemlabelsBusiness.cs | 14 ++- .../HuiYan/teamitemsBusiness.cs | 15 ++- .../HuiYan/IcatsBusiness.cs | 16 +++ src/Coldairarrow.IBusiness/IOperator.cs | 4 + .../齐越慧眼/齐越慧眼/ApiHelper.cs | 72 +++++++++++- 客户端/齐越慧眼/齐越慧眼/App.xaml | 8 +- .../齐越慧眼/齐越慧眼/App.xaml.cs | 3 +- .../齐越慧眼/LoginWindow.xaml | 28 +++++ .../齐越慧眼/LoginWindow.xaml.cs | 32 +++++ .../齐越慧眼/LoginWindowViewModel.cs | 110 ++++++++++++++++++ .../齐越慧眼/齐越慧眼/MainWindow.xaml | 2 +- .../齐越慧眼/MainWindow.xaml.cs | 2 - .../齐越慧眼/ToStringConverter.cs | 75 ++++++++++++ .../UserControls/BrowerControl.xaml.cs | 51 +++++++- .../齐越慧眼/UserControls/CatControl.xaml | 1 + .../UserControls/CatControl.xaml.cs | 18 ++- .../UserControls/ItemControl.xaml.cs | 1 + .../vuepage/client/src/views/cats/Index.vue | 26 +++-- .../vuepage/client/src/views/items/Index.vue | 4 +- .../vuepage/dist/css/app.3528f00e.css | 1 - .../vuepage/dist/css/app.66edb6c9.css | 1 - .../齐越慧眼/vuepage/dist/js/about.js | 2 - .../齐越慧眼/vuepage/dist/js/about.js.map | 1 - .../齐越慧眼/vuepage/dist/js/app.js | 2 +- .../齐越慧眼/vuepage/dist/js/app.js.map | 2 +- .../齐越慧眼/齐越慧眼.csproj | 15 +-- 31 files changed, 505 insertions(+), 68 deletions(-) create mode 100644 客户端/齐越慧眼/齐越慧眼/LoginWindow.xaml create mode 100644 客户端/齐越慧眼/齐越慧眼/LoginWindow.xaml.cs create mode 100644 客户端/齐越慧眼/齐越慧眼/LoginWindowViewModel.cs create mode 100644 客户端/齐越慧眼/齐越慧眼/ToStringConverter.cs delete mode 100644 客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.3528f00e.css delete mode 100644 客户端/齐越慧眼/齐越慧眼/vuepage/dist/css/app.66edb6c9.css delete mode 100644 客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/about.js delete mode 100644 客户端/齐越慧眼/齐越慧眼/vuepage/dist/js/about.js.map diff --git a/src/Coldairarrow.Api/Controllers/HuiYan/catsController.cs b/src/Coldairarrow.Api/Controllers/HuiYan/catsController.cs index f1cf4c2..e234538 100644 --- a/src/Coldairarrow.Api/Controllers/HuiYan/catsController.cs +++ b/src/Coldairarrow.Api/Controllers/HuiYan/catsController.cs @@ -86,7 +86,7 @@ namespace Coldairarrow.Api.Controllers.HuiYan /// 获取所有品类词列表 /// /// - [HttpGet, AllowAnonymous] + [HttpGet] public async Task> GetCatDatas() { return await _catsBus.GetTreeDataListAsync(); @@ -97,12 +97,23 @@ namespace Coldairarrow.Api.Controllers.HuiYan /// /// /// - [HttpPost, AllowAnonymous] + [HttpPost] public AjaxResult AddPLKeyWord(KeyWordDto model) { return _catsBus.AddKeyWord(model); } + /// + /// 更新打开时间 + /// + /// + /// + [HttpPost] + public AjaxResult SetKeyOpenTime(string id,ItemPlatform platform) + { + return _catsBus.SetKeyOpenTime(id); + } + #endregion } } \ No newline at end of file diff --git a/src/Coldairarrow.Api/Controllers/HuiYan/itemlabelsController.cs b/src/Coldairarrow.Api/Controllers/HuiYan/itemlabelsController.cs index 587b780..c68d9c3 100644 --- a/src/Coldairarrow.Api/Controllers/HuiYan/itemlabelsController.cs +++ b/src/Coldairarrow.Api/Controllers/HuiYan/itemlabelsController.cs @@ -69,7 +69,7 @@ namespace Coldairarrow.Api.Controllers.HuiYan /// /// /// - [HttpPost, AllowAnonymous] + [HttpPost] public AjaxResult SetItemLabel(ItemLabelDto model) { return _itemlabelsBus.SetItemLabel(model); @@ -81,7 +81,7 @@ namespace Coldairarrow.Api.Controllers.HuiYan /// /// /// - [HttpPost, AllowAnonymous] + [HttpPost] public AjaxResult GetLabelByItemIds([FromBody] List ids, [FromQuery] ItemPlatform platform) { diff --git a/src/Coldairarrow.Api/Controllers/HuiYan/teamitemsController.cs b/src/Coldairarrow.Api/Controllers/HuiYan/teamitemsController.cs index 2308d6d..8f1ba1f 100644 --- a/src/Coldairarrow.Api/Controllers/HuiYan/teamitemsController.cs +++ b/src/Coldairarrow.Api/Controllers/HuiYan/teamitemsController.cs @@ -69,7 +69,7 @@ namespace Coldairarrow.Api.Controllers.HuiYan /// /// /// - [HttpPost, AllowAnonymous] + [HttpPost] public PageResult GetItems(PageInput input) { return _teamitemsBus.GetItems(input); @@ -80,7 +80,7 @@ namespace Coldairarrow.Api.Controllers.HuiYan /// /// /// - [HttpPost, AllowAnonymous] + [HttpPost] public AjaxResult AddItem(TeamitemDto model) { return _teamitemsBus.AddItem(model); @@ -91,7 +91,7 @@ namespace Coldairarrow.Api.Controllers.HuiYan /// /// /// - [HttpPost, AllowAnonymous] + [HttpPost] public AjaxResult SetItem(TeamitemDto model) { return _teamitemsBus.SetItem(model); @@ -103,7 +103,7 @@ namespace Coldairarrow.Api.Controllers.HuiYan /// /// /// - [HttpPost, AllowAnonymous] + [HttpPost] public AjaxResult SetState(string id, int state) { return _teamitemsBus.SetState(id, state); diff --git a/src/Coldairarrow.Api/DependencyInjection/Operator.cs b/src/Coldairarrow.Api/DependencyInjection/Operator.cs index bbbf0b0..9c73f54 100644 --- a/src/Coldairarrow.Api/DependencyInjection/Operator.cs +++ b/src/Coldairarrow.Api/DependencyInjection/Operator.cs @@ -25,11 +25,26 @@ namespace Coldairarrow.Api _userCache = userCache; UserId = httpContextAccessor?.HttpContext?.User.Claims .Where(x => x.Type == "userId").FirstOrDefault()?.Value; + + + if (string.IsNullOrEmpty(UserId)) + { + string json = httpContextAccessor?.HttpContext?.User.Claims + .Where(x => x.Type == "user").FirstOrDefault()?.Value; + if (!string.IsNullOrEmpty(json)) + { + var user = Newtonsoft.Json.JsonConvert.DeserializeObject(json); + + UserId = user.Id; + TeamId = user.TeamId; + } + } } private Base_UserDTO _property; private object _lockObj = new object(); + public string TeamId { get; set; } /// /// 当前操作者UserId /// diff --git a/src/Coldairarrow.Business/HuiYan/catsBusiness.cs b/src/Coldairarrow.Business/HuiYan/catsBusiness.cs index 9d7320a..954a41f 100644 --- a/src/Coldairarrow.Business/HuiYan/catsBusiness.cs +++ b/src/Coldairarrow.Business/HuiYan/catsBusiness.cs @@ -1,5 +1,6 @@ using Coldairarrow.Entity.DTO; using Coldairarrow.Entity.HuiYan; +using Coldairarrow.IBusiness; using Coldairarrow.Util; using EFCore.Sharding; using LinqKit; @@ -14,9 +15,11 @@ namespace Coldairarrow.Business.HuiYan { public class catsBusiness : BaseBusiness, IcatsBusiness, ITransientDependency { - public catsBusiness(IDbAccessor db) + readonly IOperator _operator; + public catsBusiness(IDbAccessor db, IOperator @operator) : base(db) { + _operator = @operator; } #region 外部接口 @@ -208,7 +211,7 @@ namespace Coldairarrow.Business.HuiYan public async Task> GetTreeDataListAsync() { - var where = LinqHelper.True().And(c => c.Type == 0 || string.IsNullOrEmpty(c.TeamId)); + var where = LinqHelper.True().And(c => c.Type == 0 || c.TeamId== _operator.TeamId); var list = await GetIQueryable().Where(where).ToListAsync(); var treeList = list @@ -218,12 +221,25 @@ namespace Coldairarrow.Business.HuiYan ParentId = x.ParentId, Text = x.Name, Value = x.Id, - Type = x.Type + Type = x.Type, + IsShowJDTime= x.LastShowJDTime==null?true:(DateTime.Now- x.LastShowJDTime.Value).TotalDays>3, + IsShowPddTime = x.LastShowPddTime == null ? true : (DateTime.Now - x.LastShowPddTime.Value).TotalDays > 3, + IsShowTBTime = x.LastShowTBTime == null ? true : (DateTime.Now - x.LastShowTBTime.Value).TotalDays > 3, }).ToList(); return TreeHelper.BuildTree(treeList); } + public AjaxResult SetKeyOpenTime(string id) + { + if (Db.Update(c => c.Id == id, (item) => + { + item.LastShowTBTime = DateTime.Now; + }) > 0) + return Success(); + return Error(); + } + public AjaxResult AddKeyWord(KeyWordDto model) { var cat = new cats() @@ -237,7 +253,8 @@ namespace Coldairarrow.Business.HuiYan //设置为团队库 Type = model.Type, //暂时没有登录信息 - TeamId = string.Empty + TeamId = _operator.TeamId + }; int row = Db.Insert(cat); diff --git a/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs b/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs index 0a7094c..b167df1 100644 --- a/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs +++ b/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs @@ -10,18 +10,22 @@ using System.Linq.Dynamic.Core; using System; using System.Threading.Tasks; using System.Linq.Expressions; +using Coldairarrow.IBusiness; namespace Coldairarrow.Business.HuiYan { public class itemlabelsBusiness : BaseBusiness, IitemlabelsBusiness, ITransientDependency { IteamitemsBusiness iteamitemsBusiness; - public itemlabelsBusiness(IDbAccessor db, IteamitemsBusiness _iteamitemsBusiness) + readonly IOperator _operator; + public itemlabelsBusiness(IDbAccessor db, IteamitemsBusiness _iteamitemsBusiness, IOperator @operator) : base(db) { iteamitemsBusiness = _iteamitemsBusiness; + _operator = @operator; } + #region 外部接口 public async Task> GetDataListAsync(PageInput input) @@ -88,7 +92,7 @@ namespace Coldairarrow.Business.HuiYan //查询这边还需要添加 （Teamid筛选，或者HasFilter=True） 的二选一查询 var where = LinqHelper.True().And(c => c.Platform == (int)platform && ids.Contains(c.GoodsId)); - //where = where.And(c => c.TeamId == "" || c.HasFilter ==true); + where = where.And(c => c.TeamId == _operator.TeamId || c.HasFilter ==true); var list = q.Where(where).ToListAsync().Result; @@ -140,9 +144,9 @@ namespace Coldairarrow.Business.HuiYan Deleted = false, Id = IdHelper.GetId(), ItemsId = item.Id, - CreatorId = string.Empty, - TeamId = string.Empty, - UserId = string.Empty + CreatorId =_operator.UserId, + TeamId =_operator.TeamId, + UserId = _operator.UserId }; switch (model.Status) diff --git a/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs b/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs index 06dc182..75179ea 100644 --- a/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs +++ b/src/Coldairarrow.Business/HuiYan/teamitemsBusiness.cs @@ -1,5 +1,6 @@ using Coldairarrow.Entity.DTO; using Coldairarrow.Entity.HuiYan; +using Coldairarrow.IBusiness; using Coldairarrow.Util; using EFCore.Sharding; using LinqKit; @@ -16,9 +17,11 @@ namespace Coldairarrow.Business.HuiYan { public class teamitemsBusiness : BaseBusiness, IteamitemsBusiness, ITransientDependency { - public teamitemsBusiness(IDbAccessor db) + readonly IOperator _operator; + public teamitemsBusiness(IDbAccessor db, IOperator @operator) : base(db) { + _operator = @operator; } #region 外部接口 @@ -87,6 +90,7 @@ namespace Coldairarrow.Business.HuiYan //查询对应状态 var where = LinqHelper.True().And(c => c.State == int.Parse(search.Keyword)); + where = where.And(c => c.TeamId == _operator.TeamId); var list = q.Where(where).GetPageResultAsync(input).Result; @@ -113,7 +117,7 @@ namespace Coldairarrow.Business.HuiYan GoodsId = model.GoodsId, CreateTime = DateTime.Now, - CreatorId = string.Empty, + CreatorId =_operator.UserId, Deleted = false, HasFilter = false, Id = IdHelper.GetId(), @@ -134,14 +138,13 @@ namespace Coldairarrow.Business.HuiYan { State = 0, CreateTime = DateTime.Now, - CreatorId = string.Empty, + CreatorId = _operator.UserId, Deleted = false, ExtensionJson = Newtonsoft.Json.JsonConvert.SerializeObject(model.Extensions), Id = IdHelper.GetId(), - //待完善 - TeamId = string.Empty, - UserId = string.Empty, + TeamId = _operator.TeamId, + UserId =_operator.UserId, Price = model.Price, ItemImg = model.ItemImg, diff --git a/src/Coldairarrow.IBusiness/HuiYan/IcatsBusiness.cs b/src/Coldairarrow.IBusiness/HuiYan/IcatsBusiness.cs index 7b04cdb..aca10ca 100644 --- a/src/Coldairarrow.IBusiness/HuiYan/IcatsBusiness.cs +++ b/src/Coldairarrow.IBusiness/HuiYan/IcatsBusiness.cs @@ -21,6 +21,7 @@ namespace Coldairarrow.Business.HuiYan AjaxResult AddKeyWord(CatDto model); Task> GetTreeDataListAsync(); AjaxResult AddKeyWord(KeyWordDto model); + AjaxResult SetKeyOpenTime(string id); } @@ -37,5 +38,20 @@ namespace Coldairarrow.Business.HuiYan public string key { get => Id; } public int Type { get; set; } + + /// + /// 淘宝时间是否超时 + /// + public bool IsShowTBTime { get; set; } + + /// + /// 京东时间 + /// + public bool IsShowJDTime { get; set; } + + /// + /// 拼多多时间是否超时 + /// + public bool IsShowPddTime { get; set; } } } \ No newline at end of file diff --git a/src/Coldairarrow.IBusiness/IOperator.cs b/src/Coldairarrow.IBusiness/IOperator.cs index 29805d5..b2d43d4 100644 --- a/src/Coldairarrow.IBusiness/IOperator.cs +++ b/src/Coldairarrow.IBusiness/IOperator.cs @@ -8,6 +8,10 @@ namespace Coldairarrow.IBusiness /// public interface IOperator { + /// + /// 团队ID + /// + string TeamId { get; } /// /// 当前操作者UserId /// diff --git a/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs b/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs index 377c269..8f0de4f 100644 --- a/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs +++ b/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs @@ -14,6 +14,40 @@ namespace 齐越慧眼 public static string JwtToken { get; set; } + /// + /// 登录 + /// + /// + /// + /// + public static (bool isOk, string msg) LoginUser(string userName, string password) + { + string result = Http("http://mdsapi.qiyue666.com/TaskList/User/SubmitLogin", Newtonsoft.Json.JsonConvert.SerializeObject(new { userName, password })); + + if (string.IsNullOrEmpty(result)) + return (false, "服务器异常"); + var data = Newtonsoft.Json.JsonConvert.DeserializeObject(result); + bool isSuccess = data.Success; + + if (isSuccess) + { + string msg = data.Data.ToString(); + if (msg.Contains("账号")) + { + return (false, msg); + } + + JwtToken = msg; + + return (true, data.Msg ?? ""); + } + else + { + return (false, data.Msg ?? ""); + } + } + + /// /// 设置商品标签 @@ -32,6 +66,8 @@ namespace 齐越慧眼 } + + /// /// 获取标签信息 /// @@ -61,6 +97,31 @@ namespace 齐越慧眼 } + /// + /// 设置关键词打开时间 + /// + /// + /// + /// + public static (bool isOk, string msg) SetKeyOpenTime(string id, ItemPlatform platform) + { + try + { + var result = Http($"/HuiYan/cats/SetKeyOpenTime?platform={platform}&id={id}", string.Empty); + + var data = Newtonsoft.Json.JsonConvert.DeserializeObject(result); + + bool isSuccess = data.Success; + + return (isSuccess, data.Msg??"操作失败"); + } + catch + { + return (false,"系统异常"); + } + } + + /// /// http接口调用 /// @@ -71,6 +132,13 @@ namespace 齐越慧眼 { try { + string url = api; + + if (!url.StartsWith("http")) + { + url = ApiBase + api; + } + HttpClient http = new HttpClient(); http.Timeout = new TimeSpan(0, 0, 35); http.DefaultRequestHeaders.Add("Authorization", "Bearer " + JwtToken); @@ -78,11 +146,11 @@ namespace 齐越慧眼 { StringContent content = new StringContent(postData); content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json"); - var result = http.PostAsync(ApiBase + api, content).Result.Content.ReadAsStringAsync().Result; + var result = http.PostAsync(url, content).Result.Content.ReadAsStringAsync().Result; return result; } - var request = new HttpRequestMessage() { Method = HttpMethod.Get, RequestUri = new Uri(ApiBase + api) }; + var request = new HttpRequestMessage() { Method = HttpMethod.Get, RequestUri = new Uri(url) }; var res = http.SendAsync(request).Result; diff --git a/客户端/齐越慧眼/齐越慧眼/App.xaml b/客户端/齐越慧眼/齐越慧眼/App.xaml index aace080..4f72417 100644 --- a/客户端/齐越慧眼/齐越慧眼/App.xaml +++ b/客户端/齐越慧眼/齐越慧眼/App.xaml @@ -2,12 +2,16 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:齐越慧眼" - StartupUri="MainWindow.xaml"> + xmlns:conver="clr-namespace:WPF.Converters" + StartupUri="LoginWindow.xaml"> - + + + + diff --git a/客户端/齐越慧眼/齐越慧眼/App.xaml.cs b/客户端/齐越慧眼/齐越慧眼/App.xaml.cs index 5552bd4..0c00915 100644 --- a/客户端/齐越慧眼/齐越慧眼/App.xaml.cs +++ b/客户端/齐越慧眼/齐越慧眼/App.xaml.cs @@ -20,7 +20,8 @@ namespace 齐越慧眼 var settings = new CefSettings() { CachePath = System.Environment.CurrentDirectory + "\\webDatas\\data", // LocalesDirPath = System.Environment.CurrentDirectory + "\\webDatas", - RootCachePath= System.Environment.CurrentDirectory + "\\rootCache" + RootCachePath= System.Environment.CurrentDirectory + "\\rootCache", + }; // ... diff --git a/客户端/齐越慧眼/齐越慧眼/LoginWindow.xaml b/客户端/齐越慧眼/齐越慧眼/LoginWindow.xaml new file mode 100644 index 0000000..9444d7d --- /dev/null +++ b/客户端/齐越慧眼/齐越慧眼/LoginWindow.xaml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + public partial class BrowerControl : UserControl { + + public static BrowerControl Main = null; public ChromiumWebBrowser web; public BrowerControl() { @@ -39,12 +41,34 @@ namespace 齐越慧眼.UserControls web.JavascriptObjectRepository.Settings.LegacyBindingEnabled = true; web.JavascriptObjectRepository.Register("hyCoreModel", new CefAsyncJS(), BindingOptions.DefaultBinder); + Main = this; } private void BrowerControl_Loaded(object sender, RoutedEventArgs e) { - web.WebBrowser.LoadingStateChanged += WebBrowser_LoadingStateChanged; + Thread t = new Thread(() => { + + IWebBrowser webBrowser = null; + + Application.Current.Dispatcher.Invoke(() => { + webBrowser = web.WebBrowser; + }); + + while (webBrowser == null) + { + Thread.Sleep(100); + Application.Current.Dispatcher.Invoke(() => { + webBrowser = web.WebBrowser; + }); + } + + Application.Current.Dispatcher.Invoke(() => { + web.WebBrowser.LoadingStateChanged += WebBrowser_LoadingStateChanged; + }); + }); + + t.Start(); } private string lastUrl = string.Empty; @@ -57,7 +81,6 @@ namespace 齐越慧眼.UserControls //开始单页查询 if (lastUrl.StartsWith("https://s.taobao.com/search")) { - web.ShowDevTools(); StartPage(); } @@ -94,7 +117,7 @@ namespace 齐越慧眼.UserControls } - + lastUrl = string.Empty; }); t.Start(); @@ -151,6 +174,8 @@ namespace 齐越慧眼.UserControls } + + /// /// 添加操作面板 /// @@ -283,7 +308,7 @@ namespace 齐越慧眼.UserControls /// /// /// - private (bool isOk, object result) DoJavaScript(string js) + public (bool isOk, object result) DoJavaScript(string js) { js = js.Replace("\n", "").Replace("\r\n", "").Replace(System.Environment.NewLine, "").Replace("\r", ""); Task task = null; @@ -329,6 +354,24 @@ namespace 齐越慧眼.UserControls Title = title }); + if (result.isOk) + { + //判断是否团队过滤 + if (type == 1) + { + BrowerControl.Main.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').addClass(""falseBg"")"); + } + + if (type == 3) + { + BrowerControl.Main.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').prepend('
竞
')"); + } + + if (type == 1) + { + BrowerControl.Main.DoJavaScript($@"$($('div#mainsrp-itemlist .items .item').find('a[data-nid=""{itemId}""]').parent().parent()).find('.myitemState').addClass(""trueBg"")"); + } + } MessageBox.Show(result.msg, "提示"); return result.isOk; diff --git a/客户端/齐越慧眼/齐越慧眼/UserControls/CatControl.xaml b/客户端/齐越慧眼/齐越慧眼/UserControls/CatControl.xaml index 0ba2d53..d1babd4 100644 --- a/客户端/齐越慧眼/齐越慧眼/UserControls/CatControl.xaml +++ b/客户端/齐越慧眼/齐越慧眼/UserControls/CatControl.xaml @@ -8,5 +8,6 @@ mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800"> + diff --git a/客户端/齐越慧眼/齐越慧眼/UserControls/CatControl.xaml.cs b/客户端/齐越慧眼/齐越慧眼/UserControls/CatControl.xaml.cs index 745ff9e..4119002 100644 --- a/客户端/齐越慧眼/齐越慧眼/UserControls/CatControl.xaml.cs +++ b/客户端/齐越慧眼/齐越慧眼/UserControls/CatControl.xaml.cs @@ -32,25 +32,35 @@ namespace 齐越慧眼.UserControls DefaultEncoding = "UTF-8", Plugins= CefState.Enabled, //关于跨域限制 - WebSecurity = CefState.Disabled - + WebSecurity = CefState.Disabled, }, + }; - + grid.Children.Add(web); web.JavascriptObjectRepository.Settings.LegacyBindingEnabled = true; web.JavascriptObjectRepository.Register("hyCoreModel", new CatsAsyncJS(), BindingOptions.DefaultBinder); + + web.ExecuteScriptAsyncWhenPageLoaded(@$"localStorage.setItem('user', '{{""token"":""{ApiHelper.JwtToken}""}}');window.getDatas();"); + + } + private void Button_Click(object sender, RoutedEventArgs e) + { + web.ShowDevTools(); + } } public class CatsAsyncJS { - public void openTabByKey(string keyWord,int type) + public void openTabByKey(string keyWord,string id,int type) { + var result= ApiHelper.SetKeyOpenTime(id, (Models.ItemPlatform)type); + MainWindow.Main.ChangeTab(keyWord, type); } } diff --git a/客户端/齐越慧眼/齐越慧眼/UserControls/ItemControl.xaml.cs b/客户端/齐越慧眼/齐越慧眼/UserControls/ItemControl.xaml.cs index b8f163e..ccf742a 100644 --- a/客户端/齐越慧眼/齐越慧眼/UserControls/ItemControl.xaml.cs +++ b/客户端/齐越慧眼/齐越慧眼/UserControls/ItemControl.xaml.cs @@ -37,6 +37,7 @@ namespace 齐越慧眼.UserControls }; grid.Children.Add(web); + web.ExecuteScriptAsyncWhenPageLoaded(@$"localStorage.setItem('user', '{{""token"":""{ApiHelper.JwtToken}""}}');window.getDatas(0);"); } } diff --git a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/cats/Index.vue b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/cats/Index.vue index cae15ea..4ed9972 100644 --- a/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/cats/Index.vue +++ b/客户端/齐越慧眼/齐越慧眼/vuepage/client/src/views/cats/Index.vue @@ -1,13 +1,13 @@