From c868460cd7b928537c6297ac68ca3414ddfab838 Mon Sep 17 00:00:00 2001
From: wule <jtt_fan@qq.com>
Date: Mon, 19 Oct 2026 16:11:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BB=E5=8D=95=E6=8A=A5?=
 =?UTF-8?q?=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;
+			}
 		}
 
 		/// <summary>
@@ -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 @@
 				<ColumnDefinition Width="120*" />
 				<ColumnDefinition Width="72*" />
 			</Grid.ColumnDefinitions>
-			<TextBlock
+			<TextBlock d:Text="No.1"
 				HorizontalAlignment="Center"
 				VerticalAlignment="Center"
 				Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Converter={StaticResource listBoxIndexConverter}}" />
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;