From bf3a06c0b07a26e3b25a87dea6cc8ddde9ff3e29 Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Thu, 22 Jun 2023 13:59:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A1=AE=E8=AE=A4=E6=94=B6?=
 =?UTF-8?q?=E8=B4=A7=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs                     |  2 +-
 .../Views/PackTask/WareHouseListControl.xaml     | 16 +++-------------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index 91ad6e11..ca99fbe9 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -13,7 +13,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10131";
+            ClientVersion = "10132";
         }
 
         private User user;
diff --git a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
index 7eb84f49..62dc7c9f 100644
--- a/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
+++ b/BBWY.Client/Views/PackTask/WareHouseListControl.xaml
@@ -463,20 +463,10 @@
 
                                         <c:BButton Grid.Column="11" HorizontalAlignment="Stretch"   Style="{StaticResource LinkButton}"     VerticalAlignment="Center" Content="确认收货" 
                                                 Visibility="{Binding OrderId,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}" 
+                                                     CommandParameter="{Binding}"
+                                               Command="{Binding DataContext.UpdateTaskStateCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}"
                                                >
-                                            <b:Interaction.Triggers>
-                                                <b:EventTrigger EventName="PreviewMouseLeftButtonDown">
-                                                    <b:InvokeCommandAction Command="{Binding DataContext.UpdateTaskStateCommand,RelativeSource={RelativeSource Mode=FindAncestor,AncestorType={x:Type Page}}}">
-                                                        <b:InvokeCommandAction.CommandParameter>
-                                                            <MultiBinding Converter="{StaticResource mptConverter}">
-                                                                <Binding Path="TaskId" />
-                                                                <Binding Path="TaskState"/>
-                                                                <Binding Path="OrderId"/>
-                                                            </MultiBinding>
-                                                        </b:InvokeCommandAction.CommandParameter>
-                                                    </b:InvokeCommandAction>
-                                                </b:EventTrigger>
-                                            </b:Interaction.Triggers>
+                                          
                                         </c:BButton>
 
                                     </Grid>