From 7a4dba5cd8eb8fe6bbb2fecf6740a0dee6af79da Mon Sep 17 00:00:00 2001
From: chfei <chaihongfei@126.com>
Date: Tue, 8 Sep 2026 10:09:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OrderCtrls/OrderListRowItemCtrl.xaml      | 1094 +++++++----------
 1 file changed, 417 insertions(+), 677 deletions(-)

diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
index 52e3a27..922b86c 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
@@ -9,8 +9,8 @@
 	xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
 	xmlns:wpf="WPFCommon"
 	d:Background="White"
-	d:DesignHeight="220"
-	d:DesignWidth="1300"
+	d:DesignHeight="320"
+	d:DesignWidth="1800"
 	DataContextChanged="UserControl_DataContextChanged"
 	mc:Ignorable="d">
 	<UserControl.Resources>
@@ -20,11 +20,23 @@
 
 		<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>
+		<Style
+			x:Key="LinkButton"
+			BasedOn="{StaticResource ButtonBaseStyle}"
+			TargetType="Button">
+			<Setter Property="Height" Value="20" />
+			<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>
@@ -43,7 +55,7 @@
 				<ColumnDefinition Width="200*" />
 				<ColumnDefinition Width="100*" MinWidth="200" />
 				<ColumnDefinition Width="75*" MinWidth="150" />
-				<ColumnDefinition Width="170*" />
+				<ColumnDefinition Width="170*" MinWidth="380" />
 				<ColumnDefinition Width="120*" />
 				<ColumnDefinition Width="120*" />
 				<ColumnDefinition Width="72*" />
@@ -314,30 +326,16 @@
 
 			</wpf:SpacingStackPanel>
 			<!--  订单状态/地址  -->
-			<Grid
+			<wpf:SpacingStackPanel
 				Grid.Column="5"
 				VerticalAlignment="Center"
-				Background="Transparent">
-				<Grid.RowDefinitions>
-					<RowDefinition Height="*" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="*" />
-				</Grid.RowDefinitions>
+				Orientation="Vertical"
+				VerticalSpacing="2">
 
-				<WrapPanel
-					Grid.Column="1"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center">
+				<!--  状态标签行（原 Row 1）  -->
+				<WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
 					<Border
 						Name="b_gift"
-						Grid.Row="1"
 						Height="auto"
 						MinWidth="30"
 						Margin="8,0,0,0"
@@ -376,11 +374,8 @@
 								Foreground="{Binding ElementName=b_gift, Path=BorderBrush}"
 								Text="{Binding ItemOrder.GiftOrderStatusStr}" />
 						</WrapPanel>
-
-
 					</Border>
 					<Border
-						Grid.Row="1"
 						Height="auto"
 						MinWidth="30"
 						Margin="8,0,0,0"
@@ -391,22 +386,17 @@
 						BorderBrush="{Binding OrderItemStatusBorderColor}"
 						BorderThickness="1"
 						CornerRadius="2">
-						<TextBox
-							Grid.Column="1"
+						<TextBlock
 							MinWidth="20"
 							Margin="2,0,2,0"
 							VerticalAlignment="Center"
-							VerticalContentAlignment="Center"
 							d:Foreground="{StaticResource pageColorBrush}"
 							d:Text="订单状态"
 							Background="Transparent"
-							BorderThickness="0"
 							Foreground="{Binding OrderItemStatusStrColor}"
-							IsReadOnly="True"
 							Text="{Binding OrderItemStatusStr}" />
 					</Border>
 					<Border
-						Grid.Row="1"
 						Height="auto"
 						MinWidth="30"
 						Margin="8,0,0,0"
@@ -416,210 +406,160 @@
 						BorderThickness="1"
 						CornerRadius="2"
 						Visibility="{Binding ElementName=txtWaybillException, Path=Text, Converter={StaticResource HasTextVisibility}}">
-						<TextBox
+						<TextBlock
 							x:Name="txtWaybillException"
-							Grid.Column="1"
 							MinWidth="20"
 							Margin="2,0,2,0"
 							VerticalAlignment="Center"
-							VerticalContentAlignment="Center"
 							d:Text="物流异常"
 							Background="Transparent"
-							BorderThickness="0"
 							Foreground="{StaticResource PageWarningBrush}"
-							IsReadOnly="True"
 							Text="{Binding ShopWaybillExceptionStr}" />
 					</Border>
 				</WrapPanel>
-				<TextBox
+
+				<!--  售后状态  -->
+				<TextBlock
 					x:Name="txtStatusStr"
-					Grid.Row="2"
-					Grid.Column="1"
-					Margin="0,2,0,2"
 					HorizontalAlignment="Center"
 					VerticalAlignment="Top"
 					d:Text="售后状态"
 					Background="Transparent"
-					BorderThickness="0"
 					Foreground="{Binding ItemRefund.RefundStatusColor}"
-					IsReadOnly="True"
 					Text="{Binding ItemRefund.RefundStatusStr}"
 					Visibility="{Binding ElementName=txtStatusStr, Path=Text, Converter={StaticResource HasTextVisibility}}" />
-				<TextBox
+				<!--  售后原因  -->
+				<TextBlock
 					x:Name="txtRefundReasonTextStr"
-					Grid.Row="3"
-					Grid.Column="1"
-					Margin="0,2,0,2"
 					HorizontalAlignment="Center"
 					VerticalAlignment="Top"
 					d:Text="售后原因"
 					Background="Transparent"
-					BorderThickness="0"
 					Foreground="#f56c6c"
-					IsReadOnly="True"
 					Text="{Binding ItemRefund.reasonTextStr}"
 					Visibility="{Binding ElementName=txtRefundReasonTextStr, Path=Text, Converter={StaticResource HasTextVisibility}}" />
-				<TextBox
+
+				<!--  售后结果  -->
+				<TextBlock
 					x:Name="txtRefundResult"
-					Grid.Row="4"
-					Grid.Column="1"
-					Margin="0,2,0,2"
 					HorizontalAlignment="Center"
 					VerticalAlignment="Top"
 					d:Text="售后结果"
 					Background="Transparent"
-					BorderThickness="0"
 					Foreground="#f56c6c"
-					IsReadOnly="True"
 					Text="{Binding RefundResultStr}"
 					Visibility="{Binding ElementName=txtRefundResult, Path=Text, Converter={StaticResource HasTextVisibility}}" />
 
-				<WrapPanel
-					Grid.Row="5"
-					Grid.Column="1"
-					Width="auto"
-					HorizontalAlignment="Center"
-					Orientation="Horizontal">
-					<TextBox
-						Grid.Row="5"
-						Grid.Column="1"
-						Margin="0,2,0,2"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="收货地址：" />
-					<uc:UcWaterMarkTextBox1
-						x:Name="txtUserAddress"
-						Grid.Row="5"
-						Grid.Column="1"
-						Margin="0,2,4,2"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="{Binding ItemOrder.AddressStr, Converter={StaticResource TextEllipsisConverter26}}"
-						TextWrapping="Wrap"
-						ToolTip="{Binding ItemOrder.AddressStr}"
-						WaterMark="收货地址" />
-					<Border
-						Grid.Column="6"
-						Width="12"
-						Height="12"
-						VerticalAlignment="Center"
-						Background="Transparent"
-						Cursor="Hand"
-						MouseLeftButtonDown="pathCopyAddress_MouseLeftButtonDown"
-						Visibility="{Binding ElementName=txtUserAddress, Path=Visibility}">
-						<Path
-							Margin="0,0,0,0"
-							Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
-							Fill="{StaticResource PageLinkBrush}"
+				<!--  收货地址  -->
+				<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"
-							Stretch="Uniform" />
-					</Border>
-					<Button
-						x:Name="btnSeeAddressDetail"
-						Margin="4,0,0,0"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						Click="btnSeeAddressDetail_Click"
-						Content="👁"
-						Cursor="Hand"
-						Foreground="{StaticResource PageLinkBrush}"
-						Tag="{Binding order_id}" />
-				</WrapPanel>
-				<!--<Button Grid.Column="1" Grid.Row="6" x:Name="btnGetRefundAddress" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
-                                        Margin="4,0,0,0" Content="仓库退货地址：点击复制" Click="btnGetRefundAddress_Click" Tag="{Binding order_id}"></Button>-->
-				<WrapPanel
-					Grid.Row="6"
-					Grid.Column="1"
-					Width="auto"
-					HorizontalAlignment="Center"
-					Orientation="Horizontal">
-					<TextBlock
-						VerticalAlignment="Center"
-						Text="退款单号："
-						Visibility="{Binding ElementName=txtRefundId, Path=Visibility}" />
-					<uc:UcWaterMarkTextBox1
-						x:Name="txtRefundId"
-						Grid.Row="6"
-						Grid.Column="1"
-						Margin="0,2,4,2"
-						HorizontalAlignment="Center"
-						VerticalAlignment="Center"
-						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
-						Grid.Column="6"
-						Width="12"
-						Height="12"
-						VerticalAlignment="Center"
-						Background="Transparent"
-						Cursor="Hand"
-						MouseLeftButtonDown="pathRefundId_MouseLeftButtonDown"
-						Visibility="{Binding ElementName=txtRefundId, Path=Visibility}">
-						<Path
-							Margin="0,0,0,0"
-							Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
-							Fill="{StaticResource PageLinkBrush}"
+							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"
-							Stretch="Uniform" />
-					</Border>
-				</WrapPanel>
-				<WrapPanel
-					Grid.Row="7"
-					Width="auto"
-					HorizontalAlignment="Center"
-					Orientation="Horizontal"
-					Visibility="{Binding RefundAddressStr, Converter={StaticResource HasTextVisibility}}">
-					<TextBox
-						Grid.Row="5"
-						Grid.Column="1"
-						Margin="0,2,0,2"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="退货地址：" />
-					<uc:UcWaterMarkTextBox1
-						x:Name="txtRefundAddress"
-						Grid.Row="5"
-						Grid.Column="1"
-						Margin="0,2,4,2"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="0"
-						IsReadOnly="True"
-						Text="{Binding RefundAddressStr, Converter={StaticResource TextEllipsisConverter26}}"
-						TextWrapping="Wrap"
-						ToolTip="{Binding RefundAddressStr}"
-						WaterMark="退货地址" />
-					<Border
-						Grid.Column="6"
-						Width="12"
-						Height="12"
-						VerticalAlignment="Center"
-						Background="Transparent"
-						Cursor="Hand"
-						MouseLeftButtonDown="pathCopyRefundAddress_MouseLeftButtonDown"
-						Visibility="{Binding ElementName=txtUserAddress, Path=Visibility}">
-						<Path
-							Margin="0,0,0,0"
-							Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
-							Fill="{StaticResource PageLinkBrush}"
+							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"
-							Stretch="Uniform" />
-					</Border>
-				</WrapPanel>
-			</Grid>
+							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"
@@ -650,16 +590,13 @@
 						BorderThickness="1"
 						CornerRadius="2"
 						Visibility="{Binding BuyerTransitWaybillStatusStr, Converter={StaticResource HasTextVisibility}}">
-						<TextBox
+						<TextBlock
 							x:Name="txtBuyStatus"
 							MinWidth="20"
 							VerticalAlignment="Center"
-							VerticalContentAlignment="Center"
 							d:Text="买手状态"
 							Background="Transparent"
-							BorderThickness="0"
 							Foreground="{Binding BuyerTransitWaybillStatusStrColor}"
-							IsReadOnly="True"
 							Text="{Binding BuyerTransitWaybillStatusStr}" />
 					</Border>
 					<Border
@@ -675,16 +612,13 @@
 						BorderThickness="1"
 						CornerRadius="2"
 						Visibility="{Binding WarehouseWaybillStatusStr, Converter={StaticResource HasTextVisibility}}">
-						<TextBox
+						<TextBlock
 							x:Name="txtWarehouseStatus"
 							MinWidth="20"
 							VerticalAlignment="Center"
-							VerticalContentAlignment="Center"
 							d:Text="仓库状态"
 							Background="Transparent"
-							BorderThickness="0"
 							Foreground="{Binding WarehouseWaybillStatusStrColor}"
-							IsReadOnly="True"
 							MouseEnter="txtWarehouseStatus_MouseEnter"
 							Text="{Binding WarehouseWaybillStatusStr}" />
 					</Border>
@@ -698,16 +632,13 @@
 						BorderThickness="1"
 						CornerRadius="2"
 						Visibility="{Binding TransitRefundVoidStatusStr, Converter={StaticResource HasTextVisibility}}">
-						<TextBox
+						<TextBlock
 							MinWidth="20"
 							Padding="0"
 							VerticalAlignment="Center"
-							VerticalContentAlignment="Center"
 							d:Text="作废状态"
 							Background="Transparent"
-							BorderThickness="0"
 							Foreground="White"
-							IsReadOnly="True"
 							Text="{Binding TransitRefundVoidStatusStr}" />
 					</Border>
 				</WrapPanel>
@@ -745,17 +676,14 @@
 							BorderThickness="1"
 							CornerRadius="2"
 							Visibility="{Binding TransitRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
-							<TextBox
+							<TextBlock
 								x:Name="txtRefundStatus"
 								MinWidth="20"
 								Padding="0"
 								VerticalAlignment="Center"
-								VerticalContentAlignment="Center"
 								d:Text="买手退货状态"
 								Background="Transparent"
-								BorderThickness="0"
 								Foreground="White"
-								IsReadOnly="True"
 								Text="{Binding TransitRefundStatusStr}" />
 						</Border>
 					</WrapPanel>
@@ -895,17 +823,14 @@
 							BorderThickness="1"
 							CornerRadius="2"
 							Visibility="{Binding DirectRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
-							<TextBox
+							<TextBlock
 								x:Name="txtOutBuyerRefundStatus"
 								MinWidth="20"
 								Padding="0"
 								VerticalAlignment="Center"
-								VerticalContentAlignment="Center"
 								d:Text="直发买手退货状态"
 								Background="Transparent"
-								BorderThickness="0"
 								Foreground="White"
-								IsReadOnly="True"
 								Text="{Binding DirectRefundStatusStr}" />
 						</Border>
 					</WrapPanel>
@@ -1025,501 +950,316 @@
 
 			</wpf:SpacingStackPanel>
 			<!--  备注  -->
-			<Grid
+			<wpf:SpacingStackPanel
 				Grid.Column="7"
 				VerticalAlignment="Center"
-				Background="Transparent">
-				<Grid.RowDefinitions>
-					<RowDefinition Height="*" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="*" />
-				</Grid.RowDefinitions>
+				Orientation="Vertical"
+				VerticalSpacing="2">
 
-				<WrapPanel
-					Grid.Row="1"
-					Grid.Column="1"
-					Orientation="Horizontal">
-					<TextBox
-						Grid.Row="1"
-						Grid.Column="1"
-						Margin="0,1,-8,1"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						BorderThickness="1"
-						IsReadOnly="True"
-						Text="买家留言：" />
+				<!--  买家留言  -->
+				<wpf:TitleContent Title="买家留言：">
 					<uc:UcWaterMarkTextBox1
-						Grid.Row="1"
-						Grid.Column="1"
-						Margin="0,1,0,1"
-						VerticalAlignment="Top"
 						Background="Transparent"
 						BorderThickness="1"
 						IsReadOnly="True"
 						Text=""
 						TextWrapping="Wrap"
 						WaterMark="买家留言" />
-				</WrapPanel>
+				</wpf:TitleContent>
 
-				<WrapPanel
-					Grid.Row="2"
-					Grid.Column="1"
-					Orientation="Horizontal">
-					<TextBox
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="0,1,-8,1"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						BorderThickness="1"
-						IsReadOnly="True"
-						Text="店铺备注：" />
-					<uc:UcWaterMarkTextBox1
-						x:Name="txtShopRemark"
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="0,1,0,1"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="1"
-						IsReadOnly="True"
-						Text="{Binding ItemOrder.shop_remark}"
-						TextWrapping="Wrap"
-						WaterMark="店铺备注" />
-					<Button
-						x:Name="btnEditShopRemark"
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="2,0,0,0"
-						HorizontalAlignment="Center"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						Click="btnEditShopRemark_Click"
-						Content="编辑"
-						Cursor="Hand"
-						Foreground="{StaticResource PageLinkBrush}" />
-					<Button
-						x:Name="btnCancelEditShopRemark"
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="0,0,0,0"
-						HorizontalAlignment="Center"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						Click="btnCancelEditShopRemark_Click"
-						Content="取消"
-						Cursor="Hand"
-						Foreground="{StaticResource PageLinkBrush}"
-						Visibility="Collapsed" />
-				</WrapPanel>
-				<WrapPanel
-					Grid.Row="3"
-					Grid.Column="1"
-					Orientation="Horizontal">
-					<TextBox
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="0,1,-8,1"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						BorderThickness="1"
-						IsReadOnly="True"
-						Text="软件备注：" />
-					<uc:UcWaterMarkTextBox1
-						x:Name="txtAppRemark"
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="0,1,0,1"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="1"
-						IsReadOnly="True"
-						Text="{Binding ItemOrder.soft_remark}"
-						TextWrapping="Wrap"
-						WaterMark="软件备注" />
-					<Button
-						x:Name="btnEditAppRemark"
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="2,0,0,0"
-						HorizontalAlignment="Center"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						Click="btnEditAppRemark_Click"
-						Content="编辑"
-						Cursor="Hand"
-						Foreground="{StaticResource PageLinkBrush}" />
-					<Button
-						x:Name="btnCancelEditAppRemark"
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="0,0,0,0"
-						HorizontalAlignment="Center"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						Click="btnCancelEditAppRemark_Click"
-						Content="取消"
-						Cursor="Hand"
-						Foreground="{StaticResource PageLinkBrush}"
-						Visibility="Collapsed" />
-				</WrapPanel>
-				<WrapPanel
-					Grid.Row="4"
-					Grid.Column="1"
-					Orientation="Horizontal"
-					Visibility="{Binding AddEditTransitWarehouseRejectStr, Converter={StaticResource HasTextVisibility}}">
-					<TextBox
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="0,1,-8,1"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						BorderThickness="1"
-						IsReadOnly="True"
-						Text="中转仓拒收：" />
-					<uc:UcWaterMarkTextBox1
-						x:Name="txtTransitWarehouseRejectSuccessTime"
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="0,1,0,1"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="1"
-						IsReadOnly="True"
-						Text="{Binding TransitWarehouseRejectSuccessTimeStr}"
-						TextWrapping="Wrap"
-						WaterMark="中转仓拒收" />
-					<Button
-						x:Name="btnAddEditTransitWarehouseReject"
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="2,0,0,0"
-						HorizontalAlignment="Center"
-						d:Content="申请"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						Click="btnAddEditTransitWarehouseReject_Click"
-						Content="{Binding AddEditTransitWarehouseRejectStr}"
-						Cursor="Hand"
-						Foreground="{StaticResource PageLinkBrush}" />
-					<Button
-						x:Name="btnPddRefundTransitWarehouseRejectOrder"
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="2,0,0,0"
-						HorizontalAlignment="Center"
-						d:Visibility="Visible"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						Click="btnPddRefundTransitWarehouseRejectOrder_Click"
-						Content="测试退货"
-						Cursor="Hand"
-						Foreground="{StaticResource PageLinkBrush}"
-						Visibility="Collapsed" />
-				</WrapPanel>
-				<WrapPanel
-					Grid.Row="5"
-					Grid.Column="1"
-					Orientation="Horizontal"
-					Visibility="{Binding AddEditTransitWarehouseAfterSaleStr, Converter={StaticResource HasTextVisibility}}">
-					<TextBox
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="0,1,-8,1"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						BorderThickness="1"
-						IsReadOnly="True"
-						Text="拦截退回总店：" />
-					<uc:UcWaterMarkTextBox1
-						x:Name="txtTransitWarehouseAfterSale"
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="0,1,0,1"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="1"
-						IsReadOnly="True"
-						Text="{Binding TransitWarehouseAfterSaleWayBillStr}"
-						TextWrapping="Wrap"
-						WaterMark="拦截退回总店" />
-					<!--  Visibility="{Binding Text,RelativeSource={RelativeSource Self},Converter={StaticResource HasTextVisibility}}"  -->
-					<Button
-						x:Name="btnAddEditTransitWarehouseAfterSale"
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="2,0,0,0"
-						HorizontalAlignment="Center"
-						d:Content="添加"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						Click="btnAddEditTransitWarehouseAfterSale_Click"
-						Content="{Binding AddEditTransitWarehouseAfterSaleStr}"
-						Cursor="Hand"
-						Foreground="{StaticResource PageLinkBrush}" />
-				</WrapPanel>
-				<WrapPanel
-					Grid.Row="6"
-					Grid.Column="1"
-					Width="auto"
-					Orientation="Horizontal"
-					Visibility="{Binding AddEditTransitWarehouseReturnOrderStr, Converter={StaticResource HasTextVisibility}}">
-					<TextBox
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="0,1,-8,1"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						BorderThickness="1"
-						IsReadOnly="True"
-						Text="云仓退货：" />
-					<uc:UcWaterMarkTextBox1
-						x:Name="txtTransitReturnOrderWaybill"
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="0,1,0,1"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderThickness="1"
-						IsReadOnly="True"
-						Text="{Binding AddEditTransitWarehouseReturnOrderWaybillStr}"
-						TextWrapping="Wrap"
-						WaterMark="云仓退货" />
-					<Button
-						x:Name="btnRetrunOrder"
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="2,0,0,0"
-						HorizontalAlignment="Center"
-						d:Content="添加"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						Click="btnReturnOrder_Click"
-						Content="{Binding AddEditTransitWarehouseReturnOrderStr}"
-						Cursor="Hand"
-						Foreground="{StaticResource PageLinkBrush}" />
-				</WrapPanel>
-				<WrapPanel
-					Grid.Row="7"
-					Grid.Column="1"
-					Width="auto"
-					Orientation="Horizontal"
-					Visibility="{Binding PddBuyerAfterSaleAddressStr, Converter={StaticResource HasTextVisibility}}">
-					<TextBox
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="0,1,-8,1"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						BorderThickness="1"
-						IsReadOnly="True"
-						Text="总店地址：" />
-					<!--<TextBlock Text="{Binding PddBuyerAfterSaleAddressStr}" TextTrimming="CharacterEllipsis" Width="100" ToolTip="这是一个非常长的文本字符串，需要显示省略号..." Visibility="Collapsed" x:Name="tbBuyerRefundAddress"/>-->
-					<uc:UcWaterMarkTextBox1
-						x:Name="txtBuyerRefundAddress"
-						Margin="0,1,0,1"
-						VerticalAlignment="Top"
-						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
-						Grid.Column="6"
-						Width="12"
-						Height="12"
-						VerticalAlignment="Center"
-						Background="Transparent"
-						Cursor="Hand"
-						MouseLeftButtonDown="pathBuyerAfterSaleAddress_MouseLeftButtonDown"
-						Visibility="{Binding ElementName=txtBuyerRefundAddress, Path=Visibility}">
-						<Path
-							Margin="0,0,0,0"
-							Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
-							Fill="{StaticResource PageLinkBrush}"
+				<!--  店铺备注  -->
+				<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="Visible"
+							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"
+							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"
+							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"
+							WaterMark="拦截退回总店" />
+						<Button
+							x:Name="btnAddEditTransitWarehouseAfterSale"
+							d:Content="添加"
+							Click="btnAddEditTransitWarehouseAfterSale_Click"
+							Content="{Binding AddEditTransitWarehouseAfterSaleStr}"
+							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"
+							WaterMark="云仓退货" />
+						<Button
+							x:Name="btnRetrunOrder"
+							d:Content="添加"
+							Click="btnReturnOrder_Click"
+							Content="{Binding AddEditTransitWarehouseReturnOrderStr}"
+							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"
-							Stretch="Uniform" />
-					</Border>
-				</WrapPanel>
+							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>
 
-				<WrapPanel
-					Grid.Row="8"
-					Grid.Column="1"
-					Width="auto"
-					Orientation="Horizontal"
-					Visibility="{Binding DirectPddBuyerAfterSaleAddressStr, Converter={StaticResource HasTextVisibility}}">
-					<TextBox
-						Grid.Row="2"
-						Grid.Column="1"
-						Margin="0,1,-8,1"
-						VerticalAlignment="Top"
-						Background="Transparent"
-						BorderBrush="Transparent"
-						BorderThickness="1"
-						IsReadOnly="True"
-						Text="直发总店：" />
-					<uc:UcWaterMarkTextBox1
-						x:Name="txtDirectBuyerRefundAddress"
-						Margin="0,1,0,1"
-						VerticalAlignment="Top"
-						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
-						Grid.Column="6"
-						Width="12"
-						Height="12"
-						VerticalAlignment="Center"
-						Background="Transparent"
-						Cursor="Hand"
-						MouseLeftButtonDown="pathDirectBuyerAfterSaleAddress_MouseLeftButtonDown"
-						Visibility="{Binding ElementName=txtBuyerRefundAddress, Path=Visibility}">
-						<Path
-							Margin="0,0,0,0"
-							Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
-							Fill="{StaticResource PageLinkBrush}"
+				<!--  直发总店  -->
+				<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"
-							Stretch="Uniform" />
-					</Border>
-				</WrapPanel>
+							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="pathDirectBuyerAfterSaleAddress_MouseLeftButtonDown"
+								Stretch="Uniform" />
+						</Border>
+					</WrapPanel>
+				</wpf:TitleContent>
 
-			</Grid>
+			</wpf:SpacingStackPanel>
 			<!--  操作  -->
-			<Grid
+			<wpf:SpacingStackPanel
 				Grid.Column="8"
 				VerticalAlignment="Center"
-				Background="Transparent">
-				<Grid.RowDefinitions>
-					<RowDefinition Height="*" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="Auto" />
-					<RowDefinition Height="*" />
-				</Grid.RowDefinitions>
-				<!--<Button Grid.Column="1" Grid.Row="2" Background="Transparent" HorizontalAlignment="Center"
-                        Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent" Margin="4,0,0,0" Content="核对拍单" Click=""></Button>-->
-				<!--<Button Grid.Column="1" Grid.Row="1" Background="Transparent" x:Name="btnBuyOrder" Click="btnBuyOrder_Click"
-                        Visibility="{Binding ItemOrder.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}"
-                        Style="{StaticResource BasePageButtonLightStyle}" Margin="4,0,0,0" Content="关联拍单" Width="56" Height="24"/>-->
-				<WrapPanel Grid.Row="1" HorizontalAlignment="Center">
-					<Button
-						x:Name="btnMapSkus"
-						Grid.Row="2"
-						Grid.Column="1"
-						Height="24"
-						MinWidth="38"
-						Margin="4,4,0,4"
-						HorizontalAlignment="Center"
-						Click="btnMapSkus_Click"
-						Content="选择SKU"
-						Style="{StaticResource BasePageButtonLightStyle}"
-						Visibility="{Binding MapSkusBtnVisibility}" />
+				Orientation="Vertical"
+				VerticalSpacing="5">
+				<!--  操作按钮行（原 Row 1）  -->
+				<wpf:TitleContent>
+					<WrapPanel HorizontalAlignment="Center">
+						<Button
+							x:Name="btnMapSkus"
+							Height="24"
+							MinWidth="38"
+							Margin="4,4,0,4"
+							HorizontalAlignment="Center"
+							Click="btnMapSkus_Click"
+							Content="选择SKU"
+							Style="{StaticResource BasePageButtonLightStyle}"
+							Visibility="{Binding MapSkusBtnVisibility}" />
 
+						<Button
+							x:Name="btnBuyOrder"
+							Height="24"
+							MinWidth="38"
+							Margin="4,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}}" />
 
+						<Button
+							x:Name="btnVoidTransitOrder"
+							Height="24"
+							MinWidth="38"
+							Margin="4,0,0,0"
+							HorizontalAlignment="Center"
+							d:Visibility="Visible"
+							Click="btnVoidTransitOrder_Click"
+							Content="作废重拍"
+							Style="{StaticResource BasePageButtonLightStyle}"
+							Visibility="Collapsed" />
+
+						<Button
+							x:Name="btnAbnormalOrderRebuy"
+							Height="24"
+							MinWidth="38"
+							Margin="4,0,0,0"
+							HorizontalAlignment="Center"
+							d:Visibility="Visible"
+							Click="btnAbnormalOrderRebuy_Click"
+							Content="异常重拍"
+							Style="{StaticResource BasePageButtonLightStyle}"
+							Visibility="Collapsed" />
+					</WrapPanel>
+				</wpf:TitleContent>
+
+				<!--  直发拍单  -->
+				<wpf:TitleContent>
 					<Button
-						x:Name="btnBuyOrder"
-						Grid.Row="1"
-						Grid.Column="1"
+						x:Name="btnDirectBuyOrder"
 						Height="24"
 						MinWidth="38"
 						Margin="4,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}"
+						Click="btnDirectBuyOrder_Click"
+						Content="直发拍单"
 						Style="{StaticResource BasePageButtonLightStyle}"
-						Visibility="{Binding ItemOrder.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}" />
+						Visibility="{Binding BtnDirectBuyOrderVisibility}" />
+				</wpf:TitleContent>
 
+				<!--  礼品发货  -->
+				<wpf:TitleContent>
 					<Button
-						x:Name="btnVoidTransitOrder"
-						Grid.Row="2"
-						Grid.Column="1"
+						x:Name="btnShipGift"
 						Height="24"
 						MinWidth="38"
 						Margin="4,0,0,0"
 						HorizontalAlignment="Center"
 						d:Visibility="Visible"
-						Click="btnVoidTransitOrder_Click"
-						Content="作废重拍"
+						Click="btn_ShipGiftCommand"
+						Content="礼品发货"
 						Style="{StaticResource BasePageButtonLightStyle}"
-						Visibility="Collapsed" />
+						Visibility="{Binding ItemOrder.IsWaitSend, Converter={StaticResource VisibleToVisibilityConverter}}" />
+				</wpf:TitleContent>
 
-					<Button
-						x:Name="btnAbnormalOrderRebuy"
-						Grid.Row="2"
-						Grid.Column="1"
-						Height="24"
-						MinWidth="38"
-						Margin="4,0,0,0"
-						HorizontalAlignment="Center"
-						d:Visibility="Visible"
-						Click="btnAbnormalOrderRebuy_Click"
-						Content="异常重拍"
-						Style="{StaticResource BasePageButtonLightStyle}"
-						Visibility="Collapsed" />
-
-				</WrapPanel>
-				<Button
-					x:Name="btnDirectBuyOrder"
-					Grid.Row="2"
-					Grid.Column="1"
-					Height="24"
-					MinWidth="38"
-					Margin="4,16,0,0"
-					HorizontalAlignment="Center"
-					Click="btnDirectBuyOrder_Click"
-					Content="直发拍单"
-					Style="{StaticResource BasePageButtonLightStyle}"
-					Visibility="{Binding BtnDirectBuyOrderVisibility}" />
-				<Button
-					x:Name="btnShipGift"
-					Grid.Row="3"
-					Grid.Column="1"
-					Height="24"
-					MinWidth="38"
-					Margin="4,16,0,0"
-					HorizontalAlignment="Center"
-					d:Visibility="Visible"
-					Click="btn_ShipGiftCommand"
-					Content="礼品发货"
-					Style="{StaticResource BasePageButtonLightStyle}"
-					Visibility="{Binding ItemOrder.IsWaitSend, Converter={StaticResource VisibleToVisibilityConverter}}" />
-			</Grid>
+			</wpf:SpacingStackPanel>
 		</Grid>
 	</Grid>
 </UserControl>