diff --git a/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs b/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs index df6cf27..e4ca774 100644 --- a/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs +++ b/src/Coldairarrow.Business/HuiYan/itemlabelsBusiness.cs @@ -103,7 +103,7 @@ namespace Coldairarrow.Business.HuiYan public AjaxResult SetItemLabel(ItemLabelDto model) { bool isAddItem = false; - var item= Db.GetIQueryable().FirstOrDefault(c => c.GoodsId == model.ItemId); + var item= Db.GetIQueryable().FirstOrDefault(c => c.GoodsId == model.ItemId&&c.Platform==(int)model.Platform); if (item == null) { diff --git a/src/Coldairarrow.Entity/DTO/ItemLabelDto.cs b/src/Coldairarrow.Entity/DTO/ItemLabelDto.cs index 7f05586..0d5df7b 100644 --- a/src/Coldairarrow.Entity/DTO/ItemLabelDto.cs +++ b/src/Coldairarrow.Entity/DTO/ItemLabelDto.cs @@ -43,8 +43,8 @@ namespace Coldairarrow.Entity.DTO /// Jd = 1, /// - /// 拼多多 + /// 阿里巴巴 /// - Pdd = 2 + ALBB = 2 } } diff --git a/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs b/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs index b9f2280..f9a5d52 100644 --- a/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs +++ b/客户端/齐越慧眼/齐越慧眼/ApiHelper.cs @@ -10,8 +10,8 @@ namespace 齐越慧眼 { public class ApiHelper { - // public static string ApiBase { get; set; } = "http://localhost:5000"; - public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com"; + public static string ApiBase { get; set; } = "http://localhost:5000"; + //public static string ApiBase { get; set; } = "http://hyapi.qiyue666.com"; public static string JwtToken { get; set; } diff --git a/客户端/齐越慧眼/齐越慧眼/LoginWindow.xaml.cs b/客户端/齐越慧眼/齐越慧眼/LoginWindow.xaml.cs index 3941d86..ef9223d 100644 --- a/客户端/齐越慧眼/齐越慧眼/LoginWindow.xaml.cs +++ b/客户端/齐越慧眼/齐越慧眼/LoginWindow.xaml.cs @@ -2,6 +2,7 @@ using System; using System.Collections.Generic; using System.Text; +using System.Text.RegularExpressions; using System.Windows; using System.Windows.Controls; using System.Windows.Data; @@ -21,6 +22,7 @@ namespace 齐越慧眼 public LoginWindow() { InitializeComponent(); + LoginWindowViewModel.Main.Window = this; } diff --git a/客户端/齐越慧眼/齐越慧眼/Properties/launchSettings.json b/客户端/齐越慧眼/齐越慧眼/Properties/launchSettings.json index 85e32fa..ac766bb 100644 --- a/客户端/齐越慧眼/齐越慧眼/Properties/launchSettings.json +++ b/客户端/齐越慧眼/齐越慧眼/Properties/launchSettings.json @@ -2,7 +2,7 @@ "profiles": { "齐越慧眼": { "commandName": "Project", - "nativeDebugging": true + "nativeDebugging": false } } } \ No newline at end of file diff --git a/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs b/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs index c403433..f2f2713 100644 --- a/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs +++ b/客户端/齐越慧眼/齐越慧眼/UserControls/BrowerControl.xaml.cs @@ -788,7 +788,7 @@ namespace 齐越慧眼.UserControls int type = data.type; string price = data.price; - price = price.Replace("¥", "").Trim(); + price = Regex.Match(price, @"([1-9]\d*\.?\d*)|(0\.\d*[1-9])").Groups[0].Value.Trim(); string sales = data.sales; string title = data.title; title = title.Trim(); @@ -853,7 +853,7 @@ namespace 齐越慧眼.UserControls int type = data.type; string price = data.price; - price = price.Replace("¥", "").Trim(); + price = Regex.Match(price, @"([1-9]\d*\.?\d*)|(0\.\d*[1-9])").Groups[0].Value.Trim(); string sales = data.sales; sales = sales.Trim(); string title = data.title; @@ -919,7 +919,7 @@ namespace 齐越慧眼.UserControls int type = data.type; string price = data.price; - price = price.Replace("¥", "").Trim(); + price = Regex.Match(price, @"([1-9]\d*\.?\d*)|(0\.\d*[1-9])").Groups[0].Value.Trim(); string sales = data.sales; sales = sales.Trim(); string title = data.title;