From b74e4598a71fcfd83ffe59ef36b3ab08cdc6734e Mon Sep 17 00:00:00 2001 From: wule Date: Mon, 19 Oct 2026 15:13:18 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AF=BB=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs | 5 ++++- 29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs | 3 ++- AllBase/ImageBuild.cs | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs index b8f8dcf..94d54fd 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs @@ -344,7 +344,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls })); int page = 0; int totalPage = 1; - int pageSize = 200; + int pageSize = 50; +#if DEBUG + pageSize = 200; +#endif while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds))) { diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs index a43dc34..adbb7b9 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs @@ -796,7 +796,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls // })); //}); - var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient="); + //var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient="); + var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img); imgOrderItem.Source = bImg; diff --git a/AllBase/ImageBuild.cs b/AllBase/ImageBuild.cs index 08673fd..d4bd1c6 100644 --- a/AllBase/ImageBuild.cs +++ b/AllBase/ImageBuild.cs @@ -484,7 +484,7 @@ namespace AllBase if (width != null && height != null) { bitmap.DecodePixelWidth = width.Value; - bitmap.DecodePixelHeight = height.Value; + //bitmap.DecodePixelHeight = height.Value; } bitmap.CreateOptions = BitmapCreateOptions.PreservePixelFormat; bitmap.CacheOption = BitmapCacheOption.OnLoad; // 或者使用 BitmapCacheOption.OnLoad 以减少内存使用 From 7eea26cdda7414785ca7be724dd915a3598b2d5d Mon Sep 17 00:00:00 2001 From: wule Date: Mon, 19 Oct 2026 15:14:03 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AllBase/BaseClass.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 0aa3528..1cb7e28 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -37,7 +37,7 @@ namespace AllBase /// 版本ID /// - public static int VersionCount = 332; + public static int VersionCount = 333; public static string ServerUrl { get; set; } = "http://1.13.195.131:9000"; public static string DebugUrl { get; set; } = "http://localhost:9000"; From c868460cd7b928537c6297ac68ca3414ddfab838 Mon Sep 17 00:00:00 2001 From: wule Date: Mon, 19 Oct 2026 16:11:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BB=E5=8D=95?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E8=B7=B3=E5=87=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ctrls/OrderCtrls/OrderListCtrl.xaml.cs | 20 +++++++++++++------ .../OrderCtrls/OrderListRowItemCtrl.xaml | 2 +- .../OrderCtrls/OrderListRowItemCtrl.xaml.cs | 3 ++- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs index 94d54fd..be3f241 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs @@ -1841,7 +1841,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } } - return FilterTabPage(order, filterHeadStr); + try + { + return FilterTabPage(order, filterHeadStr); + } + catch (Exception ex) + { + BaseMsgWindow.ShowAnimateMessage("订单 " + order.order_id + " 子筛选发生错误：" + ex.Message); + return false; + } } /// @@ -2026,14 +2034,14 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls //if (chkReturnOrderAddressIsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail != GlobalConfig.TransitReturnOrderReturnAddress)) // return true; //// 非退货仓 - //else if (chkNotReturnOrderAddressIsChecked == true && order.orderItems.Any(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress)) + //else if (chkNotReturnOrderAddressIsChecked == true && order.orderItems?.Any(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress)) // return true; // 商家受理中 - if (chkEmergencyWaitSupplierAcceptIsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund.RefundStatusStr == "商家受理中")) + if (chkEmergencyWaitSupplierAcceptIsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund?.RefundStatusStr == "商家受理中")) return true; // 待商家收货 - if (chkEmergencyWaitSupplierReceiveIsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund.RefundStatusStr == "待商家收货")) + if (chkEmergencyWaitSupplierReceiveIsChecked == true && !order.orderItems.Any(oi => oi.ItemRefund?.RefundStatusStr == "待商家收货")) return true; // 退款完成(但买手没退) if (chkEmergencyShopAfterSaleSuccessIsChecked == true && order.DeliveryDeadlineStatusStr != "退款完成") @@ -2043,10 +2051,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls return true; // 退货退款 - if (chkEmergencyReturnIsChecked == true && !(order.refundItems.OrderByDescending(or => or.create_time).FirstOrDefault()?.type).ParseToString().Contains("RETURN")) + if (chkEmergencyReturnIsChecked == true && !(order.refundItems?.OrderByDescending(or => or.create_time).FirstOrDefault()?.type).ParseToString().Contains("RETURN")) return true; // 仅退款 - else if (chkEmergencyRefundIsChecked == true && !(order.refundItems.OrderByDescending(or => or.create_time).FirstOrDefault()?.type).ParseToString().Contains("REFUND")) + else if (chkEmergencyRefundIsChecked == true && !(order.refundItems?.OrderByDescending(or => or.create_time).FirstOrDefault()?.type).ParseToString().Contains("REFUND")) return true; } if (filterHeadStr.StartsWith("退货仓自动售后单")) diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml index e231f0b..a0ad508 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml @@ -58,7 +58,7 @@ - diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs index adbb7b9..9353c9e 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs @@ -797,7 +797,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls //}); //var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient="); - var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img); + //var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/85|imageMogr2/auto-orient="); + var bImg = await AllBase.ImageBuild.LoadBitmipImageFromUrlAsync(order_item.thumb_img + "?imageView2/1/w/100/h/100/format/jpg/q/80"); imgOrderItem.Source = bImg; From e04e4e5108cce1382cd8f8b2e02f42c31cfdb398 Mon Sep 17 00:00:00 2001 From: wule Date: Mon, 19 Oct 2026 16:12:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AllBase/BaseClass.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 1cb7e28..d04f635 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -37,7 +37,7 @@ namespace AllBase /// 版本ID /// - public static int VersionCount = 333; + public static int VersionCount = 335; public static string ServerUrl { get; set; } = "http://1.13.195.131:9000"; public static string DebugUrl { get; set; } = "http://localhost:9000";