From aad92e8f8e92db1c0eb571338d15c9293220accb Mon Sep 17 00:00:00 2001 From: wule Date: Mon, 19 Oct 2026 09:06:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E4=BC=98=E5=8C=96=E8=AF=BB?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Ctrls/OrderCtrls/OrderListCtrl.xaml.cs | 14 +- .../Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs | 2 +- .../OrderCtrls/OrderListRowHeaderCtrl.xaml | 450 +++++++++--------- .../OrderCtrls/OrderListRowItemCtrl.xaml | 8 +- .../OrderCtrls/OrderListRowItemCtrl.xaml.cs | 3 +- AllBase/ImageBuild.cs | 2 +- AllBase/Model/DBModel/ShopLoginInfo.cs | 12 +- AllBase/Model/DBModel/oms_wei_order_info.cs | 20 +- .../Model/DBModel/oms_wei_order_item_info.cs | 21 +- 9 files changed, 275 insertions(+), 257 deletions(-) diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs index fb6a5ff..0248e08 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs @@ -1833,16 +1833,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls } } - //var filterHeadStrRst = false; - //Dispatcher.Invoke(new Action(() => - //{ - // filterHeadStrRst = FilterTabPage(order, filterHeadStr); - //})); - //if (filterHeadStrRst) - // return filterHeadStrRst; - - //return false; - return FilterTabPage(order, filterHeadStr); } @@ -2679,9 +2669,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls BuyerLoginInfo buyer = null; if (tmpOrderItem.ItemOrder?.OrderBuyType == "云仓") - Dispatcher.Invoke(new Action(() => { buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_nick == tmpOrderItem.ItemTransitOrderWithVoid.buyer_account); })); + Dispatcher.Invoke(() => { buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_nick == tmpOrderItem.ItemTransitOrderWithVoid.buyer_account); }); else if (tmpOrderItem.ItemOrder?.OrderBuyType == "直发" || tmpOrderItem.ItemOrder?.OrderBuyType == "云改直") - Dispatcher.Invoke(new Action(() => { buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_nick == tmpOrderItem.ItemOrder?.out_account); })); + Dispatcher.Invoke(() => { buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_nick == tmpOrderItem.ItemOrder?.out_account); }); if (buyer == null) { BaseMsgWindow.ShowAnimateMessage("买手单：" + pddOrderSn + " 买手不在当前账户下，跳过", "Error", 3); diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs index 081a59f..f9db760 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs @@ -43,7 +43,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls { await Task.Run(() => { Thread.Sleep(1); }); - if (this.DataContext is oms_wei_order_info order && this.IsArrangeValid) + if (this.DataContext is oms_wei_order_info order) { int index = 0; foreach (var orderItem in order.orderItems) diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml index 3eeede0..46e288d 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml @@ -1,86 +1,86 @@  + x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListRowHeaderCtrl" + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls" + d:DesignHeight="50" + d:DesignWidth="800" + mc:Ignorable="d"> - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - + + + - - - + + + - + - + - - - - + + + + - - + Width="15" + Height="15" + Margin="2,0,0,0" + d:Fill="SkyBlue" + Data="M 0,0 L 1,0 L 1,1 L 10,1 L 7,4 L 10,7 L 1,7 L 1,12 L 0,12 Z" + Fill="{Binding ColourFlagBrush}" + Stretch="Uniform" /> + + - + - - - + + diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml index 32322b4..592127f 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml @@ -859,7 +859,7 @@ - + + CornerRadius="2"> + Text="{Binding DirectRefundStatusStr}" + Visibility="{Binding DirectRefundStatusStrVisibility}" /> diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs index e12953c..2c30e27 100644 --- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs +++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs @@ -787,7 +787,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls // 异步加载图片防止卡顿 // 缩略图在有的电脑上无法显示 //BitmapImage bImg = ImageUrlToBitmapImageConverter.LoadImageFromUrl(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient="); - BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img, 100, 100); + //BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img, 100, 100); + BitmapImage bImg = AllBase.ImageBuild.LoadBitmipImageFromUrl(order_item.thumb_img); Thread.Sleep(Randomx.GetId(1000)); Dispatcher.Invoke(new Action(() => { diff --git a/AllBase/ImageBuild.cs b/AllBase/ImageBuild.cs index 9f11f3b..d511dd4 100644 --- a/AllBase/ImageBuild.cs +++ b/AllBase/ImageBuild.cs @@ -386,7 +386,7 @@ namespace AllBase } } - public static BitmapImage LoadBitmipImageFromUrl(string url, int? width = 0, int? height = 0) + public static BitmapImage LoadBitmipImageFromUrl(string url, int? width = null, int? height = null) { BitmapImage bitmap = new BitmapImage(); diff --git a/AllBase/Model/DBModel/ShopLoginInfo.cs b/AllBase/Model/DBModel/ShopLoginInfo.cs index 1711824..a285be8 100644 --- a/AllBase/Model/DBModel/ShopLoginInfo.cs +++ b/AllBase/Model/DBModel/ShopLoginInfo.cs @@ -58,8 +58,16 @@ namespace AllBase.Model.DBModel public string LoginStatusStr { get { return this.GetValue(x => x.LoginStatusStr); } - set { this.SetValue(x => x.LoginStatusStr, value); } - } + set { this.SetValue(x => x.LoginStatusStr, value); + //LoginStatusStrColor = value == "在线" ? new SolidColorBrush(Color.FromRgb(50, 180, 50)) : new SolidColorBrush(Color.FromRgb(255, 50, 50)); + LoginStatusStrColor = value == "在线" ? GlobalConfig.GreenTextBrush : GlobalConfig.RedTextBrush; + } + } + public SolidColorBrush LoginStatusStrColor + { + get { return this.GetValue(x => x.LoginStatusStrColor); } + set { this.SetValue(x => x.LoginStatusStrColor, value); } + } public string LoginStatus { get { return this.GetValue(x => x.LoginStatus); } diff --git a/AllBase/Model/DBModel/oms_wei_order_info.cs b/AllBase/Model/DBModel/oms_wei_order_info.cs index b1b8a24..e9da18a 100644 --- a/AllBase/Model/DBModel/oms_wei_order_info.cs +++ b/AllBase/Model/DBModel/oms_wei_order_info.cs @@ -34,7 +34,12 @@ namespace AllBase.Model.DBModel public string OrderBuyType { get { return this.GetValue(x => x.OrderBuyType); } - set { this.SetValue(x => x.OrderBuyType, value); } + set { this.SetValue(x => x.OrderBuyType, value); OrderBuyTypeVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; } + } + public Visibility OrderBuyTypeVisibility + { + get { return this.GetValue(x => x.OrderBuyTypeVisibility); } + set { this.SetValue(x => x.OrderBuyTypeVisibility, value); } } public SolidColorBrush OrderBuyTypeColor { @@ -379,7 +384,12 @@ namespace AllBase.Model.DBModel get { return this.GetValue(x => x.IsSelect); } set { this.SetValue(x => x.IsSelect, value); } } - public bool is_visible { get; set; } = true; + public Visibility OutAccountStrVisibility + { + get { return this.GetValue(x => x.OutAccountStrVisibility); } + set { this.SetValue(x => x.OutAccountStrVisibility, value); } + } + //public bool is_visible { get; set; } = true; public long id { get; set; } @@ -645,7 +655,11 @@ namespace AllBase.Model.DBModel /// /// 外采账户 /// - public string out_account { get; set; } + public string out_account + { + get { return this.GetValue(x => x.out_account); } + set { this.SetValue(x => x.out_account, value); OutAccountStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; } + } /// /// 外采订单号 /// diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs index e05946f..98b7712 100644 --- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs +++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs @@ -1123,14 +1123,19 @@ namespace AllBase.Model.DBModel set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStrVisibility, value); } } public string DirectRefundStatusStr - { - get { return this.GetValue(x => x.DirectRefundStatusStr); } - set { this.SetValue(x => x.DirectRefundStatusStr, value); } - } - /// - /// 直发买手售后字段文字显示背景颜色 - /// - public SolidColorBrush DirectRefundStatusBackColor + { + get { return this.GetValue(x => x.DirectRefundStatusStr); } + set { this.SetValue(x => x.DirectRefundStatusStr, value); DirectRefundStatusStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; } + } + public Visibility DirectRefundStatusStrVisibility + { + get { return this.GetValue(x => x.DirectRefundStatusStrVisibility); } + set { this.SetValue(x => x.DirectRefundStatusStrVisibility, value); } + } + /// + /// 直发买手售后字段文字显示背景颜色 + /// + public SolidColorBrush DirectRefundStatusBackColor { get { return this.GetValue(x => x.DirectRefundStatusBackColor); } set { this.SetValue(x => x.DirectRefundStatusBackColor, value); }