修改订单列表页UI

This commit is contained in:
chfei committed 2026-09-08 10:10:01 +08:00
1 parent 599b74a880
commit 7a4dba5cd8
1 file changed
+130 -390
@@ -9,8 +9,8 @@
xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls" xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
xmlns:wpf="WPFCommon" xmlns:wpf="WPFCommon"
d:Background="White" d:Background="White"
d:DesignHeight="220" d:DesignHeight="320"
d:DesignWidth="1300" d:DesignWidth="1800"
DataContextChanged="UserControl_DataContextChanged" DataContextChanged="UserControl_DataContextChanged"
mc:Ignorable="d"> mc:Ignorable="d">
<UserControl.Resources> <UserControl.Resources>
@@ -20,11 +20,23 @@
<Style BasedOn="{StaticResource TitleContentBaseStyle}" TargetType="wpf:TitleContent"> <Style BasedOn="{StaticResource TitleContentBaseStyle}" TargetType="wpf:TitleContent">
<Setter Property="Placement" Value="Left" /> <Setter Property="Placement" Value="Left" />
<Setter Property="TitleVerticalAlignment" Value="Center" />
<Setter Property="LeftTitlePadding" Value="0,0,0,0" /> <Setter Property="LeftTitlePadding" Value="0,0,0,0" />
</Style> </Style>
<Style TargetType="wpf:SpacingStackPanel"> <Style TargetType="wpf:SpacingStackPanel">
<Setter Property="Margin" Value="3,0" /> <Setter Property="Margin" Value="3,0" />
</Style> </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> </UserControl.Resources>
<Grid> <Grid>
@@ -43,7 +55,7 @@
<ColumnDefinition Width="200*" /> <ColumnDefinition Width="200*" />
<ColumnDefinition Width="100*" MinWidth="200" /> <ColumnDefinition Width="100*" MinWidth="200" />
<ColumnDefinition Width="75*" MinWidth="150" /> <ColumnDefinition Width="75*" MinWidth="150" />
<ColumnDefinition Width="170*" /> <ColumnDefinition Width="170*" MinWidth="380" />
<ColumnDefinition Width="120*" /> <ColumnDefinition Width="120*" />
<ColumnDefinition Width="120*" /> <ColumnDefinition Width="120*" />
<ColumnDefinition Width="72*" /> <ColumnDefinition Width="72*" />
@@ -314,30 +326,16 @@
</wpf:SpacingStackPanel> </wpf:SpacingStackPanel>
<!-- 订单状态/地址 --> <!-- 订单状态/地址 -->
<Grid <wpf:SpacingStackPanel
Grid.Column="5" Grid.Column="5"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent"> Orientation="Vertical"
<Grid.RowDefinitions> VerticalSpacing="2">
<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>
<WrapPanel <!-- 状态标签行(原 Row 1) -->
Grid.Column="1" <WrapPanel HorizontalAlignment="Center" VerticalAlignment="Center">
HorizontalAlignment="Center"
VerticalAlignment="Center">
<Border <Border
Name="b_gift" Name="b_gift"
Grid.Row="1"
Height="auto" Height="auto"
MinWidth="30" MinWidth="30"
Margin="8,0,0,0" Margin="8,0,0,0"
@@ -376,11 +374,8 @@
Foreground="{Binding ElementName=b_gift, Path=BorderBrush}" Foreground="{Binding ElementName=b_gift, Path=BorderBrush}"
Text="{Binding ItemOrder.GiftOrderStatusStr}" /> Text="{Binding ItemOrder.GiftOrderStatusStr}" />
</WrapPanel> </WrapPanel>
</Border> </Border>
<Border <Border
Grid.Row="1"
Height="auto" Height="auto"
MinWidth="30" MinWidth="30"
Margin="8,0,0,0" Margin="8,0,0,0"
@@ -391,22 +386,17 @@
BorderBrush="{Binding OrderItemStatusBorderColor}" BorderBrush="{Binding OrderItemStatusBorderColor}"
BorderThickness="1" BorderThickness="1"
CornerRadius="2"> CornerRadius="2">
<TextBox <TextBlock
Grid.Column="1"
MinWidth="20" MinWidth="20"
Margin="2,0,2,0" Margin="2,0,2,0"
VerticalAlignment="Center" VerticalAlignment="Center"
VerticalContentAlignment="Center"
d:Foreground="{StaticResource pageColorBrush}" d:Foreground="{StaticResource pageColorBrush}"
d:Text="订单状态" d:Text="订单状态"
Background="Transparent" Background="Transparent"
BorderThickness="0"
Foreground="{Binding OrderItemStatusStrColor}" Foreground="{Binding OrderItemStatusStrColor}"
IsReadOnly="True"
Text="{Binding OrderItemStatusStr}" /> Text="{Binding OrderItemStatusStr}" />
</Border> </Border>
<Border <Border
Grid.Row="1"
Height="auto" Height="auto"
MinWidth="30" MinWidth="30"
Margin="8,0,0,0" Margin="8,0,0,0"
@@ -416,85 +406,57 @@
BorderThickness="1" BorderThickness="1"
CornerRadius="2" CornerRadius="2"
Visibility="{Binding ElementName=txtWaybillException, Path=Text, Converter={StaticResource HasTextVisibility}}"> Visibility="{Binding ElementName=txtWaybillException, Path=Text, Converter={StaticResource HasTextVisibility}}">
<TextBox <TextBlock
x:Name="txtWaybillException" x:Name="txtWaybillException"
Grid.Column="1"
MinWidth="20" MinWidth="20"
Margin="2,0,2,0" Margin="2,0,2,0"
VerticalAlignment="Center" VerticalAlignment="Center"
VerticalContentAlignment="Center"
d:Text="物流异常" d:Text="物流异常"
Background="Transparent" Background="Transparent"
BorderThickness="0"
Foreground="{StaticResource PageWarningBrush}" Foreground="{StaticResource PageWarningBrush}"
IsReadOnly="True"
Text="{Binding ShopWaybillExceptionStr}" /> Text="{Binding ShopWaybillExceptionStr}" />
</Border> </Border>
</WrapPanel> </WrapPanel>
<TextBox
<!-- 售后状态 -->
<TextBlock
x:Name="txtStatusStr" x:Name="txtStatusStr"
Grid.Row="2"
Grid.Column="1"
Margin="0,2,0,2"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Top" VerticalAlignment="Top"
d:Text="售后状态" d:Text="售后状态"
Background="Transparent" Background="Transparent"
BorderThickness="0"
Foreground="{Binding ItemRefund.RefundStatusColor}" Foreground="{Binding ItemRefund.RefundStatusColor}"
IsReadOnly="True"
Text="{Binding ItemRefund.RefundStatusStr}" Text="{Binding ItemRefund.RefundStatusStr}"
Visibility="{Binding ElementName=txtStatusStr, Path=Text, Converter={StaticResource HasTextVisibility}}" /> Visibility="{Binding ElementName=txtStatusStr, Path=Text, Converter={StaticResource HasTextVisibility}}" />
<TextBox <!-- 售后原因 -->
<TextBlock
x:Name="txtRefundReasonTextStr" x:Name="txtRefundReasonTextStr"
Grid.Row="3"
Grid.Column="1"
Margin="0,2,0,2"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Top" VerticalAlignment="Top"
d:Text="售后原因" d:Text="售后原因"
Background="Transparent" Background="Transparent"
BorderThickness="0"
Foreground="#f56c6c" Foreground="#f56c6c"
IsReadOnly="True"
Text="{Binding ItemRefund.reasonTextStr}" Text="{Binding ItemRefund.reasonTextStr}"
Visibility="{Binding ElementName=txtRefundReasonTextStr, Path=Text, Converter={StaticResource HasTextVisibility}}" /> Visibility="{Binding ElementName=txtRefundReasonTextStr, Path=Text, Converter={StaticResource HasTextVisibility}}" />
<TextBox
<!-- 售后结果 -->
<TextBlock
x:Name="txtRefundResult" x:Name="txtRefundResult"
Grid.Row="4"
Grid.Column="1"
Margin="0,2,0,2"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Top" VerticalAlignment="Top"
d:Text="售后结果" d:Text="售后结果"
Background="Transparent" Background="Transparent"
BorderThickness="0"
Foreground="#f56c6c" Foreground="#f56c6c"
IsReadOnly="True"
Text="{Binding RefundResultStr}" Text="{Binding RefundResultStr}"
Visibility="{Binding ElementName=txtRefundResult, Path=Text, Converter={StaticResource HasTextVisibility}}" /> Visibility="{Binding ElementName=txtRefundResult, Path=Text, Converter={StaticResource HasTextVisibility}}" />
<WrapPanel <!-- 收货地址 -->
Grid.Row="5" <wpf:TitleContent Title="收货地址:">
Grid.Column="1" <WrapPanel Orientation="Horizontal">
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 <uc:UcWaterMarkTextBox1
x:Name="txtUserAddress" x:Name="txtUserAddress"
Grid.Row="5" VerticalAlignment="Center"
Grid.Column="1" d:Text="胡xx 18990991234 辽宁省朝阳市 北漂.."
Margin="0,2,4,2"
VerticalAlignment="Top"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
IsReadOnly="True" IsReadOnly="True"
@@ -503,7 +465,6 @@
ToolTip="{Binding ItemOrder.AddressStr}" ToolTip="{Binding ItemOrder.AddressStr}"
WaterMark="收货地址" /> WaterMark="收货地址" />
<Border <Border
Grid.Column="6"
Width="12" Width="12"
Height="12" Height="12"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -512,7 +473,6 @@
MouseLeftButtonDown="pathCopyAddress_MouseLeftButtonDown" MouseLeftButtonDown="pathCopyAddress_MouseLeftButtonDown"
Visibility="{Binding ElementName=txtUserAddress, Path=Visibility}"> Visibility="{Binding ElementName=txtUserAddress, Path=Visibility}">
<Path <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" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
Fill="{StaticResource PageLinkBrush}" Fill="{StaticResource PageLinkBrush}"
MouseLeftButtonDown="pathCopyAddress_MouseLeftButtonDown" MouseLeftButtonDown="pathCopyAddress_MouseLeftButtonDown"
@@ -521,6 +481,7 @@
<Button <Button
x:Name="btnSeeAddressDetail" x:Name="btnSeeAddressDetail"
Margin="4,0,0,0" Margin="4,0,0,0"
Padding="0"
Background="Transparent" Background="Transparent"
BorderBrush="Transparent" BorderBrush="Transparent"
Click="btnSeeAddressDetail_Click" Click="btnSeeAddressDetail_Click"
@@ -529,25 +490,16 @@
Foreground="{StaticResource PageLinkBrush}" Foreground="{StaticResource PageLinkBrush}"
Tag="{Binding order_id}" /> Tag="{Binding order_id}" />
</WrapPanel> </WrapPanel>
<!--<Button Grid.Column="1" Grid.Row="6" x:Name="btnGetRefundAddress" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent" </wpf:TitleContent>
Margin="4,0,0,0" Content="仓库退货地址:点击复制" Click="btnGetRefundAddress_Click" Tag="{Binding order_id}"></Button>-->
<WrapPanel <!-- 退款单号 -->
Grid.Row="6" <wpf:TitleContent Title="退款单号:" Visibility="{Binding ElementName=txtRefundId, Path=Visibility}">
Grid.Column="1" <WrapPanel Orientation="Horizontal">
Width="auto"
HorizontalAlignment="Center"
Orientation="Horizontal">
<TextBlock
VerticalAlignment="Center"
Text="退款单号:"
Visibility="{Binding ElementName=txtRefundId, Path=Visibility}" />
<uc:UcWaterMarkTextBox1 <uc:UcWaterMarkTextBox1
x:Name="txtRefundId" x:Name="txtRefundId"
Grid.Row="6"
Grid.Column="1"
Margin="0,2,4,2"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
d:Text="20003030304040"
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
Cursor="Hand" Cursor="Hand"
@@ -558,43 +510,30 @@
Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}" Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}"
WaterMark="退款单号" /> WaterMark="退款单号" />
<Border <Border
Grid.Column="6"
Width="12" Width="12"
Height="12" Height="12"
Margin="4,0,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent" Background="Transparent"
Cursor="Hand" Cursor="Hand"
MouseLeftButtonDown="pathRefundId_MouseLeftButtonDown" MouseLeftButtonDown="pathRefundId_MouseLeftButtonDown"
Visibility="{Binding ElementName=txtRefundId, Path=Visibility}"> Visibility="{Binding ElementName=txtRefundId, Path=Visibility}">
<Path <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" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
Fill="{StaticResource PageLinkBrush}" Fill="{StaticResource PageLinkBrush}"
MouseLeftButtonDown="pathRefundId_MouseLeftButtonDown" MouseLeftButtonDown="pathRefundId_MouseLeftButtonDown"
Stretch="Uniform" /> Stretch="Uniform" />
</Border> </Border>
</WrapPanel> </WrapPanel>
<WrapPanel </wpf:TitleContent>
Grid.Row="7"
Width="auto" <!-- 退货地址 -->
HorizontalAlignment="Center" <wpf:TitleContent Title="退货地址:" Visibility="{Binding RefundAddressStr, Converter={StaticResource HasTextVisibility}}">
Orientation="Horizontal" <WrapPanel 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 <uc:UcWaterMarkTextBox1
x:Name="txtRefundAddress" x:Name="txtRefundAddress"
Grid.Row="5"
Grid.Column="1"
Margin="0,2,4,2"
VerticalAlignment="Top" VerticalAlignment="Top"
d:Text="胡xx 18990991234 辽宁省朝阳市 北漂.."
Background="Transparent" Background="Transparent"
BorderThickness="0" BorderThickness="0"
IsReadOnly="True" IsReadOnly="True"
@@ -603,23 +542,24 @@
ToolTip="{Binding RefundAddressStr}" ToolTip="{Binding RefundAddressStr}"
WaterMark="退货地址" /> WaterMark="退货地址" />
<Border <Border
Grid.Column="6"
Width="12" Width="12"
Height="12" Height="12"
Margin="4,0,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent" Background="Transparent"
Cursor="Hand" Cursor="Hand"
MouseLeftButtonDown="pathCopyRefundAddress_MouseLeftButtonDown" MouseLeftButtonDown="pathCopyRefundAddress_MouseLeftButtonDown"
Visibility="{Binding ElementName=txtUserAddress, Path=Visibility}"> Visibility="{Binding ElementName=txtUserAddress, Path=Visibility}">
<Path <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" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
Fill="{StaticResource PageLinkBrush}" Fill="{StaticResource PageLinkBrush}"
MouseLeftButtonDown="pathCopyRefundAddress_MouseLeftButtonDown" MouseLeftButtonDown="pathCopyRefundAddress_MouseLeftButtonDown"
Stretch="Uniform" /> Stretch="Uniform" />
</Border> </Border>
</WrapPanel> </WrapPanel>
</Grid> </wpf:TitleContent>
</wpf:SpacingStackPanel>
<!-- 单号 --> <!-- 单号 -->
<wpf:SpacingStackPanel <wpf:SpacingStackPanel
Grid.Column="6" Grid.Column="6"
@@ -650,16 +590,13 @@
BorderThickness="1" BorderThickness="1"
CornerRadius="2" CornerRadius="2"
Visibility="{Binding BuyerTransitWaybillStatusStr, Converter={StaticResource HasTextVisibility}}"> Visibility="{Binding BuyerTransitWaybillStatusStr, Converter={StaticResource HasTextVisibility}}">
<TextBox <TextBlock
x:Name="txtBuyStatus" x:Name="txtBuyStatus"
MinWidth="20" MinWidth="20"
VerticalAlignment="Center" VerticalAlignment="Center"
VerticalContentAlignment="Center"
d:Text="买手状态" d:Text="买手状态"
Background="Transparent" Background="Transparent"
BorderThickness="0"
Foreground="{Binding BuyerTransitWaybillStatusStrColor}" Foreground="{Binding BuyerTransitWaybillStatusStrColor}"
IsReadOnly="True"
Text="{Binding BuyerTransitWaybillStatusStr}" /> Text="{Binding BuyerTransitWaybillStatusStr}" />
</Border> </Border>
<Border <Border
@@ -675,16 +612,13 @@
BorderThickness="1" BorderThickness="1"
CornerRadius="2" CornerRadius="2"
Visibility="{Binding WarehouseWaybillStatusStr, Converter={StaticResource HasTextVisibility}}"> Visibility="{Binding WarehouseWaybillStatusStr, Converter={StaticResource HasTextVisibility}}">
<TextBox <TextBlock
x:Name="txtWarehouseStatus" x:Name="txtWarehouseStatus"
MinWidth="20" MinWidth="20"
VerticalAlignment="Center" VerticalAlignment="Center"
VerticalContentAlignment="Center"
d:Text="仓库状态" d:Text="仓库状态"
Background="Transparent" Background="Transparent"
BorderThickness="0"
Foreground="{Binding WarehouseWaybillStatusStrColor}" Foreground="{Binding WarehouseWaybillStatusStrColor}"
IsReadOnly="True"
MouseEnter="txtWarehouseStatus_MouseEnter" MouseEnter="txtWarehouseStatus_MouseEnter"
Text="{Binding WarehouseWaybillStatusStr}" /> Text="{Binding WarehouseWaybillStatusStr}" />
</Border> </Border>
@@ -698,16 +632,13 @@
BorderThickness="1" BorderThickness="1"
CornerRadius="2" CornerRadius="2"
Visibility="{Binding TransitRefundVoidStatusStr, Converter={StaticResource HasTextVisibility}}"> Visibility="{Binding TransitRefundVoidStatusStr, Converter={StaticResource HasTextVisibility}}">
<TextBox <TextBlock
MinWidth="20" MinWidth="20"
Padding="0" Padding="0"
VerticalAlignment="Center" VerticalAlignment="Center"
VerticalContentAlignment="Center"
d:Text="作废状态" d:Text="作废状态"
Background="Transparent" Background="Transparent"
BorderThickness="0"
Foreground="White" Foreground="White"
IsReadOnly="True"
Text="{Binding TransitRefundVoidStatusStr}" /> Text="{Binding TransitRefundVoidStatusStr}" />
</Border> </Border>
</WrapPanel> </WrapPanel>
@@ -745,17 +676,14 @@
BorderThickness="1" BorderThickness="1"
CornerRadius="2" CornerRadius="2"
Visibility="{Binding TransitRefundStatusStr, Converter={StaticResource HasTextVisibility}}"> Visibility="{Binding TransitRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
<TextBox <TextBlock
x:Name="txtRefundStatus" x:Name="txtRefundStatus"
MinWidth="20" MinWidth="20"
Padding="0" Padding="0"
VerticalAlignment="Center" VerticalAlignment="Center"
VerticalContentAlignment="Center"
d:Text="买手退货状态" d:Text="买手退货状态"
Background="Transparent" Background="Transparent"
BorderThickness="0"
Foreground="White" Foreground="White"
IsReadOnly="True"
Text="{Binding TransitRefundStatusStr}" /> Text="{Binding TransitRefundStatusStr}" />
</Border> </Border>
</WrapPanel> </WrapPanel>
@@ -895,17 +823,14 @@
BorderThickness="1" BorderThickness="1"
CornerRadius="2" CornerRadius="2"
Visibility="{Binding DirectRefundStatusStr, Converter={StaticResource HasTextVisibility}}"> Visibility="{Binding DirectRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
<TextBox <TextBlock
x:Name="txtOutBuyerRefundStatus" x:Name="txtOutBuyerRefundStatus"
MinWidth="20" MinWidth="20"
Padding="0" Padding="0"
VerticalAlignment="Center" VerticalAlignment="Center"
VerticalContentAlignment="Center"
d:Text="直发买手退货状态" d:Text="直发买手退货状态"
Background="Transparent" Background="Transparent"
BorderThickness="0"
Foreground="White" Foreground="White"
IsReadOnly="True"
Text="{Binding DirectRefundStatusStr}" /> Text="{Binding DirectRefundStatusStr}" />
</Border> </Border>
</WrapPanel> </WrapPanel>
@@ -1025,68 +950,28 @@
</wpf:SpacingStackPanel> </wpf:SpacingStackPanel>
<!-- 备注 --> <!-- 备注 -->
<Grid <wpf:SpacingStackPanel
Grid.Column="7" Grid.Column="7"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent"> Orientation="Vertical"
<Grid.RowDefinitions> VerticalSpacing="2">
<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>
<WrapPanel <!-- 买家留言 -->
Grid.Row="1" <wpf:TitleContent Title="买家留言:">
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="买家留言:" />
<uc:UcWaterMarkTextBox1 <uc:UcWaterMarkTextBox1
Grid.Row="1"
Grid.Column="1"
Margin="0,1,0,1"
VerticalAlignment="Top"
Background="Transparent" Background="Transparent"
BorderThickness="1" BorderThickness="1"
IsReadOnly="True" IsReadOnly="True"
Text="" Text=""
TextWrapping="Wrap" TextWrapping="Wrap"
WaterMark="买家留言" /> WaterMark="买家留言" />
</WrapPanel> </wpf:TitleContent>
<WrapPanel <!-- 店铺备注 -->
Grid.Row="2" <wpf:TitleContent Title="店铺备注:">
Grid.Column="1" <WrapPanel Orientation="Horizontal">
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 <uc:UcWaterMarkTextBox1
x:Name="txtShopRemark" x:Name="txtShopRemark"
Grid.Row="2"
Grid.Column="1"
Margin="0,1,0,1" Margin="0,1,0,1"
VerticalAlignment="Top" VerticalAlignment="Top"
Background="Transparent" Background="Transparent"
@@ -1094,51 +979,28 @@
IsReadOnly="True" IsReadOnly="True"
Text="{Binding ItemOrder.shop_remark}" Text="{Binding ItemOrder.shop_remark}"
TextWrapping="Wrap" TextWrapping="Wrap"
Visibility="Visible"
WaterMark="店铺备注" /> WaterMark="店铺备注" />
<Button <Button
x:Name="btnEditShopRemark" x:Name="btnEditShopRemark"
Grid.Row="2"
Grid.Column="1"
Margin="2,0,0,0"
HorizontalAlignment="Center"
Background="Transparent"
BorderBrush="Transparent"
Click="btnEditShopRemark_Click" Click="btnEditShopRemark_Click"
Content="编辑" Content="编辑"
Cursor="Hand" Style="{StaticResource LinkButton}" />
Foreground="{StaticResource PageLinkBrush}" />
<Button <Button
x:Name="btnCancelEditShopRemark" x:Name="btnCancelEditShopRemark"
Grid.Row="2" d:Visibility="Visible"
Grid.Column="1"
Margin="0,0,0,0"
HorizontalAlignment="Center"
Background="Transparent"
BorderBrush="Transparent"
Click="btnCancelEditShopRemark_Click" Click="btnCancelEditShopRemark_Click"
Content="取消" Content="取消"
Cursor="Hand" Style="{StaticResource LinkButton}"
Foreground="{StaticResource PageLinkBrush}"
Visibility="Collapsed" /> Visibility="Collapsed" />
</WrapPanel> </WrapPanel>
<WrapPanel </wpf:TitleContent>
Grid.Row="3"
Grid.Column="1" <!-- 软件备注 -->
Orientation="Horizontal"> <wpf:TitleContent Title="软件备注:">
<TextBox <WrapPanel Orientation="Horizontal">
Grid.Row="2"
Grid.Column="1"
Margin="0,1,-8,1"
VerticalAlignment="Top"
Background="Transparent"
BorderBrush="Transparent"
BorderThickness="1"
IsReadOnly="True"
Text="软件备注:" />
<uc:UcWaterMarkTextBox1 <uc:UcWaterMarkTextBox1
x:Name="txtAppRemark" x:Name="txtAppRemark"
Grid.Row="2"
Grid.Column="1"
Margin="0,1,0,1" Margin="0,1,0,1"
VerticalAlignment="Top" VerticalAlignment="Top"
Background="Transparent" Background="Transparent"
@@ -1149,49 +1011,24 @@
WaterMark="软件备注" /> WaterMark="软件备注" />
<Button <Button
x:Name="btnEditAppRemark" x:Name="btnEditAppRemark"
Grid.Row="2"
Grid.Column="1"
Margin="2,0,0,0"
HorizontalAlignment="Center"
Background="Transparent"
BorderBrush="Transparent"
Click="btnEditAppRemark_Click" Click="btnEditAppRemark_Click"
Content="编辑" Content="编辑"
Cursor="Hand" Style="{StaticResource LinkButton}" />
Foreground="{StaticResource PageLinkBrush}" />
<Button <Button
x:Name="btnCancelEditAppRemark" x:Name="btnCancelEditAppRemark"
Grid.Row="2" d:Visibility="Visible"
Grid.Column="1"
Margin="0,0,0,0"
HorizontalAlignment="Center"
Background="Transparent"
BorderBrush="Transparent"
Click="btnCancelEditAppRemark_Click" Click="btnCancelEditAppRemark_Click"
Content="取消" Content="取消"
Cursor="Hand" Style="{StaticResource LinkButton}"
Foreground="{StaticResource PageLinkBrush}"
Visibility="Collapsed" /> Visibility="Collapsed" />
</WrapPanel> </WrapPanel>
<WrapPanel </wpf:TitleContent>
Grid.Row="4"
Grid.Column="1" <!-- 中转仓拒收 -->
Orientation="Horizontal" <wpf:TitleContent Title="中转仓拒收:" Visibility="{Binding AddEditTransitWarehouseRejectStr, Converter={StaticResource HasTextVisibility}}">
Visibility="{Binding AddEditTransitWarehouseRejectStr, Converter={StaticResource HasTextVisibility}}"> <WrapPanel 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 <uc:UcWaterMarkTextBox1
x:Name="txtTransitWarehouseRejectSuccessTime" x:Name="txtTransitWarehouseRejectSuccessTime"
Grid.Row="2"
Grid.Column="1"
Margin="0,1,0,1" Margin="0,1,0,1"
VerticalAlignment="Top" VerticalAlignment="Top"
Background="Transparent" Background="Transparent"
@@ -1202,51 +1039,25 @@
WaterMark="中转仓拒收" /> WaterMark="中转仓拒收" />
<Button <Button
x:Name="btnAddEditTransitWarehouseReject" x:Name="btnAddEditTransitWarehouseReject"
Grid.Row="2"
Grid.Column="1"
Margin="2,0,0,0"
HorizontalAlignment="Center"
d:Content="申请" d:Content="申请"
Background="Transparent"
BorderBrush="Transparent"
Click="btnAddEditTransitWarehouseReject_Click" Click="btnAddEditTransitWarehouseReject_Click"
Content="{Binding AddEditTransitWarehouseRejectStr}" Content="{Binding AddEditTransitWarehouseRejectStr}"
Cursor="Hand" Style="{StaticResource LinkButton}" />
Foreground="{StaticResource PageLinkBrush}" />
<Button <Button
x:Name="btnPddRefundTransitWarehouseRejectOrder" x:Name="btnPddRefundTransitWarehouseRejectOrder"
Grid.Row="2"
Grid.Column="1"
Margin="2,0,0,0"
HorizontalAlignment="Center"
d:Visibility="Visible" d:Visibility="Visible"
Background="Transparent"
BorderBrush="Transparent"
Click="btnPddRefundTransitWarehouseRejectOrder_Click" Click="btnPddRefundTransitWarehouseRejectOrder_Click"
Content="测试退货" Content="测试退货"
Cursor="Hand" Style="{StaticResource LinkButton}"
Foreground="{StaticResource PageLinkBrush}"
Visibility="Collapsed" /> Visibility="Collapsed" />
</WrapPanel> </WrapPanel>
<WrapPanel </wpf:TitleContent>
Grid.Row="5"
Grid.Column="1" <!-- 拦截退回总店 -->
Orientation="Horizontal" <wpf:TitleContent Title="拦截退回总店:" Visibility="{Binding AddEditTransitWarehouseAfterSaleStr, Converter={StaticResource HasTextVisibility}}">
Visibility="{Binding AddEditTransitWarehouseAfterSaleStr, Converter={StaticResource HasTextVisibility}}"> <WrapPanel 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 <uc:UcWaterMarkTextBox1
x:Name="txtTransitWarehouseAfterSale" x:Name="txtTransitWarehouseAfterSale"
Grid.Row="2"
Grid.Column="1"
Margin="0,1,0,1" Margin="0,1,0,1"
VerticalAlignment="Top" VerticalAlignment="Top"
Background="Transparent" Background="Transparent"
@@ -1255,41 +1066,20 @@
Text="{Binding TransitWarehouseAfterSaleWayBillStr}" Text="{Binding TransitWarehouseAfterSaleWayBillStr}"
TextWrapping="Wrap" TextWrapping="Wrap"
WaterMark="拦截退回总店" /> WaterMark="拦截退回总店" />
<!-- Visibility="{Binding Text,RelativeSource={RelativeSource Self},Converter={StaticResource HasTextVisibility}}" -->
<Button <Button
x:Name="btnAddEditTransitWarehouseAfterSale" x:Name="btnAddEditTransitWarehouseAfterSale"
Grid.Row="2"
Grid.Column="1"
Margin="2,0,0,0"
HorizontalAlignment="Center"
d:Content="添加" d:Content="添加"
Background="Transparent"
BorderBrush="Transparent"
Click="btnAddEditTransitWarehouseAfterSale_Click" Click="btnAddEditTransitWarehouseAfterSale_Click"
Content="{Binding AddEditTransitWarehouseAfterSaleStr}" Content="{Binding AddEditTransitWarehouseAfterSaleStr}"
Cursor="Hand" Style="{StaticResource LinkButton}" />
Foreground="{StaticResource PageLinkBrush}" />
</WrapPanel> </WrapPanel>
<WrapPanel </wpf:TitleContent>
Grid.Row="6"
Grid.Column="1" <!-- 云仓退货 -->
Width="auto" <wpf:TitleContent Title="云仓退货:" Visibility="{Binding AddEditTransitWarehouseReturnOrderStr, Converter={StaticResource HasTextVisibility}}">
Orientation="Horizontal" <WrapPanel 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 <uc:UcWaterMarkTextBox1
x:Name="txtTransitReturnOrderWaybill" x:Name="txtTransitReturnOrderWaybill"
Grid.Row="2"
Grid.Column="1"
Margin="0,1,0,1" Margin="0,1,0,1"
VerticalAlignment="Top" VerticalAlignment="Top"
Background="Transparent" Background="Transparent"
@@ -1300,39 +1090,21 @@
WaterMark="云仓退货" /> WaterMark="云仓退货" />
<Button <Button
x:Name="btnRetrunOrder" x:Name="btnRetrunOrder"
Grid.Row="2"
Grid.Column="1"
Margin="2,0,0,0"
HorizontalAlignment="Center"
d:Content="添加" d:Content="添加"
Background="Transparent"
BorderBrush="Transparent"
Click="btnReturnOrder_Click" Click="btnReturnOrder_Click"
Content="{Binding AddEditTransitWarehouseReturnOrderStr}" Content="{Binding AddEditTransitWarehouseReturnOrderStr}"
Cursor="Hand" Style="{StaticResource LinkButton}" />
Foreground="{StaticResource PageLinkBrush}" />
</WrapPanel> </WrapPanel>
<WrapPanel </wpf:TitleContent>
Grid.Row="7"
Grid.Column="1" <!-- 总店地址 -->
Width="auto" <wpf:TitleContent Title="总店地址:" Visibility="{Binding PddBuyerAfterSaleAddressStr, Converter={StaticResource HasTextVisibility}}">
Orientation="Horizontal" <WrapPanel 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 <uc:UcWaterMarkTextBox1
x:Name="txtBuyerRefundAddress" x:Name="txtBuyerRefundAddress"
Margin="0,1,0,1" Margin="0,1,0,1"
VerticalAlignment="Top" VerticalAlignment="Top"
d:Text="123123123123"
Background="Transparent" Background="Transparent"
BorderThickness="1" BorderThickness="1"
IsReadOnly="True" IsReadOnly="True"
@@ -1342,7 +1114,6 @@
Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}" Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}"
WaterMark="总店退货地址" /> WaterMark="总店退货地址" />
<Border <Border
Grid.Column="6"
Width="12" Width="12"
Height="12" Height="12"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -1351,34 +1122,22 @@
MouseLeftButtonDown="pathBuyerAfterSaleAddress_MouseLeftButtonDown" MouseLeftButtonDown="pathBuyerAfterSaleAddress_MouseLeftButtonDown"
Visibility="{Binding ElementName=txtBuyerRefundAddress, Path=Visibility}"> Visibility="{Binding ElementName=txtBuyerRefundAddress, Path=Visibility}">
<Path <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" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
Fill="{StaticResource PageLinkBrush}" Fill="{StaticResource PageLinkBrush}"
MouseLeftButtonDown="pathBuyerAfterSaleAddress_MouseLeftButtonDown" MouseLeftButtonDown="pathBuyerAfterSaleAddress_MouseLeftButtonDown"
Stretch="Uniform" /> Stretch="Uniform" />
</Border> </Border>
</WrapPanel> </WrapPanel>
</wpf:TitleContent>
<WrapPanel <!-- 直发总店 -->
Grid.Row="8" <wpf:TitleContent Title="直发总店:" Visibility="{Binding DirectPddBuyerAfterSaleAddressStr, Converter={StaticResource HasTextVisibility}}">
Grid.Column="1" <WrapPanel Orientation="Horizontal">
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 <uc:UcWaterMarkTextBox1
x:Name="txtDirectBuyerRefundAddress" x:Name="txtDirectBuyerRefundAddress"
Margin="0,1,0,1" Margin="0,1,0,1"
VerticalAlignment="Top" VerticalAlignment="Top"
d:Text="123123123123"
Background="Transparent" Background="Transparent"
BorderThickness="1" BorderThickness="1"
IsReadOnly="True" IsReadOnly="True"
@@ -1388,7 +1147,6 @@
Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}" Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}"
WaterMark="总店退货地址" /> WaterMark="总店退货地址" />
<Border <Border
Grid.Column="6"
Width="12" Width="12"
Height="12" Height="12"
VerticalAlignment="Center" VerticalAlignment="Center"
@@ -1397,42 +1155,26 @@
MouseLeftButtonDown="pathDirectBuyerAfterSaleAddress_MouseLeftButtonDown" MouseLeftButtonDown="pathDirectBuyerAfterSaleAddress_MouseLeftButtonDown"
Visibility="{Binding ElementName=txtBuyerRefundAddress, Path=Visibility}"> Visibility="{Binding ElementName=txtBuyerRefundAddress, Path=Visibility}">
<Path <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" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z"
Fill="{StaticResource PageLinkBrush}" Fill="{StaticResource PageLinkBrush}"
MouseLeftButtonDown="pathDirectBuyerAfterSaleAddress_MouseLeftButtonDown" MouseLeftButtonDown="pathDirectBuyerAfterSaleAddress_MouseLeftButtonDown"
Stretch="Uniform" /> Stretch="Uniform" />
</Border> </Border>
</WrapPanel> </WrapPanel>
</wpf:TitleContent>
</Grid> </wpf:SpacingStackPanel>
<!-- 操作 --> <!-- 操作 -->
<Grid <wpf:SpacingStackPanel
Grid.Column="8" Grid.Column="8"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="Transparent"> Orientation="Vertical"
<Grid.RowDefinitions> VerticalSpacing="5">
<RowDefinition Height="*" /> <!-- 操作按钮行(原 Row 1) -->
<RowDefinition Height="Auto" /> <wpf:TitleContent>
<RowDefinition Height="Auto" /> <WrapPanel HorizontalAlignment="Center">
<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 <Button
x:Name="btnMapSkus" x:Name="btnMapSkus"
Grid.Row="2"
Grid.Column="1"
Height="24" Height="24"
MinWidth="38" MinWidth="38"
Margin="4,4,0,4" Margin="4,4,0,4"
@@ -1442,11 +1184,8 @@
Style="{StaticResource BasePageButtonLightStyle}" Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding MapSkusBtnVisibility}" /> Visibility="{Binding MapSkusBtnVisibility}" />
<Button <Button
x:Name="btnBuyOrder" x:Name="btnBuyOrder"
Grid.Row="1"
Grid.Column="1"
Height="24" Height="24"
MinWidth="38" MinWidth="38"
Margin="4,0,0,0" Margin="4,0,0,0"
@@ -1467,8 +1206,6 @@
<Button <Button
x:Name="btnVoidTransitOrder" x:Name="btnVoidTransitOrder"
Grid.Row="2"
Grid.Column="1"
Height="24" Height="24"
MinWidth="38" MinWidth="38"
Margin="4,0,0,0" Margin="4,0,0,0"
@@ -1481,8 +1218,6 @@
<Button <Button
x:Name="btnAbnormalOrderRebuy" x:Name="btnAbnormalOrderRebuy"
Grid.Row="2"
Grid.Column="1"
Height="24" Height="24"
MinWidth="38" MinWidth="38"
Margin="4,0,0,0" Margin="4,0,0,0"
@@ -1492,34 +1227,39 @@
Content="异常重拍" Content="异常重拍"
Style="{StaticResource BasePageButtonLightStyle}" Style="{StaticResource BasePageButtonLightStyle}"
Visibility="Collapsed" /> Visibility="Collapsed" />
</WrapPanel> </WrapPanel>
</wpf:TitleContent>
<!-- 直发拍单 -->
<wpf:TitleContent>
<Button <Button
x:Name="btnDirectBuyOrder" x:Name="btnDirectBuyOrder"
Grid.Row="2"
Grid.Column="1"
Height="24" Height="24"
MinWidth="38" MinWidth="38"
Margin="4,16,0,0" Margin="4,0,0,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
Click="btnDirectBuyOrder_Click" Click="btnDirectBuyOrder_Click"
Content="直发拍单" Content="直发拍单"
Style="{StaticResource BasePageButtonLightStyle}" Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding BtnDirectBuyOrderVisibility}" /> Visibility="{Binding BtnDirectBuyOrderVisibility}" />
</wpf:TitleContent>
<!-- 礼品发货 -->
<wpf:TitleContent>
<Button <Button
x:Name="btnShipGift" x:Name="btnShipGift"
Grid.Row="3"
Grid.Column="1"
Height="24" Height="24"
MinWidth="38" MinWidth="38"
Margin="4,16,0,0" Margin="4,0,0,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
d:Visibility="Visible" d:Visibility="Visible"
Click="btn_ShipGiftCommand" Click="btn_ShipGiftCommand"
Content="礼品发货" Content="礼品发货"
Style="{StaticResource BasePageButtonLightStyle}" Style="{StaticResource BasePageButtonLightStyle}"
Visibility="{Binding ItemOrder.IsWaitSend, Converter={StaticResource VisibleToVisibilityConverter}}" /> Visibility="{Binding ItemOrder.IsWaitSend, Converter={StaticResource VisibleToVisibilityConverter}}" />
</Grid> </wpf:TitleContent>
</wpf:SpacingStackPanel>
</Grid> </Grid>
</Grid> </Grid>
</UserControl> </UserControl>