From 9a52403d988c31f3607fadb7c8599c1c1b6a4b78 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Tue, 25 Jul 2023 13:54:52 +0800 Subject: [PATCH 1/3] 10155 --- BBWY.Client/GlobalContext.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index a16db80b..da65c194 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,7 +13,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10154"; + ClientVersion = "10155"; } private User user; From f5631af506faad4d6c37b6b3cc762f2c3e82259f Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Tue, 25 Jul 2023 15:15:10 +0800 Subject: [PATCH 2/3] 1 --- BBWY.Client/BBWYAppSettings.json | 4 ++-- .../PackTask/PackDetailViewModel.cs | 24 ++++++++++--------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json index 34888905..ef760e08 100644 --- a/BBWY.Client/BBWYAppSettings.json +++ b/BBWY.Client/BBWYAppSettings.json @@ -4,6 +4,6 @@ "MDSApiHost": "http://mdsapi.qiyue666.com", "JOSApiHost": "", "1688ApiHost": "", - "QKApiHost": "http://localhost:8080" - // "QKApiHost": "http://qiku.qiyue666.com" + // "QKApiHost": "http://localhost:8080" + "QKApiHost": "http://qiku.qiyue666.com" } \ No newline at end of file diff --git a/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs index a4986502..115a3184 100644 --- a/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs @@ -116,10 +116,10 @@ namespace BBWY.Client.ViewModels.PackTask get => processTaskCount; set { Set(ref processTaskCount, value); - if (PackProcessType == PackProcessType.推荐工序&& SelectProcessComboIdV2>0&& ProcessTaskCount>0) - + if (PackProcessType == PackProcessType.推荐工序 && SelectProcessComboIdV2 > 0 && ProcessTaskCount > 0) + TotalPackFeesDetail(null, ProcessTaskCount, SelectProcessComboIdV2); - if (PackProcessType == PackProcessType.自定义工序&& !SelectProcessType.IsNullOrEmpty()&& ProcessTaskCount>0) + if (PackProcessType == PackProcessType.自定义工序 && !SelectProcessType.IsNullOrEmpty() && ProcessTaskCount > 0) TotalPackFeesDetail(SelectProcessType, ProcessTaskCount, null); } } @@ -317,7 +317,7 @@ namespace BBWY.Client.ViewModels.PackTask } private void TotalPackFeesDetail(string processType, int taskCount, long? processComboId) { - + var discountRes = processService.GetDiscountFactory(processType, taskCount, processComboId); if (!discountRes.Success) @@ -346,7 +346,7 @@ namespace BBWY.Client.ViewModels.PackTask } //统计打包费用 - + } @@ -788,13 +788,15 @@ namespace BBWY.Client.ViewModels.PackTask foreach (var con in resData.ConsumableList) { var condate = ConsumableServiceList.FirstOrDefault(c => c.ConsumableItem.IsNullOrEmpty() && c.ConsumableType == con.ConsumableTypeName); - App.Current.Dispatcher.Invoke(() => - { - condate.ConsumablePrice = con.ConsumablePrice; - condate.SelectId = con.ConsumableId; - condate.TaskCount = con.TaskCount; + if (condate != null) - }); + App.Current.Dispatcher.Invoke(() => + { + condate.ConsumablePrice = con.ConsumablePrice; + condate.SelectId = con.ConsumableId; + condate.TaskCount = con.TaskCount; + + }); } } From 7161fd523b30691cabc50cead0a9eed7738d4490 Mon Sep 17 00:00:00 2001 From: "506583276@qq.com" <506583276@qq.com> Date: Tue, 25 Jul 2023 15:42:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E6=89=93?= =?UTF-8?q?=E5=8C=85=E6=95=B0=E6=8D=AE=E4=BB=BB=E5=8A=A1=E9=87=8F=E4=B8=8D?= =?UTF-8?q?=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BBWY.Client/BBWYAppSettings.json | 4 ++-- BBWY.Client/GlobalContext.cs | 2 +- BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BBWY.Client/BBWYAppSettings.json b/BBWY.Client/BBWYAppSettings.json index ef760e08..e1b3dcff 100644 --- a/BBWY.Client/BBWYAppSettings.json +++ b/BBWY.Client/BBWYAppSettings.json @@ -4,6 +4,6 @@ "MDSApiHost": "http://mdsapi.qiyue666.com", "JOSApiHost": "", "1688ApiHost": "", - // "QKApiHost": "http://localhost:8080" - "QKApiHost": "http://qiku.qiyue666.com" + "QKApiHost": "http://localhost:8080" + //"QKApiHost": "http://qiku.qiyue666.com" } \ No newline at end of file diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs index da65c194..40747ba3 100644 --- a/BBWY.Client/GlobalContext.cs +++ b/BBWY.Client/GlobalContext.cs @@ -13,7 +13,7 @@ namespace BBWY.Client { ShopServiceGroupList = new List(); ShopServiceGroupLowerList = new List(); - ClientVersion = "10155"; + ClientVersion = "10156"; } private User user; diff --git a/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs b/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs index 115a3184..c2c23284 100644 --- a/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs +++ b/BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs @@ -757,7 +757,7 @@ namespace BBWY.Client.ViewModels.PackTask SuggestPackUserName = resData.SuggestPackUserName; - TaskCount = resData.ProcessTaskCount; + ProcessTaskCount = resData.ProcessTaskCount; DirectionalSingleFees = resData.DirectionalSingleFees?.ToString(); if (resData.DirectionalSingleFees > 0) {