chfei/29WxOrder
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复读单报错跳出问题

Browse Source
This commit is contained in:
wule committed 2026-10-19 16:11:54 +08:00
1 parent e4b1a24ddb
commit c868460cd7
3 files changed
+17 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+14 -6
View File
@@ -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("退货仓自动售后单"))
29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
+1 -1
View File
@@ -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}}" />
29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+2 -1
View File
@@ -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;