Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

Login.xaml

@@ -13,13 +13,13 @@
                 <ImageBrush ImageSource="/sunlight_logotext.jpg"/>
             </Rectangle.Fill>
         </Rectangle>
-        <ComboBox Name="Name" Height="24" Margin="60,164,10,0" VerticalAlignment="Top" FontSize="14" IsEditable="True" KeyUp="SearchBox_OnKeyDownd"/>
+        <ComboBox x:Name="Name" Height="24" Margin="60,164,10,0" VerticalAlignment="Top" FontSize="14" IsEditable="True" KeyUp="SearchBox_OnKeyDownd"/>
-        <PasswordBox Name="Pasword" Height="24" Margin="60,210,10,0" VerticalAlignment="Top" FontSize="14" input:InputMethod.IsInputMethodEnabled="False" KeyUp="SearchBox_OnKeyDownd"/>
+        <PasswordBox x:Name="Pasword" Height="24" Margin="60,210,10,0" VerticalAlignment="Top" FontSize="14" input:InputMethod.IsInputMethodEnabled="False" KeyUp="SearchBox_OnKeyDownd"/>
         <TextBlock HorizontalAlignment="Left" Height="26" Margin="10,166,0,0" TextWrapping="Wrap" Text="账号" VerticalAlignment="Top" Width="41" FontSize="20" RenderTransformOrigin="0.833,0.478"/>
         <TextBlock HorizontalAlignment="Left" Height="26" Margin="10,210,0,0" TextWrapping="Wrap" Text="密码" VerticalAlignment="Top" Width="41" FontSize="20" RenderTransformOrigin="0.833,0.478"/>
-        <Button Content="登录" HorizontalAlignment="Left" Height="23" Margin="60,264,0,0" VerticalAlignment="Top" Width="44" Click="Button_Click_1"/>
+        <Button Content="登录" HorizontalAlignment="Left" Height="23" Margin="60,264,0,0" VerticalAlignment="Top" Width="44" Click="Button_Click_1" Background="#FFDDDDDD" Foreground="Black" BorderBrush="White"/>
-        <Button Content="退出" HorizontalAlignment="Left" Height="23" Margin="140,264,0,0" VerticalAlignment="Top" Width="44" Click="Button_Click"/>
+        <Button Content="退出" HorizontalAlignment="Left" Height="23" Margin="140,264,0,0" VerticalAlignment="Top" Width="44" Click="Button_Click" Background="#FFDDDDDD" Foreground="Black" BorderBrush="White"/>
-        <TextBlock Height="28" Margin="20,118,20,0" TextWrapping="Wrap" Text="物料单据管理程序" VerticalAlignment="Top" FontSize="24"/>
+        <TextBlock Height="30" Margin="20,115,20,0" TextWrapping="Wrap" Text="物料单据管理程序" VerticalAlignment="Top" FontSize="24"/>
 
     </Grid>
 </Window>

Login.xaml.cs

@@ -59,9 +59,8 @@ namespace formula_manage
         {
             if (e.Key == Key.Enter)
             {
-                SendKeys.SendWait("{tab}");
+                SendKeys.SendWait("{Tab}");
             }
         }
-
     }
 }