From bbac29ac78bc236b170515e15f0affb006030a36 Mon Sep 17 00:00:00 2001
From: wule <jtt_fan@qq.com>
Date: Mon, 19 Oct 2026 13:23:50 +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       |   24 +-
 .../Ctrls/OrderCtrls/OrderListCtrl.xaml.cs    |   19 +-
 .../Ctrls/OrderCtrls/OrderListRowCtrl.xaml    |   37 +
 .../Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs |   30 +-
 .../OrderCtrls/OrderListRowHeaderCtrl.xaml    |  467 +--
 .../OrderCtrls/OrderListRowHeaderCtrl.xaml.cs |    2 +-
 .../OrderCtrls/OrderListRowItemCtrl.xaml      | 2900 ++++++++---------
 .../OrderCtrls/OrderListRowItemCtrl.xaml.cs   |    4 +-
 AllBase/Model/DBModel/oms_wei_order_info.cs   |   73 +-
 .../Model/DBModel/oms_wei_order_item_info.cs  |   36 +-
 10 files changed, 1845 insertions(+), 1747 deletions(-)

diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
index 8221a74..2de9c26 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
@@ -688,11 +688,11 @@
 				</TabItem>
 				<TabItem
 					MinWidth="60"
+					d:Header="异常需重拍"
 					Background="Transparent"
 					BorderBrush="Transparent"
 					Foreground="#FFEE0099"
-					d:Header="异常需重拍"
-                    Header="{Binding AbnormalTabTxt}"
+					Header="{Binding AbnormalTabTxt}"
 					SizeChanged="TabItem_SizeChanged" />
 				<TabItem
 					MinWidth="60"
@@ -875,11 +875,11 @@
 				</TabItem>
 				<TabItem
 					MinWidth="60"
+					d:Header="需处理售后单"
 					Background="#FF6666"
 					BorderBrush="Transparent"
 					Foreground="#FF2222"
-					d:Header="需处理售后单"
-                    Header="{Binding EmergencyManualReturnOrderTabTxt}"
+					Header="{Binding EmergencyManualReturnOrderTabTxt}"
 					SizeChanged="TabItem_SizeChanged">
 					<Border
 						Margin="4,0,4,4"
@@ -1154,11 +1154,11 @@
 				</TabItem>
 				<TabItem
 					MinWidth="60"
+					d:Header="退货仓自动售后单"
 					Background="Transparent"
 					BorderBrush="Transparent"
 					Foreground="#FF7744"
-					d:Header="退货仓自动售后单"
-                    Header="{Binding EmergencyDistribReturnOrderTabTxt}"
+					Header="{Binding EmergencyDistribReturnOrderTabTxt}"
 					SizeChanged="TabItem_SizeChanged">
 					<Border
 						Margin="4,0,4,4"
@@ -1290,11 +1290,11 @@
 				</TabItem>
 				<TabItem
 					MinWidth="60"
+					d:Header="售后完成单"
 					Background="Transparent"
 					BorderBrush="Transparent"
 					Foreground="#FFaa77"
-					d:Header="售后完成单"
-                    Header="{Binding RefundTabTxt}"
+					Header="{Binding RefundTabTxt}"
 					SizeChanged="TabItem_SizeChanged">
 					<Border
 						Margin="4,0,4,4"
@@ -1382,10 +1382,10 @@
 				</TabItem>
 				<TabItem
 					MinWidth="60"
+					d:Header="全部订单"
 					Background="Transparent"
 					BorderBrush="Transparent"
-					d:Header="全部订单"
-                    Header="{Binding AllOrderTabTxt}"
+					Header="{Binding AllOrderTabTxt}"
 					SizeChanged="TabItem_SizeChanged" />
 				<!--<TabItem Header="发货异常">
                     <Grid Background="#FFE5E5E5"/>
@@ -1499,9 +1499,11 @@
 			HorizontalContentAlignment="Stretch"
 			BorderThickness="0"
 			ScrollViewer.CanContentScroll="True"
+			VirtualizingPanel.IsVirtualizingWhenGrouping="True"
 			VirtualizingPanel.ScrollUnit="Pixel"
 			VirtualizingStackPanel.IsVirtualizing="True"
-			><!--VirtualizingStackPanel.VirtualizationMode="Recycling"-->
+			VirtualizingStackPanel.VirtualizationMode="Recycling">
+			<!--  VirtualizingStackPanel.VirtualizationMode="Recycling"  -->
 			<!--  使用自定义属性模板去除ListBox高亮显示框  -->
 			<ListBox.ItemContainerStyle>
 				<Style TargetType="ListBoxItem">
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
index 0248e08..b8f8dcf 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
@@ -344,7 +344,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			}));
 			int page = 0;
 			int totalPage = 1;
-			int pageSize = 50;
+			int pageSize = 200;
 
 			while (true && (IsAutoReadOrder || !string.IsNullOrEmpty(orderIds)))
 			{
@@ -753,6 +753,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			var url3 = BaseClass.Build29WxObjString("order/wx_get_transit_order");
 			var data3 = UserLogin.GetSignaturex();
 			data3 += "&order_no=" + order_ids;
+			data3 += "&page_size=5000";
 			var html3 = GetHtml.PostUtf8(url3, data3);
 			if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
 				html3 = GetHtml.PostUtf8(url3, data3);
@@ -1544,8 +1545,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			//var orders1 = string.Join(",", GlobalConfig.lstFilterOrder.Select(o => o.order_id));
 			var userOrderLst = GlobalConfig.lstOrder.Where(o => GlobalConfig.ShopLoginList.Any(s => s.ErpShopId.ParseToLong() == o.shop_id)).ToList();
 
-			TabItem tabItem = null;
-			List<TabItem> tabItems = this.tabOrderType.Items.Cast<TabItem>().ToList();
+			//TabItem tabItem = null;
+			//List<TabItem> tabItems = this.tabOrderType.Items.Cast<TabItem>().ToList();
 			{
 				var lstCount = userOrderLst.Where(r => r.IsWaitBuy).Count();
 				var filteLstTmpCount = userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")).Count();
@@ -1630,15 +1631,18 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 					int n = 0;
 					foreach (var order in orderLstTmp)
 					{
-						if (n++ % 100 == 0)
-							Thread.Sleep(1);
+						//if (n++ % 10 == 0)
+						Thread.Sleep(1);
 
 						if (token.IsCancellationRequested)
 							break;
 
 						if (!GlobalConfig.lstFilterOrder.ToList().Any(o => o.order_id == order.order_id))
 						{
-							Dispatcher.Invoke(() => { GlobalConfig.lstFilterOrder.Add(order); });
+							Dispatcher.InvokeAsync(() => 
+							{ 
+								GlobalConfig.lstFilterOrder.Add(order); 
+							});
 						}
 					}
 				}
@@ -1682,7 +1686,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 				var index = -1;
 				if (nextOrder != null)
                     index = GlobalConfig.lstFilterOrder.IndexOf(nextOrder);
-				Dispatcher.Invoke(() =>
+				Dispatcher.InvokeAsync(() =>
 				{
 					if (nextOrder != null && index >= 0 && GlobalConfig.lstFilterOrder.Count > index)
 					{
@@ -1693,6 +1697,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 						GlobalConfig.lstFilterOrder.Add(order);
 					}
 				});
+				Thread.Sleep(1);
 			}
 
 			if (updateTabCount)
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml
index 8d378cb..845d926 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml
@@ -43,8 +43,32 @@
 					<Grid.RowDefinitions>
 						<RowDefinition Height="6" />
 						<RowDefinition Height="auto" />
+						<RowDefinition Height="auto" />
+						<RowDefinition Height="auto" />
+						<RowDefinition Height="auto" />
+						<RowDefinition Height="auto" />
 						<RowDefinition Height="6" />
 					</Grid.RowDefinitions>
+					<local:OrderListRowItemCtrl
+						Grid.Row="1"
+						DataContext="{Binding orderItem}"
+						Visibility="{Binding OrderItemVisibility}" />
+					<!--<local:OrderListRowItemCtrl
+						Grid.Row="2"
+						DataContext="{Binding orderItem2}"
+						Visibility="{Binding OrderItemVisibility}" />
+					<local:OrderListRowItemCtrl
+						Grid.Row="3"
+						DataContext="{Binding orderItem2}"
+						Visibility="{Binding OrderItemVisibility}" />
+					<local:OrderListRowItemCtrl
+						Grid.Row="4"
+						DataContext="{Binding orderItem3}"
+						Visibility="{Binding OrderItemVisibility}" />
+					<local:OrderListRowItemCtrl
+						Grid.Row="5"
+						DataContext="{Binding orderItem4}"
+						Visibility="{Binding OrderItemVisibility}" />-->
 					<!--<ItemsControl Grid.Row="1" ItemsSource="{Binding orderItems}">
 						<ItemsControl.ItemTemplate>
                             <DataTemplate>
@@ -52,6 +76,19 @@
 							</DataTemplate>
 						</ItemsControl.ItemTemplate>
 					</ItemsControl>-->
+					<!--<ListBox
+						Grid.Row="1"
+						ItemsSource="{Binding orderItems}"
+						ScrollViewer.HorizontalScrollBarVisibility="Disabled"
+						ScrollViewer.VerticalScrollBarVisibility="Disabled"
+						VirtualizingStackPanel.IsVirtualizing="True"
+						VirtualizingStackPanel.VirtualizationMode="Recycling">
+						<ListBox.ItemTemplate>
+							<DataTemplate>
+								<local:OrderListRowItemCtrl DataContext="{Binding}" />
+							</DataTemplate>
+						</ListBox.ItemTemplate>
+					</ListBox>-->
 					<!--<TextBlock Text="{Binding ProductName}" Margin="20,0,0,0"/>-->
 				</Grid>
 			</Border>
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs
index f9db760..31fab23 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs
@@ -41,22 +41,22 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 
         private async void OrderListRowCtrl_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
-			await Task.Run(() => { Thread.Sleep(1); });
+			//await Task.Run(() => { Thread.Sleep(1); });
 
-			if (this.DataContext is oms_wei_order_info order)
-			{
-				int index = 0;
-				foreach (var orderItem in order.orderItems)
-				{
-					gridChildOrder.RowDefinitions.Insert(gridChildOrder.RowDefinitions.Count - 1, new RowDefinition() { Height = GridLength.Auto });
-					index++;
-					var rowItem = new OrderListRowItemCtrl() { DataContext = orderItem, Name = "rowItem" + index };
-					Grid.SetRow(rowItem, index);
-					this.gridChildOrder.Children.Add(rowItem);
-					if (index >= 5)
-						break;
-				}
-			}
+			//if (this.DataContext is oms_wei_order_info order)
+			//{
+			//	int index = 0;
+			//	foreach (var orderItem in order.orderItems)
+			//	{
+			//		gridChildOrder.RowDefinitions.Insert(gridChildOrder.RowDefinitions.Count - 1, new RowDefinition() { Height = GridLength.Auto });
+			//		index++;
+			//		var rowItem = new OrderListRowItemCtrl() { DataContext = orderItem, Name = "rowItem" + index };
+			//		Grid.SetRow(rowItem, index);
+			//		this.gridChildOrder.Children.Add(rowItem);
+			//		if (index >= 5)
+			//			break;
+			//	}
+			//}
 		}
 
         private void CheckBox_Click(object sender, RoutedEventArgs e)
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
index bc0827d..7fcc3b6 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
@@ -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 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 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,169 +94,170 @@
                              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.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="店铺名称" />
+			<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="#FF8888"
+				IsReadOnly="True"
+				Text="{Binding OrderDiffItemCountStr}"
+				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"
-                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">
-                    <Button
-                        Width="60"
-                        Height="22"
-                        Margin="0,0,10,0"
-                        Click="btn_createOrderSupportTicket"
-                        Content="创建工单"
-                        Style="{StaticResource BasePageButtonStyle}" />
-                    <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}}"  -->
-                </WrapPanel>
-            </Border>
+			<Border
+				x:Name="borderFlag"
+				Grid.Column="12"
+				Width="auto"
+				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">
+					<Button
+						Width="60"
+						Height="22"
+						Margin="0,0,10,0"
+						Click="btn_createOrderSupportTicket"
+						Content="创建工单"
+						Style="{StaticResource BasePageButtonStyle}" />
+					<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}}"  -->
+				</WrapPanel>
+			</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>
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml.cs
index 29f555f..7144248 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml.cs
@@ -121,7 +121,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			{
 				if (order.orderItems.Count > 5)
 				{
-					txtCount.Text = "该订单共计 " + order.orderItems.Count + " 件商品";
+					//txtCount.Text = "该订单共计 " + order.orderItems.Count + " 件商品";
 				}
 			}
 		}
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
index 592127f..e231f0b 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
@@ -1,104 +1,104 @@
 <UserControl
-    x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListRowItemCtrl"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:_29WxOrderWpf.Converters"
-    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"
-    xmlns:wpf="WPFCommon"
-    d:Background="White"
-    d:DesignHeight="320"
-    d:DesignWidth="1800"
-    DataContextChanged="UserControl_DataContextChanged"
-    mc:Ignorable="d">
-    <UserControl.Resources>
-        <conv:InverseVisibleToVisibilityConverter x:Key="InverseVisibleToVisibilityConverter" />
-        <conv:VisibleToVisibilityConverter x:Key="VisibleToVisibilityConverter" />
-        <conv:MoreThanZeroVisibilityConverter x:Key="MoreThanZeroVisibilityConverter" />
+	x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListRowItemCtrl"
+	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+	xmlns:conv="clr-namespace:_29WxOrderWpf.Converters"
+	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"
+	xmlns:wpf="WPFCommon"
+	d:Background="White"
+	d:DesignHeight="320"
+	d:DesignWidth="1800"
+	DataContextChanged="UserControl_DataContextChanged"
+	mc:Ignorable="d">
+	<UserControl.Resources>
+		<conv:InverseVisibleToVisibilityConverter x:Key="InverseVisibleToVisibilityConverter" />
+		<conv:VisibleToVisibilityConverter x:Key="VisibleToVisibilityConverter" />
+		<conv:MoreThanZeroVisibilityConverter x:Key="MoreThanZeroVisibilityConverter" />
 
-        <Style BasedOn="{StaticResource TitleContentBaseStyle}" TargetType="wpf:TitleContent">
-            <Setter Property="Placement" Value="Left" />
-            <Setter Property="TitleVerticalAlignment" Value="Center" />
-            <Setter Property="LeftTitlePadding" Value="0,0,0,0" />
-        </Style>
-        <Style TargetType="wpf:SpacingStackPanel">
-            <Setter Property="Margin" Value="3,0" />
-        </Style>
-        <!--  BasedOn="{StaticResource ButtonBaseStyle}"  -->
-        <Style x:Key="LinkButton" TargetType="Button">
-            <Setter Property="Height" Value="18" />
-            <Setter Property="Background" Value="Transparent" />
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="Foreground" Value="{StaticResource PageLinkBrush}" />
-            <Setter Property="Cursor" Value="Hand" />
-            <Setter Property="Padding" Value="4,0" />
-        </Style>
-    </UserControl.Resources>
+		<Style BasedOn="{StaticResource TitleContentBaseStyle}" TargetType="wpf:TitleContent">
+			<Setter Property="Placement" Value="Left" />
+			<Setter Property="TitleVerticalAlignment" Value="Center" />
+			<Setter Property="LeftTitlePadding" Value="0,0,0,0" />
+		</Style>
+		<Style TargetType="wpf:SpacingStackPanel">
+			<Setter Property="Margin" Value="3,0" />
+		</Style>
+		<!--  BasedOn="{StaticResource ButtonBaseStyle}"  -->
+		<Style x:Key="LinkButton" TargetType="Button">
+			<Setter Property="Height" Value="18" />
+			<Setter Property="Background" Value="Transparent" />
+			<Setter Property="BorderThickness" Value="0" />
+			<Setter Property="Foreground" Value="{StaticResource PageLinkBrush}" />
+			<Setter Property="Cursor" Value="Hand" />
+			<Setter Property="Padding" Value="4,0" />
+		</Style>
+	</UserControl.Resources>
 
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="0" />
-            <RowDefinition Height="*" />
-            <RowDefinition Height="0" />
-        </Grid.RowDefinitions>
-        <Grid
-            x:Name="gridListItem"
-            Grid.Row="1"
-            VerticalAlignment="Center">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="36" />
-                <ColumnDefinition Width="28" />
-                <ColumnDefinition Width="200*" />
-                <ColumnDefinition Width="100*" MinWidth="180" />
-                <ColumnDefinition Width="75*" MinWidth="130" />
-                <ColumnDefinition Width="170*" MinWidth="280" />
-                <ColumnDefinition Width="120*" />
-                <ColumnDefinition Width="120*" />
-                <ColumnDefinition Width="72*" />
-            </Grid.ColumnDefinitions>
-            <TextBlock
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Converter={StaticResource listBoxIndexConverter}}" />
-            <CheckBox
-                Grid.Column="1"
-                Margin="0,0,0,0"
-                HorizontalAlignment="Center"
-                VerticalAlignment="Center"
-                Background="Transparent"
-                Click="CheckBox_Click"
-                IsChecked="{Binding ItemOrder.IsSelect, Mode=TwoWay}"
-                Tag="{Binding order_id}" />
-            <!--  订单商品信息  -->
-            <Grid
-                Grid.Column="2"
-                VerticalAlignment="Center"
-                Background="Transparent">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="auto" MinWidth="50" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <!--<Image Grid.Row="1" x:Name="imgOrderItem" Grid.Column="0" VerticalAlignment="Top" Height="100" Width="100" Margin="0,2,8,2" Source="{Binding thumb_img, Converter={StaticResource ImageUrlToBitmapImage}}"></Image>-->
-                <Image
-                    x:Name="imgOrderItem"
-                    Grid.Row="1"
-                    Grid.Column="0"
-                    Width="100"
-                    Height="100"
-                    Margin="0,2,8,2"
-                    VerticalAlignment="Top"
-                    Cursor="Hand"
-                    MouseDown="imgOrderItem_MouseDown"
-                    MouseEnter="imgOrderItem_MouseEnter"
-                    MouseLeave="imgOrderItem_MouseLeave" />
+	<Grid>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="0" />
+			<RowDefinition Height="*" />
+			<RowDefinition Height="0" />
+		</Grid.RowDefinitions>
+		<Grid
+			x:Name="gridListItem"
+			Grid.Row="1"
+			VerticalAlignment="Center">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="36" />
+				<ColumnDefinition Width="28" />
+				<ColumnDefinition Width="200*" />
+				<ColumnDefinition Width="100*" MinWidth="180" />
+				<ColumnDefinition Width="75*" MinWidth="130" />
+				<ColumnDefinition Width="170*" MinWidth="280" />
+				<ColumnDefinition Width="120*" />
+				<ColumnDefinition Width="120*" />
+				<ColumnDefinition Width="72*" />
+			</Grid.ColumnDefinitions>
+			<TextBlock
+				HorizontalAlignment="Center"
+				VerticalAlignment="Center"
+				Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Converter={StaticResource listBoxIndexConverter}}" />
+			<CheckBox
+				Grid.Column="1"
+				Margin="0,0,0,0"
+				HorizontalAlignment="Center"
+				VerticalAlignment="Center"
+				Background="Transparent"
+				Click="CheckBox_Click"
+				IsChecked="{Binding ItemOrder.IsSelect, Mode=TwoWay}"
+				Tag="{Binding order_id}" />
+			<!--  订单商品信息  -->
+			<Grid
+				Grid.Column="2"
+				VerticalAlignment="Center"
+				Background="Transparent">
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="auto" MinWidth="50" />
+					<ColumnDefinition Width="*" />
+				</Grid.ColumnDefinitions>
+				<!--<Image Grid.Row="1" x:Name="imgOrderItem" Grid.Column="0" VerticalAlignment="Top" Height="100" Width="100" Margin="0,2,8,2" Source="{Binding thumb_img, Converter={StaticResource ImageUrlToBitmapImage}}"></Image>-->
+				<Image
+					x:Name="imgOrderItem"
+					Grid.Row="1"
+					Grid.Column="0"
+					Width="100"
+					Height="100"
+					Margin="0,2,8,2"
+					VerticalAlignment="Top"
+					Cursor="Hand"
+					MouseDown="imgOrderItem_MouseDown"
+					MouseEnter="imgOrderItem_MouseEnter"
+					MouseLeave="imgOrderItem_MouseLeave" />
 
-                <wpf:SpacingStackPanel
-                    Grid.Column="1"
-                    Orientation="Vertical"
-                    VerticalSpacing="2">
-                    <!--<Grid.RowDefinitions>
+				<wpf:SpacingStackPanel
+					Grid.Column="1"
+					Orientation="Vertical"
+					VerticalSpacing="2">
+					<!--<Grid.RowDefinitions>
 						<RowDefinition Height="*" />
 						<RowDefinition Height="Auto" />
 						<RowDefinition Height="Auto" />
@@ -111,901 +111,901 @@
 						<RowDefinition Height="*" />
 					</Grid.RowDefinitions>-->
 
-                    <!--<Image Grid.RowSpan="20" Grid.Column="0" Height="80" Width="80" Margin="0,0,8,0" Source="{DynamicResource imgErrPic}"></Image>-->
-                    <uc:UcWaterMarkTextBox1
-                        x:Name="txtGoodsName"
-                        HorizontalAlignment="Left"
-                        d:Text="商品名称"
-                        d:Visibility="Visible"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        FontWeight="Bold"
-                        IsReadOnly="True"
-                        Text="{Binding title}"
-                        TextWrapping="Wrap"
-                        WaterMark="商品名称" />
+					<!--<Image Grid.RowSpan="20" Grid.Column="0" Height="80" Width="80" Margin="0,0,8,0" Source="{DynamicResource imgErrPic}"></Image>-->
+					<uc:UcWaterMarkTextBox1
+						x:Name="txtGoodsName"
+						HorizontalAlignment="Left"
+						d:Text="商品名称"
+						d:Visibility="Visible"
+						Background="Transparent"
+						BorderThickness="0"
+						FontWeight="Bold"
+						IsReadOnly="True"
+						Text="{Binding title}"
+						TextWrapping="Wrap"
+						WaterMark="商品名称" />
 
-                    <wpf:TitleContent Title="数量：">
-                        <uc:UcWaterMarkTextBox1
-                            d:DataContext="数量"
-                            BorderThickness="0"
-                            IsReadOnly="True"
-                            Text="{Binding sku_cnt}"
-                            TextWrapping="Wrap"
-                            WaterMark="SKU数量" />
-                    </wpf:TitleContent>
-                    <wpf:TitleContent Title="规格：">
-                        <uc:UcWaterMarkTextBox1
-                            VerticalAlignment="Top"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            IsReadOnly="True"
-                            Text="{Binding SkuAttrStr}"
-                            TextWrapping="Wrap"
-                            WaterMark="规格" />
-                    </wpf:TitleContent>
-                    <WrapPanel>
-                        <TextBlock VerticalAlignment="Center" Text="平台商品ID：" />
-                        <uc:UcWaterMarkTextBox1
-                            VerticalAlignment="Top"
-                            d:Text="平台ID"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            IsReadOnly="True"
-                            Text="{Binding product_id}"
-                            TextWrapping="Wrap"
-                            WaterMark="平台商品ID" />
-                        <Button
-                            x:Name="btnOptimizeProduct"
-                            MinWidth="48"
-                            MinHeight="16"
-                            Margin="2,0,0,0"
-                            Padding="2,0"
-                            Click="btnOptimizeProduct_Click"
-                            Content="优化订单商品"
-                            Style="{StaticResource BasePageButtonLightStyle}" />
-                    </WrapPanel>
-                    <wpf:TitleContent Title="系统商品ID：">
-                        <uc:UcWaterMarkTextBox1
-                            VerticalAlignment="Top"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            IsReadOnly="True"
-                            Text="{Binding out_product_id}"
-                            TextWrapping="Wrap"
-                            WaterMark="系统商品ID" />
-                    </wpf:TitleContent>
+					<wpf:TitleContent Title="数量：">
+						<uc:UcWaterMarkTextBox1
+							d:DataContext="数量"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding sku_cnt}"
+							TextWrapping="Wrap"
+							WaterMark="SKU数量" />
+					</wpf:TitleContent>
+					<wpf:TitleContent Title="规格：">
+						<uc:UcWaterMarkTextBox1
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding SkuAttrStr}"
+							TextWrapping="Wrap"
+							WaterMark="规格" />
+					</wpf:TitleContent>
+					<WrapPanel>
+						<TextBlock VerticalAlignment="Center" Text="平台商品ID：" />
+						<uc:UcWaterMarkTextBox1
+							VerticalAlignment="Top"
+							d:Text="平台ID"
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding product_id}"
+							TextWrapping="Wrap"
+							WaterMark="平台商品ID" />
+						<Button
+							x:Name="btnOptimizeProduct"
+							MinWidth="48"
+							MinHeight="16"
+							Margin="2,0,0,0"
+							Padding="2,0"
+							Click="btnOptimizeProduct_Click"
+							Content="优化订单商品"
+							Style="{StaticResource BasePageButtonLightStyle}" />
+					</WrapPanel>
+					<wpf:TitleContent Title="系统商品ID：">
+						<uc:UcWaterMarkTextBox1
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding out_product_id}"
+							TextWrapping="Wrap"
+							WaterMark="系统商品ID" />
+					</wpf:TitleContent>
 
-                    <wpf:TitleContent Title="系统sku编码：">
-                        <uc:UcWaterMarkTextBox1
-                            VerticalAlignment="Top"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            IsReadOnly="True"
-                            Text="{Binding out_sku_id}"
-                            TextWrapping="Wrap"
-                            WaterMark="系统sku编码" />
-                    </wpf:TitleContent>
-                </wpf:SpacingStackPanel>
-            </Grid>
-            <!--  订单时间信息  -->
-            <wpf:SpacingStackPanel
-                Grid.Column="3"
-                VerticalAlignment="Center"
-                Orientation="Vertical"
-                VerticalSpacing="2">
-                <wpf:TitleContent Title="成交时间：">
-                    <uc:UcWaterMarkTextBox1
-                        d:Text="00-01-01 01:01:01"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        IsReadOnly="True"
-                        Text="{Binding CreateDateTimeStr}"
-                        TextWrapping="Wrap"
-                        WaterMark="成交时间" />
-                </wpf:TitleContent>
+					<wpf:TitleContent Title="系统sku编码：">
+						<uc:UcWaterMarkTextBox1
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding out_sku_id}"
+							TextWrapping="Wrap"
+							WaterMark="系统sku编码" />
+					</wpf:TitleContent>
+				</wpf:SpacingStackPanel>
+			</Grid>
+			<!--  订单时间信息  -->
+			<wpf:SpacingStackPanel
+				Grid.Column="3"
+				VerticalAlignment="Center"
+				Orientation="Vertical"
+				VerticalSpacing="2">
+				<wpf:TitleContent Title="成交时间：">
+					<uc:UcWaterMarkTextBox1
+						d:Text="00-01-01 01:01:01"
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding CreateDateTimeStr}"
+						TextWrapping="Wrap"
+						WaterMark="成交时间" />
+				</wpf:TitleContent>
 
-                <wpf:TitleContent Title="发货时间：" Visibility="{Binding ItemOrder.ShipDoneTimeVisibility}">
-                    <uc:UcWaterMarkTextBox1
-                        d:Text="00-01-01 01:01:01"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        IsReadOnly="True"
-                        Text="{Binding ItemOrder.ShipDoneTimeStr}"
-                        TextWrapping="Wrap"
-                        WaterMark="发货时间" />
-                </wpf:TitleContent>
+				<wpf:TitleContent Title="发货时间：" Visibility="{Binding ItemOrder.ShipDoneTimeVisibility}">
+					<uc:UcWaterMarkTextBox1
+						d:Text="00-01-01 01:01:01"
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding ItemOrder.ShipDoneTimeStr}"
+						TextWrapping="Wrap"
+						WaterMark="发货时间" />
+				</wpf:TitleContent>
 
-                <wpf:TitleContent Title="退款时间：" Visibility="{Binding RefundTimeVisibility}">
-                    <uc:UcWaterMarkTextBox1
-                        d:Text="00-01-01 01:01:01"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        IsReadOnly="True"
-                        Text="{Binding RefundDateTimeStr}"
-                        TextWrapping="Wrap"
-                        WaterMark="退款时间" />
-                </wpf:TitleContent>
-                <!--<TextBox Text="更新时间：" Grid.Column="1" Grid.Row="4" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+				<wpf:TitleContent Title="退款时间：" Visibility="{Binding RefundTimeVisibility}">
+					<uc:UcWaterMarkTextBox1
+						d:Text="00-01-01 01:01:01"
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding RefundDateTimeStr}"
+						TextWrapping="Wrap"
+						WaterMark="退款时间" />
+				</wpf:TitleContent>
+				<!--<TextBox Text="更新时间：" Grid.Column="1" Grid.Row="4" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
                 <uc:UcWaterMarkTextBox1 WaterMark="更新时间" Text="{Binding UpdateDateTimeStr}" Grid.Column="1" Grid.Row="4" Margin="60,2,4,2" VerticalAlignment="Top"
                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>-->
-            </wpf:SpacingStackPanel>
-            <!--  订单利润  -->
-            <wpf:SpacingStackPanel
-                Grid.Column="4"
-                VerticalAlignment="Center"
-                Orientation="Vertical"
-                VerticalSpacing="2">
+			</wpf:SpacingStackPanel>
+			<!--  订单利润  -->
+			<wpf:SpacingStackPanel
+				Grid.Column="4"
+				VerticalAlignment="Center"
+				Orientation="Vertical"
+				VerticalSpacing="2">
 
-                <wpf:TitleContent Title="售价：">
-                    <uc:UcWaterMarkTextBox1
-                        Background="Transparent"
-                        BorderThickness="0"
-                        IsReadOnly="True"
-                        Text="{Binding RealPriceStr}"
-                        TextWrapping="Wrap"
-                        WaterMark="售价" />
-                </wpf:TitleContent>
+				<wpf:TitleContent Title="售价：">
+					<uc:UcWaterMarkTextBox1
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding RealPriceStr}"
+						TextWrapping="Wrap"
+						WaterMark="售价" />
+				</wpf:TitleContent>
 
-                <wpf:TitleContent Title="店铺运费：">
-                    <uc:UcWaterMarkTextBox1
-                        Background="Transparent"
-                        BorderThickness="0"
-                        IsReadOnly="True"
-                        Text="{Binding PostagePriceStr}"
-                        TextWrapping="Wrap"
-                        WaterMark="店铺运费" />
-                </wpf:TitleContent>
+				<wpf:TitleContent Title="店铺运费：">
+					<uc:UcWaterMarkTextBox1
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding PostagePriceStr}"
+						TextWrapping="Wrap"
+						WaterMark="店铺运费" />
+				</wpf:TitleContent>
 
-                <wpf:TitleContent Title="平台优惠：">
-                    <uc:UcWaterMarkTextBox1
-                        d:Text="￥100.00"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        IsReadOnly="True"
-                        Text="{Binding CashCouponDiscountedPriceStr}"
-                        TextWrapping="Wrap"
-                        WaterMark="平台优惠" />
-                </wpf:TitleContent>
+				<wpf:TitleContent Title="平台优惠：">
+					<uc:UcWaterMarkTextBox1
+						d:Text="￥100.00"
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding CashCouponDiscountedPriceStr}"
+						TextWrapping="Wrap"
+						WaterMark="平台优惠" />
+				</wpf:TitleContent>
 
-                <wpf:TitleContent Title="进价：" Visibility="{Binding PurchasePriceVisibility}">
-                    <uc:UcWaterMarkTextBox1
-                        d:Text="￥100.00"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        IsReadOnly="True"
-                        Text="{Binding PurchasePriceStr}"
-                        TextWrapping="Wrap"
-                        Visibility="{Binding PurchasePriceVisibility}"
-                        WaterMark="进价" />
-                </wpf:TitleContent>
+				<wpf:TitleContent Title="进价：" Visibility="{Binding PurchasePriceVisibility}">
+					<uc:UcWaterMarkTextBox1
+						d:Text="￥100.00"
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding PurchasePriceStr}"
+						TextWrapping="Wrap"
+						Visibility="{Binding PurchasePriceVisibility}"
+						WaterMark="进价" />
+				</wpf:TitleContent>
 
-                <wpf:TitleContent Title="运费：" Visibility="{Binding FreightVisibility}">
-                    <uc:UcWaterMarkTextBox1
-                        d:Text="￥100.00"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        IsReadOnly="True"
-                        Text="{Binding FreightStr}"
-                        TextWrapping="Wrap"
-                        Visibility="{Binding FreightVisibility}"
-                        WaterMark="运费" />
-                </wpf:TitleContent>
+				<wpf:TitleContent Title="运费：" Visibility="{Binding FreightVisibility}">
+					<uc:UcWaterMarkTextBox1
+						d:Text="￥100.00"
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding FreightStr}"
+						TextWrapping="Wrap"
+						Visibility="{Binding FreightVisibility}"
+						WaterMark="运费" />
+				</wpf:TitleContent>
 
-                <wpf:TitleContent Title="平台服务费：">
-                    <uc:UcWaterMarkTextBox1
-                        d:Text="￥100.00"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        IsReadOnly="True"
-                        Text="{Binding PredictCommissionFeeStr}"
-                        TextWrapping="Wrap"
-                        WaterMark="平台服务费" />
-                </wpf:TitleContent>
+				<wpf:TitleContent Title="平台服务费：">
+					<uc:UcWaterMarkTextBox1
+						d:Text="￥100.00"
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding PredictCommissionFeeStr}"
+						TextWrapping="Wrap"
+						WaterMark="平台服务费" />
+				</wpf:TitleContent>
 
-                <wpf:TitleContent Title="达人佣金：">
-                    <uc:UcWaterMarkTextBox1
-                        Background="Transparent"
-                        BorderThickness="0"
-                        IsReadOnly="True"
-                        Text="{Binding CommissionAmountStr}"
-                        TextWrapping="Wrap"
-                        WaterMark="达人佣金" />
-                </wpf:TitleContent>
+				<wpf:TitleContent Title="达人佣金：">
+					<uc:UcWaterMarkTextBox1
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding CommissionAmountStr}"
+						TextWrapping="Wrap"
+						WaterMark="达人佣金" />
+				</wpf:TitleContent>
 
-                <wpf:TitleContent Title="外采金额：">
-                    <uc:UcWaterMarkTextBox1
-                        Background="Transparent"
-                        BorderThickness="0"
-                        IsReadOnly="True"
-                        Text="{Binding OutAmountStr}"
-                        TextWrapping="Wrap"
-                        WaterMark="外采金额" />
-                </wpf:TitleContent>
+				<wpf:TitleContent Title="外采金额：">
+					<uc:UcWaterMarkTextBox1
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding OutAmountStr}"
+						TextWrapping="Wrap"
+						WaterMark="外采金额" />
+				</wpf:TitleContent>
 
-                <wpf:TitleContent Title="利润：">
-                    <uc:UcWaterMarkTextBox1
-                        Background="Transparent"
-                        BorderThickness="0"
-                        FontWeight="Bold"
-                        Foreground="{Binding ProfitStrColor}"
-                        IsReadOnly="True"
-                        Text="{Binding ProfitCountStr}"
-                        TextWrapping="Wrap"
-                        WaterMark="利润" />
-                </wpf:TitleContent>
+				<wpf:TitleContent Title="利润：">
+					<uc:UcWaterMarkTextBox1
+						Background="Transparent"
+						BorderThickness="0"
+						FontWeight="Bold"
+						Foreground="{Binding ProfitStrColor}"
+						IsReadOnly="True"
+						Text="{Binding ProfitCountStr}"
+						TextWrapping="Wrap"
+						WaterMark="利润" />
+				</wpf:TitleContent>
 
-            </wpf:SpacingStackPanel>
-            <!--  订单状态/地址  -->
-            <wpf:SpacingStackPanel
-                Grid.Column="5"
-                VerticalAlignment="Center"
-                Orientation="Vertical"
-                VerticalSpacing="2">
+			</wpf:SpacingStackPanel>
+			<!--  订单状态/地址  -->
+			<wpf:SpacingStackPanel
+				Grid.Column="5"
+				VerticalAlignment="Center"
+				Orientation="Vertical"
+				VerticalSpacing="2">
 
-                <!--  状态标签行（原 Row 1）  -->
-                <WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                    <Border
-                        Name="b_gift"
-                        Height="auto"
-                        MinWidth="30"
-                        Margin="8,0,0,0"
-                        Padding="2,0"
-                        HorizontalAlignment="Center"
-                        d:Background="{StaticResource PageWarningBrush20}"
-                        d:BorderBrush="{StaticResource PageWarningBrushCC}"
-                        BorderThickness="1"
-                        CornerRadius="2"
-                        Visibility="{Binding ItemOrder.gift_order_status, Converter={StaticResource MoreThanZeroVisibilityConverter}}">
-                        <Border.Style>
-                            <Style TargetType="Border">
-                                <Setter Property="Background" Value="{StaticResource PageWarningBrush20}" />
-                                <Setter Property="BorderBrush" Value="{StaticResource PageWarningBrushCC}" />
-                                <Style.Triggers>
-                                    <DataTrigger Binding="{Binding ItemOrder.GiftSuccessed}" Value="True">
-                                        <Setter Property="Background" Value="{StaticResource PageOkBrush50}" />
-                                        <Setter Property="BorderBrush" Value="{StaticResource PageOkBrush}" />
-                                    </DataTrigger>
-                                    <DataTrigger Binding="{Binding ItemOrder.GiftSuccessed}" Value="false">
-                                        <Setter Property="ToolTip" Value="{Binding ItemOrder.GiftErrorMsg}" />
-                                    </DataTrigger>
-                                </Style.Triggers>
-                            </Style>
-                        </Border.Style>
-                        <WrapPanel>
-                            <TextBlock
-                                Margin="0,0,0,1"
-                                FontSize="14"
-                                Foreground="{Binding ElementName=b_gift, Path=BorderBrush}"
-                                Style="{StaticResource TextBlockIcon}"
-                                Text="{StaticResource txt-gift}" />
-                            <TextBlock
-                                VerticalAlignment="Center"
-                                d:Text="礼物发货成功"
-                                Foreground="{Binding ElementName=b_gift, Path=BorderBrush}"
-                                Text="{Binding ItemOrder.GiftOrderStatusStr}" />
-                        </WrapPanel>
-                    </Border>
-                    <Border
-                        Height="auto"
-                        MinWidth="30"
-                        Margin="8,0,0,0"
-                        HorizontalAlignment="Center"
-                        d:Background="{StaticResource pageColorLightBrush}"
-                        d:BorderBrush="{StaticResource pageColorBrush}"
-                        Background="{Binding OrderItemStatusBackColor}"
-                        BorderBrush="{Binding OrderItemStatusBorderColor}"
-                        BorderThickness="1"
-                        CornerRadius="2">
-                        <TextBlock
-                            MinWidth="20"
-                            Margin="2,0,2,0"
-                            VerticalAlignment="Center"
-                            d:Foreground="{StaticResource pageColorBrush}"
-                            d:Text="订单状态"
-                            Background="Transparent"
-                            Foreground="{Binding OrderItemStatusStrColor}"
-                            Text="{Binding OrderItemStatusStr}" />
-                    </Border>
-                    <Border
-                        Height="auto"
-                        MinWidth="30"
-                        Margin="8,0,0,0"
-                        HorizontalAlignment="Center"
-                        Background="{StaticResource PageWarningBrush20}"
-                        BorderBrush="{StaticResource PageWarningBrushCC}"
-                        BorderThickness="1"
-                        CornerRadius="2"
-                        Visibility="{Binding ShopWaybillExceptionStrVisibility}">
-                        <TextBlock
-                            x:Name="txtWaybillException"
-                            MinWidth="20"
-                            Margin="2,0,2,0"
-                            VerticalAlignment="Center"
-                            d:Text="物流异常"
-                            Background="Transparent"
-                            Foreground="{StaticResource PageWarningBrush}"
-                            Text="{Binding ShopWaybillExceptionStr}" />
-                    </Border>
-                </WrapPanel>
+				<!--  状态标签行（原 Row 1）  -->
+				<WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+					<Border
+						Name="b_gift"
+						Height="auto"
+						MinWidth="30"
+						Margin="8,0,0,0"
+						Padding="2,0"
+						HorizontalAlignment="Center"
+						d:Background="{StaticResource PageWarningBrush20}"
+						d:BorderBrush="{StaticResource PageWarningBrushCC}"
+						BorderThickness="1"
+						CornerRadius="2"
+						Visibility="{Binding ItemOrder.gift_order_status, Converter={StaticResource MoreThanZeroVisibilityConverter}}">
+						<Border.Style>
+							<Style TargetType="Border">
+								<Setter Property="Background" Value="{StaticResource PageWarningBrush20}" />
+								<Setter Property="BorderBrush" Value="{StaticResource PageWarningBrushCC}" />
+								<Style.Triggers>
+									<DataTrigger Binding="{Binding ItemOrder.GiftSuccessed}" Value="True">
+										<Setter Property="Background" Value="{StaticResource PageOkBrush50}" />
+										<Setter Property="BorderBrush" Value="{StaticResource PageOkBrush}" />
+									</DataTrigger>
+									<DataTrigger Binding="{Binding ItemOrder.GiftSuccessed}" Value="false">
+										<Setter Property="ToolTip" Value="{Binding ItemOrder.GiftErrorMsg}" />
+									</DataTrigger>
+								</Style.Triggers>
+							</Style>
+						</Border.Style>
+						<WrapPanel>
+							<TextBlock
+								Margin="0,0,0,1"
+								FontSize="14"
+								Foreground="{Binding ElementName=b_gift, Path=BorderBrush}"
+								Style="{StaticResource TextBlockIcon}"
+								Text="{StaticResource txt-gift}" />
+							<TextBlock
+								VerticalAlignment="Center"
+								d:Text="礼物发货成功"
+								Foreground="{Binding ElementName=b_gift, Path=BorderBrush}"
+								Text="{Binding ItemOrder.GiftOrderStatusStr}" />
+						</WrapPanel>
+					</Border>
+					<Border
+						Height="auto"
+						MinWidth="30"
+						Margin="8,0,0,0"
+						HorizontalAlignment="Center"
+						d:Background="{StaticResource pageColorLightBrush}"
+						d:BorderBrush="{StaticResource pageColorBrush}"
+						Background="{Binding OrderItemStatusBackColor}"
+						BorderBrush="{Binding OrderItemStatusBorderColor}"
+						BorderThickness="1"
+						CornerRadius="2">
+						<TextBlock
+							MinWidth="20"
+							Margin="2,0,2,0"
+							VerticalAlignment="Center"
+							d:Foreground="{StaticResource pageColorBrush}"
+							d:Text="订单状态"
+							Background="Transparent"
+							Foreground="{Binding OrderItemStatusStrColor}"
+							Text="{Binding OrderItemStatusStr}" />
+					</Border>
+					<Border
+						Height="auto"
+						MinWidth="30"
+						Margin="8,0,0,0"
+						HorizontalAlignment="Center"
+						Background="{StaticResource PageWarningBrush20}"
+						BorderBrush="{StaticResource PageWarningBrushCC}"
+						BorderThickness="1"
+						CornerRadius="2"
+						Visibility="{Binding ShopWaybillExceptionStrVisibility}">
+						<TextBlock
+							x:Name="txtWaybillException"
+							MinWidth="20"
+							Margin="2,0,2,0"
+							VerticalAlignment="Center"
+							d:Text="物流异常"
+							Background="Transparent"
+							Foreground="{StaticResource PageWarningBrush}"
+							Text="{Binding ShopWaybillExceptionStr}" />
+					</Border>
+				</WrapPanel>
 
-                <!--  售后状态  -->
-                <WrapPanel>
-                    <TextBlock
-                        x:Name="txtOrderItemStatusStr"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        d:Text="物品售后状态"
-                        Background="Transparent"
-                        Foreground="{Binding ItemRefund.RefundStatusColor}"
-                        Text="{Binding RefundStatusStr}"
-                        Visibility="{Binding RefundStatusStrVisibility}" />
-                    <TextBlock
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        Background="Transparent"
-                        Foreground="{Binding ItemRefund.RefundStatusColor}"
-                        Text="："
-                        Visibility="{Binding RefundStatusStrVisibility}" />
-                    <TextBlock
-                        x:Name="txtStatusStr"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        d:Text="售后状态"
-                        Background="Transparent"
-                        Foreground="{Binding ItemRefund.RefundStatusColor}"
-                        Text="{Binding ItemRefund.RefundStatusStr}"
-                        Visibility="{Binding ItemRefund.RefundStatusStrVisibility}" />
-                </WrapPanel>
-                <!--  售后原因  -->
-                <TextBlock
-                    x:Name="txtRefundReasonTextStr"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Top"
-                    d:Text="售后原因"
-                    Background="Transparent"
-                    Foreground="#f56c6c"
-                    Text="{Binding ItemRefund.ReasonTextStr}"
-                    Visibility="{Binding RefundReasonTextStrVisibility}" />
+				<!--  售后状态  -->
+				<WrapPanel>
+					<TextBlock
+						x:Name="txtOrderItemStatusStr"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Top"
+						d:Text="物品售后状态"
+						Background="Transparent"
+						Foreground="{Binding ItemRefund.RefundStatusColor}"
+						Text="{Binding RefundStatusStr}"
+						Visibility="{Binding RefundStatusStrVisibility}" />
+					<TextBlock
+						HorizontalAlignment="Center"
+						VerticalAlignment="Top"
+						Background="Transparent"
+						Foreground="{Binding ItemRefund.RefundStatusColor}"
+						Text="："
+						Visibility="{Binding RefundStatusStrVisibility}" />
+					<TextBlock
+						x:Name="txtStatusStr"
+						HorizontalAlignment="Center"
+						VerticalAlignment="Top"
+						d:Text="售后状态"
+						Background="Transparent"
+						Foreground="{Binding ItemRefund.RefundStatusColor}"
+						Text="{Binding ItemRefund.RefundStatusStr}"
+						Visibility="{Binding ItemRefund.RefundStatusStrVisibility}" />
+				</WrapPanel>
+				<!--  售后原因  -->
+				<TextBlock
+					x:Name="txtRefundReasonTextStr"
+					HorizontalAlignment="Center"
+					VerticalAlignment="Top"
+					d:Text="售后原因"
+					Background="Transparent"
+					Foreground="#f56c6c"
+					Text="{Binding ItemRefund.ReasonTextStr}"
+					Visibility="{Binding RefundReasonTextStrVisibility}" />
 
-                <!--  售后结果  -->
-                <TextBlock
-                    x:Name="txtRefundResult"
-                    HorizontalAlignment="Center"
-                    VerticalAlignment="Top"
-                    d:Text="售后结果"
-                    Background="Transparent"
-                    Foreground="#f56c6c"
-                    Text="{Binding RefundResultStr}"
-                    Visibility="{Binding RefundResultStrVisibility}" />
+				<!--  售后结果  -->
+				<TextBlock
+					x:Name="txtRefundResult"
+					HorizontalAlignment="Center"
+					VerticalAlignment="Top"
+					d:Text="售后结果"
+					Background="Transparent"
+					Foreground="#f56c6c"
+					Text="{Binding RefundResultStr}"
+					Visibility="{Binding RefundResultStrVisibility}" />
 
-                <!--  收货地址  -->
-                <wpf:TitleContent Title="收货地址：">
-                    <WrapPanel Orientation="Horizontal">
-                        <uc:UcWaterMarkTextBox1
-                            x:Name="txtUserAddress"
-                            VerticalAlignment="Center"
-                            d:Text="胡xx 18990991234 辽宁省朝阳市 北漂.."
-                            Background="Transparent"
-                            BorderThickness="0"
-                            IsReadOnly="True"
-                            Text="{Binding ItemOrder.AddressStr, Converter={StaticResource TextEllipsisConverter26}}"
-                            TextWrapping="Wrap"
-                            ToolTip="{Binding ItemOrder.AddressStr}"
-                            WaterMark="收货地址" />
-                        <Border
-                            Width="12"
-                            Height="12"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            Cursor="Hand"
-                            MouseLeftButtonDown="pathCopyAddress_MouseLeftButtonDown"
-                            Visibility="{Binding ElementName=txtUserAddress, Path=Visibility}">
-                            <Path
-                                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="pathCopyAddress_MouseLeftButtonDown"
-                                Stretch="Uniform" />
-                        </Border>
-                        <Button
-                            x:Name="btnSeeAddressDetail"
-                            Margin="4,0,0,0"
-                            Padding="0"
-                            Background="Transparent"
-                            BorderBrush="Transparent"
-                            Click="btnSeeAddressDetail_Click"
-                            Content="👁"
-                            Cursor="Hand"
-                            Foreground="{StaticResource PageLinkBrush}"
-                            Tag="{Binding order_id}" />
-                    </WrapPanel>
-                </wpf:TitleContent>
+				<!--  收货地址  -->
+				<wpf:TitleContent Title="收货地址：">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtUserAddress"
+							VerticalAlignment="Center"
+							d:Text="胡xx 18990991234 辽宁省朝阳市 北漂.."
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding ItemOrder.AddressStr, Converter={StaticResource TextEllipsisConverter26}}"
+							TextWrapping="Wrap"
+							ToolTip="{Binding ItemOrder.AddressStr}"
+							WaterMark="收货地址" />
+						<Border
+							Width="12"
+							Height="12"
+							VerticalAlignment="Center"
+							Background="Transparent"
+							Cursor="Hand"
+							MouseLeftButtonDown="pathCopyAddress_MouseLeftButtonDown"
+							Visibility="{Binding ElementName=txtUserAddress, Path=Visibility}">
+							<Path
+								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="pathCopyAddress_MouseLeftButtonDown"
+								Stretch="Uniform" />
+						</Border>
+						<Button
+							x:Name="btnSeeAddressDetail"
+							Margin="4,0,0,0"
+							Padding="0"
+							Background="Transparent"
+							BorderBrush="Transparent"
+							Click="btnSeeAddressDetail_Click"
+							Content="👁"
+							Cursor="Hand"
+							Foreground="{StaticResource PageLinkBrush}"
+							Tag="{Binding order_id}" />
+					</WrapPanel>
+				</wpf:TitleContent>
 
-                <!--  退款单号  -->
-                <wpf:TitleContent Title="退款单号：" Visibility="{Binding ElementName=txtRefundId, Path=Visibility}">
-                    <WrapPanel Orientation="Horizontal">
-                        <uc:UcWaterMarkTextBox1
-                            x:Name="txtRefundId"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            d:Text="20003030304040"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            Cursor="Hand"
-                            Foreground="{StaticResource PageLinkBrush}"
-                            IsReadOnly="True"
-                            Text="{Binding ItemRefund.after_sale_order_id}"
-                            TextWrapping="Wrap"
-                            Visibility="{Binding RefundAfterSaleOrderIdVisibility}"
-                            WaterMark="退款单号" />
-                        <Border
-                            Width="12"
-                            Height="12"
-                            Margin="4,0,0,0"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            Cursor="Hand"
-                            MouseLeftButtonDown="pathRefundId_MouseLeftButtonDown"
-                            Visibility="{Binding ElementName=txtRefundId, Path=Visibility}">
-                            <Path
-                                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="pathRefundId_MouseLeftButtonDown"
-                                Stretch="Uniform" />
-                        </Border>
-                    </WrapPanel>
-                </wpf:TitleContent>
+				<!--  退款单号  -->
+				<wpf:TitleContent Title="退款单号：" Visibility="{Binding ElementName=txtRefundId, Path=Visibility}">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtRefundId"
+							HorizontalAlignment="Center"
+							VerticalAlignment="Center"
+							d:Text="20003030304040"
+							Background="Transparent"
+							BorderThickness="0"
+							Cursor="Hand"
+							Foreground="{StaticResource PageLinkBrush}"
+							IsReadOnly="True"
+							Text="{Binding ItemRefund.after_sale_order_id}"
+							TextWrapping="Wrap"
+							Visibility="{Binding RefundAfterSaleOrderIdVisibility}"
+							WaterMark="退款单号" />
+						<Border
+							Width="12"
+							Height="12"
+							Margin="4,0,0,0"
+							VerticalAlignment="Center"
+							Background="Transparent"
+							Cursor="Hand"
+							MouseLeftButtonDown="pathRefundId_MouseLeftButtonDown"
+							Visibility="{Binding ElementName=txtRefundId, Path=Visibility}">
+							<Path
+								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="pathRefundId_MouseLeftButtonDown"
+								Stretch="Uniform" />
+						</Border>
+					</WrapPanel>
+				</wpf:TitleContent>
 
-                <!--  退货地址  -->
-                <wpf:TitleContent Title="退货地址：" Visibility="{Binding RefundAddressShortStrVisibility}">
-                    <WrapPanel Orientation="Horizontal">
-                        <uc:UcWaterMarkTextBox1
-                            x:Name="txtRefundAddress"
-                            VerticalAlignment="Top"
-                            d:Text="胡xx 18990991234 辽宁省朝阳市 北漂.."
-                            Background="Transparent"
-                            BorderThickness="0"
-                            IsReadOnly="True"
-                            Text="{Binding RefundAddressShortStr}"
-                            TextWrapping="Wrap"
-                            ToolTip="{Binding RefundAddressStr}"
-                            WaterMark="退货地址" />
-                        <Border
-                            Width="12"
-                            Height="12"
-                            Margin="4,0,0,0"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            Cursor="Hand"
-                            MouseLeftButtonDown="pathCopyRefundAddress_MouseLeftButtonDown"
-                            Visibility="{Binding ElementName=txtUserAddress, Path=Visibility}">
-                            <Path
-                                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="pathCopyRefundAddress_MouseLeftButtonDown"
-                                Stretch="Uniform" />
-                        </Border>
-                    </WrapPanel>
-                </wpf:TitleContent>
+				<!--  退货地址  -->
+				<wpf:TitleContent Title="退货地址：" Visibility="{Binding RefundAddressShortStrVisibility}">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtRefundAddress"
+							VerticalAlignment="Top"
+							d:Text="胡xx 18990991234 辽宁省朝阳市 北漂.."
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding RefundAddressShortStr}"
+							TextWrapping="Wrap"
+							ToolTip="{Binding RefundAddressStr}"
+							WaterMark="退货地址" />
+						<Border
+							Width="12"
+							Height="12"
+							Margin="4,0,0,0"
+							VerticalAlignment="Center"
+							Background="Transparent"
+							Cursor="Hand"
+							MouseLeftButtonDown="pathCopyRefundAddress_MouseLeftButtonDown"
+							Visibility="{Binding ElementName=txtUserAddress, Path=Visibility}">
+							<Path
+								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="pathCopyRefundAddress_MouseLeftButtonDown"
+								Stretch="Uniform" />
+						</Border>
+					</WrapPanel>
+				</wpf:TitleContent>
 
-            </wpf:SpacingStackPanel>
-            <!--  单号  -->
-            <wpf:SpacingStackPanel
-                Grid.Column="6"
-                VerticalAlignment="Center"
-                Orientation="Vertical"
-                VerticalSpacing="2">
+			</wpf:SpacingStackPanel>
+			<!--  单号  -->
+			<wpf:SpacingStackPanel
+				Grid.Column="6"
+				VerticalAlignment="Center"
+				Orientation="Vertical"
+				VerticalSpacing="2">
 
-                <!--  状态标签行  -->
-                <WrapPanel
-                    x:Name="wpTransitWaybillStatus"
-                    Margin="0,0,0,2"
-                    HorizontalAlignment="Center">
-                    <Border
-                        x:Name="borderBuyStatas"
-                        Height="auto"
-                        MinWidth="30"
-                        Margin="0,0,4,0"
-                        HorizontalAlignment="Center"
-                        d:Background="{StaticResource PageOkBrush50}"
-                        d:BorderBrush="{StaticResource PageOkBrush}"
-                        Background="{Binding BuyerTransitWaybillStatusBackColor}"
-                        BorderBrush="{Binding BuyerTransitWaybillStatusBorderColor}"
-                        BorderThickness="1"
-                        CornerRadius="2"
-                        Visibility="{Binding BuyerTransitWaybillStatusStrVisibility}">
-                        <TextBlock
-                            x:Name="txtBuyStatus"
-                            MinWidth="20"
-                            VerticalAlignment="Center"
-                            d:Text="买手状态"
-                            Background="Transparent"
-                            Foreground="{Binding BuyerTransitWaybillStatusStrColor}"
-                            Text="{Binding BuyerTransitWaybillStatusStr}" />
-                    </Border>
-                    <Border
-                        x:Name="borderWarehouseStatas"
-                        Height="auto"
-                        MinWidth="30"
-                        Margin="0,0,4,0"
-                        HorizontalAlignment="Center"
-                        d:Background="{StaticResource PageOkBrush50}"
-                        d:BorderBrush="{StaticResource PageOkBrush}"
-                        Background="{Binding WarehouseWaybillStatusBackColor}"
-                        BorderBrush="{Binding WarehouseWaybillStatusBorderColor}"
-                        BorderThickness="1"
-                        CornerRadius="2"
-                        Visibility="{Binding WarehouseWaybillStatusStrVisibility}">
-                        <TextBlock
-                            x:Name="txtWarehouseStatus"
-                            MinWidth="20"
-                            VerticalAlignment="Center"
-                            d:Text="仓库状态"
-                            Background="Transparent"
-                            Foreground="{Binding WarehouseWaybillStatusStrColor}"
-                            MouseEnter="txtWarehouseStatus_MouseEnter"
-                            Text="{Binding WarehouseWaybillStatusStr}" />
-                    </Border>
-                    <Border
-                        Height="auto"
-                        MinWidth="30"
-                        Margin="0,0,4,0"
-                        HorizontalAlignment="Center"
-                        Background="{StaticResource pageColorBrush}"
-                        BorderBrush="{StaticResource pageColorBrush}"
-                        BorderThickness="1"
-                        CornerRadius="2"
-                        Visibility="{Binding TransitRefundVoidStatusStrVisibility}">
-                        <TextBlock
-                            MinWidth="20"
-                            Padding="0"
-                            VerticalAlignment="Center"
-                            d:Text="作废状态"
-                            Background="Transparent"
-                            Foreground="White"
-                            Text="{Binding TransitRefundVoidStatusStr}" />
-                    </Border>
-                </WrapPanel>
+				<!--  状态标签行  -->
+				<WrapPanel
+					x:Name="wpTransitWaybillStatus"
+					Margin="0,0,0,2"
+					HorizontalAlignment="Center">
+					<Border
+						x:Name="borderBuyStatas"
+						Height="auto"
+						MinWidth="30"
+						Margin="0,0,4,0"
+						HorizontalAlignment="Center"
+						d:Background="{StaticResource PageOkBrush50}"
+						d:BorderBrush="{StaticResource PageOkBrush}"
+						Background="{Binding BuyerTransitWaybillStatusBackColor}"
+						BorderBrush="{Binding BuyerTransitWaybillStatusBorderColor}"
+						BorderThickness="1"
+						CornerRadius="2"
+						Visibility="{Binding BuyerTransitWaybillStatusStrVisibility}">
+						<TextBlock
+							x:Name="txtBuyStatus"
+							MinWidth="20"
+							VerticalAlignment="Center"
+							d:Text="买手状态"
+							Background="Transparent"
+							Foreground="{Binding BuyerTransitWaybillStatusStrColor}"
+							Text="{Binding BuyerTransitWaybillStatusStr}" />
+					</Border>
+					<Border
+						x:Name="borderWarehouseStatas"
+						Height="auto"
+						MinWidth="30"
+						Margin="0,0,4,0"
+						HorizontalAlignment="Center"
+						d:Background="{StaticResource PageOkBrush50}"
+						d:BorderBrush="{StaticResource PageOkBrush}"
+						Background="{Binding WarehouseWaybillStatusBackColor}"
+						BorderBrush="{Binding WarehouseWaybillStatusBorderColor}"
+						BorderThickness="1"
+						CornerRadius="2"
+						Visibility="{Binding WarehouseWaybillStatusStrVisibility}">
+						<TextBlock
+							x:Name="txtWarehouseStatus"
+							MinWidth="20"
+							VerticalAlignment="Center"
+							d:Text="仓库状态"
+							Background="Transparent"
+							Foreground="{Binding WarehouseWaybillStatusStrColor}"
+							MouseEnter="txtWarehouseStatus_MouseEnter"
+							Text="{Binding WarehouseWaybillStatusStr}" />
+					</Border>
+					<Border
+						Height="auto"
+						MinWidth="30"
+						Margin="0,0,4,0"
+						HorizontalAlignment="Center"
+						Background="{StaticResource pageColorBrush}"
+						BorderBrush="{StaticResource pageColorBrush}"
+						BorderThickness="1"
+						CornerRadius="2"
+						Visibility="{Binding TransitRefundVoidStatusStrVisibility}">
+						<TextBlock
+							MinWidth="20"
+							Padding="0"
+							VerticalAlignment="Center"
+							d:Text="作废状态"
+							Background="Transparent"
+							Foreground="White"
+							Text="{Binding TransitRefundVoidStatusStr}" />
+					</Border>
+				</WrapPanel>
 
-                <!--  采购账户  -->
-                <wpf:TitleContent
-                    x:Name="wpBuyAccount"
-                    Title="采购账户："
-                    Cursor="Hand"
-                    Foreground="#0099ff"
-                    MouseLeftButtonUp="TransitOrderBuy_Click"
-                    Visibility="{Binding ItemTransitOutOrderBuyerStrVisibility}">
-                    <WrapPanel Orientation="Horizontal">
-                        <uc:UcWaterMarkTextBox1
-                            x:Name="txtTransitOrderBuyerStr"
-                            Margin="-2,2,4,2"
-                            Padding="0"
-                            VerticalAlignment="Top"
-                            d:Text="AAA采购王者"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            Cursor="Hand"
-                            Foreground="#0099ff"
-                            IsReadOnly="True"
-                            Tag="{Binding ItemTransitOrderWithVoid.buyer_account}"
-                            Text="{Binding ItemTransitOrderWithVoid.OutOrderBuyerStr}"
-                            TextWrapping="Wrap"
-                            WaterMark="采购账户：" />
-                        <Border
-                            x:Name="borderTransitBuyerRefundStatus"
-                            Height="auto"
-                            MinWidth="30"
-                            HorizontalAlignment="Center"
-                            d:Background="{StaticResource PageOkBrush}"
-                            d:BorderBrush="{StaticResource PageOkBrush}"
-                            Background="{Binding TransitRefundStatusBackColor}"
-                            BorderBrush="{Binding TransitRefundStatusBackColor}"
-                            BorderThickness="1"
-                            CornerRadius="2"
-                            Visibility="{Binding TransitRefundStatusStrVisibility}">
-                            <TextBlock
-                                x:Name="txtRefundStatus"
-                                MinWidth="20"
-                                Padding="0"
-                                VerticalAlignment="Center"
-                                d:Text="买手退货状态"
-                                Background="Transparent"
-                                Foreground="White"
-                                Text="{Binding TransitRefundStatusStr}" />
-                        </Border>
-                    </WrapPanel>
-                </wpf:TitleContent>
+				<!--  采购账户  -->
+				<wpf:TitleContent
+					x:Name="wpBuyAccount"
+					Title="采购账户："
+					Cursor="Hand"
+					Foreground="#0099ff"
+					MouseLeftButtonUp="TransitOrderBuy_Click"
+					Visibility="{Binding ItemTransitOutOrderBuyerStrVisibility}">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtTransitOrderBuyerStr"
+							Margin="-2,2,4,2"
+							Padding="0"
+							VerticalAlignment="Top"
+							d:Text="AAA采购王者"
+							Background="Transparent"
+							BorderThickness="0"
+							Cursor="Hand"
+							Foreground="#0099ff"
+							IsReadOnly="True"
+							Tag="{Binding ItemTransitOrderWithVoid.buyer_account}"
+							Text="{Binding ItemTransitOrderWithVoid.OutOrderBuyerStr}"
+							TextWrapping="Wrap"
+							WaterMark="采购账户：" />
+						<Border
+							x:Name="borderTransitBuyerRefundStatus"
+							Height="auto"
+							MinWidth="30"
+							HorizontalAlignment="Center"
+							d:Background="{StaticResource PageOkBrush}"
+							d:BorderBrush="{StaticResource PageOkBrush}"
+							Background="{Binding TransitRefundStatusBackColor}"
+							BorderBrush="{Binding TransitRefundStatusBackColor}"
+							BorderThickness="1"
+							CornerRadius="2"
+							Visibility="{Binding TransitRefundStatusStrVisibility}">
+							<TextBlock
+								x:Name="txtRefundStatus"
+								MinWidth="20"
+								Padding="0"
+								VerticalAlignment="Center"
+								d:Text="买手退货状态"
+								Background="Transparent"
+								Foreground="White"
+								Text="{Binding TransitRefundStatusStr}" />
+						</Border>
+					</WrapPanel>
+				</wpf:TitleContent>
 
-                <!--  采购单号  -->
-                <wpf:TitleContent
-                    x:Name="wpBuyOrderId"
-                    Title="采购单号："
-                    Cursor="Hand"
-                    Foreground="#0099ff"
-                    Visibility="{Binding ItemTransitOutOrderNoStrVisibility}">
-                    <WrapPanel Orientation="Horizontal">
-                        <uc:UcWaterMarkTextBox1
-                            x:Name="txtTransitOrderNumStr"
-                            Margin="-2,0"
-                            Padding="0"
-                            VerticalAlignment="Top"
-                            d:Text="261009-123456…"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            Cursor="Hand"
-                            Foreground="#0099ff"
-                            IsReadOnly="True"
-                            Text="{Binding ItemTransitOrderWithVoid.OutOrderNumStr}"
-                            TextWrapping="Wrap"
-                            WaterMark="采购单号：" />
-                        <Border
-                            Width="12"
-                            Height="12"
-                            Margin="4,0,0,0"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            Cursor="Hand"
-                            MouseLeftButtonDown="Path_MouseLeftButtonDown"
-                            Tag="{Binding order_id}">
-                            <Path
-                                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" />
-                        </Border>
-                    </WrapPanel>
-                </wpf:TitleContent>
+				<!--  采购单号  -->
+				<wpf:TitleContent
+					x:Name="wpBuyOrderId"
+					Title="采购单号："
+					Cursor="Hand"
+					Foreground="#0099ff"
+					Visibility="{Binding ItemTransitOutOrderNoStrVisibility}">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtTransitOrderNumStr"
+							Margin="-2,0"
+							Padding="0"
+							VerticalAlignment="Top"
+							d:Text="261009-123456…"
+							Background="Transparent"
+							BorderThickness="0"
+							Cursor="Hand"
+							Foreground="#0099ff"
+							IsReadOnly="True"
+							Text="{Binding ItemTransitOrderWithVoid.OutOrderNumStr}"
+							TextWrapping="Wrap"
+							WaterMark="采购单号：" />
+						<Border
+							Width="12"
+							Height="12"
+							Margin="4,0,0,0"
+							VerticalAlignment="Center"
+							Background="Transparent"
+							Cursor="Hand"
+							MouseLeftButtonDown="Path_MouseLeftButtonDown"
+							Tag="{Binding order_id}">
+							<Path
+								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" />
+						</Border>
+					</WrapPanel>
+				</wpf:TitleContent>
 
-                <!--  采购时间  -->
-                <wpf:TitleContent
-                    x:Name="wpBuyTime"
-                    Title="采购时间："
-                    Foreground="{Binding OutOrderTimeQualifiedBrush}"
-                    Visibility="{Binding OutOrderTimeQualifiedStrVisibility}">
-                    <uc:UcWaterMarkTextBox1
-                        x:Name="txtOutOrderTimeQualifiedStr"
-                        Margin="-2,0"
-                        Padding="0"
-                        VerticalAlignment="Top"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        Foreground="{Binding OutOrderTimeQualifiedBrush}"
-                        IsReadOnly="True"
-                        Text="{Binding OutOrderTimeQualifiedStr}"
-                        TextWrapping="Wrap"
-                        WaterMark="采购时间：" />
-                </wpf:TitleContent>
+				<!--  采购时间  -->
+				<wpf:TitleContent
+					x:Name="wpBuyTime"
+					Title="采购时间："
+					Foreground="{Binding OutOrderTimeQualifiedBrush}"
+					Visibility="{Binding OutOrderTimeQualifiedStrVisibility}">
+					<uc:UcWaterMarkTextBox1
+						x:Name="txtOutOrderTimeQualifiedStr"
+						Margin="-2,0"
+						Padding="0"
+						VerticalAlignment="Top"
+						Background="Transparent"
+						BorderThickness="0"
+						Foreground="{Binding OutOrderTimeQualifiedBrush}"
+						IsReadOnly="True"
+						Text="{Binding OutOrderTimeQualifiedStr}"
+						TextWrapping="Wrap"
+						WaterMark="采购时间：" />
+				</wpf:TitleContent>
 
-                <!--  取号物流  -->
-                <wpf:TitleContent
-                    Title="取号物流："
-                    Foreground="{StaticResource PageOkBrush}"
-                    Visibility="{Binding TransitOrderWaybillToWareHouseStrVisibility}">
-                    <uc:UcWaterMarkTextBox1
-                        Margin="-2,0"
-                        Padding="0"
-                        VerticalAlignment="Top"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        Foreground="{StaticResource PageOkBrush}"
-                        IsReadOnly="True"
-                        Text="{Binding TransitOrderWaybillToWareHouseStr}"
-                        TextWrapping="Wrap"
-                        WaterMark="取号物流" />
-                </wpf:TitleContent>
+				<!--  取号物流  -->
+				<wpf:TitleContent
+					Title="取号物流："
+					Foreground="{StaticResource PageOkBrush}"
+					Visibility="{Binding TransitOrderWaybillToWareHouseStrVisibility}">
+					<uc:UcWaterMarkTextBox1
+						Margin="-2,0"
+						Padding="0"
+						VerticalAlignment="Top"
+						Background="Transparent"
+						BorderThickness="0"
+						Foreground="{StaticResource PageOkBrush}"
+						IsReadOnly="True"
+						Text="{Binding TransitOrderWaybillToWareHouseStr}"
+						TextWrapping="Wrap"
+						WaterMark="取号物流" />
+				</wpf:TitleContent>
 
-                <!--  提前物流（已隐藏）  -->
-                <wpf:TitleContent Title="提前物流：" Visibility="Collapsed">
-                    <uc:UcWaterMarkTextBox1
-                        Margin="-2,2"
-                        Padding="0"
-                        VerticalAlignment="Top"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        Foreground="{StaticResource PageWarningBrush}"
-                        IsReadOnly="True"
-                        Text="{Binding TransitOrderWaybillFakeStr}"
-                        TextWrapping="Wrap"
-                        WaterMark="提前物流" />
-                </wpf:TitleContent>
+				<!--  提前物流（已隐藏）  -->
+				<wpf:TitleContent Title="提前物流：" Visibility="Collapsed">
+					<uc:UcWaterMarkTextBox1
+						Margin="-2,2"
+						Padding="0"
+						VerticalAlignment="Top"
+						Background="Transparent"
+						BorderThickness="0"
+						Foreground="{StaticResource PageWarningBrush}"
+						IsReadOnly="True"
+						Text="{Binding TransitOrderWaybillFakeStr}"
+						TextWrapping="Wrap"
+						WaterMark="提前物流" />
+				</wpf:TitleContent>
 
-                <!--  仓库物流  -->
-                <wpf:TitleContent Title="仓库物流：" Visibility="{Binding TransitOrderWaybillFromWareHouseStrVisibility}">
-                    <WrapPanel>
-                        <uc:UcWaterMarkTextBox1
-                            Margin="-2,0"
-                            Padding="0"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            IsReadOnly="True"
-                            Text="{Binding TransitOrderWaybillFromWareHouseStr}"
-                            TextWrapping="Wrap"
-                            WaterMark="仓库物流" />
-                        <Button
-                            x:Name="btnGetTransitWaybillDetail"
-                            Margin="4,0,0,0"
-                            Padding="0,0,0,0"
-                            d:Content="查看"
-                            Click="btnGetTransitWaybillDetail_Click"
-                            Content="{Binding LatestTransitEWaybill.StatusStr}"
-                            Style="{StaticResource LinkButton}" />
-                    </WrapPanel>
-                </wpf:TitleContent>
+				<!--  仓库物流  -->
+				<wpf:TitleContent Title="仓库物流：" Visibility="{Binding TransitOrderWaybillFromWareHouseStrVisibility}">
+					<WrapPanel>
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,0"
+							Padding="0"
+							VerticalAlignment="Center"
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding TransitOrderWaybillFromWareHouseStr}"
+							TextWrapping="Wrap"
+							WaterMark="仓库物流" />
+						<Button
+							x:Name="btnGetTransitWaybillDetail"
+							Margin="4,0,0,0"
+							Padding="0,0,0,0"
+							d:Content="查看"
+							Click="btnGetTransitWaybillDetail_Click"
+							Content="{Binding LatestTransitEWaybill.StatusStr}"
+							Style="{StaticResource LinkButton}" />
+					</WrapPanel>
+				</wpf:TitleContent>
 
-                <!--  仓库物流  -->
-                <wpf:TitleContent Title="补发物流：" Visibility="{Binding TransitExtraPackageWaybillStrVisibility}">
-                    <WrapPanel>
-                        <uc:UcWaterMarkTextBox1
-                            Margin="-2,0"
-                            Padding="0"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            IsReadOnly="True"
-                            Text="{Binding TransitExtraPackageWaybillStr}"
-                            TextWrapping="Wrap"
-                            WaterMark="补发物流" />
-                        <Button
-                            x:Name="btnVoidTransitExtraOrder"
-                            Margin="4,0,0,0"
-                            Padding="0,0,0,0"
-                            d:Content="作废"
-                            Click="btnVoidTransitExtraOrder_Click"
-                            Content="{Binding TransitExtraPackageWaybillBtnStr}"
-                            Style="{StaticResource LinkButton}"
-                            Visibility="{Binding TransitExtraPackageWaybillBtnStrVisibility}" />
-                    </WrapPanel>
-                </wpf:TitleContent>
+				<!--  仓库物流  -->
+				<wpf:TitleContent Title="补发物流：" Visibility="{Binding TransitExtraPackageWaybillStrVisibility}">
+					<WrapPanel>
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,0"
+							Padding="0"
+							VerticalAlignment="Center"
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding TransitExtraPackageWaybillStr}"
+							TextWrapping="Wrap"
+							WaterMark="补发物流" />
+						<Button
+							x:Name="btnVoidTransitExtraOrder"
+							Margin="4,0,0,0"
+							Padding="0,0,0,0"
+							d:Content="作废"
+							Click="btnVoidTransitExtraOrder_Click"
+							Content="{Binding TransitExtraPackageWaybillBtnStr}"
+							Style="{StaticResource LinkButton}"
+							Visibility="{Binding TransitExtraPackageWaybillBtnStrVisibility}" />
+					</WrapPanel>
+				</wpf:TitleContent>
 
-                <!--  外采买手  -->
-                <wpf:TitleContent Title="外采买手：" Visibility="{Binding ItemOrder.OutAccountStrVisibility}">
-                    <WrapPanel Orientation="Horizontal">
-                        <uc:UcWaterMarkTextBox1
-                            x:Name="txtDirectBuyer"
-                            Margin="-2,2,4,2"
-                            Padding="0"
-                            VerticalAlignment="Top"
-                            d:Text="BBB采购废柴"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            Cursor="Hand"
-                            Foreground="#0099ff"
-                            IsReadOnly="True"
-                            Text="{Binding ItemOrder.out_account}"
-                            TextWrapping="Wrap"
-                            WaterMark="外采买手：" />
-                        <Border
-                            x:Name="borderOutBuyerRefundStatus"
-                            Height="auto"
-                            MinWidth="30"
-                            HorizontalAlignment="Center"
-                            d:Background="{StaticResource PageOkBrush}"
-                            d:BorderBrush="{StaticResource PageOkBrush}"
-                            Background="{Binding DirectRefundStatusBackColor}"
-                            BorderBrush="{Binding DirectRefundStatusBackColor}"
-                            BorderThickness="1"
-                            CornerRadius="2">
-                            <TextBlock
-                                x:Name="txtOutBuyerRefundStatus"
-                                MinWidth="20"
-                                Padding="0"
-                                VerticalAlignment="Center"
-                                d:Text="直发买手退货状态"
-                                Background="Transparent"
-                                Foreground="White"
-                                Text="{Binding DirectRefundStatusStr}"
-                                Visibility="{Binding DirectRefundStatusStrVisibility}" />
-                        </Border>
-                    </WrapPanel>
-                </wpf:TitleContent>
+				<!--  外采买手  -->
+				<wpf:TitleContent Title="外采买手：" Visibility="{Binding ItemOrder.OutAccountStrVisibility}">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtDirectBuyer"
+							Margin="-2,2,4,2"
+							Padding="0"
+							VerticalAlignment="Top"
+							d:Text="BBB采购废柴"
+							Background="Transparent"
+							BorderThickness="0"
+							Cursor="Hand"
+							Foreground="#0099ff"
+							IsReadOnly="True"
+							Text="{Binding ItemOrder.out_account}"
+							TextWrapping="Wrap"
+							WaterMark="外采买手：" />
+						<Border
+							x:Name="borderOutBuyerRefundStatus"
+							Height="auto"
+							MinWidth="30"
+							HorizontalAlignment="Center"
+							d:Background="{StaticResource PageOkBrush}"
+							d:BorderBrush="{StaticResource PageOkBrush}"
+							Background="{Binding DirectRefundStatusBackColor}"
+							BorderBrush="{Binding DirectRefundStatusBackColor}"
+							BorderThickness="1"
+							CornerRadius="2"
+							Visibility="{Binding DirectRefundStatusStrVisibility}">
+							<TextBlock
+								x:Name="txtOutBuyerRefundStatus"
+								MinWidth="20"
+								Padding="0"
+								VerticalAlignment="Center"
+								d:Text="直发买手退货状态"
+								Background="Transparent"
+								Foreground="White"
+								Text="{Binding DirectRefundStatusStr}" />
+						</Border>
+					</WrapPanel>
+				</wpf:TitleContent>
 
-                <!--  外采单号  -->
-                <wpf:TitleContent
-                    Title="外采单号："
-                    Foreground="#0099ff"
-                    Visibility="{Binding ItemOrder.out_order_no, Converter={StaticResource HasTextVisibility}}">
-                    <WrapPanel Orientation="Horizontal">
-                        <uc:UcWaterMarkTextBox1
-                            x:Name="txtDirectBuyerOrderNo"
-                            Margin="-2,2"
-                            Padding="0"
-                            VerticalAlignment="Top"
-                            d:Text="261009-123456…"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            Cursor="Hand"
-                            Foreground="#0099ff"
-                            IsReadOnly="True"
-                            Text="{Binding ItemOrder.out_order_no}"
-                            TextWrapping="Wrap"
-                            WaterMark="外采单号" />
-                        <Border
-                            Width="12"
-                            Height="12"
-                            Margin="4,0,0,0"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            Cursor="Hand"
-                            MouseLeftButtonDown="PathCopyDirectBuyerOrderNo_MouseLeftButtonDown"
-                            Visibility="{Binding ElementName=txtDirectBuyerOrderNo, Path=Text, Converter={StaticResource HasTextVisibility}}">
-                            <Path
-                                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="PathCopyDirectBuyerOrderNo_MouseLeftButtonDown"
-                                Stretch="Uniform" />
-                        </Border>
-                    </WrapPanel>
-                </wpf:TitleContent>
-                <!--  采购时间  -->
-                <wpf:TitleContent
-                    x:Name="wpDirectBuyTime"
-                    Title="外采时间："
-                    Visibility="{Binding DirectOrderBuyTimeStrVisibility}">
-                    <uc:UcWaterMarkTextBox1
-                        x:Name="txtDirectOrderBuyTimeStr"
-                        Margin="-2,2"
-                        Padding="0"
-                        VerticalAlignment="Top"
-                        Background="Transparent"
-                        BorderThickness="0"
-                        IsReadOnly="True"
-                        Text="{Binding DirectOrderBuyTimeStr}"
-                        TextWrapping="Wrap"
-                        WaterMark="采购时间：" />
-                </wpf:TitleContent>
+				<!--  外采单号  -->
+				<wpf:TitleContent
+					Title="外采单号："
+					Foreground="#0099ff"
+					Visibility="{Binding ItemOrder.out_order_no, Converter={StaticResource HasTextVisibility}}">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtDirectBuyerOrderNo"
+							Margin="-2,2"
+							Padding="0"
+							VerticalAlignment="Top"
+							d:Text="261009-123456…"
+							Background="Transparent"
+							BorderThickness="0"
+							Cursor="Hand"
+							Foreground="#0099ff"
+							IsReadOnly="True"
+							Text="{Binding ItemOrder.out_order_no}"
+							TextWrapping="Wrap"
+							WaterMark="外采单号" />
+						<Border
+							Width="12"
+							Height="12"
+							Margin="4,0,0,0"
+							VerticalAlignment="Center"
+							Background="Transparent"
+							Cursor="Hand"
+							MouseLeftButtonDown="PathCopyDirectBuyerOrderNo_MouseLeftButtonDown"
+							Visibility="{Binding ElementName=txtDirectBuyerOrderNo, Path=Text, Converter={StaticResource HasTextVisibility}}">
+							<Path
+								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="PathCopyDirectBuyerOrderNo_MouseLeftButtonDown"
+								Stretch="Uniform" />
+						</Border>
+					</WrapPanel>
+				</wpf:TitleContent>
+				<!--  采购时间  -->
+				<wpf:TitleContent
+					x:Name="wpDirectBuyTime"
+					Title="外采时间："
+					Visibility="{Binding DirectOrderBuyTimeStrVisibility}">
+					<uc:UcWaterMarkTextBox1
+						x:Name="txtDirectOrderBuyTimeStr"
+						Margin="-2,2"
+						Padding="0"
+						VerticalAlignment="Top"
+						Background="Transparent"
+						BorderThickness="0"
+						IsReadOnly="True"
+						Text="{Binding DirectOrderBuyTimeStr}"
+						TextWrapping="Wrap"
+						WaterMark="采购时间：" />
+				</wpf:TitleContent>
 
-                <!--  外采物流  -->
-                <wpf:TitleContent Title="外采物流：" Visibility="{Binding ItemOrder.OutExpressNoStr, Converter={StaticResource HasTextVisibility}}">
-                    <WrapPanel Orientation="Horizontal">
-                        <uc:UcWaterMarkTextBox1
-                            Margin="-2,2"
-                            Padding="0"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            Foreground="{Binding ItemOrder.OutExpressNoBrush}"
-                            IsReadOnly="True"
-                            Text="{Binding ItemOrder.out_express_company}"
-                            TextWrapping="Wrap"
-                            WaterMark="外采物流" />
-                        <uc:UcWaterMarkTextBox1
-                            Margin="-2,2"
-                            Padding="0"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            Foreground="{Binding ItemOrder.OutExpressNoBrush}"
-                            IsReadOnly="True"
-                            Text="-"
-                            TextWrapping="Wrap"
-                            WaterMark="-" />
-                        <uc:UcWaterMarkTextBox1
-                            Margin="-2,2,4,2"
-                            Padding="0"
-                            VerticalAlignment="Center"
-                            d:Text="外采物流单号"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            Foreground="{Binding ItemOrder.OutExpressNoBrush}"
-                            IsReadOnly="True"
-                            Text="{Binding ItemOrder.OutExpressNoStr}"
-                            TextWrapping="Wrap"
-                            WaterMark="外采物流的那好" />
+				<!--  外采物流  -->
+				<wpf:TitleContent Title="外采物流：" Visibility="{Binding ItemOrder.OutExpressNoStr, Converter={StaticResource HasTextVisibility}}">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,2"
+							Padding="0"
+							VerticalAlignment="Center"
+							Background="Transparent"
+							BorderThickness="0"
+							Foreground="{Binding ItemOrder.OutExpressNoBrush}"
+							IsReadOnly="True"
+							Text="{Binding ItemOrder.out_express_company}"
+							TextWrapping="Wrap"
+							WaterMark="外采物流" />
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,2"
+							Padding="0"
+							VerticalAlignment="Center"
+							Background="Transparent"
+							BorderThickness="0"
+							Foreground="{Binding ItemOrder.OutExpressNoBrush}"
+							IsReadOnly="True"
+							Text="-"
+							TextWrapping="Wrap"
+							WaterMark="-" />
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,2,4,2"
+							Padding="0"
+							VerticalAlignment="Center"
+							d:Text="外采物流单号"
+							Background="Transparent"
+							BorderThickness="0"
+							Foreground="{Binding ItemOrder.OutExpressNoBrush}"
+							IsReadOnly="True"
+							Text="{Binding ItemOrder.OutExpressNoStr}"
+							TextWrapping="Wrap"
+							WaterMark="外采物流的那好" />
 
-                        <Button
-                            x:Name="btnGetDirectWaybillDetail"
-                            Margin="4,0,0,0"
-                            Padding="0,0,0,0"
-                            d:Content="查看"
-                            Click="btnGetDirectWaybillDetail_Click"
-                            Content="{Binding LatestDirectEWaybill.StatusStr}"
-                            Style="{StaticResource LinkButton}" />
-                    </WrapPanel>
-                </wpf:TitleContent>
-                <wpf:TitleContent Title="同步物流：" Visibility="{Binding ItemOrder.SyncWaybillIdInfo, Converter={StaticResource HasTextVisibility}}">
-                    <WrapPanel Orientation="Horizontal">
-                        <!--<uc:UcWaterMarkTextBox1
+						<Button
+							x:Name="btnGetDirectWaybillDetail"
+							Margin="4,0,0,0"
+							Padding="0,0,0,0"
+							d:Content="查看"
+							Click="btnGetDirectWaybillDetail_Click"
+							Content="{Binding LatestDirectEWaybill.StatusStr}"
+							Style="{StaticResource LinkButton}" />
+					</WrapPanel>
+				</wpf:TitleContent>
+				<wpf:TitleContent Title="同步物流：" Visibility="{Binding ItemOrder.SyncWaybillIdInfo, Converter={StaticResource HasTextVisibility}}">
+					<WrapPanel Orientation="Horizontal">
+						<!--<uc:UcWaterMarkTextBox1
 							Margin="-2,2"
 							Padding="0"
 							VerticalAlignment="Center"
@@ -1016,7 +1016,7 @@
 							Text="{Binding ItemOrder.out_express_company}"
 							TextWrapping="Wrap"
 							WaterMark="外采物流" />-->
-                        <!--<uc:UcWaterMarkTextBox1
+						<!--<uc:UcWaterMarkTextBox1
 							Margin="-2,2"
 							Padding="0"
 							VerticalAlignment="Center"
@@ -1027,525 +1027,525 @@
 							Text="-"
 							TextWrapping="Wrap"
 							WaterMark="-" />-->
-                        <uc:UcWaterMarkTextBox1
-                            Margin="-2,2,4,2"
-                            Padding="0"
-                            VerticalAlignment="Center"
-                            d:Text="物流单"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            IsReadOnly="True"
-                            Text="{Binding ItemOrder.SyncWaybillIdInfo}"
-                            TextWrapping="Wrap"
-                            WaterMark="同步物流" />
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,2,4,2"
+							Padding="0"
+							VerticalAlignment="Center"
+							d:Text="物流单"
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding ItemOrder.SyncWaybillIdInfo}"
+							TextWrapping="Wrap"
+							WaterMark="同步物流" />
 
-                        <uc:UcWaterMarkTextBox1
-                            Margin="-2,2,4,2"
-                            Padding="0"
-                            VerticalAlignment="Center"
-                            d:Text="取件码"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            IsReadOnly="True"
-                            Text="{Binding ItemOrder.SyncWaybillPickNo}"
-                            TextWrapping="Wrap"
-                            WaterMark="取件码" />
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,2,4,2"
+							Padding="0"
+							VerticalAlignment="Center"
+							d:Text="取件码"
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding ItemOrder.SyncWaybillPickNo}"
+							TextWrapping="Wrap"
+							WaterMark="取件码" />
 
 
 
-                        <uc:UcWaterMarkTextBox1
-                            Margin="-2,2,4,2"
-                            Padding="0"
-                            VerticalAlignment="Center"
-                            d:Text="报错信息"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            IsReadOnly="True"
-                            Text="{Binding SyncLogisticsMsg}"
-                            TextWrapping="Wrap"
-                            WaterMark="同步单信息" />
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,2,4,2"
+							Padding="0"
+							VerticalAlignment="Center"
+							d:Text="报错信息"
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding SyncLogisticsMsg}"
+							TextWrapping="Wrap"
+							WaterMark="同步单信息" />
 
-                        <Button
-                            x:Name="btnTrySendSyncOrder"
-                            Margin="4,0,0,0"
-                            Padding="0,0,0,0"
-                            d:Content="发送"
-                            Click="btnTrySendSyncOrder_Click"
-                            Content="发送"
-                            Style="{StaticResource LinkButton}"
-                            Tag="{Binding ItemOrder.OutExpressNoStr}"
-                            Visibility="{Binding ItemOrder.RealSyncWaybillId, Converter={StaticResource NotHasTextVisibility}}" />
+						<Button
+							x:Name="btnTrySendSyncOrder"
+							Margin="4,0,0,0"
+							Padding="0,0,0,0"
+							d:Content="发送"
+							Click="btnTrySendSyncOrder_Click"
+							Content="发送"
+							Style="{StaticResource LinkButton}"
+							Tag="{Binding ItemOrder.OutExpressNoStr}"
+							Visibility="{Binding ItemOrder.RealSyncWaybillId, Converter={StaticResource NotHasTextVisibility}}" />
 
-                        <Button
-                            x:Name="btnEditPickNo"
-                            Padding="0,0,0,0"
-                            d:Content="填取件码"
-                            Click="btnEditPickNo_Click"
-                            Content="填取件码"
-                            Style="{StaticResource LinkButton}"
-                            Tag="{Binding ItemOrder.OutExpressNoStr}"
-                            Visibility="{Binding ItemOrder.RealSyncWaybillId, Converter={StaticResource HasTextVisibility}}" />
-                    </WrapPanel>
-                </wpf:TitleContent>
+						<Button
+							x:Name="btnEditPickNo"
+							Padding="0,0,0,0"
+							d:Content="填取件码"
+							Click="btnEditPickNo_Click"
+							Content="填取件码"
+							Style="{StaticResource LinkButton}"
+							Tag="{Binding ItemOrder.OutExpressNoStr}"
+							Visibility="{Binding ItemOrder.RealSyncWaybillId, Converter={StaticResource HasTextVisibility}}" />
+					</WrapPanel>
+				</wpf:TitleContent>
 
-                <!--  买家退货  -->
-                <wpf:TitleContent Title="买家退货：" Visibility="{Binding ReturnWaybillIdStr, Converter={StaticResource HasTextVisibility}}">
-                    <WrapPanel Orientation="Horizontal">
-                        <uc:UcWaterMarkTextBox1
-                            Margin="-2,2"
-                            Padding="0"
-                            VerticalAlignment="Top"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            IsReadOnly="True"
-                            Text="{Binding ItemRefund.return_delivery_name}"
-                            TextWrapping="Wrap"
-                            WaterMark="买家退货" />
-                        <uc:UcWaterMarkTextBox1
-                            Margin="-2,2"
-                            Padding="0"
-                            VerticalAlignment="Top"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            IsReadOnly="True"
-                            Text="-"
-                            TextWrapping="Wrap"
-                            WaterMark="-" />
-                        <uc:UcWaterMarkTextBox1
-                            Margin="-2,2,4,2"
-                            Padding="0"
-                            VerticalAlignment="Top"
-                            Background="Transparent"
-                            BorderThickness="0"
-                            IsReadOnly="True"
-                            Text="{Binding ReturnWaybillIdStr}"
-                            TextWrapping="Wrap"
-                            WaterMark="买家退货" />
-                    </WrapPanel>
-                </wpf:TitleContent>
+				<!--  买家退货  -->
+				<wpf:TitleContent Title="买家退货：" Visibility="{Binding ReturnWaybillIdStr, Converter={StaticResource HasTextVisibility}}">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,2"
+							Padding="0"
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding ItemRefund.return_delivery_name}"
+							TextWrapping="Wrap"
+							WaterMark="买家退货" />
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,2"
+							Padding="0"
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="-"
+							TextWrapping="Wrap"
+							WaterMark="-" />
+						<uc:UcWaterMarkTextBox1
+							Margin="-2,2,4,2"
+							Padding="0"
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="0"
+							IsReadOnly="True"
+							Text="{Binding ReturnWaybillIdStr}"
+							TextWrapping="Wrap"
+							WaterMark="买家退货" />
+					</WrapPanel>
+				</wpf:TitleContent>
 
-            </wpf:SpacingStackPanel>
-            <!--  备注  -->
-            <wpf:SpacingStackPanel
-                Grid.Column="7"
-                VerticalAlignment="Center"
-                Orientation="Vertical"
-                VerticalSpacing="2">
+			</wpf:SpacingStackPanel>
+			<!--  备注  -->
+			<wpf:SpacingStackPanel
+				Grid.Column="7"
+				VerticalAlignment="Center"
+				Orientation="Vertical"
+				VerticalSpacing="2">
 
-                <!--  买家留言  -->
-                <wpf:TitleContent Title="买家留言：">
-                    <uc:UcWaterMarkTextBox1
-                        d:Text="留言留言"
-                        Background="Transparent"
-                        BorderThickness="1"
-                        IsReadOnly="True"
-                        Text=""
-                        TextWrapping="Wrap" />
-                </wpf:TitleContent>
+				<!--  买家留言  -->
+				<wpf:TitleContent Title="买家留言：">
+					<uc:UcWaterMarkTextBox1
+						d:Text="留言留言"
+						Background="Transparent"
+						BorderThickness="1"
+						IsReadOnly="True"
+						Text=""
+						TextWrapping="Wrap" />
+				</wpf:TitleContent>
 
-                <!--  店铺备注  -->
-                <wpf:TitleContent Title="店铺备注：">
-                    <WrapPanel Orientation="Horizontal">
-                        <uc:UcWaterMarkTextBox1
-                            x:Name="txtShopRemark"
-                            Margin="0,1,0,1"
-                            VerticalAlignment="Top"
-                            Background="Transparent"
-                            BorderThickness="1"
-                            IsReadOnly="True"
-                            Text="{Binding ItemOrder.shop_remark}"
-                            TextWrapping="Wrap"
-                            Visibility="{Binding ItemOrder.shop_remark, Converter={StaticResource HasTextVisibility}}"
-                            WaterMark="店铺备注" />
-                        <Button
-                            x:Name="btnEditShopRemark"
-                            Click="btnEditShopRemark_Click"
-                            Content="编辑"
-                            Style="{StaticResource LinkButton}" />
-                        <Button
-                            x:Name="btnCancelEditShopRemark"
-                            d:Visibility="Visible"
-                            Click="btnCancelEditShopRemark_Click"
-                            Content="取消"
-                            Style="{StaticResource LinkButton}"
-                            Visibility="Collapsed" />
-                    </WrapPanel>
-                </wpf:TitleContent>
+				<!--  店铺备注  -->
+				<wpf:TitleContent Title="店铺备注：">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtShopRemark"
+							Margin="0,1,0,1"
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="1"
+							IsReadOnly="True"
+							Text="{Binding ItemOrder.shop_remark}"
+							TextWrapping="Wrap"
+							Visibility="{Binding ItemOrder.shop_remark, Converter={StaticResource HasTextVisibility}}"
+							WaterMark="店铺备注" />
+						<Button
+							x:Name="btnEditShopRemark"
+							Click="btnEditShopRemark_Click"
+							Content="编辑"
+							Style="{StaticResource LinkButton}" />
+						<Button
+							x:Name="btnCancelEditShopRemark"
+							d:Visibility="Visible"
+							Click="btnCancelEditShopRemark_Click"
+							Content="取消"
+							Style="{StaticResource LinkButton}"
+							Visibility="Collapsed" />
+					</WrapPanel>
+				</wpf:TitleContent>
 
-                <!--  软件备注  -->
-                <wpf:TitleContent Title="软件备注：">
-                    <WrapPanel Orientation="Horizontal">
-                        <uc:UcWaterMarkTextBox1
-                            x:Name="txtAppRemark"
-                            Margin="0,1,0,1"
-                            VerticalAlignment="Top"
-                            Background="Transparent"
-                            BorderThickness="1"
-                            IsReadOnly="True"
-                            Text="{Binding ItemOrder.soft_remark}"
-                            TextWrapping="Wrap"
-                            Visibility="{Binding ItemOrder.soft_remark, Converter={StaticResource HasTextVisibility}}"
-                            WaterMark="软件备注" />
-                        <Button
-                            x:Name="btnEditAppRemark"
-                            Click="btnEditAppRemark_Click"
-                            Content="编辑"
-                            Style="{StaticResource LinkButton}" />
-                        <Button
-                            x:Name="btnCancelEditAppRemark"
-                            d:Visibility="Visible"
-                            Click="btnCancelEditAppRemark_Click"
-                            Content="取消"
-                            Style="{StaticResource LinkButton}"
-                            Visibility="Collapsed" />
-                    </WrapPanel>
-                </wpf:TitleContent>
+				<!--  软件备注  -->
+				<wpf:TitleContent Title="软件备注：">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtAppRemark"
+							Margin="0,1,0,1"
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="1"
+							IsReadOnly="True"
+							Text="{Binding ItemOrder.soft_remark}"
+							TextWrapping="Wrap"
+							Visibility="{Binding ItemOrder.soft_remark, Converter={StaticResource HasTextVisibility}}"
+							WaterMark="软件备注" />
+						<Button
+							x:Name="btnEditAppRemark"
+							Click="btnEditAppRemark_Click"
+							Content="编辑"
+							Style="{StaticResource LinkButton}" />
+						<Button
+							x:Name="btnCancelEditAppRemark"
+							d:Visibility="Visible"
+							Click="btnCancelEditAppRemark_Click"
+							Content="取消"
+							Style="{StaticResource LinkButton}"
+							Visibility="Collapsed" />
+					</WrapPanel>
+				</wpf:TitleContent>
 
-                <!--  中转仓拒收  -->
-                <wpf:TitleContent Title="中转仓拒收：" Visibility="{Binding AddEditTransitWarehouseRejectStr, Converter={StaticResource HasTextVisibility}}">
-                    <WrapPanel Orientation="Horizontal">
-                        <uc:UcWaterMarkTextBox1
-                            x:Name="txtTransitWarehouseRejectSuccessTime"
-                            Margin="0,1,0,1"
-                            VerticalAlignment="Top"
-                            Background="Transparent"
-                            BorderThickness="1"
-                            IsReadOnly="True"
-                            Text="{Binding TransitWarehouseRejectSuccessTimeStr}"
-                            TextWrapping="Wrap"
-                            Visibility="{Binding TransitWarehouseRejectSuccessTimeStr, Converter={StaticResource HasTextVisibility}}"
-                            WaterMark="中转仓拒收" />
-                        <Button
-                            x:Name="btnAddEditTransitWarehouseReject"
-                            d:Content="申请"
-                            Click="btnAddEditTransitWarehouseReject_Click"
-                            Content="{Binding AddEditTransitWarehouseRejectStr}"
-                            Style="{StaticResource LinkButton}" />
-                        <Button
-                            x:Name="btnPddRefundTransitWarehouseRejectOrder"
-                            d:Visibility="Visible"
-                            Click="btnPddRefundTransitWarehouseRejectOrder_Click"
-                            Content="测试拒收"
-                            Style="{StaticResource LinkButton}"
-                            Visibility="Collapsed" />
-                    </WrapPanel>
-                </wpf:TitleContent>
+				<!--  中转仓拒收  -->
+				<wpf:TitleContent Title="中转仓拒收：" Visibility="{Binding AddEditTransitWarehouseRejectStr, Converter={StaticResource HasTextVisibility}}">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtTransitWarehouseRejectSuccessTime"
+							Margin="0,1,0,1"
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="1"
+							IsReadOnly="True"
+							Text="{Binding TransitWarehouseRejectSuccessTimeStr}"
+							TextWrapping="Wrap"
+							Visibility="{Binding TransitWarehouseRejectSuccessTimeStr, Converter={StaticResource HasTextVisibility}}"
+							WaterMark="中转仓拒收" />
+						<Button
+							x:Name="btnAddEditTransitWarehouseReject"
+							d:Content="申请"
+							Click="btnAddEditTransitWarehouseReject_Click"
+							Content="{Binding AddEditTransitWarehouseRejectStr}"
+							Style="{StaticResource LinkButton}" />
+						<Button
+							x:Name="btnPddRefundTransitWarehouseRejectOrder"
+							d:Visibility="Visible"
+							Click="btnPddRefundTransitWarehouseRejectOrder_Click"
+							Content="测试拒收"
+							Style="{StaticResource LinkButton}"
+							Visibility="Collapsed" />
+					</WrapPanel>
+				</wpf:TitleContent>
 
-                <!--  拦截退回总店  -->
-                <wpf:TitleContent Title="拦截退回总店：" Visibility="{Binding AddEditTransitWarehouseAfterSaleStr, Converter={StaticResource HasTextVisibility}}">
-                    <WrapPanel Orientation="Horizontal">
-                        <uc:UcWaterMarkTextBox1
-                            x:Name="txtTransitWarehouseAfterSale"
-                            Margin="0,1,0,1"
-                            VerticalAlignment="Top"
-                            Background="Transparent"
-                            BorderThickness="1"
-                            IsReadOnly="True"
-                            Text="{Binding TransitWarehouseAfterSaleWayBillStr}"
-                            TextWrapping="Wrap"
-                            Visibility="{Binding TransitWarehouseAfterSaleWayBillStr, Converter={StaticResource HasTextVisibility}}"
-                            WaterMark="拦截退回总店" />
-                        <Button
-                            x:Name="btnAddEditTransitWarehouseAfterSale"
-                            d:Content="添加"
-                            Click="btnAddEditTransitWarehouseAfterSale_Click"
-                            Content="{Binding AddEditTransitWarehouseAfterSaleStr}"
-                            Style="{StaticResource LinkButton}" />
-                        <uc:UcWaterMarkTextBox1
-                            x:Name="txtInterceptReturnInfoStr"
-                            Margin="0,1,0,1"
-                            VerticalAlignment="Top"
-                            d:Text="拦截失败原因"
-                            d:Visibility="Visible"
-                            Background="Transparent"
-                            BorderThickness="1"
-                            IsReadOnly="True"
-                            Text="{Binding InterceptReturnInfoStr, Converter={StaticResource TextEllipsisConverter8}}"
-                            TextWrapping="Wrap"
-                            ToolTip="{Binding InterceptReturnInfoStr}"
-                            Visibility="{Binding InterceptReturnInfoStr, Converter={StaticResource HasTextVisibility}}" />
-                    </WrapPanel>
-                </wpf:TitleContent>
+				<!--  拦截退回总店  -->
+				<wpf:TitleContent Title="拦截退回总店：" Visibility="{Binding AddEditTransitWarehouseAfterSaleStr, Converter={StaticResource HasTextVisibility}}">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtTransitWarehouseAfterSale"
+							Margin="0,1,0,1"
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="1"
+							IsReadOnly="True"
+							Text="{Binding TransitWarehouseAfterSaleWayBillStr}"
+							TextWrapping="Wrap"
+							Visibility="{Binding TransitWarehouseAfterSaleWayBillStr, Converter={StaticResource HasTextVisibility}}"
+							WaterMark="拦截退回总店" />
+						<Button
+							x:Name="btnAddEditTransitWarehouseAfterSale"
+							d:Content="添加"
+							Click="btnAddEditTransitWarehouseAfterSale_Click"
+							Content="{Binding AddEditTransitWarehouseAfterSaleStr}"
+							Style="{StaticResource LinkButton}" />
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtInterceptReturnInfoStr"
+							Margin="0,1,0,1"
+							VerticalAlignment="Top"
+							d:Text="拦截失败原因"
+							d:Visibility="Visible"
+							Background="Transparent"
+							BorderThickness="1"
+							IsReadOnly="True"
+							Text="{Binding InterceptReturnInfoStr, Converter={StaticResource TextEllipsisConverter8}}"
+							TextWrapping="Wrap"
+							ToolTip="{Binding InterceptReturnInfoStr}"
+							Visibility="{Binding InterceptReturnInfoStr, Converter={StaticResource HasTextVisibility}}" />
+					</WrapPanel>
+				</wpf:TitleContent>
 
-                <!--  云仓退货  -->
-                <wpf:TitleContent Title="云仓退货：" Visibility="{Binding AddEditTransitWarehouseReturnOrderStr, Converter={StaticResource HasTextVisibility}}">
-                    <WrapPanel Orientation="Horizontal">
-                        <uc:UcWaterMarkTextBox1
-                            x:Name="txtTransitReturnOrderWaybill"
-                            Margin="0,1,0,1"
-                            VerticalAlignment="Top"
-                            Background="Transparent"
-                            BorderThickness="1"
-                            IsReadOnly="True"
-                            Text="{Binding AddEditTransitWarehouseReturnOrderWaybillStr}"
-                            TextWrapping="Wrap"
-                            Visibility="{Binding AddEditTransitWarehouseReturnOrderWaybillStr, Converter={StaticResource HasTextVisibility}}"
-                            WaterMark="云仓退货" />
-                        <Button
-                            x:Name="btnRetrunOrder"
-                            d:Content="创建"
-                            Click="btnReturnOrder_Click"
-                            Content="{Binding AddEditTransitWarehouseReturnOrderStr}"
-                            Style="{StaticResource BasePageButtonLightStyle}" />
-                        <!--  Style="{StaticResource LinkButton}"  -->
-                    </WrapPanel>
-                </wpf:TitleContent>
+				<!--  云仓退货  -->
+				<wpf:TitleContent Title="云仓退货：" Visibility="{Binding AddEditTransitWarehouseReturnOrderStr, Converter={StaticResource HasTextVisibility}}">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtTransitReturnOrderWaybill"
+							Margin="0,1,0,1"
+							VerticalAlignment="Top"
+							Background="Transparent"
+							BorderThickness="1"
+							IsReadOnly="True"
+							Text="{Binding AddEditTransitWarehouseReturnOrderWaybillStr}"
+							TextWrapping="Wrap"
+							Visibility="{Binding AddEditTransitWarehouseReturnOrderWaybillStr, Converter={StaticResource HasTextVisibility}}"
+							WaterMark="云仓退货" />
+						<Button
+							x:Name="btnRetrunOrder"
+							d:Content="创建"
+							Click="btnReturnOrder_Click"
+							Content="{Binding AddEditTransitWarehouseReturnOrderStr}"
+							Style="{StaticResource BasePageButtonLightStyle}" />
+						<!--  Style="{StaticResource LinkButton}"  -->
+					</WrapPanel>
+				</wpf:TitleContent>
 
-                <!--  总店地址  -->
-                <wpf:TitleContent Title="总店地址：" Visibility="{Binding PddBuyerAfterSaleAddressStrVisibility}">
-                    <WrapPanel Orientation="Horizontal">
-                        <uc:UcWaterMarkTextBox1
-                            x:Name="txtBuyerRefundAddress"
-                            Margin="0,1,0,1"
-                            VerticalAlignment="Top"
-                            d:Text="123123123123"
-                            Background="Transparent"
-                            BorderThickness="1"
-                            IsReadOnly="True"
-                            Text="{Binding PddBuyerAfterSaleAddressShortStr}"
-                            TextWrapping="Wrap"
-                            ToolTip="{Binding PddBuyerAfterSaleAddressStr}"
-                            WaterMark="总店退货地址" />
-                        <Border
-                            Width="12"
-                            Height="12"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            Cursor="Hand"
-                            MouseLeftButtonDown="pathBuyerAfterSaleAddress_MouseLeftButtonDown"
-                            Visibility="{Binding ElementName=txtBuyerRefundAddress, Path=Visibility}">
-                            <Path
-                                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="pathBuyerAfterSaleAddress_MouseLeftButtonDown"
-                                Stretch="Uniform" />
-                        </Border>
-                    </WrapPanel>
-                </wpf:TitleContent>
+				<!--  总店地址  -->
+				<wpf:TitleContent Title="总店地址：" Visibility="{Binding PddBuyerAfterSaleAddressStrVisibility}">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtBuyerRefundAddress"
+							Margin="0,1,0,1"
+							VerticalAlignment="Top"
+							d:Text="123123123123"
+							Background="Transparent"
+							BorderThickness="1"
+							IsReadOnly="True"
+							Text="{Binding PddBuyerAfterSaleAddressShortStr}"
+							TextWrapping="Wrap"
+							ToolTip="{Binding PddBuyerAfterSaleAddressStr}"
+							WaterMark="总店退货地址" />
+						<Border
+							Width="12"
+							Height="12"
+							VerticalAlignment="Center"
+							Background="Transparent"
+							Cursor="Hand"
+							MouseLeftButtonDown="pathBuyerAfterSaleAddress_MouseLeftButtonDown"
+							Visibility="{Binding ElementName=txtBuyerRefundAddress, Path=Visibility}">
+							<Path
+								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="pathBuyerAfterSaleAddress_MouseLeftButtonDown"
+								Stretch="Uniform" />
+						</Border>
+					</WrapPanel>
+				</wpf:TitleContent>
 
-                <!--  直发总店  -->
-                <wpf:TitleContent Title="直发总店：" Visibility="{Binding DirectPddBuyerAfterSaleAddressStrVisibility}">
-                    <WrapPanel Orientation="Horizontal">
-                        <uc:UcWaterMarkTextBox1
-                            x:Name="txtDirectBuyerRefundAddress"
-                            Margin="0,1,0,1"
-                            VerticalAlignment="Top"
-                            d:Text="123123123123"
-                            Background="Transparent"
-                            BorderThickness="1"
-                            IsReadOnly="True"
-                            Text="{Binding DirectPddBuyerAfterSaleAddressShortStr}"
-                            TextWrapping="Wrap"
-                            ToolTip="{Binding DirectPddBuyerAfterSaleAddressStr}"
-                            WaterMark="总店退货地址" />
-                        <Border
-                            Width="12"
-                            Height="12"
-                            VerticalAlignment="Center"
-                            Background="Transparent"
-                            Cursor="Hand"
-                            MouseLeftButtonDown="pathDirectBuyerAfterSaleAddress_MouseLeftButtonDown"
-                            Visibility="{Binding ElementName=txtDirectBuyerRefundAddress, Path=Visibility}">
-                            <Path
-                                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="pathDirectBuyerAfterSaleAddress_MouseLeftButtonDown"
-                                Stretch="Uniform" />
-                        </Border>
-                    </WrapPanel>
-                </wpf:TitleContent>
+				<!--  直发总店  -->
+				<wpf:TitleContent Title="直发总店：" Visibility="{Binding DirectPddBuyerAfterSaleAddressStrVisibility}">
+					<WrapPanel Orientation="Horizontal">
+						<uc:UcWaterMarkTextBox1
+							x:Name="txtDirectBuyerRefundAddress"
+							Margin="0,1,0,1"
+							VerticalAlignment="Top"
+							d:Text="123123123123"
+							Background="Transparent"
+							BorderThickness="1"
+							IsReadOnly="True"
+							Text="{Binding DirectPddBuyerAfterSaleAddressShortStr}"
+							TextWrapping="Wrap"
+							ToolTip="{Binding DirectPddBuyerAfterSaleAddressStr}"
+							WaterMark="总店退货地址" />
+						<Border
+							Width="12"
+							Height="12"
+							VerticalAlignment="Center"
+							Background="Transparent"
+							Cursor="Hand"
+							MouseLeftButtonDown="pathDirectBuyerAfterSaleAddress_MouseLeftButtonDown"
+							Visibility="{Binding ElementName=txtDirectBuyerRefundAddress, Path=Visibility}">
+							<Path
+								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="pathDirectBuyerAfterSaleAddress_MouseLeftButtonDown"
+								Stretch="Uniform" />
+						</Border>
+					</WrapPanel>
+				</wpf:TitleContent>
 
-            </wpf:SpacingStackPanel>
-            <!--  操作  -->
+			</wpf:SpacingStackPanel>
+			<!--  操作  -->
 
 
-            <wpf:SpacingStackPanel
-                Grid.Column="8"
-                HorizontalAlignment="Right"
-                VerticalAlignment="Center"
-                HorizontalSpacing="1"
-                ItemHorizontalAlignment="Right"
-                ItemVerticalAlignment="Center"
-                Orientation="Horizontal"
-                VerticalSpacing="6">
+			<wpf:SpacingStackPanel
+				Grid.Column="8"
+				HorizontalAlignment="Right"
+				VerticalAlignment="Center"
+				HorizontalSpacing="1"
+				ItemHorizontalAlignment="Right"
+				ItemVerticalAlignment="Center"
+				Orientation="Horizontal"
+				VerticalSpacing="6">
 
-                <wpf:SpacingStackPanel
-                    Grid.Column="8"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Center"
-                    Orientation="Vertical"
-                    VerticalSpacing="6">
+				<wpf:SpacingStackPanel
+					Grid.Column="8"
+					HorizontalAlignment="Right"
+					VerticalAlignment="Center"
+					Orientation="Vertical"
+					VerticalSpacing="6">
 
 
-                    <wpf:TitleContent>
-                        <Button
-                            x:Name="btnMapSkus"
-                            Height="22"
-                            MinWidth="38"
-                            Margin="0,0,0,0"
-                            HorizontalAlignment="Center"
-                            Click="btnMapSkus_Click"
-                            Content="选择SKU"
-                            Style="{StaticResource BasePageButtonLightStyle}"
-                            Visibility="{Binding MapSkusBtnVisibility}" />
-                    </wpf:TitleContent>
+					<wpf:TitleContent>
+						<Button
+							x:Name="btnMapSkus"
+							Height="22"
+							MinWidth="38"
+							Margin="0,0,0,0"
+							HorizontalAlignment="Center"
+							Click="btnMapSkus_Click"
+							Content="选择SKU"
+							Style="{StaticResource BasePageButtonLightStyle}"
+							Visibility="{Binding MapSkusBtnVisibility}" />
+					</wpf:TitleContent>
 
-                    <wpf:TitleContent>
-                        <Button
-                            x:Name="btnBuyOrder"
-                            Height="22"
-                            MinWidth="38"
-                            Margin="0,0,0,0"
-                            HorizontalAlignment="Center"
-                            d:Background="{StaticResource pageColorLightBrush}"
-                            d:BorderBrush="{StaticResource pageColorBrush}"
-                            d:Content="拍　　单"
-                            d:Foreground="{StaticResource pageColorBrush}"
-                            d:Visibility="Visible"
-                            Background="{Binding BuyGoodsBtnBackColor}"
-                            BorderBrush="{Binding BuyGoodsBtnColor}"
-                            Click="btnBuyOrder_Click"
-                            Content="{Binding BuyGoodsBtnTxt}"
-                            Foreground="{Binding BuyGoodsBtnColor}"
-                            IsEnabled="{Binding IsBuyGoodsBtnEnabled}"
-                            Style="{StaticResource BasePageButtonLightStyle}"
-                            Visibility="{Binding ItemOrder.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}" />
+					<wpf:TitleContent>
+						<Button
+							x:Name="btnBuyOrder"
+							Height="22"
+							MinWidth="38"
+							Margin="0,0,0,0"
+							HorizontalAlignment="Center"
+							d:Background="{StaticResource pageColorLightBrush}"
+							d:BorderBrush="{StaticResource pageColorBrush}"
+							d:Content="拍　　单"
+							d:Foreground="{StaticResource pageColorBrush}"
+							d:Visibility="Visible"
+							Background="{Binding BuyGoodsBtnBackColor}"
+							BorderBrush="{Binding BuyGoodsBtnColor}"
+							Click="btnBuyOrder_Click"
+							Content="{Binding BuyGoodsBtnTxt}"
+							Foreground="{Binding BuyGoodsBtnColor}"
+							IsEnabled="{Binding IsBuyGoodsBtnEnabled}"
+							Style="{StaticResource BasePageButtonLightStyle}"
+							Visibility="{Binding ItemOrder.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}" />
 
-                    </wpf:TitleContent>
-                    <wpf:TitleContent>
-                        <Button
-                            x:Name="btnVoidTransitOrder"
-                            Height="22"
-                            MinWidth="38"
-                            Margin="0,0,0,0"
-                            HorizontalAlignment="Center"
-                            d:Visibility="Visible"
-                            Click="btnVoidTransitOrder_Click"
-                            Content="作废重拍"
-                            Style="{StaticResource BasePageButtonLightStyle}"
-                            Visibility="{Binding BtnVoidTransitOrderVisibility}" />
-                    </wpf:TitleContent>
+					</wpf:TitleContent>
+					<wpf:TitleContent>
+						<Button
+							x:Name="btnVoidTransitOrder"
+							Height="22"
+							MinWidth="38"
+							Margin="0,0,0,0"
+							HorizontalAlignment="Center"
+							d:Visibility="Visible"
+							Click="btnVoidTransitOrder_Click"
+							Content="作废重拍"
+							Style="{StaticResource BasePageButtonLightStyle}"
+							Visibility="{Binding BtnVoidTransitOrderVisibility}" />
+					</wpf:TitleContent>
 
-                    <wpf:TitleContent>
-                        <Button
-                            x:Name="btnAbnormalOrderRebuy"
-                            Height="22"
-                            MinWidth="38"
-                            Margin="0,0,0,0"
-                            HorizontalAlignment="Center"
-                            d:Visibility="Visible"
-                            Click="btnAbnormalOrderRebuy_Click"
-                            Content="异常重拍"
-                            Style="{StaticResource BasePageButtonLightStyle}"
-                            Visibility="{Binding BtnAbnormalOrderRebuyVisibility}" />
-                    </wpf:TitleContent>
+					<wpf:TitleContent>
+						<Button
+							x:Name="btnAbnormalOrderRebuy"
+							Height="22"
+							MinWidth="38"
+							Margin="0,0,0,0"
+							HorizontalAlignment="Center"
+							d:Visibility="Visible"
+							Click="btnAbnormalOrderRebuy_Click"
+							Content="异常重拍"
+							Style="{StaticResource BasePageButtonLightStyle}"
+							Visibility="{Binding BtnAbnormalOrderRebuyVisibility}" />
+					</wpf:TitleContent>
 
 
-                    <!--  直发拍单  -->
-                    <wpf:TitleContent>
-                        <Button
-                            x:Name="btnDirectBuyOrder"
-                            Height="22"
-                            MinWidth="38"
-                            Margin="0,0,0,0"
-                            HorizontalAlignment="Center"
-                            Click="btnDirectBuyOrder_Click"
-                            Content="直发拍单"
-                            Style="{StaticResource BasePageButtonLightStyle}"
-                            Visibility="{Binding BtnDirectBuyOrderVisibility}" />
-                    </wpf:TitleContent>
+					<!--  直发拍单  -->
+					<wpf:TitleContent>
+						<Button
+							x:Name="btnDirectBuyOrder"
+							Height="22"
+							MinWidth="38"
+							Margin="0,0,0,0"
+							HorizontalAlignment="Center"
+							Click="btnDirectBuyOrder_Click"
+							Content="直发拍单"
+							Style="{StaticResource BasePageButtonLightStyle}"
+							Visibility="{Binding BtnDirectBuyOrderVisibility}" />
+					</wpf:TitleContent>
 
-                    <!--  礼品发货  -->
-                    <wpf:TitleContent>
-                        <Button
-                            x:Name="btnShipGift"
-                            Height="22"
-                            MinWidth="38"
-                            Margin="0,0,0,0"
-                            HorizontalAlignment="Center"
-                            d:Visibility="Visible"
-                            Click="btn_ShipGiftCommand"
-                            Content="礼品发货"
-                            Style="{StaticResource BasePageButtonLightStyle}"
-                            Visibility="{Binding ItemOrder.IsWaitSend, Converter={StaticResource VisibleToVisibilityConverter}}" />
-                    </wpf:TitleContent>
-                </wpf:SpacingStackPanel>
+					<!--  礼品发货  -->
+					<wpf:TitleContent>
+						<Button
+							x:Name="btnShipGift"
+							Height="22"
+							MinWidth="38"
+							Margin="0,0,0,0"
+							HorizontalAlignment="Center"
+							d:Visibility="Visible"
+							Click="btn_ShipGiftCommand"
+							Content="礼品发货"
+							Style="{StaticResource BasePageButtonLightStyle}"
+							Visibility="{Binding ItemOrder.IsWaitSend, Converter={StaticResource VisibleToVisibilityConverter}}" />
+					</wpf:TitleContent>
+				</wpf:SpacingStackPanel>
 
-                <wpf:SpacingStackPanel
-                    Grid.Column="8"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Center"
-                    Orientation="Vertical"
-                    VerticalSpacing="3">
-                    <Button
-                        x:Name="btnChangeWaybill"
-                        MinWidth="38"
-                        MinHeight="20"
-                        Margin="0,0,0,0"
-                        Padding="0"
-                        HorizontalAlignment="Center"
-                        d:Visibility="Visible"
-                        Click="btnChangeWaybill_Click"
-                        Content="补发/修改物流"
-                        FontSize="11"
-                        Style="{StaticResource BasePageButtonLightStyle}"
-                        Visibility="{Binding ItemOrder.IsShowChangeWaybillBtn, Converter={StaticResource VisibleToVisibilityConverter}}" />
-                    <Button
-                        x:Name="btnAddEditTransitWarehouseReject_New"
-                        MinWidth="38"
-                        MinHeight="20"
-                        Margin="0,0,0,0"
-                        Padding="0"
-                        HorizontalAlignment="Center"
-                        d:Visibility="Visible"
-                        Click="btnAddEditTransitWarehouseReject_Click"
-                        Style="{StaticResource BasePageButtonLightStyle}"
-                        Visibility="{Binding RejectOrReturnPackageBtnVisibility}">
-                        <TextBlock>
-                            云仓拒收<LineBreak />
-                            退回总店</TextBlock>
-                    </Button>
-                    <Button
-                        x:Name="btnAddEditTransitWarehouseAfterSale_n1"
-                        MinWidth="38"
-                        MinHeight="20"
-                        Margin="0,0,0,0"
-                        Padding="0"
-                        Click="btnAddEditTransitWarehouseAfterSale_Click"
-                        Style="{StaticResource BasePageButtonLightStyle}"
-                        Visibility="{Binding RejectOrReturnPackageBtnVisibility}">
-                        <TextBlock>
-                            拒收失败<LineBreak />
-                            转寄总店</TextBlock>
-                    </Button>
-                    <Button
-                        x:Name="btnAddEditTransitWarehouseAfterSale_n2"
-                        MinWidth="38"
-                        MinHeight="20"
-                        Margin="0,0,0,0"
-                        Padding="0"
-                        Click="btnAddEditTransitWarehouseAfterSale_Click"
-                        Style="{StaticResource BasePageButtonLightStyle}"
-                        Visibility="{Binding RejectOrReturnPackageBtnVisibility}">
-                        <TextBlock>
-                            出库拦截<LineBreak />
-                            退回仓库</TextBlock>
-                    </Button>
-                    <Button
-                        x:Name="btnTransitExtraPackages"
-                        Height="20"
-                        MinWidth="38"
-                        Margin="0,0,0,0"
-                        Padding="0"
-                        HorizontalAlignment="Center"
-                        d:Visibility="Visible"
-                        Click="btnTransitExtraPackages_Click"
-                        Content="滞留补发买家"
-                        FontSize="11"
-                        Style="{StaticResource BasePageButtonLightStyle}"
-                        Visibility="{Binding ItemOrder.IsShowTransitExtraPackagesBtn, Converter={StaticResource VisibleToVisibilityConverter}}" />
-                </wpf:SpacingStackPanel>
-            </wpf:SpacingStackPanel>
-        </Grid>
-    </Grid>
+				<wpf:SpacingStackPanel
+					Grid.Column="8"
+					HorizontalAlignment="Right"
+					VerticalAlignment="Center"
+					Orientation="Vertical"
+					VerticalSpacing="3">
+					<Button
+						x:Name="btnChangeWaybill"
+						MinWidth="38"
+						MinHeight="20"
+						Margin="0,0,0,0"
+						Padding="0"
+						HorizontalAlignment="Center"
+						d:Visibility="Visible"
+						Click="btnChangeWaybill_Click"
+						Content="补发/修改物流"
+						FontSize="11"
+						Style="{StaticResource BasePageButtonLightStyle}"
+						Visibility="{Binding ItemOrder.IsShowChangeWaybillBtn, Converter={StaticResource VisibleToVisibilityConverter}}" />
+					<Button
+						x:Name="btnAddEditTransitWarehouseReject_New"
+						MinWidth="38"
+						MinHeight="20"
+						Margin="0,0,0,0"
+						Padding="0"
+						HorizontalAlignment="Center"
+						d:Visibility="Visible"
+						Click="btnAddEditTransitWarehouseReject_Click"
+						Style="{StaticResource BasePageButtonLightStyle}"
+						Visibility="{Binding RejectOrReturnPackageBtnVisibility}">
+						<TextBlock>
+							云仓拒收<LineBreak />
+							退回总店</TextBlock>
+					</Button>
+					<Button
+						x:Name="btnAddEditTransitWarehouseAfterSale_n1"
+						MinWidth="38"
+						MinHeight="20"
+						Margin="0,0,0,0"
+						Padding="0"
+						Click="btnAddEditTransitWarehouseAfterSale_Click"
+						Style="{StaticResource BasePageButtonLightStyle}"
+						Visibility="{Binding RejectOrReturnPackageBtnVisibility}">
+						<TextBlock>
+							拒收失败<LineBreak />
+							转寄总店</TextBlock>
+					</Button>
+					<Button
+						x:Name="btnAddEditTransitWarehouseAfterSale_n2"
+						MinWidth="38"
+						MinHeight="20"
+						Margin="0,0,0,0"
+						Padding="0"
+						Click="btnAddEditTransitWarehouseAfterSale_Click"
+						Style="{StaticResource BasePageButtonLightStyle}"
+						Visibility="{Binding RejectOrReturnPackageBtnVisibility}">
+						<TextBlock>
+							出库拦截<LineBreak />
+							退回仓库</TextBlock>
+					</Button>
+					<Button
+						x:Name="btnTransitExtraPackages"
+						Height="20"
+						MinWidth="38"
+						Margin="0,0,0,0"
+						Padding="0"
+						HorizontalAlignment="Center"
+						d:Visibility="Visible"
+						Click="btnTransitExtraPackages_Click"
+						Content="滞留补发买家"
+						FontSize="11"
+						Style="{StaticResource BasePageButtonLightStyle}"
+						Visibility="{Binding ItemOrder.IsShowTransitExtraPackagesBtn, Converter={StaticResource VisibleToVisibilityConverter}}" />
+				</wpf:SpacingStackPanel>
+			</wpf:SpacingStackPanel>
+		</Grid>
+	</Grid>
 </UserControl>
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
index 2c30e27..1ca9424 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
@@ -787,8 +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);
+					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/Model/DBModel/oms_wei_order_info.cs b/AllBase/Model/DBModel/oms_wei_order_info.cs
index e9da18a..4316078 100644
--- a/AllBase/Model/DBModel/oms_wei_order_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_info.cs
@@ -30,6 +30,11 @@ namespace AllBase.Model.DBModel
 			get { return this.GetValue(x => x.Shop); }
 			set { this.SetValue(x => x.Shop, value); }
 		}
+		public string OrderDiffItemCountStr
+		{
+			get { return this.GetValue(x => x.OrderDiffItemCountStr); }
+			set { this.SetValue(x => x.OrderDiffItemCountStr, value); }
+		}
 
 		public string OrderBuyType
 		{
@@ -48,6 +53,31 @@ namespace AllBase.Model.DBModel
 		}
 
 		public ObservableCollection<oms_wei_order_item_info> orderItems { get; set; } = new ObservableCollection<oms_wei_order_item_info>();
+		public oms_wei_order_item_info orderItem
+		{
+			get { return this.GetValue(x => x.orderItem); }
+			set { this.SetValue(x => x.orderItem, value); }
+		}
+		public oms_wei_order_item_info orderItem2
+		{
+			get { return this.GetValue(x => x.orderItem2); }
+			set { this.SetValue(x => x.orderItem2, value); }
+		}
+		public oms_wei_order_item_info orderItem3
+		{
+			get { return this.GetValue(x => x.orderItem3); }
+			set { this.SetValue(x => x.orderItem3, value); }
+		}
+		public oms_wei_order_item_info orderItem4
+		{
+			get { return this.GetValue(x => x.orderItem4); }
+			set { this.SetValue(x => x.orderItem4, value); }
+		}
+		public oms_wei_order_item_info orderItem5
+		{
+			get { return this.GetValue(x => x.orderItem5); }
+			set { this.SetValue(x => x.orderItem5, value); }
+		}
 
 		public ObservableCollection<oms_wei_refund_info> refundItems { get; set; } = new ObservableCollection<oms_wei_refund_info>();
 
@@ -714,22 +744,22 @@ namespace AllBase.Model.DBModel
 			Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == shop_id.ParseToString());
 
 			if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
-            {
-                OrderBuyType = "云改直";
-                OrderBuyTypeColor = GlobalConfig.PurpleBrush190;
-            }
-            else if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发"))
-            {
-                OrderBuyType = "直发";
-                OrderBuyTypeColor = GlobalConfig.RedTextBrush205;
-            }
-            else if (this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
-            {
-                OrderBuyType = "云仓";
-                OrderBuyTypeColor = GlobalConfig.GreenTextBrush;
-            }
-            else
-                OrderBuyType = "";
+			{
+				OrderBuyType = "云改直";
+				OrderBuyTypeColor = GlobalConfig.PurpleBrush190;
+			}
+			else if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发"))
+			{
+				OrderBuyType = "直发";
+				OrderBuyTypeColor = GlobalConfig.RedTextBrush205;
+			}
+			else if (this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
+			{
+				OrderBuyType = "云仓";
+				OrderBuyTypeColor = GlobalConfig.GreenTextBrush;
+			}
+			else
+				OrderBuyType = "";
 
 			if (this.orderItems.Any(oi => oi.ItemRefund?.type == "REFUND"))
 				this.RefundTypeStr = "仅退款";
@@ -744,7 +774,7 @@ namespace AllBase.Model.DBModel
 			IsRefund = GetIsRefund();
 			IsEmergency = GetIsEmergency();
 			IsDistribReturnOrder = GetIsDistribReturnOrder();
-			IsEmergencyDistribReturnOrder = IsEmergency && IsDistribReturnOrder; 
+			IsEmergencyDistribReturnOrder = IsEmergency && IsDistribReturnOrder;
 			IsEmergencyManualReturnOrder = IsEmergency && !IsDistribReturnOrder;
 			IsAbnormal = GetIsAbnormal();
 
@@ -762,8 +792,15 @@ namespace AllBase.Model.DBModel
 			SetDeliveryDeadlineStr();
 			SetStatusBoxColor();
 			SetOutExpressNo();
-            SetShipDoneTimeStr();
+			SetShipDoneTimeStr();
 			SetColorBrush();
+
+			orderItem = orderItems.FirstOrDefault() != null ? orderItems.FirstOrDefault() : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
+			orderItem2 = orderItems.Count > 1 ? orderItems[1] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
+			orderItem3 = orderItems.Count > 2 ? orderItems[2] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
+			orderItem4 = orderItems.Count > 3 ? orderItems[3] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
+			orderItem5 = orderItems.Count > 4 ? orderItems[4] : new oms_wei_order_item_info() { OrderItemVisibility = Visibility.Collapsed };
+			OrderDiffItemCountStr = orderItems.Count > 1 ? "该订单共有 " + orderItems.Count + " 个不同的商品规格" : "";
 		}
 
 		public void SetColorBrush()
diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
index 98b7712..3f152c2 100644
--- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
@@ -27,13 +27,23 @@ namespace AllBase.Model.DBModel
         {
             get { return this.GetValue(x => x.Shop); }
             set { this.SetValue(x => x.Shop, value); }
-        }
+		}
 
-        #region 订单采购参数
-        /// <summary>
-        /// 采购关联
-        /// </summary>
-        public WXBuyMapInfo PddBuyMap
+		/// <summary>
+		/// 订单扩展信息
+		/// </summary>
+		public Visibility OrderItemVisibility
+		{
+			get { return this.GetValue(x => x.OrderItemVisibility); }
+			set { this.SetValue(x => x.OrderItemVisibility, value); }
+		}
+
+
+		#region 订单采购参数
+		/// <summary>
+		/// 采购关联
+		/// </summary>
+		public WXBuyMapInfo PddBuyMap
         {
             get { return this.GetValue(x => x.PddBuyMap); }
             set { this.SetValue(x => x.PddBuyMap, value); }
@@ -391,10 +401,10 @@ namespace AllBase.Model.DBModel
 			this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault();
 			this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
 			// 优先找非撤销买手退款单
-			this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no && p.statusText == "退款成功") ??
-				                     PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no && !p.statusText.Contains("申请已撤销"));
+			this.PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no && p.statusText == "退款成功") ??
+				                     PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no && !p.statusText.Contains("申请已撤销"));
 			if (PddBuyerAfterSale == null)
-				PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid.out_order_no);
+				PddBuyerAfterSale = PddBuyerAfterSales?.FirstOrDefault(p => p.orderSn == this.ItemTransitOrderWithVoid?.out_order_no);
 
 			// 直接取号和更正取号显示的买手到仓库物流
 			if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)
@@ -1125,7 +1135,13 @@ namespace AllBase.Model.DBModel
 		public string DirectRefundStatusStr
 		{
 			get { return this.GetValue(x => x.DirectRefundStatusStr); }
-			set { this.SetValue(x => x.DirectRefundStatusStr, value); DirectRefundStatusStrVisibility = string.IsNullOrWhiteSpace(value) ? Visibility.Collapsed : Visibility.Visible; }
+			set {
+				if (order_id == "3739897762013171200")
+				{
+
+				}
+				this.SetValue(x => x.DirectRefundStatusStr, value);
+				DirectRefundStatusStrVisibility = string.IsNullOrWhiteSpace(DirectRefundStatusStr) ? Visibility.Collapsed : Visibility.Visible; }
 		}
 		public Visibility DirectRefundStatusStrVisibility
 		{