diff --git a/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs b/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs index 1554636..09bba06 100644 --- a/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs +++ b/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs @@ -159,7 +159,7 @@ namespace Coldairarrow.Business.HuiYan //如果是竞品,则添加任务池 - if (model.Status == ItemLabelStatus.Competing) + if (model.Status == ItemLabelStatus.Competing&& model.Platform== ItemPlatform.Jd) { //添加任务池 ijdskutaskBusiness.PushTask(new Entity.JDSku.jdskutask() diff --git a/src/Coldairarrow.Business/JDSku/jdskutaskBusiness.cs b/src/Coldairarrow.Business/JDSku/jdskutaskBusiness.cs index c0a49f5..6a579e4 100644 --- a/src/Coldairarrow.Business/JDSku/jdskutaskBusiness.cs +++ b/src/Coldairarrow.Business/JDSku/jdskutaskBusiness.cs @@ -17,7 +17,7 @@ namespace Coldairarrow.Business.JDSku { readonly IOperator _operator; readonly IDistributedCache _cache; - public jdskutaskBusiness(IDbAccessor db, IOperator @operator, IDistributedCache cache) + public jdskutaskBusiness(IMDSDbAccessor db, IOperator @operator, IDistributedCache cache) : base(db) { _operator = @operator; diff --git a/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs b/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs index 134672f..ccccbdf 100644 --- a/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs +++ b/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs @@ -14,6 +14,7 @@ namespace 齐越慧眼 { #if DEBUG public static string ApiBase { get; set; } = "http://localhost:5000"; + //public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com"; #else public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com"; #endif @@ -29,9 +30,9 @@ namespace 齐越慧眼 { #if DEBUG - //return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDgyNTMwMzM3MDMxNDU4ODE2IiwidGVhbUlkIjoiMTUxNjk3Nzk0NDkzNTc5NjczNiIsImV4cCI6MTY4MzM2OTA3N30.WWc1W5EKcAsH1hxDbt2c3PQ85h-ZecG0YIVSq2BhHjU"; + return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTE5NTA3MzgwMTkzMjAyMTc2IiwidGVhbUlkIjoiMTQzOTg5ODUxNDIyMDkxMjY0MCIsImV4cCI6MTY4ODExNzc4Nn0.xnkLLkvmMtNwS1u4SAEj-i6rwNZ1_prx_LmkGQEP47o"; - return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTAwNjY3OTAyNDU2NTAwMjI0IiwidGVhbUlkIjoiMTQ2MzAyOTM1NTEwNDk2NDYwOCIsImV4cCI6MTY4MzM0NDg3Nn0.6AsD6DK9Or05w8HPhjb9tQY8RJAT4zo4ouH9sasl_Rk"; + //return "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNTAwNjY3OTAyNDU2NTAwMjI0IiwidGVhbUlkIjoiMTQ2MzAyOTM1NTEwNDk2NDYwOCIsImV4cCI6MTY4MzM0NDg3Nn0.6AsD6DK9Or05w8HPhjb9tQY8RJAT4zo4ouH9sasl_Rk"; #endif if (string.IsNullOrEmpty(jwtToken)) diff --git a/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs b/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs index 266ec0b..ecaf4ca 100644 --- a/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs +++ b/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs @@ -1024,17 +1024,24 @@ namespace 齐越慧眼.UserControls //如果是竞品,则需要输入自己的SKU if (type == 3) { - SkuWindow skuWindow = new SkuWindow(); - if (skuWindow.ShowDialog() != true) + Application.Current.Dispatcher.Invoke(() => { - return false; - } + SkuWindow skuWindow = new SkuWindow(); + if (skuWindow.ShowDialog() != true) + { - sku=skuWindow.Sku; + } + sku = skuWindow.Sku; + }); + + if (string.IsNullOrEmpty(sku)) + return false; } + + var result = ApiHelper.SetItemLabel(new Models.ItemLabelDto() { Img = img,