Merge remote-tracking branch 'origin/zhangxueyang' into zyy

XHWK.WKTool/LoginWindow.xaml

@@ -55,6 +55,22 @@
                 </Setter.Value>
             </Setter>
         </Style>
+        <Style x:Key="NoMouseOverButtonStyle" TargetType="{x:Type Button}">
+            <Setter Property="BorderThickness" Value="1"/>
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+            <Setter Property="HorizontalContentAlignment" Value="Center"/>
+            <Setter Property="VerticalContentAlignment" Value="Center"/>
+            <Setter Property="Padding" Value="1"/>
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <Border x:Name="Chrome" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                        </Border>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
     </Window.Resources>
     <Grid Background="#FFFFFF">
         <!--分5行-->
@@ -69,7 +85,7 @@
         <Border Grid.Row="0" Background="#2D8CF0">
             <Grid>
                 <TextBlock Text="登录星火微课系统" Foreground="#FFFFFF" FontSize="16" Padding="10,13,0,0"/>
-                <Button  Cursor="Hand" Grid.Row="0" x:Name="btnDown" Content="×" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Click="BtnDown_Click"/>
+                <Button  Cursor="Hand"  Grid.Row="0" x:Name="btnDown" Content="×" Background="Transparent" Foreground="#FFFFFF" FontSize="25" Padding="10,0,10,0" HorizontalAlignment="Right" Style="{StaticResource NoMouseOverButtonStyle}" Click="BtnDown_Click"/>
             </Grid>
         </Border>
         <!--第二行 登陆 账号-->

XHWK.WKTool/XHMicroLessonSystemWindow.xaml.cs

@@ -3459,7 +3459,18 @@ namespace XHWK.WKTool
         /// <param name="e"></param>
         private void BtnLoginType_Click(object sender, RoutedEventArgs e)
         {
-            Login();
+            if ("未登录".Equals(txbLoginType.Text))
+            {
+                Login();
+            }
+            else
+            {
+                MessageBoxResult dr = MessageWindow.Show("确定退出登陆？", "提示", MessageBoxButton.OKCancel);
+                if (dr == MessageBoxResult.OK)
+                {
+                    Login();
+                }
+            }
         }
         /// <summary>
         /// 登陆