diff --git a/Interact/Client.cs b/Interact/Client.cs
index d782ff0..35aa041 100644
--- a/Interact/Client.cs
+++ b/Interact/Client.cs
@@ -80,7 +80,7 @@ namespace Interact
 				return false;
 			}
 			
-			workingDictionary.Clear();	//清空临时记录
+			workingDictionary?.Clear();	//清空临时记录
 			if (sendLoopThread != null)
 				sendLoopThread.Abort();
 			if (readLoopThread != null)
diff --git a/StormChatWPF/Chat.cs b/StormChatWPF/Chat.cs
index e67a055..67a49b9 100644
--- a/StormChatWPF/Chat.cs
+++ b/StormChatWPF/Chat.cs
@@ -19,20 +19,8 @@ namespace StormChatWPF
             StormClient.OnGetUserListDone += GetContactsList;
             StormClient.OnMessage +=ReciveMessage;
         }
+        internal User SetContact { get; set; }//设置当前联系人对象
 
-
-        private User ChatNow;
-        internal User SetContact
-        {
-            get
-            {
-                return ChatNow;
-            }
-            set
-            {
-                ChatNow = value;
-            }
-        }//设置当前联系人对象
         internal static void GetContactsList(ResultHead head, User[] users)
         {
             if (head.Error != "")
@@ -47,7 +35,10 @@ namespace StormChatWPF
         {
             if (StormClient.Initialize())
             {
-                StormClient.QueueLogin(user,password);
+                if (!StormClient.QueueLogin(user, password))
+                {
+                    MessageBox.Show("登录失败");
+                }
             }
             else
             {
@@ -68,7 +59,7 @@ namespace StormChatWPF
                     }
                     else
                     {
-                        MessageBox.Show("登录失败！");
+                        MessageBox.Show("请核对账号密码！");
                     }
                 });
         }//登录完成
diff --git a/StormChatWPF/LogWindow.xaml b/StormChatWPF/LogWindow.xaml
index efe8c9a..ed4a88f 100644
--- a/StormChatWPF/LogWindow.xaml
+++ b/StormChatWPF/LogWindow.xaml
@@ -5,13 +5,25 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:StormChatWPF"
         mc:Ignorable="d"
-        Title="MainWindow" Height="450" Width="800">
-	<Grid Margin="0,0,-0.4,-1">
-		<Image x:Name="LogImage" Margin="0,0,0,181" Source="/RESOURCES/logFormBackground.jpg" Stretch="None"/>
-		<Button x:Name="Login_button" Content="LogIn" Margin="361,370,361,32" RenderTransformOrigin="0.664,1.51" Click="Login_button_Click"/>
-		<TextBox x:Name="AccountBox" Margin="346,263,340,0" TextWrapping="Wrap" Text="201701110203" Height="15" VerticalAlignment="Top" />
-		<PasswordBox x:Name="passwordBox" Margin="346,311,0,0" Password="1233211234567" RenderTransformOrigin="0.503,0.59" Height="18" VerticalAlignment="Top" HorizontalAlignment="Left" Width="109"/>
-
-
+        Title="StormChat" Height="450" Width="800"
+		Icon="UI/闪电.png">
+	<Grid Height="418" VerticalAlignment="Stretch" Margin="2,1,1,1">
+		<Grid.ColumnDefinitions>
+			<ColumnDefinition Width="200*"/>
+			<ColumnDefinition Width="200*"/>
+			<ColumnDefinition Width="200*"/>
+			<ColumnDefinition Width="200*"/>
+		</Grid.ColumnDefinitions>
+		<Grid.RowDefinitions>
+			<RowDefinition Height="150*"/>
+			<RowDefinition Height="150*"/>
+			<RowDefinition Height="150*"/>
+		</Grid.RowDefinitions>
+		<Image x:Name="LogBackground"  Grid.ColumnSpan="4" Height="268" Margin="10,10,10,0" Grid.RowSpan="2" VerticalAlignment="Top" Source="UI/登录界面底.png"/>
+		<Button x:Name="Login_button" Content="LogIn" Click="Login_button_Click" Grid.ColumnSpan="2" Grid.Column="1" Grid.Row="2" Margin="160,70,160,45" Width="75"/>
+		<TextBox x:Name="AccountBox" TextWrapping="Wrap" Text="201701110203" Grid.Row="2" TextAlignment="Center" Margin="137.4,5,137.8,112.6" Grid.Column="1" Grid.ColumnSpan="2" Height="22" Width="120">
+			
+		</TextBox>
+		<PasswordBox x:Name="passwordBox" Password="1233211234567" Margin="135,35,135,0" Grid.Column="1" Grid.Row="2" VerticalAlignment="Top" Grid.ColumnSpan="2" Height="22" Width="120"/>
 	</Grid>
 </Window>
diff --git a/StormChatWPF/LogWindow.xaml.cs b/StormChatWPF/LogWindow.xaml.cs
index 924a07b..5e05e4d 100644
--- a/StormChatWPF/LogWindow.xaml.cs
+++ b/StormChatWPF/LogWindow.xaml.cs
@@ -37,6 +37,7 @@ namespace StormChatWPF
         }//将收到的消息展现于UI界面
         internal void ShowUserMessage()
         {
-        }
+        }//展现自己发出的消息
+
     }
 }
diff --git a/StormChatWPF/MainWindow.xaml.cs b/StormChatWPF/MainWindow.xaml.cs
index 052fe07..4763064 100644
--- a/StormChatWPF/MainWindow.xaml.cs
+++ b/StormChatWPF/MainWindow.xaml.cs
@@ -25,9 +25,9 @@ namespace StormChatWPF
         }
         private void AddUserList()
         {
-            if (Chat.userlist.Any())
+            if (Chat.ContactsList.Any())
             {
-                foreach (var user in Chat.userlist)
+                foreach (var user in Chat.ContactsList)
                 {
                     UsersList.Items.Add(user);
                 }
diff --git a/StormChatWPF/StormChatWPF.csproj b/StormChatWPF/StormChatWPF.csproj
index de5ebf1..08cf33d 100644
--- a/StormChatWPF/StormChatWPF.csproj
+++ b/StormChatWPF/StormChatWPF.csproj
@@ -115,5 +115,11 @@
       <Name>Interact</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="UI\登录界面底.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="UI\闪电.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/StormChatWPF/UI/登录界面底.png b/StormChatWPF/UI/登录界面底.png
new file mode 100644
index 0000000..711b76e
Binary files /dev/null and b/StormChatWPF/UI/登录界面底.png differ
diff --git a/StormChatWPF/UI/闪电.png b/StormChatWPF/UI/闪电.png
new file mode 100644
index 0000000..7581c24
Binary files /dev/null and b/StormChatWPF/UI/闪电.png differ