diff --git a/ViewModel/LogViewModel.cs b/ViewModel/LogViewModel.cs
index 23426d6..ca2d558 100644
--- a/ViewModel/LogViewModel.cs
+++ b/ViewModel/LogViewModel.cs
@@ -1,15 +1,34 @@
using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
using Models;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using System.Windows;
namespace Audit.ViewModel
{
public class LogViewModel : ViewModelBase
{
public UserAccount UserAccount { get; set; } = AuditData.Instance.UserAccount;
+
+ private RelayCommand logCommand;
+ public RelayCommand LogCommand
+ {
+ get { return logCommand; }
+ set { logCommand = value; }
+ }
+
+ public LogViewModel()
+ {
+
+ logCommand = new RelayCommand(() =>
+ {
+ MessageBox.Show("成功");
+
+ });
+ }
}
}
diff --git a/Windows/LogWindow.xaml b/Windows/LogWindow.xaml
index 875bafa..87aac8a 100644
--- a/Windows/LogWindow.xaml
+++ b/Windows/LogWindow.xaml
@@ -11,7 +11,7 @@
-
+
diff --git a/Windows/LogWindow.xaml.cs b/Windows/LogWindow.xaml.cs
index 229bdb9..2701cc9 100644
--- a/Windows/LogWindow.xaml.cs
+++ b/Windows/LogWindow.xaml.cs
@@ -27,7 +27,7 @@ namespace Audit.Windows
private void Exit(object sender, RoutedEventArgs e)//退出按钮
{
- Application.Current.Shutdown();//关闭程序窗口
+ Application.Current.Shutdown();//关闭窗口
}
private void Log(object sender, RoutedEventArgs e)//登录按钮
@@ -40,12 +40,12 @@ namespace Audit.Windows
{
MessageBox.Show("警告:进入设置模式请您明确操作目的及可能需承担的后果");
Windows.Set_up setup = new Windows.Set_up();
- setup.Show();
- this.Close();
+ setup.Show();//实例化并打开设置窗口
+ this.Close();//关闭当前窗口
}
else
{
- MessageBox.Show("错误01:错误的认证信息");
+ MessageBox.Show("ERR01:拒绝认证");//设置密码错误
}
}
else