diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
index c691afd..9cf8e5d 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
@@ -1132,8 +1132,8 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
                 }
 
                 bool isUpdate = false;
-                PddBuyerAfterSaleLiteInfo afterSale = null;
-                if (!lstPddBuyerAfterSaleInfoLite.Any(or => or.afterSalesId == af.afterSalesId))
+				PddBuyerAfterSaleLiteInfo afterSale = lstPddBuyerAfterSaleInfoLite.ToList().FirstOrDefault(aft => aft.afterSalesId == af.afterSalesId);
+				if (afterSale == null)
                 {
                     isUpdate = true;
                     afterSale = af;
@@ -1141,7 +1141,6 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
                 }
                 else
                 {
-                    afterSale = lstPddBuyerAfterSaleInfoLite.FirstOrDefault(aft => aft.afterSalesId == af.afterSalesId);
                     var afterSaleTmp = JsonHelper.DeserializeJsonToObject<PddBuyerAfterSaleLiteInfo>(JsonHelper.SerializeObject(afterSale));
                     //afterSaleTmp.sendStatus = ""; // 比较订单变化，如果有变化，才写库或者处理（设置为空强制变化）
                     afterSaleTmp.AfterSaleStatusOldStr = null; // 设置null，比较订单变化，如果有变化，才写
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
index c109120..85cb4d0 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,902 +111,902 @@
 						<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.ship_done_time_visibility}">
-					<uc:UcWaterMarkTextBox1
-						d:Text="00-01-01 01:01:01"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="{Binding ItemOrder.ship_done_time_str}"
-						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 ElementName=txtWaybillException, Path=Text, Converter={StaticResource HasTextVisibility}}">
-						<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 ElementName=txtOrderItemStatusStr, Path=Text, Converter={StaticResource HasTextVisibility}}" />
-					<TextBlock
-						HorizontalAlignment="Center"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						Foreground="{Binding ItemRefund.RefundStatusColor}"
-						Text="："
-						Visibility="{Binding ElementName=txtOrderItemStatusStr, Path=Text, Converter={StaticResource HasTextVisibility}}" />
-					<TextBlock
-						x:Name="txtStatusStr"
-						HorizontalAlignment="Center"
-						VerticalAlignment="Top"
-						d:Text="售后状态"
-						Background="Transparent"
-						Foreground="{Binding ItemRefund.RefundStatusColor}"
-						Text="{Binding ItemRefund.RefundStatusStr}"
-						Visibility="{Binding ElementName=txtStatusStr, Path=Text, Converter={StaticResource HasTextVisibility}}" />
-				</WrapPanel>
-				<!--  售后原因  -->
-				<TextBlock
-					x:Name="txtRefundReasonTextStr"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Top"
-					d:Text="售后原因"
-					Background="Transparent"
-					Foreground="#f56c6c"
-					Text="{Binding ItemRefund.reasonTextStr}"
-					Visibility="{Binding ElementName=txtRefundReasonTextStr, Path=Text, Converter={StaticResource HasTextVisibility}}" />
+                <!--  售后状态  -->
+                <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 ItemRefund.ReasonTextStrVisibility}" />
 
-				<!--  售后结果  -->
-				<TextBlock
-					x:Name="txtRefundResult"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Top"
-					d:Text="售后结果"
-					Background="Transparent"
-					Foreground="#f56c6c"
-					Text="{Binding RefundResultStr}"
-					Visibility="{Binding ElementName=txtRefundResult, Path=Text, Converter={StaticResource HasTextVisibility}}" />
+                <!--  售后结果  -->
+                <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 Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}"
-							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 Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}"
+                            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 RefundAddressStr, Converter={StaticResource HasTextVisibility}}">
-					<WrapPanel Orientation="Horizontal">
-						<uc:UcWaterMarkTextBox1
-							x:Name="txtRefundAddress"
-							VerticalAlignment="Top"
-							d:Text="胡xx 18990991234 辽宁省朝阳市 北漂.."
-							Background="Transparent"
-							BorderThickness="0"
-							IsReadOnly="True"
-							Text="{Binding RefundAddressStr, Converter={StaticResource TextEllipsisConverter26}}"
-							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 RefundAddressStr, Converter={StaticResource HasTextVisibility}}">
+                    <WrapPanel Orientation="Horizontal">
+                        <uc:UcWaterMarkTextBox1
+                            x:Name="txtRefundAddress"
+                            VerticalAlignment="Top"
+                            d:Text="胡xx 18990991234 辽宁省朝阳市 北漂.."
+                            Background="Transparent"
+                            BorderThickness="0"
+                            IsReadOnly="True"
+                            Text="{Binding RefundAddressStr, Converter={StaticResource TextEllipsisConverter26}}"
+                            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 BuyerTransitWaybillStatusStr, Converter={StaticResource HasTextVisibility}}">
-						<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 WarehouseWaybillStatusStr, Converter={StaticResource HasTextVisibility}}">
-						<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 TransitRefundVoidStatusStr, Converter={StaticResource HasTextVisibility}}">
-						<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 BuyerTransitWaybillStatusStr, Converter={StaticResource HasTextVisibility}}">
+                        <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 WarehouseWaybillStatusStr, Converter={StaticResource HasTextVisibility}}">
+                        <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 TransitRefundVoidStatusStr, Converter={StaticResource HasTextVisibility}}">
+                        <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 ElementName=txtTransitOrderBuyerStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
-					<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 TransitRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
-							<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 ElementName=txtTransitOrderBuyerStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
+                    <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 TransitRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
+                            <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 ElementName=txtTransitOrderNumStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
-					<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}"
-							Visibility="{Binding ElementName=txtTransitOrderBuyerStr, 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="Path_MouseLeftButtonDown"
-								Stretch="Uniform" />
-						</Border>
-					</WrapPanel>
-				</wpf:TitleContent>
+                <!--  采购单号  -->
+                <wpf:TitleContent
+                    x:Name="wpBuyOrderId"
+                    Title="采购单号："
+                    Cursor="Hand"
+                    Foreground="#0099ff"
+                    Visibility="{Binding ElementName=txtTransitOrderNumStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
+                    <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}"
+                            Visibility="{Binding ElementName=txtTransitOrderBuyerStr, 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="Path_MouseLeftButtonDown"
+                                Stretch="Uniform" />
+                        </Border>
+                    </WrapPanel>
+                </wpf:TitleContent>
 
-				<!--  采购时间  -->
-				<wpf:TitleContent
-					x:Name="wpBuyTime"
-					Title="采购时间："
-					Foreground="{Binding OutOrderTimeQualifiedBrush}"
-					Visibility="{Binding ElementName=txtOutOrderTimeQualifiedStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
-					<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 ElementName=txtOutOrderTimeQualifiedStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
+                    <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 TransitOrderWaybillToWareHouseStr, Converter={StaticResource HasTextVisibility}}">
-					<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 TransitOrderWaybillToWareHouseStr, Converter={StaticResource HasTextVisibility}}">
+                    <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 TransitOrderWaybillFromWareHouseStr, Converter={StaticResource HasTextVisibility}}">
-					<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 TransitOrderWaybillFromWareHouseStr, Converter={StaticResource HasTextVisibility}}">
+                    <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 TransitExtraPackageWaybillStr, Converter={StaticResource HasTextVisibility}}">
-					<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 TransitExtraPackageWaybillBtnStr, Converter={StaticResource HasTextVisibility}}" />
-					</WrapPanel>
-				</wpf:TitleContent>
+                <!--  仓库物流  -->
+                <wpf:TitleContent Title="补发物流：" Visibility="{Binding TransitExtraPackageWaybillStr, Converter={StaticResource HasTextVisibility}}">
+                    <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 TransitExtraPackageWaybillBtnStr, Converter={StaticResource HasTextVisibility}}" />
+                    </WrapPanel>
+                </wpf:TitleContent>
 
-				<!--  外采买手  -->
-				<wpf:TitleContent Title="外采买手：" Visibility="{Binding ItemOrder.out_account, Converter={StaticResource HasTextVisibility}}">
-					<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 DirectRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
-							<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="外采买手：" Visibility="{Binding ItemOrder.out_account, Converter={StaticResource HasTextVisibility}}">
+                    <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 DirectRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
+                            <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 ElementName=txtDirectOrderBuyTimeStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
-					<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 ElementName=txtDirectOrderBuyTimeStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
+                    <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"
@@ -1017,7 +1017,7 @@
 							Text="{Binding ItemOrder.out_express_company}"
 							TextWrapping="Wrap"
 							WaterMark="外采物流" />-->
-						<!--<uc:UcWaterMarkTextBox1
+                        <!--<uc:UcWaterMarkTextBox1
 							Margin="-2,2"
 							Padding="0"
 							VerticalAlignment="Center"
@@ -1028,527 +1028,527 @@
 							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 PddBuyerAfterSaleAddressStr, Converter={StaticResource HasTextVisibility}}">
-					<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 PddBuyerAfterSaleAddressStr, Converter={StaticResource TextEllipsisConverter}}"
-							TextWrapping="Wrap"
-							ToolTip="{Binding PddBuyerAfterSaleAddressStr}"
-							Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}"
-							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 PddBuyerAfterSaleAddressStr, Converter={StaticResource HasTextVisibility}}">
+                    <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 PddBuyerAfterSaleAddressStr, Converter={StaticResource TextEllipsisConverter}}"
+                            TextWrapping="Wrap"
+                            ToolTip="{Binding PddBuyerAfterSaleAddressStr}"
+                            Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}"
+                            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 DirectPddBuyerAfterSaleAddressStr, Converter={StaticResource HasTextVisibility}}">
-					<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 DirectPddBuyerAfterSaleAddressStr, Converter={StaticResource TextEllipsisConverter}}"
-							TextWrapping="Wrap"
-							ToolTip="{Binding DirectPddBuyerAfterSaleAddressStr}"
-							Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}"
-							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 DirectPddBuyerAfterSaleAddressStr, Converter={StaticResource HasTextVisibility}}">
+                    <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 DirectPddBuyerAfterSaleAddressStr, Converter={StaticResource TextEllipsisConverter}}"
+                            TextWrapping="Wrap"
+                            ToolTip="{Binding DirectPddBuyerAfterSaleAddressStr}"
+                            Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}"
+                            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="Collapsed" />
-					</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="Collapsed" />
-					</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 628de88..a866649 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
@@ -355,7 +355,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 				return;
 			}
 
-			if (!GetIsAbnormalOrderRebuy(orderItem) && GlobalConfig.lstOrder.Any(o => o.orderItems
+			if (!orderItem.GetIsAbnormalOrderRebuy() && GlobalConfig.lstOrder.Any(o => o.orderItems
 				.Any(oi => oi.ItemTransitOrder?.order_no == orderItem.order_id && oi.ItemTransitOrder?.order_sku_id == orderItem.sku_id)))
 			{
 				OrderListCtrl.InitOrderItemObservableProp(orderItem);
@@ -795,25 +795,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 					}));
 				});
 
-				// 作废重拍
-				if (order_item.ItemOrder.status == 20 /*&& order_item.refund_status <= 1*/ && order_item.ItemTransitOrder != null)
-				{
-					btnVoidTransitOrder.Visibility = Visibility.Visible;
-				}
-				else
-				{
-					btnVoidTransitOrder.Visibility = Visibility.Collapsed;
-				}
-
-				// 异常重拍
-				if (GetIsAbnormalOrderRebuy(order_item))
-				{
-					btnAbnormalOrderRebuy.Visibility = Visibility.Visible;
-				}
-				else
-				{
-					btnAbnormalOrderRebuy.Visibility = Visibility.Collapsed;
-				}
 
 				// 待采购不显示所有采购信息状态（否则会显示作废订单状态）
 				if (GlobalConfig.OrderTabHeaderStr.StartsWith("待采购"))
@@ -831,30 +812,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			}
 		}
 
-		/// <summary>
-		/// 判断中转仓订单是否可以异常重拍
-		/// </summary>
-		/// <param name="order_item"></param>
-		/// <returns></returns>
-		static bool GetIsAbnormalOrderRebuy(oms_wei_order_item_info order_item)
-		{
-			// 不是异常单的不可异常重拍
-			if (order_item?.ItemOrder?.IsAbnormal != true)
-				return false;
-			// 买手未退款的，中转正式取号以后的，不可异常重拍
-			if (order_item.ItemTransitOrder?.refund_status != "买手退款成功" ||
-				order_item.WarehouseWaybillStatusStr == "中转已取号" || order_item.WarehouseWaybillStatusStr == "中转已入库" || order_item.WarehouseWaybillStatusStr == "中转已出库")
-				return false;
-			// 已正式取号的，不可异常重拍
-			if (order_item.ItemTransitOrder?.pre_allocated_order_no == 1 || order_item.ItemTransitOrder?.pre_allocated_order_no == 3)
-				return false;
-			// 仓库异常的异常单不可异常重拍
-			List<string> rawMsgKeyWords = new List<string> { "取号异常", "无法调用" };
-			if (rawMsgKeyWords.Any(k => (order_item.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains(k)) && order_item.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1)
-				return false;
-
-			return true;
-		}
 		private void TransitOrderBuy_Click(object sender, MouseButtonEventArgs e)
 		{
 			var orderItem = this.DataContext as oms_wei_order_item_info;
diff --git a/AllBase/Model/DBModel/oms_wei_order_info.cs b/AllBase/Model/DBModel/oms_wei_order_info.cs
index b623214..fe1d3db 100644
--- a/AllBase/Model/DBModel/oms_wei_order_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_info.cs
@@ -74,74 +74,35 @@ namespace AllBase.Model.DBModel
         /// 售后订单（不含售后关闭） -- 改为售后完成单 260726
         /// </summary>
         public bool IsRefund
-        {
-            get
-            {
-				// return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD");
-				if (!orderItems.Any(oi => oi.refund_status > 1))
-                    return false;
-                if (IsEmergency)
-                    return false;
-                return true;
-            }
-            set { }
-        }
+		{
+			get { return this.GetValue(x => x.IsRefund); }
+			set { this.SetValue(x => x.IsRefund, value); }
+		}
 
         /// <summary>
         /// 紧急订单
         /// </summary>
         public bool IsEmergency
-        {
-            get
-            {
-                if (this.order_id == "3737858759084367872")
-                {
-                }
-                // 微信订单退货中
-                if (orderItems.Any(oi => oi.refund_status == 2 || oi.refund_status == 3))
-                {
-                    return true;
-                }
-                // 微信订单退款中或退款成功，但是买手订单未完成退款
-                if (orderItems.Any(oi => oi.refund_status > 1 && oi.ItemTransitOrders.Count > 0 && oi.ItemTransitOrders.Any(t => !t.refund_status.Contains("退款成功"))))
-                {
-                    return true;
-                }
-                if (orderItems.Any(oi => oi.refund_status > 1) && !out_order_no.IsNullOrEmpty() && this.out_after_sale_status != "退款成功")
-                {
-                    return true;
-                }
-                return false;
-            }
-            set { }
+		{
+			get { return this.GetValue(x => x.IsEmergency); }
+			set { this.SetValue(x => x.IsEmergency, value); }
 		}
 
 		public bool IsEmergencyDistribReturnOrder
 		{
-			get
-			{
-				return IsEmergency && IsDistribReturnOrder;
-			}
-			set { }
+			get { return this.GetValue(x => x.IsEmergencyDistribReturnOrder); }
+			set { this.SetValue(x => x.IsEmergencyDistribReturnOrder, value); }
 		}
 		public bool IsEmergencyManualReturnOrder
 		{
-			get
-			{
-				return IsEmergency && !IsDistribReturnOrder;
-			}
-			set { }
+			get { return this.GetValue(x => x.IsEmergencyManualReturnOrder); }
+			set { this.SetValue(x => x.IsEmergencyManualReturnOrder, value); }
 		}
 
 		public bool IsDistribReturnOrder
 		{
-			get
-			{
-				//return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
-				//return this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
-				return this.orderItems.All(oi => oi.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true);
-			}
-			set { }
+			get { return this.GetValue(x => x.IsDistribReturnOrder); }
+			set { this.SetValue(x => x.IsDistribReturnOrder, value); }
 		}
 		/// <summary>
 		/// 异常单(买手异常退货)异常需重拍
@@ -219,42 +180,49 @@ namespace AllBase.Model.DBModel
 		/// <summary>
 		/// 订单发货完成时间
 		/// </summary>
-		public string ship_done_time_str
-		{
-			get { return BaseClass.StampToDateTime(this.ship_done_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss"); }
-			set { }
-		}
+		public string ShipDoneTimeStr
+        {
+            get { return this.GetValue(x => x.ShipDoneTimeStr); }
+            set { this.SetValue(x => x.ShipDoneTimeStr, value); }
+        }
 		/// <summary>
 		/// 订单发货完成时间可见
 		/// </summary>
-		public Visibility ship_done_time_visibility
-		{
-			get { return this.ship_done_time.ParseToInt() > 0 ? Visibility.Visible : Visibility.Collapsed; }
-			set { }
-		}
+		public Visibility ShipDoneTimeVisibility
+        {
+            get { return this.GetValue(x => x.ShipDoneTimeVisibility); }
+            set { this.SetValue(x => x.ShipDoneTimeVisibility, value); }
+        }
+        void SetShipDoneTimeStr()
+        {
+            ShipDoneTimeStr = BaseClass.StampToDateTime(this.ship_done_time.ParseToInt()).ToString("yy-MM-dd HH:mm:ss");
+            ShipDoneTimeVisibility = this.ship_done_time.ParseToInt() > 0 ? Visibility.Visible : Visibility.Collapsed;
+        }
 
-		/// <summary>
-		/// 订单总状态文本
-		/// </summary>
-		public string DeliveryDeadlineStatusStr
+        /// <summary>
+        /// 订单总状态文本
+        /// </summary>
+        public string DeliveryDeadlineStatusStr
 		{
-			get
+			get { return this.GetValue(x => x.DeliveryDeadlineStatusStr); }
+		    set { this.SetValue(x => x.DeliveryDeadlineStatusStr, value); }
+		}
+		void SetDeliveryDeadlineStatusStr()
+		{
+			if (this.refundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.RefundStatusStr)))
+				DeliveryDeadlineStatusStr = "退款中";
+			else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成"))
+				DeliveryDeadlineStatusStr = "退款完成";
+			// 用户取消申请
+			else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单")) &&
+					  this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
+				DeliveryDeadlineStatusStr = this.refundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr;
+			else if (this.status == 20 || this.status == 21)
 			{
-				if (this.refundItems.Any(r => "商家受理中,待买家退货,待商家收货,平台退款中,待用户确认,待用户处理商家协商,待用户处理商家代发起的售后申请,物流拦截中".Contains(r.RefundStatusStr)))
-					return "退款中";
-				else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成"))
-					return "退款完成";
-				// 用户取消申请
-				else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单") || GlobalConfig.OrderTabHeaderStr.StartsWith("退货仓自动售后单")) &&
-						  this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
-					return this.refundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr;
-				if (this.status == 20 || this.status == 21)
-				{
-					return "剩余";
-				}
-				return "剩余";
+				DeliveryDeadlineStatusStr = "剩余";
 			}
-			set { }
+			else
+				DeliveryDeadlineStatusStr = "剩余";
 		}
 
 		/// <summary>
@@ -332,26 +300,24 @@ namespace AllBase.Model.DBModel
 		}
 
 		public string OutExpressNoStr
-		{
-			get
-			{
-				if (order_id == "3738634560083228416")
-				{
-
-				}
-				if (this.out_shipped == 2 && !string.IsNullOrEmpty(this.out_express_no)) 
-					return this.out_express_no + " ×";
-				return this.out_express_no;
-			}
-			set { }
-		}
+        {
+            get { return this.GetValue(x => x.OutExpressNoStr); }
+            set { this.SetValue(x => x.OutExpressNoStr, value); }
+        }
 		public SolidColorBrush OutExpressNoBrush
-		{
-			get
-			{
-				return OutExpressNoStr.EndsWith(" ×") ? GlobalConfig.RedTextBrush : GlobalConfig.BlackBrush;
-			}
-		}
+        {
+            get { return this.GetValue(x => x.OutExpressNoBrush); }
+            set { this.SetValue(x => x.OutExpressNoBrush, value); }
+        }
+        void SetOutExpressNo()
+        {
+            if (this.out_shipped == 2 && !string.IsNullOrEmpty(this.out_express_no))
+                OutExpressNoStr = this.out_express_no + " ×";
+            else
+                OutExpressNoStr = this.out_express_no;
+
+            OutExpressNoBrush = OutExpressNoStr.EndsWith(" ×") ? GlobalConfig.RedTextBrush : GlobalConfig.BlackBrush;
+        }
 
 		public string GiftOrderStatusStr
 		{
@@ -744,11 +710,11 @@ namespace AllBase.Model.DBModel
 			IsWaitBuy = GetIsWaitBuy();
 			IsWaitSend = GetIsWaitSend();
 			IsWaitReceive = GetIsWaitReceive();
-
-			if (order_id == "3739089000222605568")
-			{
-
-			}
+			IsRefund = GetIsRefund();
+			IsEmergency = GetIsEmergency();
+			IsDistribReturnOrder = GetIsDistribReturnOrder();
+			IsEmergencyDistribReturnOrder = IsEmergency && IsDistribReturnOrder; 
+			IsEmergencyManualReturnOrder = IsEmergency && !IsDistribReturnOrder;
 			IsAbnormal = GetIsAbnormal();
 
 			if (IsWaitBuy/* || IsWaitSend*/)
@@ -760,7 +726,11 @@ namespace AllBase.Model.DBModel
 				IsShowTransitExtraPackagesBtn = false;
 			else
 				IsShowTransitExtraPackagesBtn = true;
-		}
+
+			SetDeliveryDeadlineStatusStr();
+            SetOutExpressNo();
+            SetShipDoneTimeStr();
+        }
 
 		public bool GetIsWaitBuy()
 		{
@@ -817,11 +787,6 @@ namespace AllBase.Model.DBModel
 
 		private bool GetIsWaitReceive()
 		{
-			if (order_id == "3738622310043515392")
-			{
-
-			}
-
 			if (refundItems?.Any(r => r.IsRefund) == true)
 				return false;
 			if (orderItems?.Any(oi => oi.refund_status > 1) == true)
@@ -833,11 +798,6 @@ namespace AllBase.Model.DBModel
 
 		public bool GetIsAbnormal()
 		{
-			if (order_id == "3739720775494980096")
-			{
-
-			}
-
 			// 三退或者两退，为退款完成单
 			//if (orderItems.All(oi => (oi.refund_status == 4 || oi.refund_status == 11) && (oi.ItemTransitOrder != null || string.IsNullOrWhiteSpace(out_order_no)) &&
 			//	(oi.ItemTransitOrder == null || oi.ItemTransitOrder?.refund_status == "买手退款成功") && (string.IsNullOrWhiteSpace(out_order_no) || out_after_sale_status == "退款成功")))
@@ -870,5 +830,41 @@ namespace AllBase.Model.DBModel
 				return true;
 			return false;
 		}
+
+		public bool GetIsRefund()
+		{
+			// return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD");
+			if (!orderItems.Any(oi => oi.refund_status > 1))
+				return false;
+			if (GetIsEmergency())
+				return false;
+			return true;
+		}
+
+		public bool GetIsEmergency()
+		{
+			// 微信订单退货中
+			if (orderItems.Any(oi => oi.refund_status == 2 || oi.refund_status == 3))
+			{
+				return true;
+			}
+			// 微信订单退款中或退款成功，但是买手订单未完成退款
+			if (orderItems.Any(oi => oi.refund_status > 1 && oi.ItemTransitOrders.Count > 0 && oi.ItemTransitOrders.Any(t => !t.refund_status.Contains("退款成功"))))
+			{
+				return true;
+			}
+			if (orderItems.Any(oi => oi.refund_status > 1) && !out_order_no.IsNullOrEmpty() && this.out_after_sale_status != "退款成功")
+			{
+				return true;
+			}
+			return false;
+		}
+
+		public bool GetIsDistribReturnOrder()
+		{
+			//return this.orderItems.All(oi => !string.IsNullOrEmpty(oi.ItemRefund?.return_waybill_id)) && this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
+			//return this.orderItems.All(oi => oi.ItemRefund?.return_detail == GlobalConfig.TransitReturnOrderReturnAddress);
+			return this.orderItems.All(oi => oi.ItemRefund?.return_detail?.ToUpper().Contains(GlobalConfig.TransitReturnOrderReturnAddressLite) == true);
+		}
     }
 }
diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
index c1911ff..23df8a4 100644
--- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
@@ -115,10 +115,16 @@ namespace AllBase.Model.DBModel
         public string ShopWaybillExceptionStr
         {
             get { return this.GetValue(x => x.ShopWaybillExceptionStr); }
-            set { this.SetValue(x => x.ShopWaybillExceptionStr, value); }
+            set { this.SetValue(x => x.ShopWaybillExceptionStr, value); ShopWaybillExceptionStrVisibility = value.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
         }
+		public Visibility ShopWaybillExceptionStrVisibility
+		{
+			get { return this.GetValue(x => x.ShopWaybillExceptionStrVisibility); }
+			set { this.SetValue(x => x.ShopWaybillExceptionStrVisibility, value); }
+		}
 
-        public oms_wei_order_info ItemOrder
+
+		public oms_wei_order_info ItemOrder
         {
             get { return this.GetValue(x => x.ItemOrder); }
             set { this.SetValue(x => x.ItemOrder, value); }
@@ -166,12 +172,17 @@ namespace AllBase.Model.DBModel
         public string RefundResultStr
         {
             get { return this.GetValue(x => x.RefundResultStr); }
-            set { this.SetValue(x => x.RefundResultStr, value); }
+            set { this.SetValue(x => x.RefundResultStr, value); RefundResultStrVisibility = value.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
         }
-        /// <summary>
-        /// 微信小店用户退款快递单号
-        /// </summary>
-        public string ReturnWaybillIdStr
+		public Visibility RefundResultStrVisibility
+		{
+			get { return this.GetValue(x => x.RefundResultStrVisibility); }
+			set { this.SetValue(x => x.RefundResultStrVisibility, value); }
+		}
+		/// <summary>
+		/// 微信小店用户退款快递单号
+		/// </summary>
+		public string ReturnWaybillIdStr
         {
             get { return this.GetValue(x => x.ReturnWaybillIdStr); }
             set { this.SetValue(x => x.ReturnWaybillIdStr, value); }
@@ -1310,14 +1321,30 @@ namespace AllBase.Model.DBModel
 		public string RefundStatusStr
 		{
 			get { return this.GetValue(x => x.RefundStatusStr); }
-			set { this.SetValue(x => x.RefundStatusStr, value); }
+			set { this.SetValue(x => x.RefundStatusStr, value); RefundStatusStrVisibility = value.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
+		}
+		public Visibility RefundStatusStrVisibility
+		{
+			get { return this.GetValue(x => x.RefundStatusStrVisibility); }
+			set { this.SetValue(x => x.RefundStatusStrVisibility, value); }
+		}
+
+		public Visibility BtnVoidTransitOrderVisibility
+		{
+			get { return this.GetValue(x => x.BtnVoidTransitOrderVisibility); }
+			set { this.SetValue(x => x.BtnVoidTransitOrderVisibility, value); }
+		}
+		public Visibility BtnAbnormalOrderRebuyVisibility
+		{
+			get { return this.GetValue(x => x.BtnAbnormalOrderRebuyVisibility); }
+			set { this.SetValue(x => x.BtnAbnormalOrderRebuyVisibility, value); }
 		}
 
 
-        /// <summary>
-        /// 订单商品表数据库id
-        /// </summary>
-        public long id { get; set; }
+		/// <summary>
+		/// 订单商品表数据库id
+		/// </summary>
+		public long id { get; set; }
         public long shop_id { get; set; }
         /// <summary>
         /// 商户ID
@@ -1524,10 +1551,10 @@ namespace AllBase.Model.DBModel
 				LatestDirectEWaybill = null;
 		}
 
-        public void UpdateOrderItemBuyButton()
-        {
-            var order_item = this;
-            order_item.Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == order_item.shop_id.ParseToString());
+		public void UpdateOrderItemBuyButton()
+		{
+			var order_item = this;
+			order_item.Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == order_item.shop_id.ParseToString());
 
 			// 关联商品sku
 			if (GlobalConfig.CurrentBuyPlatform == "pdd")
@@ -1597,6 +1624,44 @@ namespace AllBase.Model.DBModel
 				order_item.BuyGoodsBtnBackColor = GlobalConfig.PurpleBrush35;
 				order_item.BuyGoodsBtnColor = GlobalConfig.PurpleBrush;
 			}
-        }
-    }
+
+			// 作废重拍
+			if (order_item.ItemOrder.status == 20 /*&& order_item.refund_status <= 1*/ && order_item.ItemTransitOrder != null)
+				BtnVoidTransitOrderVisibility = Visibility.Visible;
+			else
+				BtnVoidTransitOrderVisibility = Visibility.Collapsed;
+			// 异常重拍
+			if (order_item.GetIsAbnormalOrderRebuy())
+				BtnAbnormalOrderRebuyVisibility = Visibility.Visible;
+			else
+				BtnAbnormalOrderRebuyVisibility = Visibility.Collapsed;
+		}
+
+		/// <summary>
+		/// 判断中转仓订单是否可以异常重拍
+		/// </summary>
+		/// <param name="order_item"></param>
+		/// <returns></returns>
+		public bool GetIsAbnormalOrderRebuy()
+		{
+			var order_item = this;
+
+			// 不是异常单的不可异常重拍
+			if (order_item?.ItemOrder?.IsAbnormal != true)
+				return false;
+			// 买手未退款的，中转正式取号以后的，不可异常重拍
+			if (order_item.ItemTransitOrder?.refund_status != "买手退款成功" ||
+				order_item.WarehouseWaybillStatusStr == "中转已取号" || order_item.WarehouseWaybillStatusStr == "中转已入库" || order_item.WarehouseWaybillStatusStr == "中转已出库")
+				return false;
+			// 已正式取号的，不可异常重拍
+			if (order_item.ItemTransitOrder?.pre_allocated_order_no == 1 || order_item.ItemTransitOrder?.pre_allocated_order_no == 3)
+				return false;
+			// 仓库异常的异常单不可异常重拍
+			List<string> rawMsgKeyWords = new List<string> { "取号异常", "无法调用" };
+			if (rawMsgKeyWords.Any(k => (order_item.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains(k)) && order_item.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1)
+				return false;
+
+			return true;
+		}
+	}
 }
diff --git a/AllBase/Model/DBModel/oms_wei_refund_info.cs b/AllBase/Model/DBModel/oms_wei_refund_info.cs
index 504716c..86bad48 100644
--- a/AllBase/Model/DBModel/oms_wei_refund_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_refund_info.cs
@@ -1,10 +1,12 @@
 using AllBase.Helper;
 using AllBase.Model.MvvmBaseClasses;
+using NaiBa.Util.Extension;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Media;
 
 namespace AllBase.Model.DBModel
@@ -14,9 +16,15 @@ namespace AllBase.Model.DBModel
         public string RefundStatusStr
         {
             get { return this.GetValue(x => x.status); }
-            set { this.SetValue(x => x.status, value); }
+            set { this.SetValue(x => x.status, value); RefundStatusStrVisibility = RefundStatusStr.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
         }
-        public bool IsRefund
+		public Visibility RefundStatusStrVisibility
+		{
+			get { return this.GetValue(x => x.RefundStatusStrVisibility); }
+			set { this.SetValue(x => x.RefundStatusStrVisibility, value); }
+		}
+
+		public bool IsRefund
         {
             get { return this.GetValue(x => x.IsRefund); }
             set { this.SetValue(x => x.IsRefund, value); }
@@ -32,17 +40,20 @@ namespace AllBase.Model.DBModel
         /// <summary>
         /// 售后原因文字
         /// </summary>
-        public string reasonTextStr
-        {
-            get
-            {
-                return string.IsNullOrEmpty(reason_text) ? string.Empty : "售后原因：" + reason_text;
-            }
-            set { }
-        }
+        public string ReasonTextStr
+		{
+			get { return this.GetValue(x => x.ReasonTextStr); }
+			set { this.SetValue(x => x.ReasonTextStr, value); ReasonTextStrVisibility = value.IsNullOrEmpty() ? Visibility.Collapsed : Visibility.Visible; }
+		}
+		public Visibility ReasonTextStrVisibility
+		{
+			get { return this.GetValue(x => x.ReasonTextStrVisibility); }
+			set { this.SetValue(x => x.ReasonTextStrVisibility, value); }
+		}
 
 
-        public long id { get; set; }
+
+		public long id { get; set; }
         public long? shop_id { get; set; }
         public string after_sale_order_id { get; set; }
         /// <summary>
@@ -183,7 +194,15 @@ namespace AllBase.Model.DBModel
         /// <summary>
         /// 退款原因解释
         /// </summary>
-        public string reason_text { get; set; }
+        public string reason_text
+		{
+			get { return this.GetValue(x => x.reason_text); }
+			set
+			{
+				this.SetValue(x => x.reason_text, value);
+				ReasonTextStr = string.IsNullOrEmpty(reason_text) ? string.Empty : "售后原因：" + reason_text;
+			}
+		}
         /// <summary>
         /// 售后类型。REFUND:退款；RETURN:退货退款。
         /// </summary>