修复登录后不能自动关闭bug

29WxOrderWpf/Views/PddMobileLoginView.xaml.cs

@@ -5,57 +5,59 @@ using CefSharp.Wpf;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
+using System.Windows.Media;
 
 namespace _29WxOrderWpf.Views
 {
-    /// <summary>
-    /// 拼多多买手移动版登录窗口（WPF 版 PddMobileLoginForm）
-    /// </summary>
-    public partial class PddMobileLoginView : UserControl
-    {
-        /// <summary>视图模型</summary>
-        public PddMobileLoginViewModel ViewModel { get; }
+	/// <summary>
+	/// 拼多多买手移动版登录窗口（WPF 版 PddMobileLoginForm）
+	/// </summary>
+	public partial class PddMobileLoginView : UserControl
+	{
+		/// <summary>视图模型</summary>
+		public PddMobileLoginViewModel ViewModel { get; }
 
 		public PddMobileLoginView(BuyerLoginInfo buyerInfo)
-        {
-           
+		{
+
 			InitializeComponent();
 
-            ViewModel = new PddMobileLoginViewModel(buyerInfo);
-            ViewModel.BrowserCreated += ViewModel_BrowserCreated;
-            //ViewModel.RequestClose += ViewModel_RequestClose;
+			ViewModel = new PddMobileLoginViewModel(buyerInfo);
+			ViewModel.BrowserCreated += ViewModel_BrowserCreated;
+			ViewModel.RequestClose += ViewModel_RequestClose;
 			DataContext = ViewModel;
 		}
 
-        private void PddMobileLoginView_Loaded(object sender, RoutedEventArgs e)
-        {
-            ViewModel.Start();
-        }
+		private void PddMobileLoginView_Loaded(object sender, RoutedEventArgs e)
+		{
+			ViewModel.Start();
+		}
 
-        private void PddMobileLoginView_Closed(object sender, System.EventArgs e)
-        {
-            ViewModel.Stop();
-        }
+		private void PddMobileLoginView_Closed(object sender, System.EventArgs e)
+		{
+			ViewModel.Stop();
+		}
 
-        private void ViewModel_BrowserCreated(ChromiumWebBrowser browser)
-        {
-            Grid.SetRow(browser, 0);
-            Grid.SetColumn(browser, 0);
-            BrowserHost.Children.Add(browser);
-        }
+		private void ViewModel_BrowserCreated(ChromiumWebBrowser browser)
+		{
+			Grid.SetRow(browser, 0);
+			Grid.SetColumn(browser, 0);
+			BrowserHost.Children.Add(browser);
+		}
 
-        //private void ViewModel_RequestClose()
-        //{
-        //    if (this.IsLoaded)
-        //        this.Close();
-        //}
+		private void ViewModel_RequestClose()
+		{
+			Window parentWindow = Window.GetWindow(this);
+			if (this.IsLoaded && parentWindow != null)
+				parentWindow.Close();
+		}
 
-        private void txtAddress_KeyDown(object sender, KeyEventArgs e)
-        {
-            if (e.Key == Key.Enter)
-            {
-                ViewModel.ReloadCommand.Execute(null);
-            }
-        }
-    }
+		private void txtAddress_KeyDown(object sender, KeyEventArgs e)
+		{
+			if (e.Key == Key.Enter)
+			{
+				ViewModel.ReloadCommand.Execute(null);
+			}
+		}
+	}
 }