This commit is contained in:
chfei committed 2026-10-19 10:18:04 +08:00
commit cf15ef194f
9 files changed
+52 -34

No files matched your search

@@ -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); return FilterTabPage(order, filterHeadStr);
} }
@@ -2679,9 +2669,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
BuyerLoginInfo buyer = null; BuyerLoginInfo buyer = null;
if (tmpOrderItem.ItemOrder?.OrderBuyType == "云仓") 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 == "云改直") 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) if (buyer == null)
{ {
BaseMsgWindow.ShowAnimateMessage("买手单:" + pddOrderSn + " 买手不在当前账户下,跳过", "Error", 3); BaseMsgWindow.ShowAnimateMessage("买手单:" + pddOrderSn + " 买手不在当前账户下,跳过", "Error", 3);
@@ -43,7 +43,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
{ {
await Task.Run(() => { Thread.Sleep(1); }); 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; int index = 0;
foreach (var orderItem in order.orderItems) foreach (var orderItem in order.orderItems)
@@ -39,7 +39,7 @@
Foreground="{Binding OrderBuyTypeColor}" Foreground="{Binding OrderBuyTypeColor}"
IsReadOnly="True" IsReadOnly="True"
Text="{Binding OrderBuyType}" Text="{Binding OrderBuyType}"
Visibility="{Binding OrderBuyType, Converter={StaticResource HasTextVisibility}}" /> Visibility="{Binding OrderBuyTypeVisibility}" />
<TextBox <TextBox
Grid.Column="1" Grid.Column="1"
Margin="8,8,-4,8" Margin="8,8,-4,8"
@@ -158,7 +158,7 @@
BorderThickness="0" BorderThickness="0"
FontSize="7" FontSize="7"
FontWeight="Bold" FontWeight="Bold"
Foreground="{Binding Shop.LoginStatusStr, Converter={StaticResource statusToColorBrushConverter}}" Foreground="{Binding Shop.LoginStatusStrColor}"
IsReadOnly="True" IsReadOnly="True"
Text="{Binding Shop.LoginStatusStr}" Text="{Binding Shop.LoginStatusStr}"
WaterMark="店铺状态" /> WaterMark="店铺状态" />
@@ -859,7 +859,7 @@
</wpf:TitleContent> </wpf:TitleContent>
<!-- 外采买手 --> <!-- 外采买手 -->
<wpf:TitleContent Title="外采买手:" Visibility="{Binding ItemOrder.out_account, Converter={StaticResource HasTextVisibility}}"> <wpf:TitleContent Title="外采买手:" Visibility="{Binding ItemOrder.OutAccountStrVisibility}">
<WrapPanel Orientation="Horizontal"> <WrapPanel Orientation="Horizontal">
<uc:UcWaterMarkTextBox1 <uc:UcWaterMarkTextBox1
x:Name="txtDirectBuyer" x:Name="txtDirectBuyer"
@@ -885,8 +885,7 @@
Background="{Binding DirectRefundStatusBackColor}" Background="{Binding DirectRefundStatusBackColor}"
BorderBrush="{Binding DirectRefundStatusBackColor}" BorderBrush="{Binding DirectRefundStatusBackColor}"
BorderThickness="1" BorderThickness="1"
CornerRadius="2" CornerRadius="2">
Visibility="{Binding DirectRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
<TextBlock <TextBlock
x:Name="txtOutBuyerRefundStatus" x:Name="txtOutBuyerRefundStatus"
MinWidth="20" MinWidth="20"
@@ -895,7 +894,8 @@
d:Text="直发买手退货状态" d:Text="直发买手退货状态"
Background="Transparent" Background="Transparent"
Foreground="White" Foreground="White"
Text="{Binding DirectRefundStatusStr}" /> Text="{Binding DirectRefundStatusStr}"
Visibility="{Binding DirectRefundStatusStrVisibility}" />
</Border> </Border>
</WrapPanel> </WrapPanel>
</wpf:TitleContent> </wpf:TitleContent>
@@ -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 = 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)); Thread.Sleep(Randomx.GetId(1000));
Dispatcher.Invoke(new Action(() => Dispatcher.Invoke(new Action(() =>
{ {
+1 -1
View File
@@ -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(); BitmapImage bitmap = new BitmapImage();
+10 -2
View File
@@ -58,8 +58,16 @@ namespace AllBase.Model.DBModel
public string LoginStatusStr public string LoginStatusStr
{ {
get { return this.GetValue(x => x.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 public string LoginStatus
{ {
get { return this.GetValue(x => x.LoginStatus); } get { return this.GetValue(x => x.LoginStatus); }
+17 -3
View File
@@ -34,7 +34,12 @@ namespace AllBase.Model.DBModel
public string OrderBuyType public string OrderBuyType
{ {
get { return this.GetValue(x => x.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 public SolidColorBrush OrderBuyTypeColor
{ {
@@ -379,7 +384,12 @@ namespace AllBase.Model.DBModel
get { return this.GetValue(x => x.IsSelect); } get { return this.GetValue(x => x.IsSelect); }
set { this.SetValue(x => x.IsSelect, value); } 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; } public long id { get; set; }
@@ -645,7 +655,11 @@ namespace AllBase.Model.DBModel
/// <summary> /// <summary>
/// 外采账户 /// 外采账户
/// </summary> /// </summary>
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; }
}
/// <summary> /// <summary>
/// 外采订单号 /// 外采订单号
/// </summary> /// </summary>
@@ -1123,14 +1123,19 @@ namespace AllBase.Model.DBModel
set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStrVisibility, value); } set { this.SetValue(x => x.DirectPddBuyerAfterSaleAddressStrVisibility, value); }
} }
public string DirectRefundStatusStr public string DirectRefundStatusStr
{ {
get { return this.GetValue(x => x.DirectRefundStatusStr); } get { return this.GetValue(x => x.DirectRefundStatusStr); }
set { this.SetValue(x => x.DirectRefundStatusStr, value); } set { this.SetValue(x => x.DirectRefundStatusStr, value); DirectRefundStatusStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
} }
/// <summary> public Visibility DirectRefundStatusStrVisibility
/// 直发买手售后字段文字显示背景颜色 {
/// </summary> get { return this.GetValue(x => x.DirectRefundStatusStrVisibility); }
public SolidColorBrush DirectRefundStatusBackColor set { this.SetValue(x => x.DirectRefundStatusStrVisibility, value); }
}
/// <summary>
/// 直发买手售后字段文字显示背景颜色
/// </summary>
public SolidColorBrush DirectRefundStatusBackColor
{ {
get { return this.GetValue(x => x.DirectRefundStatusBackColor); } get { return this.GetValue(x => x.DirectRefundStatusBackColor); }
set { this.SetValue(x => x.DirectRefundStatusBackColor, value); } set { this.SetValue(x => x.DirectRefundStatusBackColor, value); }