From 8b7055bb7457a9856a0977c5cf01095b29d75bed Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Thu, 1 Jun 2023 16:49:20 +0800
Subject: [PATCH] 10023

---
 BBWYB.Client/GlobalContext.cs                 | 20 +++-------------
 .../ViewModels/Order/OrderViewModel.cs        | 23 ++++---------------
 .../UpdatePurchaseTaskWindow.xaml.cs          | 14 +++++++----
 3 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/BBWYB.Client/GlobalContext.cs b/BBWYB.Client/GlobalContext.cs
index a650f5f..dbe2462 100644
--- a/BBWYB.Client/GlobalContext.cs
+++ b/BBWYB.Client/GlobalContext.cs
@@ -20,7 +20,7 @@ namespace BBWYB.Client
     {
         public GlobalContext()
         {
-            BBWYBApiVersion = "10022";
+            BBWYBApiVersion = "10023";
         }
 
         private User user;
@@ -97,22 +97,8 @@ namespace BBWYB.Client
                 return;
             }
             UpdatePurchaseTaskWindow packTask = new(res.Data, originShopName, orderSku);
-
-            //ViewModelLocator view = new();
-            //var updatePackTask = view.UpdatePurchaseTask;
-            //var show = updatePackTask.SearchSku(res.Data, originShopName, orderSku);
-
-
-            //if (!show) return;
-
-            //updatePackTask.ReflashWindow = () =>
-            //{
-            //    Task.Factory.StartNew(() => LoadOrder(PageIndex));
-
-            //};
-
-
-            packTask.ShowDialog();
+            if (!packTask.IsClosed)
+                packTask.Show();
             WeakReferenceMessenger.Default.Send(new Message_WebB_RefreshPack(null));
             //
         }
diff --git a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
index aeafa0e..371957b 100644
--- a/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
+++ b/BBWYB.Client/ViewModels/Order/OrderViewModel.cs
@@ -135,25 +135,12 @@ namespace BBWYB.Client.ViewModels
                 Task.Factory.StartNew(() => LoadOrder(PageIndex));
 
             });
+            //var source = PresentationSource.FromVisual(packTask);
+            ////如 source 为空或 source.IsDisposed == true ，这表示您的 Window 已关闭。
+            //if (source == null || source.IsDisposed)
 
-
-            // packTask.SendToViewModel(res.Data, OriginShopName, order);
-            //ViewModelLocator view = new();
-            //var updatePackTask = view.UpdatePurchaseTask;
-            //var show = updatePackTask.SearchSku(res.Data, OriginShopName, order);
-
-
-            //if (!show) return;
-
-
-            //updatePackTask.ReflashWindow = () =>
-            //{
-            //    Task.Factory.StartNew(() => LoadOrder(PageIndex));
-
-            //};
-
-
-            packTask.ShowDialog();
+            if (!packTask.IsClosed)
+                packTask.Show();
 
         }
 
diff --git a/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml.cs b/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml.cs
index f5f0b1f..715c23c 100644
--- a/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml.cs
+++ b/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml.cs
@@ -27,20 +27,26 @@ namespace BBWYB.Client.Views.PackPurchaseTaska
     /// </summary>
     public partial class UpdatePurchaseTaskWindow : BWindow
     {
-        public UpdatePurchaseTaskWindow(PackTaskResponse packTaskResponse, string shopname, OrderSku order, Action ReflashWindow=null)
+        public UpdatePurchaseTaskWindow(PackTaskResponse packTaskResponse, string shopname, OrderSku order, Action ReflashWindow = null)
         {
             InitializeComponent();
 
             var updatePackTask = (this.DataContext as UpdatePurchaseTaskViewModel);
             var show = updatePackTask.SearchSku(packTaskResponse, shopname, order);
-            if (!show) this.Close();
+            if (!show) { this.Close(); IsClosed = true; }
 
             if (ReflashWindow != null)
-                 updatePackTask.ReflashWindow= ReflashWindow;
+                updatePackTask.ReflashWindow = ReflashWindow;
+
 
             //this.Loaded += UpdatePurchaseTaskWindow_Loaded;
             //this.Unloaded += UpdatePurchaseTaskWindow_Unloaded;
         }
+
+
+        public bool IsClosed { get; set; }=false;
+
+
         private void UpdatePurchaseTaskWindow_Unloaded(object sender, RoutedEventArgs e)
         {
             WeakReferenceMessenger.Default.Unregister<Message_BindingUpdatePurchaseTaskClose>(this);
@@ -56,7 +62,7 @@ namespace BBWYB.Client.Views.PackPurchaseTaska
             });
         }
 
-      
+
 
     }