From 5969736de6a90a1960c441830a2efc9e4313f2f2 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Tue, 15 Nov 2022 11:47:52 +0800
Subject: [PATCH] 1

---
 BBWY.Client/Views/MainWindow.xaml      |  2 +-
 BBWY.Client/Views/Order/OrderList.xaml | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/BBWY.Client/Views/MainWindow.xaml b/BBWY.Client/Views/MainWindow.xaml
index 4524f03a..8e4b7e8f 100644
--- a/BBWY.Client/Views/MainWindow.xaml
+++ b/BBWY.Client/Views/MainWindow.xaml
@@ -26,7 +26,7 @@
                 <!--<TextBlock Text="{Binding GlobalContext.User.TeamName}" Margin="5,0,0,0"/>
                 <TextBlock Text="{Binding GlobalContext.User.Shop.Platform}" Margin="5,0,0,0"/>-->
                 <TextBlock Text="{Binding GlobalContext.User.Shop.ShopName}"  Margin="5,0,0,0"/>
-                <TextBlock Text="v10059" Margin="5,0,0,0"/>
+                <TextBlock Text="v10060" Margin="5,0,0,0"/>
             </StackPanel>
         </Border>
         <Grid Grid.Row="1">
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index da0c7778..ce70ff76 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -167,10 +167,18 @@
                         </TextBlock>
                     </c:BButton.Content>
                 </c:BButton>
-                <c:BButton Content="待出库" Width="100" 
+                <c:BButton Width="100" 
                            Background="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待出库:#8080FF:#F2F2F2}"
                            Foreground="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待出库:White:#4A4A4A}"
-                           Command="{Binding SetOrderStateCommand}" CommandParameter="{x:Static cmodel:OrderState.待出库}"/>
+                           Command="{Binding SetOrderStateCommand}" CommandParameter="{x:Static cmodel:OrderState.待出库}">
+                    <c:BButton.Content>
+                        <TextBlock>
+                            <Run Text="待出库"/>
+                            <Run Text="{Binding WaitOutStoreCount,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
+                                 Foreground="{StaticResource Text.Pink}"/>
+                        </TextBlock>
+                    </c:BButton.Content>
+                </c:BButton>
                 <c:BButton Content="待收货" Width="100" 
                            Background="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待收货:#8080FF:#F2F2F2}"
                            Foreground="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待收货:White:#4A4A4A}"