From 7f1f6421a81d66413b6a9294c7cb4ca89cc1b057 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Thu, 18 May 2023 23:54:56 +0800
Subject: [PATCH] 1

---
 BBWYB.Client/Views/Order/OrderList.xaml | 49 ++++++++++++++-----------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/BBWYB.Client/Views/Order/OrderList.xaml b/BBWYB.Client/Views/Order/OrderList.xaml
index 23f31ad..bc3dcec 100644
--- a/BBWYB.Client/Views/Order/OrderList.xaml
+++ b/BBWYB.Client/Views/Order/OrderList.xaml
@@ -390,6 +390,33 @@
                                     </StackPanel>
                                     <Border VerticalAlignment="Bottom" Height="1" Background="{StaticResource Border.Brush}"/>
                                 </Grid>
+
+                                <Grid  HorizontalAlignment="Right" Margin="0 0 30 0 ">
+                                    <StackPanel Height="70"  Grid.Column="7" VerticalAlignment="Center" Orientation="Horizontal" HorizontalAlignment="Center">
+                                        <c:BButton Content="取消" Style="{StaticResource LinkButton}"
+                                                   Command="{Binding DataContext.CancelOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
+                                                   CommandParameter="{Binding Id}">
+                                            <c:BButton.Visibility>
+                                                <MultiBinding Converter="{StaticResource mobjConverter}"
+                                                              ConverterParameter="已取消;true:|:Collapsed:Visible:1">
+                                                    <Binding Path="OrderState" />
+                                                    <Binding Path="IsPurchased"/>
+                                                </MultiBinding>
+                                            </c:BButton.Visibility>
+                                        </c:BButton>
+                                        <c:BButton Content="改价" Margin="5,0,0,0"
+                                                   Command="{Binding DataContext.EditPriceCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
+                                                   CommandParameter="{Binding }"
+                                                   Style="{StaticResource LinkButton}"
+                                                   Visibility="{Binding OrderState,ConverterParameter=已取消:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
+
+                                        <c:BButton Content="配置" Margin="5,0,0,0"
+                                                   Command="{Binding DataContext.EditPackConfigCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox}}}"
+                                                   CommandParameter="{Binding }"     
+                                                   Style="{StaticResource LinkButton}"
+                                                   Visibility="{Binding PackConfigState ,ConverterParameter=#null:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
+                                    </StackPanel>
+                                </Grid>
                                 <Grid Grid.Row="1">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="350"/>
@@ -723,28 +750,6 @@
                                             <DataTemplate>
                                                 <Grid Width="{Binding ActualWidth,ElementName=lbSet}" MinHeight="90">
                                                     <StackPanel  Orientation="Vertical"  Grid.Column="7"  VerticalAlignment="Center"  HorizontalAlignment="Center">
-                                                        <!--DataContext="{Binding DataContext,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}}"-->
-                                                        <StackPanel Orientation="Horizontal" DataContext="{Binding DataContext,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type ListBox},AncestorLevel=1}}" >
-                                                            <c:BButton Content="取消" Style="{StaticResource LinkButton}"
-                                                   Command="{Binding DataContext.CancelOrderCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
-                                                   CommandParameter="{Binding Id}">
-                                                                <!--OrderId-->
-                                                                <c:BButton.Visibility>
-                                                                    <MultiBinding Converter="{StaticResource mobjConverter}"
-                                                              ConverterParameter="已取消;true:|:Collapsed:Visible:1">
-                                                                        <Binding Path="OrderState"  />
-                                                                        <Binding Path="IsPurchased"  />
-                                                                    </MultiBinding>
-                                                                </c:BButton.Visibility>
-                                                            </c:BButton>
-                                                            <c:BButton Content="改价" Margin="5,0,0,0"
-                                                   Command="{Binding DataContext.EditPriceCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page    }}}"
-                                                   CommandParameter="{Binding }"
-                                                   Style="{StaticResource LinkButton}"
-                                                   Visibility="{Binding OrderState,ConverterParameter=已取消:Collapsed:Visible,Converter={StaticResource objConverter}}"/>
-                                                        </StackPanel>
-
-
                                                         <StackPanel Margin="0 5 0 0" Visibility="{Binding DataContext.OrderState,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}},Converter={StaticResource objConverter},ConverterParameter=待配置:Visible:Collapsed}">
                                                             <c:BButton Content="{Binding PackConfigState,Converter={StaticResource objConverter},ConverterParameter=已配置:修改配置:配置}" Margin="5,0,0,0"
                                                    Command="{Binding DataContext.EditPackConfigCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"