修复登录后不能自动关闭bug
This commit is contained in:
1 parent
20bfd2c22c
commit
a5d049da81
1 file changed
+40
-38
@@ -5,57 +5,59 @@ using CefSharp.Wpf;
|
|||||||
using System.Windows;
|
using System.Windows;
|
||||||
using System.Windows.Controls;
|
using System.Windows.Controls;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
|
using System.Windows.Media;
|
||||||
|
|
||||||
namespace _29WxOrderWpf.Views
|
namespace _29WxOrderWpf.Views
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 拼多多买手移动版登录窗口(WPF 版 PddMobileLoginForm)
|
/// 拼多多买手移动版登录窗口(WPF 版 PddMobileLoginForm)
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public partial class PddMobileLoginView : UserControl
|
public partial class PddMobileLoginView : UserControl
|
||||||
{
|
{
|
||||||
/// <summary>视图模型</summary>
|
/// <summary>视图模型</summary>
|
||||||
public PddMobileLoginViewModel ViewModel { get; }
|
public PddMobileLoginViewModel ViewModel { get; }
|
||||||
|
|
||||||
public PddMobileLoginView(BuyerLoginInfo buyerInfo)
|
public PddMobileLoginView(BuyerLoginInfo buyerInfo)
|
||||||
{
|
{
|
||||||
|
|
||||||
InitializeComponent();
|
InitializeComponent();
|
||||||
|
|
||||||
ViewModel = new PddMobileLoginViewModel(buyerInfo);
|
ViewModel = new PddMobileLoginViewModel(buyerInfo);
|
||||||
ViewModel.BrowserCreated += ViewModel_BrowserCreated;
|
ViewModel.BrowserCreated += ViewModel_BrowserCreated;
|
||||||
//ViewModel.RequestClose += ViewModel_RequestClose;
|
ViewModel.RequestClose += ViewModel_RequestClose;
|
||||||
DataContext = ViewModel;
|
DataContext = ViewModel;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void PddMobileLoginView_Loaded(object sender, RoutedEventArgs e)
|
private void PddMobileLoginView_Loaded(object sender, RoutedEventArgs e)
|
||||||
{
|
{
|
||||||
ViewModel.Start();
|
ViewModel.Start();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void PddMobileLoginView_Closed(object sender, System.EventArgs e)
|
private void PddMobileLoginView_Closed(object sender, System.EventArgs e)
|
||||||
{
|
{
|
||||||
ViewModel.Stop();
|
ViewModel.Stop();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ViewModel_BrowserCreated(ChromiumWebBrowser browser)
|
private void ViewModel_BrowserCreated(ChromiumWebBrowser browser)
|
||||||
{
|
{
|
||||||
Grid.SetRow(browser, 0);
|
Grid.SetRow(browser, 0);
|
||||||
Grid.SetColumn(browser, 0);
|
Grid.SetColumn(browser, 0);
|
||||||
BrowserHost.Children.Add(browser);
|
BrowserHost.Children.Add(browser);
|
||||||
}
|
}
|
||||||
|
|
||||||
//private void ViewModel_RequestClose()
|
private void ViewModel_RequestClose()
|
||||||
//{
|
{
|
||||||
// if (this.IsLoaded)
|
Window parentWindow = Window.GetWindow(this);
|
||||||
// this.Close();
|
if (this.IsLoaded && parentWindow != null)
|
||||||
//}
|
parentWindow.Close();
|
||||||
|
}
|
||||||
|
|
||||||
private void txtAddress_KeyDown(object sender, KeyEventArgs e)
|
private void txtAddress_KeyDown(object sender, KeyEventArgs e)
|
||||||
{
|
{
|
||||||
if (e.Key == Key.Enter)
|
if (e.Key == Key.Enter)
|
||||||
{
|
{
|
||||||
ViewModel.ReloadCommand.Execute(null);
|
ViewModel.ReloadCommand.Execute(null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user