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 09:06:05 +08:00
1 parent 7df2cc0957
commit aad92e8f8e
9 files changed
+275 -257
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+2 -12
View File
@@ -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);
29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs
+1 -1
View File
@@ -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)
29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
+225 -225
View File
@@ -1,86 +1,86 @@
<UserControl
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">
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">
<Border Background="{StaticResource ListRowBorderColorBrush}" CornerRadius="12,12,0,0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="20" />
</Grid.ColumnDefinitions>
<TextBox
Grid.Column="0"
Margin="8,8,-4,8"
VerticalAlignment="Center"
Background="Transparent"
BorderThickness="0"
FontSize="20"
FontWeight="ExtraBold"
Foreground="{Binding OrderBuyTypeColor}"
IsReadOnly="True"
Text="{Binding OrderBuyType}"
Visibility="{Binding OrderBuyType, Converter={StaticResource HasTextVisibility}}" />
<TextBox
Grid.Column="1"
Margin="8,8,-4,8"
VerticalAlignment="Center"
Background="Transparent"
BorderThickness="0"
FontSize="14"
IsReadOnly="True"
Text="店铺单号：" />
<uc:UcWaterMarkTextBox1
x:Name="txtOrderId"
Grid.Column="2"
Margin="0,8,4,8"
VerticalAlignment="Center"
Background="Transparent"
BorderThickness="0"
Cursor="Hand"
FontSize="14"
Foreground="{StaticResource PageLinkBrush}"
IsReadOnly="True"
Text="{Binding order_id}"
WaterMark="订单号" />
<Border
Grid.Column="3"
Width="12"
Height="12"
VerticalAlignment="Center"
Background="Transparent"
Cursor="Hand"
MouseLeftButtonDown="Path_MouseLeftButtonDown"
Tag="{Binding order_id}">
<Path
Margin="0,0,0,0"
Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
Fill="{StaticResource PageLinkBrush}"
MouseLeftButtonDown="Path_MouseLeftButtonDown"
Stretch="Uniform"
Tag="{Binding order_id}" />
</Border>
<Border Background="{StaticResource ListRowBorderColorBrush}" CornerRadius="12,12,0,0">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="auto" />
<ColumnDefinition Width="20" />
</Grid.ColumnDefinitions>
<TextBox
Grid.Column="0"
Margin="8,8,-4,8"
VerticalAlignment="Center"
Background="Transparent"
BorderThickness="0"
FontSize="20"
FontWeight="ExtraBold"
Foreground="{Binding OrderBuyTypeColor}"
IsReadOnly="True"
Text="{Binding OrderBuyType}"
Visibility="{Binding OrderBuyTypeVisibility}" />
<TextBox
Grid.Column="1"
Margin="8,8,-4,8"
VerticalAlignment="Center"
Background="Transparent"
BorderThickness="0"
FontSize="14"
IsReadOnly="True"
Text="店铺单号：" />
<uc:UcWaterMarkTextBox1
x:Name="txtOrderId"
Grid.Column="2"
Margin="0,8,4,8"
VerticalAlignment="Center"
Background="Transparent"
BorderThickness="0"
Cursor="Hand"
FontSize="14"
Foreground="{StaticResource PageLinkBrush}"
IsReadOnly="True"
Text="{Binding order_id}"
WaterMark="订单号" />
<Border
Grid.Column="3"
Width="12"
Height="12"
VerticalAlignment="Center"
Background="Transparent"
Cursor="Hand"
MouseLeftButtonDown="Path_MouseLeftButtonDown"
Tag="{Binding order_id}">
<Path
Margin="0,0,0,0"
Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
Fill="{StaticResource PageLinkBrush}"
MouseLeftButtonDown="Path_MouseLeftButtonDown"
Stretch="Uniform"
Tag="{Binding order_id}" />
</Border>
<!--<Border x:Name="borderDeadline" Grid.Column="3" Margin="8,0,0,0" Background="#e8fbf9" BorderBrush="#d0fbea" BorderThickness="1" MinWidth="30" Height="24" CornerRadius="2">
<!--<Border x:Name="borderDeadline" Grid.Column="3" Margin="8,0,0,0" Background="#e8fbf9" BorderBrush="#d0fbea" BorderThickness="1" MinWidth="30" Height="24" CornerRadius="2">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition></ColumnDefinition>
@@ -94,163 +94,163 @@
Text="{Binding DeliveryDeadlineStr}" BorderThickness="0" />
</Grid>
</Border>-->
<Border
x:Name="borderDeadline"
Grid.Column="4"
Height="24"
MinWidth="30"
Margin="8,0,0,0"
Background="{Binding StatusBoxBackColor}"
BorderBrush="{Binding StatusBoxBorderColor}"
BorderThickness="1"
CornerRadius="2">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Border
x:Name="borderDeadlineHead"
Background="{Binding StatusBoxForeColor}"
CornerRadius="2,0,10,2">
<TextBox
Grid.Column="0"
MinWidth="20"
Margin="2,0,2,1"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Background="Transparent"
BorderThickness="0"
Foreground="White"
IsReadOnly="True"
Text="{Binding DeliveryDeadlineStatusStr}" />
</Border>
<TextBox
x:Name="txtDeadline"
Grid.Column="1"
MinWidth="20"
Margin="2,0,2,1"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Background="Transparent"
BorderThickness="0"
Foreground="{Binding StatusBoxForeColor}"
IsReadOnly="True"
Text="{Binding DeliveryDeadlineStr}" />
</Grid>
</Border>
<Border
x:Name="borderDeadline"
Grid.Column="4"
Height="24"
MinWidth="30"
Margin="8,0,0,0"
Background="{Binding StatusBoxBackColor}"
BorderBrush="{Binding StatusBoxBorderColor}"
BorderThickness="1"
CornerRadius="2">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<Border
x:Name="borderDeadlineHead"
Background="{Binding StatusBoxForeColor}"
CornerRadius="2,0,10,2">
<TextBox
Grid.Column="0"
MinWidth="20"
Margin="2,0,2,1"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Background="Transparent"
BorderThickness="0"
Foreground="White"
IsReadOnly="True"
Text="{Binding DeliveryDeadlineStatusStr}" />
</Border>
<TextBox
x:Name="txtDeadline"
Grid.Column="1"
MinWidth="20"
Margin="2,0,2,1"
VerticalAlignment="Center"
VerticalContentAlignment="Center"
Background="Transparent"
BorderThickness="0"
Foreground="{Binding StatusBoxForeColor}"
IsReadOnly="True"
Text="{Binding DeliveryDeadlineStr}" />
</Grid>
</Border>
<Image
Grid.Column="5"
Width="24"
Height="24"
Margin="8,8,0,8"
Source="{StaticResource imgOrderWeishopIcon}" />
<uc:UcWaterMarkTextBox1
x:Name="txtShopLoginStatus"
Grid.Column="5"
Margin="0,12,-6,0"
Padding="0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="{StaticResource ListHeadBackColorBrush}"
BorderThickness="0"
FontSize="7"
FontWeight="Bold"
Foreground="{Binding Shop.LoginStatusStr, Converter={StaticResource statusToColorBrushConverter}}"
IsReadOnly="True"
Text="{Binding Shop.LoginStatusStr}"
WaterMark="店铺状态" />
<uc:UcWaterMarkTextBox1
x:Name="txtShopName"
Grid.Column="6"
Margin="4,8,4,8"
VerticalAlignment="Center"
Background="Transparent"
BorderThickness="0"
Cursor="Hand"
FontSize="14"
Foreground="{StaticResource PageLinkBrush}"
IsReadOnly="True"
Text="{Binding shop_name}"
WaterMark="店铺名称" />
<Image
Grid.Column="5"
Width="24"
Height="24"
Margin="8,8,0,8"
Source="{StaticResource imgOrderWeishopIcon}" />
<uc:UcWaterMarkTextBox1
x:Name="txtShopLoginStatus"
Grid.Column="5"
Margin="0,12,-6,0"
Padding="0"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Background="{StaticResource ListHeadBackColorBrush}"
BorderThickness="0"
FontSize="7"
FontWeight="Bold"
Foreground="{Binding Shop.LoginStatusStrColor}"
IsReadOnly="True"
Text="{Binding Shop.LoginStatusStr}"
WaterMark="店铺状态" />
<uc:UcWaterMarkTextBox1
x:Name="txtShopName"
Grid.Column="6"
Margin="4,8,4,8"
VerticalAlignment="Center"
Background="Transparent"
BorderThickness="0"
Cursor="Hand"
FontSize="14"
Foreground="{StaticResource PageLinkBrush}"
IsReadOnly="True"
Text="{Binding shop_name}"
WaterMark="店铺名称" />
<Border
Grid.Column="7"
Width="12"
Height="12"
VerticalAlignment="Center"
Background="Transparent"
Cursor="Hand"
MouseLeftButtonDown="pathShop_MouseLeftButtonDown"
Tag="{Binding order_id}">
<Path
Margin="0,0,0,0"
Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
Fill="{StaticResource PageLinkBrush}"
MouseLeftButtonDown="pathShop_MouseLeftButtonDown"
Stretch="Uniform"
Tag="{Binding order_id}" />
</Border>
<Border
Grid.Column="7"
Width="12"
Height="12"
VerticalAlignment="Center"
Background="Transparent"
Cursor="Hand"
MouseLeftButtonDown="pathShop_MouseLeftButtonDown"
Tag="{Binding order_id}">
<Path
Margin="0,0,0,0"
Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
Fill="{StaticResource PageLinkBrush}"
MouseLeftButtonDown="pathShop_MouseLeftButtonDown"
Stretch="Uniform"
Tag="{Binding order_id}" />
</Border>
<uc:UcWaterMarkTextBox1
x:Name="txtCount"
Grid.Column="9"
Margin="8,8,0,8"
VerticalAlignment="Center"
d:Text="该订单共有 x 条不同商品记录"
Background="Transparent"
BorderThickness="0"
FontSize="14"
Foreground="Gray"
IsReadOnly="True"
WaterMark="该订单共有 1 条不同商品记录" />
<uc:UcWaterMarkTextBox1
x:Name="txtCount"
Grid.Column="9"
Margin="8,8,0,8"
VerticalAlignment="Center"
d:Text="该订单共有 x 条不同商品记录"
Background="Transparent"
BorderThickness="0"
FontSize="14"
Foreground="Gray"
IsReadOnly="True"
WaterMark="该订单共有 1 条不同商品记录" />
<TextBlock
Grid.Column="11"
Margin="10"
VerticalAlignment="Center"
d:Text="仅退款/退货退款"
Foreground="Gray"
Text="{Binding RefundTypeStr}" />
<TextBlock
Grid.Column="11"
Margin="10"
VerticalAlignment="Center"
d:Text="仅退款/退货退款"
Foreground="Gray"
Text="{Binding RefundTypeStr}" />
<Border
x:Name="borderFlag"
Grid.Column="12"
Width="auto"
Height="15"
Margin="2"
VerticalAlignment="Center"
Background="Transparent"
Cursor="Hand"
MouseLeftButtonDown="borderFlag_MouseLeftButtonDown">
<!--<Path Margin="0,0,0,0" Fill="{StaticResource FlagGrayBrush}" 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" Stretch="Uniform" />-->
<WrapPanel VerticalAlignment="Center">
<TextBlock
VerticalAlignment="Center"
FontSize="12"
Foreground="Gray"
Text="隐藏标记" />
<Border
x:Name="borderFlag"
Grid.Column="12"
Width="auto"
Height="15"
Margin="2"
VerticalAlignment="Center"
Background="Transparent"
Cursor="Hand"
MouseLeftButtonDown="borderFlag_MouseLeftButtonDown">
<!--<Path Margin="0,0,0,0" Fill="{StaticResource FlagGrayBrush}" 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" Stretch="Uniform" />-->
<WrapPanel VerticalAlignment="Center">
<TextBlock
VerticalAlignment="Center"
FontSize="12"
Foreground="Gray"
Text="隐藏标记" />
<Path
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" />
<!--ColourFlagBrush-->
<!--Fill="{Binding colour_flag, Converter={StaticResource flagColorConverter}}"-->
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" />
<!-- ColourFlagBrush -->
<!-- Fill="{Binding colour_flag, Converter={StaticResource flagColorConverter}}" -->
</WrapPanel>
</Border>
</Border>
<!--<Border Grid.Column="11" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand">
<!--<Border Grid.Column="11" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand">
<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" MouseLeftButtonDown="pathShop_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
</Border>-->
</Grid>
</Border>
</Grid>
</Border>
</UserControl>
29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
+4 -4
View File
@@ -859,7 +859,7 @@
</wpf:TitleContent>
<!-- 外采买手 -->
<wpf:TitleContent Title="外采买手：" Visibility="{Binding ItemOrder.out_account, Converter={StaticResource HasTextVisibility}}">
<wpf:TitleContent Title="外采买手：" Visibility="{Binding ItemOrder.OutAccountStrVisibility}">
<WrapPanel Orientation="Horizontal">
<uc:UcWaterMarkTextBox1
x:Name="txtDirectBuyer"
@@ -885,8 +885,7 @@
Background="{Binding DirectRefundStatusBackColor}"
BorderBrush="{Binding DirectRefundStatusBackColor}"
BorderThickness="1"
CornerRadius="2"
Visibility="{Binding DirectRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
CornerRadius="2">
<TextBlock
x:Name="txtOutBuyerRefundStatus"
MinWidth="20"
@@ -895,7 +894,8 @@
d:Text="直发买手退货状态"
Background="Transparent"
Foreground="White"
Text="{Binding DirectRefundStatusStr}" />
Text="{Binding DirectRefundStatusStr}"
Visibility="{Binding DirectRefundStatusStrVisibility}" />
</Border>
</WrapPanel>
</wpf:TitleContent>
29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+2 -1
View File
@@ -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(() =>
{
AllBase/ImageBuild.cs
+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();
AllBase/Model/DBModel/ShopLoginInfo.cs
+10 -2
View File
@@ -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); }
AllBase/Model/DBModel/oms_wei_order_info.cs
+17 -3
View File
@@ -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
/// <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>
AllBase/Model/DBModel/oms_wei_order_item_info.cs
+13 -8
View File
@@ -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); }
}
/// <summary>
/// 直发买手售后字段文字显示背景颜色
/// </summary>
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); }
}
/// <summary>
/// 直发买手售后字段文字显示背景颜色
/// </summary>
public SolidColorBrush DirectRefundStatusBackColor
{
get { return this.GetValue(x => x.DirectRefundStatusBackColor); }
set { this.SetValue(x => x.DirectRefundStatusBackColor, value); }