继续优化读单
This commit is contained in:
1 parent
7df2cc0957
commit
aad92e8f8e
9 files changed
+275
-257
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)
|
||||||
|
|||||||
@@ -1,86 +1,86 @@
|
|||||||
<UserControl
|
<UserControl
|
||||||
x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListRowHeaderCtrl"
|
x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListRowHeaderCtrl"
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
|
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
|
xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
|
||||||
d:DesignHeight="50"
|
d:DesignHeight="50"
|
||||||
d:DesignWidth="800"
|
d:DesignWidth="800"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
|
|
||||||
<Border Background="{StaticResource ListRowBorderColorBrush}" CornerRadius="12,12,0,0">
|
<Border Background="{StaticResource ListRowBorderColorBrush}" CornerRadius="12,12,0,0">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.ColumnDefinitions>
|
<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="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="*" />
|
||||||
<ColumnDefinition Width="auto" />
|
<ColumnDefinition Width="auto" />
|
||||||
<ColumnDefinition Width="auto" />
|
<ColumnDefinition Width="auto" />
|
||||||
<ColumnDefinition Width="20" />
|
<ColumnDefinition Width="20" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<TextBox
|
<TextBox
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
Margin="8,8,-4,8"
|
Margin="8,8,-4,8"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
FontSize="20"
|
FontSize="20"
|
||||||
FontWeight="ExtraBold"
|
FontWeight="ExtraBold"
|
||||||
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"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
FontSize="14"
|
FontSize="14"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="店铺单号:" />
|
Text="店铺单号:" />
|
||||||
<uc:UcWaterMarkTextBox1
|
<uc:UcWaterMarkTextBox1
|
||||||
x:Name="txtOrderId"
|
x:Name="txtOrderId"
|
||||||
Grid.Column="2"
|
Grid.Column="2"
|
||||||
Margin="0,8,4,8"
|
Margin="0,8,4,8"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
Cursor="Hand"
|
Cursor="Hand"
|
||||||
FontSize="14"
|
FontSize="14"
|
||||||
Foreground="{StaticResource PageLinkBrush}"
|
Foreground="{StaticResource PageLinkBrush}"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding order_id}"
|
Text="{Binding order_id}"
|
||||||
WaterMark="订单号" />
|
WaterMark="订单号" />
|
||||||
<Border
|
<Border
|
||||||
Grid.Column="3"
|
Grid.Column="3"
|
||||||
Width="12"
|
Width="12"
|
||||||
Height="12"
|
Height="12"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
Cursor="Hand"
|
Cursor="Hand"
|
||||||
MouseLeftButtonDown="Path_MouseLeftButtonDown"
|
MouseLeftButtonDown="Path_MouseLeftButtonDown"
|
||||||
Tag="{Binding order_id}">
|
Tag="{Binding order_id}">
|
||||||
<Path
|
<Path
|
||||||
Margin="0,0,0,0"
|
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"
|
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}"
|
Fill="{StaticResource PageLinkBrush}"
|
||||||
MouseLeftButtonDown="Path_MouseLeftButtonDown"
|
MouseLeftButtonDown="Path_MouseLeftButtonDown"
|
||||||
Stretch="Uniform"
|
Stretch="Uniform"
|
||||||
Tag="{Binding order_id}" />
|
Tag="{Binding order_id}" />
|
||||||
</Border>
|
</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>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition></ColumnDefinition>
|
<ColumnDefinition></ColumnDefinition>
|
||||||
@@ -94,163 +94,163 @@
|
|||||||
Text="{Binding DeliveryDeadlineStr}" BorderThickness="0" />
|
Text="{Binding DeliveryDeadlineStr}" BorderThickness="0" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>-->
|
</Border>-->
|
||||||
<Border
|
<Border
|
||||||
x:Name="borderDeadline"
|
x:Name="borderDeadline"
|
||||||
Grid.Column="4"
|
Grid.Column="4"
|
||||||
Height="24"
|
Height="24"
|
||||||
MinWidth="30"
|
MinWidth="30"
|
||||||
Margin="8,0,0,0"
|
Margin="8,0,0,0"
|
||||||
Background="{Binding StatusBoxBackColor}"
|
Background="{Binding StatusBoxBackColor}"
|
||||||
BorderBrush="{Binding StatusBoxBorderColor}"
|
BorderBrush="{Binding StatusBoxBorderColor}"
|
||||||
BorderThickness="1"
|
BorderThickness="1"
|
||||||
CornerRadius="2">
|
CornerRadius="2">
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition />
|
<ColumnDefinition />
|
||||||
<ColumnDefinition />
|
<ColumnDefinition />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Border
|
<Border
|
||||||
x:Name="borderDeadlineHead"
|
x:Name="borderDeadlineHead"
|
||||||
Background="{Binding StatusBoxForeColor}"
|
Background="{Binding StatusBoxForeColor}"
|
||||||
CornerRadius="2,0,10,2">
|
CornerRadius="2,0,10,2">
|
||||||
<TextBox
|
<TextBox
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
MinWidth="20"
|
MinWidth="20"
|
||||||
Margin="2,0,2,1"
|
Margin="2,0,2,1"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
VerticalContentAlignment="Center"
|
VerticalContentAlignment="Center"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
Foreground="White"
|
Foreground="White"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding DeliveryDeadlineStatusStr}" />
|
Text="{Binding DeliveryDeadlineStatusStr}" />
|
||||||
</Border>
|
</Border>
|
||||||
<TextBox
|
<TextBox
|
||||||
x:Name="txtDeadline"
|
x:Name="txtDeadline"
|
||||||
Grid.Column="1"
|
Grid.Column="1"
|
||||||
MinWidth="20"
|
MinWidth="20"
|
||||||
Margin="2,0,2,1"
|
Margin="2,0,2,1"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
VerticalContentAlignment="Center"
|
VerticalContentAlignment="Center"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
Foreground="{Binding StatusBoxForeColor}"
|
Foreground="{Binding StatusBoxForeColor}"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding DeliveryDeadlineStr}" />
|
Text="{Binding DeliveryDeadlineStr}" />
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
|
|
||||||
<Image
|
<Image
|
||||||
Grid.Column="5"
|
Grid.Column="5"
|
||||||
Width="24"
|
Width="24"
|
||||||
Height="24"
|
Height="24"
|
||||||
Margin="8,8,0,8"
|
Margin="8,8,0,8"
|
||||||
Source="{StaticResource imgOrderWeishopIcon}" />
|
Source="{StaticResource imgOrderWeishopIcon}" />
|
||||||
<uc:UcWaterMarkTextBox1
|
<uc:UcWaterMarkTextBox1
|
||||||
x:Name="txtShopLoginStatus"
|
x:Name="txtShopLoginStatus"
|
||||||
Grid.Column="5"
|
Grid.Column="5"
|
||||||
Margin="0,12,-6,0"
|
Margin="0,12,-6,0"
|
||||||
Padding="0"
|
Padding="0"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Background="{StaticResource ListHeadBackColorBrush}"
|
Background="{StaticResource ListHeadBackColorBrush}"
|
||||||
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="店铺状态" />
|
||||||
<uc:UcWaterMarkTextBox1
|
<uc:UcWaterMarkTextBox1
|
||||||
x:Name="txtShopName"
|
x:Name="txtShopName"
|
||||||
Grid.Column="6"
|
Grid.Column="6"
|
||||||
Margin="4,8,4,8"
|
Margin="4,8,4,8"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
Cursor="Hand"
|
Cursor="Hand"
|
||||||
FontSize="14"
|
FontSize="14"
|
||||||
Foreground="{StaticResource PageLinkBrush}"
|
Foreground="{StaticResource PageLinkBrush}"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
Text="{Binding shop_name}"
|
Text="{Binding shop_name}"
|
||||||
WaterMark="店铺名称" />
|
WaterMark="店铺名称" />
|
||||||
|
|
||||||
|
|
||||||
<Border
|
<Border
|
||||||
Grid.Column="7"
|
Grid.Column="7"
|
||||||
Width="12"
|
Width="12"
|
||||||
Height="12"
|
Height="12"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
Cursor="Hand"
|
Cursor="Hand"
|
||||||
MouseLeftButtonDown="pathShop_MouseLeftButtonDown"
|
MouseLeftButtonDown="pathShop_MouseLeftButtonDown"
|
||||||
Tag="{Binding order_id}">
|
Tag="{Binding order_id}">
|
||||||
<Path
|
<Path
|
||||||
Margin="0,0,0,0"
|
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"
|
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}"
|
Fill="{StaticResource PageLinkBrush}"
|
||||||
MouseLeftButtonDown="pathShop_MouseLeftButtonDown"
|
MouseLeftButtonDown="pathShop_MouseLeftButtonDown"
|
||||||
Stretch="Uniform"
|
Stretch="Uniform"
|
||||||
Tag="{Binding order_id}" />
|
Tag="{Binding order_id}" />
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
|
|
||||||
<uc:UcWaterMarkTextBox1
|
<uc:UcWaterMarkTextBox1
|
||||||
x:Name="txtCount"
|
x:Name="txtCount"
|
||||||
Grid.Column="9"
|
Grid.Column="9"
|
||||||
Margin="8,8,0,8"
|
Margin="8,8,0,8"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
d:Text="该订单共有 x 条不同商品记录"
|
d:Text="该订单共有 x 条不同商品记录"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
BorderThickness="0"
|
BorderThickness="0"
|
||||||
FontSize="14"
|
FontSize="14"
|
||||||
Foreground="Gray"
|
Foreground="Gray"
|
||||||
IsReadOnly="True"
|
IsReadOnly="True"
|
||||||
WaterMark="该订单共有 1 条不同商品记录" />
|
WaterMark="该订单共有 1 条不同商品记录" />
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Column="11"
|
Grid.Column="11"
|
||||||
Margin="10"
|
Margin="10"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
d:Text="仅退款/退货退款"
|
d:Text="仅退款/退货退款"
|
||||||
Foreground="Gray"
|
Foreground="Gray"
|
||||||
Text="{Binding RefundTypeStr}" />
|
Text="{Binding RefundTypeStr}" />
|
||||||
|
|
||||||
<Border
|
<Border
|
||||||
x:Name="borderFlag"
|
x:Name="borderFlag"
|
||||||
Grid.Column="12"
|
Grid.Column="12"
|
||||||
Width="auto"
|
Width="auto"
|
||||||
Height="15"
|
Height="15"
|
||||||
Margin="2"
|
Margin="2"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Background="Transparent"
|
Background="Transparent"
|
||||||
Cursor="Hand"
|
Cursor="Hand"
|
||||||
MouseLeftButtonDown="borderFlag_MouseLeftButtonDown">
|
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" />-->
|
<!--<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">
|
<WrapPanel VerticalAlignment="Center">
|
||||||
<TextBlock
|
<TextBlock
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
FontSize="12"
|
FontSize="12"
|
||||||
Foreground="Gray"
|
Foreground="Gray"
|
||||||
Text="隐藏标记" />
|
Text="隐藏标记" />
|
||||||
<Path
|
<Path
|
||||||
Width="15"
|
Width="15"
|
||||||
Height="15"
|
Height="15"
|
||||||
Margin="2,0,0,0"
|
Margin="2,0,0,0"
|
||||||
d:Fill="SkyBlue"
|
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"
|
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}"
|
Fill="{Binding ColourFlagBrush}"
|
||||||
Stretch="Uniform" />
|
Stretch="Uniform" />
|
||||||
<!--ColourFlagBrush-->
|
<!-- ColourFlagBrush -->
|
||||||
<!--Fill="{Binding colour_flag, Converter={StaticResource flagColorConverter}}"-->
|
<!-- Fill="{Binding colour_flag, Converter={StaticResource flagColorConverter}}" -->
|
||||||
</WrapPanel>
|
</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" />
|
<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>-->
|
</Border>-->
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
@@ -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(() =>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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();
|
||||||
|
|
||||||
|
|||||||
@@ -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); }
|
||||||
|
|||||||
@@ -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); }
|
||||||
|
|||||||
Reference in new issue
Block a user