From 3fe394c8da4e7dd755e1b428466e9b0175b02e66 Mon Sep 17 00:00:00 2001
From: wule <jtt_fan@qq.com>
Date: Tue, 16 Jun 2026 03:45:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=99=E6=80=81=E8=B5=84=E6=BA=90=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=BC=95=E7=94=A8=E5=88=B0=E8=87=AA=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 29WxOrderWpf/29WxOrderWpf.csproj              |  57 ++++++++++++++----
 29WxOrderWpf/29WxOrderWpf.csproj.user         |  13 ++++
 29WxOrderWpf/App.xaml                         |   2 +
 29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml   |  21 ++++++-
 .../BaseWindows/BaseMsgWindow.xaml.cs         |  50 +++++++++++++++
 29WxOrderWpf/LoginWindows/LoginWindow.xaml    |   2 +-
 29WxOrderWpf/LoginWindows/LoginWindow.xaml.cs |   9 ++-
 29WxOrderWpf/MainWindow.xaml                  |   5 +-
 29WxOrderWpf/Resources/BaseMsgErr.png         | Bin 0 -> 2621 bytes
 29WxOrderWpf/Resources/BaseMsgInfo.png        | Bin 0 -> 2020 bytes
 29WxOrderWpf/Resources/BaseMsgQue.png         | Bin 0 -> 3212 bytes
 29WxOrderWpf/Styles/BaseWindowStyle.xaml      |   7 ++-
 .../Styles/StaticImageBrushDictionary.xaml    |   5 ++
 .../Styles/StaticImageDictionary.xaml         |  14 +++++
 ...UcImageButton.xaml.cs => UcImageButton.cs} |  12 +---
 29WxOrderWpf/UserControls/UcImageButton.xaml  |   8 ---
 .../{WindowBoxes.xaml => UcWindowBoxes.xaml}  |  29 +++++++--
 ...dowBoxes.xaml.cs => UcWindowBoxes.xaml.cs} |   8 +--
 18 files changed, 191 insertions(+), 51 deletions(-)
 create mode 100644 29WxOrderWpf/29WxOrderWpf.csproj.user
 create mode 100644 29WxOrderWpf/Resources/BaseMsgErr.png
 create mode 100644 29WxOrderWpf/Resources/BaseMsgInfo.png
 create mode 100644 29WxOrderWpf/Resources/BaseMsgQue.png
 create mode 100644 29WxOrderWpf/Styles/StaticImageBrushDictionary.xaml
 create mode 100644 29WxOrderWpf/Styles/StaticImageDictionary.xaml
 rename 29WxOrderWpf/UserControls/{UcImageButton.xaml.cs => UcImageButton.cs} (81%)
 delete mode 100644 29WxOrderWpf/UserControls/UcImageButton.xaml
 rename 29WxOrderWpf/UserControls/{WindowBoxes.xaml => UcWindowBoxes.xaml} (67%)
 rename 29WxOrderWpf/UserControls/{WindowBoxes.xaml.cs => UcWindowBoxes.xaml.cs} (95%)

diff --git a/29WxOrderWpf/29WxOrderWpf.csproj b/29WxOrderWpf/29WxOrderWpf.csproj
index 2e76ba3..4a92a4e 100644
--- a/29WxOrderWpf/29WxOrderWpf.csproj
+++ b/29WxOrderWpf/29WxOrderWpf.csproj
@@ -14,12 +14,27 @@
     <WarningLevel>4</WarningLevel>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -75,11 +90,9 @@
     <Compile Include="ToolCtrls\Icons.xaml.cs">
       <DependentUpon>Icons.xaml</DependentUpon>
     </Compile>
-    <Compile Include="UserControls\UcImageButton.xaml.cs">
-      <DependentUpon>UcImageButton.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="UserControls\WindowBoxes.xaml.cs">
-      <DependentUpon>WindowBoxes.xaml</DependentUpon>
+    <Compile Include="UserControls\UcImageButton.cs" />
+    <Compile Include="UserControls\UcWindowBoxes.xaml.cs">
+      <DependentUpon>UcWindowBoxes.xaml</DependentUpon>
     </Compile>
     <Page Include="BaseWindows\BaseMsgWindow.xaml">
       <SubType>Designer</SubType>
@@ -109,6 +122,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Styles\StaticImageBrushDictionary.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Styles\StaticImageDictionary.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Styles\UcImageButtonStyle.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -117,11 +138,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="UserControls\UcImageButton.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="UserControls\WindowBoxes.xaml">
+    <Page Include="UserControls\UcWindowBoxes.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -152,7 +169,18 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.2 %28x86 和 x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AllBase\29WxOrderAllBase.csproj">
       <Project>{6461D807-B1C8-45F0-B388-E0CA1A418DE0}</Project>
@@ -179,5 +207,10 @@
     <Resource Include="Resources\WindowBoxes\normal.hover.png" />
     <Resource Include="Resources\WindowBoxes\normal.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\BaseMsgErr.png" />
+    <Resource Include="Resources\BaseMsgInfo.png" />
+    <Resource Include="Resources\BaseMsgQue.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/29WxOrderWpf/29WxOrderWpf.csproj.user b/29WxOrderWpf/29WxOrderWpf.csproj.user
new file mode 100644
index 0000000..95a1d1a
--- /dev/null
+++ b/29WxOrderWpf/29WxOrderWpf.csproj.user
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <PublishUrlHistory>publish\</PublishUrlHistory>
+    <InstallUrlHistory />
+    <SupportUrlHistory />
+    <UpdateUrlHistory />
+    <BootstrapperUrlHistory />
+    <ErrorReportUrlHistory />
+    <FallbackCulture>zh-CN</FallbackCulture>
+    <VerifyUploadedFiles>false</VerifyUploadedFiles>
+  </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/29WxOrderWpf/App.xaml b/29WxOrderWpf/App.xaml
index 38ea195..65ea705 100644
--- a/29WxOrderWpf/App.xaml
+++ b/29WxOrderWpf/App.xaml
@@ -6,6 +6,8 @@
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Styles/StaticImageBrushDictionary.xaml" />
+                <ResourceDictionary Source="Styles/StaticImageDictionary.xaml" />
                 <ResourceDictionary Source="Styles/UcImageButtonStyle.xaml" />
                 <ResourceDictionary Source="Styles/BaseWindowStyle.xaml" />
                 <!-- 可以添加更多资源字典 -->
diff --git a/29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml b/29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml
index ae5e115..fcde599 100644
--- a/29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml
+++ b/29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml
@@ -5,14 +5,31 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:_29WxOrderWpf.BaseWindows"
         mc:Ignorable="d" Style="{StaticResource BaseNoneBorderWindowStyle}"
-        Title="BaseMsgWindow" Height="450" Width="800">
+        Title="BaseMsgWindow" Height="250" Width="350">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="32"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
         </Grid.RowDefinitions>
-        <userctrols:WindowBoxes VerticalAlignment="Center" HorizontalAlignment="Right" Margin="4" MinBoxVisibility="Collapsed" MaxBoxVisibility="Collapsed"/>
+        <Label x:Name="lblTitle" Margin="2,2" Foreground="White" Content="title"></Label>
+        <userctrols:UcWindowBoxes VerticalAlignment="Center" HorizontalAlignment="Right" Margin="4" MinBoxVisibility="Collapsed" MaxBoxVisibility="Collapsed"/>
         <Border Margin="2,0,2,2" Grid.Row="1" Background="White">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="120"></ColumnDefinition>
+                    <ColumnDefinition Width="*"></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Image x:Name="imgTip" Source="{StaticResource imgBaseMsgInfo}" Stretch="Uniform" Width="64" Height="64" VerticalAlignment="Top" Margin="0,30" />
+                <Grid Grid.Column="1">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*"></RowDefinition>
+                        <RowDefinition Height="80"></RowDefinition>
+                    </Grid.RowDefinitions>
+                    <Label x:Name="lblMsg" Content="message" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="0,30,30,30"/>
+                    <Button x:Name="btnCancel" Content="取消" HorizontalAlignment="Right" Margin="0,20,30,0" Grid.Row="1" VerticalAlignment="Top" Width="75" Height="26" Click="btnCancel_Click"/>
+                    <Button x:Name="btnOk" Content="确定" HorizontalAlignment="Right" Margin="0,20,130,0" Grid.Row="1" VerticalAlignment="Top" Width="75" Height="26" Click="btnOk_Click"/>
+                </Grid>
+            </Grid>
         </Border>
     </Grid>
 </local:BaseWindow>
diff --git a/29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml.cs b/29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml.cs
index 2581d26..951373b 100644
--- a/29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml.cs
+++ b/29WxOrderWpf/BaseWindows/BaseMsgWindow.xaml.cs
@@ -24,5 +24,55 @@ namespace _29WxOrderWpf.BaseWindows
             InitializeComponent();
             this.DataContext = this;
         }
+
+        private static BaseMsgWindow CreateMsgForm(string msg, string caption, MsgWindowLevel fl)
+        {
+            BaseMsgWindow msgBox = new BaseMsgWindow { lblTitle = { Content = caption }, lblMsg = { Content = msg } };
+            if (fl.Equals(MsgWindowLevel.LARGE))
+            {
+                msgBox.Width = (int)MsgWindowLevel.LARGE;
+                msgBox.Height = 500;
+            }
+            msgBox.btnOk.Margin = new Thickness(msgBox.btnCancel.Margin.Left, msgBox.btnCancel.Margin.Top, msgBox.btnCancel.Margin.Right, msgBox.btnCancel.Margin.Bottom); // 把确认按钮移到取消按钮上面
+            msgBox.btnCancel.Visibility = Visibility.Collapsed;
+            return msgBox;
+        }
+
+        public static BaseMsgWindow ShowConfirm(Window window, string msg, string caption = "", MsgWindowLevel fl = MsgWindowLevel.MEDIUM)
+        {
+            string title = string.IsNullOrEmpty(caption) ? "确认系统提示" : caption;
+            BaseMsgWindow msgBox = new BaseMsgWindow
+            {
+                lblTitle = { Content = title },
+                lblMsg = { Content = msg },
+                imgTip = { Source = Application.Current.Resources["imgBaseMsgQue"] as ImageSource },
+            };
+            if (fl.Equals(MsgWindowLevel.LARGE))
+            {
+                msgBox.Width = (int)MsgWindowLevel.LARGE;
+                msgBox.Height = 500;
+            }
+            if (window != null)
+                msgBox.Owner = window;
+            msgBox.ShowDialog();
+            return msgBox;
+        }
+
+        private void btnOk_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = true;
+        }
+
+        private void btnCancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+        }
+    }
+
+    public enum MsgWindowLevel
+    {
+        SMALL,
+        MEDIUM,
+        LARGE = 500
     }
 }
diff --git a/29WxOrderWpf/LoginWindows/LoginWindow.xaml b/29WxOrderWpf/LoginWindows/LoginWindow.xaml
index 6f1fa8a..5478425 100644
--- a/29WxOrderWpf/LoginWindows/LoginWindow.xaml
+++ b/29WxOrderWpf/LoginWindows/LoginWindow.xaml
@@ -15,6 +15,6 @@
         <Grid Grid.Row="1" Margin="2,0,2,2" Background="White">
 
         </Grid>
-        <userctrls:WindowBoxes VerticalAlignment="Top" HorizontalAlignment="Right" Margin="4" MaxBoxVisibility="Collapsed" MinBoxVisibility="Collapsed"/>
+        <userctrls:UcWindowBoxes VerticalAlignment="Top" HorizontalAlignment="Right" Margin="4" MaxBoxVisibility="Collapsed" MinBoxVisibility="Collapsed"/>
     </Grid>
 </basewindows:BaseWindow>
diff --git a/29WxOrderWpf/LoginWindows/LoginWindow.xaml.cs b/29WxOrderWpf/LoginWindows/LoginWindow.xaml.cs
index 5666956..da2e927 100644
--- a/29WxOrderWpf/LoginWindows/LoginWindow.xaml.cs
+++ b/29WxOrderWpf/LoginWindows/LoginWindow.xaml.cs
@@ -29,8 +29,15 @@ namespace _29WxOrderWpf.LoginWindows
 
         private void BaseWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
-            if (BaseMsgForm.ShowConfirm("是否关闭软件？\r\n必须登录账户才能使用，无账户请先注册一个", "请先登录或者注册").DialogResult == System.Windows.Forms.DialogResult.OK)
+            //if (BaseMsgForm.ShowConfirm("是否关闭软件？\r\n必须登录账户才能使用，无账户请先注册一个", "请先登录或者注册").DialogResult == System.Windows.Forms.DialogResult.OK)
+            //    Process.GetCurrentProcess().Kill();
+            //else
+            //    e.Cancel = true;
+
+            if (BaseMsgWindow.ShowConfirm(this, "是否关闭软件？\r\n必须登录账户才能使用，无账户请先注册一个", "请先登录或者注册").DialogResult == true)
                 Process.GetCurrentProcess().Kill();
+            else
+                e.Cancel = true;
         }
     }
 }
diff --git a/29WxOrderWpf/MainWindow.xaml b/29WxOrderWpf/MainWindow.xaml
index 31ad81f..9ff5f0f 100644
--- a/29WxOrderWpf/MainWindow.xaml
+++ b/29WxOrderWpf/MainWindow.xaml
@@ -14,12 +14,9 @@
             <RowDefinition Height="60"></RowDefinition>
             <RowDefinition Height="*"></RowDefinition>
         </Grid.RowDefinitions>
-        <!--<Border Grid.RowSpan="10" BorderThickness="1" BorderBrush="Blue">
-        </Border>-->
         <Grid x:Name="gridContainer" Grid.Row="1" Background="White" Margin="2,0,2,2">
             <orderctrls:OrderListWindow x:Name="OrderListWindow" Visibility="Hidden"></orderctrls:OrderListWindow>
         </Grid>
-        <uc:WindowBoxes VerticalAlignment="Top" HorizontalAlignment="Right" Margin="4" MaxBoxVisibility="Visible"/>
-        <!--<Button Grid.Row="0" Content="x" HorizontalAlignment="Right" Margin="4" VerticalAlignment="Top" Width="20" Height="20" Click="btnClose_Click"/>-->
+        <uc:UcWindowBoxes VerticalAlignment="Top" HorizontalAlignment="Right" Margin="4" MaxBoxVisibility="Visible"/>
     </Grid>
 </basewindows:BaseWindow>
diff --git a/29WxOrderWpf/Resources/BaseMsgErr.png b/29WxOrderWpf/Resources/BaseMsgErr.png
new file mode 100644
index 0000000000000000000000000000000000000000..1912f06355ac8c987abc41236b8a46dceca8ca55
GIT binary patch
literal 2621
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

literal 0
HcmV?d00001

diff --git a/29WxOrderWpf/Resources/BaseMsgInfo.png b/29WxOrderWpf/Resources/BaseMsgInfo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0c961e6683ce4be8a8bb3d9ce80c8cdb54ed407
GIT binary patch
literal 2020
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

literal 0
HcmV?d00001

diff --git a/29WxOrderWpf/Resources/BaseMsgQue.png b/29WxOrderWpf/Resources/BaseMsgQue.png
new file mode 100644
index 0000000000000000000000000000000000000000..59ff5e03cd9019327599515ccf2b1e979cfe8e34
GIT binary patch
literal 3212
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

literal 0
HcmV?d00001

diff --git a/29WxOrderWpf/Styles/BaseWindowStyle.xaml b/29WxOrderWpf/Styles/BaseWindowStyle.xaml
index 544dc20..cf10728 100644
--- a/29WxOrderWpf/Styles/BaseWindowStyle.xaml
+++ b/29WxOrderWpf/Styles/BaseWindowStyle.xaml
@@ -4,14 +4,16 @@
     <Style x:Key="BaseWindowStyle" TargetType="Window">
         <Setter Property="Background" Value="#FF98638f"/>
         <Setter Property="Foreground" Value="#FF666666"/>
-        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="FontSize" Value="14"/>
         <!-- 其他样式设置 -->
 
     </Style>
     <Style x:Key="BaseNoneBorderWindowStyle" TargetType="Window">
         <Setter Property="Background" Value="#FF98638f"/>
+        <Setter Property="BorderBrush" Value="#6b5393"/>
+        <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Foreground" Value="#FF666666"/>
-        <Setter Property="FontSize" Value="12"/>
+        <Setter Property="FontSize" Value="14"/>
         <Setter Property="WindowStyle" Value="None"/>
         <Setter Property="AllowsTransparency" Value="True"/>
     </Style>
@@ -28,7 +30,6 @@
             </Setter.Value>
         </Setter>
     </Style>-->
-
     <!--<Style TargetType="Button">
         <Setter Property="Template">
             <Setter.Value>
diff --git a/29WxOrderWpf/Styles/StaticImageBrushDictionary.xaml b/29WxOrderWpf/Styles/StaticImageBrushDictionary.xaml
new file mode 100644
index 0000000..35b6a06
--- /dev/null
+++ b/29WxOrderWpf/Styles/StaticImageBrushDictionary.xaml
@@ -0,0 +1,5 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ImageBrush x:Key="imgBrushClose" ImageSource="/Resources/WindowBoxes/close.png" Stretch="Uniform"/>
+    <ImageBrush x:Key="imgBrushCloseHover" ImageSource="/Resources/WindowBoxes/close.hover.png" Stretch="Uniform"/>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/29WxOrderWpf/Styles/StaticImageDictionary.xaml b/29WxOrderWpf/Styles/StaticImageDictionary.xaml
new file mode 100644
index 0000000..07eb6c3
--- /dev/null
+++ b/29WxOrderWpf/Styles/StaticImageDictionary.xaml
@@ -0,0 +1,14 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <BitmapImage x:Key="imgMin" UriSource="/Resources/WindowBoxes/min.png"/>
+    <BitmapImage x:Key="imgMinHover" UriSource="/Resources/WindowBoxes/min.hover.png"/>
+    <BitmapImage x:Key="imgNormal" UriSource="/Resources/WindowBoxes/normal.png"/>
+    <BitmapImage x:Key="imgNormalHover" UriSource="/Resources/WindowBoxes/normal.hover.png"/>
+    <BitmapImage x:Key="imgMax" UriSource="/Resources/WindowBoxes/max.png"/>
+    <BitmapImage x:Key="imgMaxHover" UriSource="/Resources/WindowBoxes/max.hover.png"/>
+    <BitmapImage x:Key="imgClose" UriSource="/Resources/WindowBoxes/close.png"/>
+    <BitmapImage x:Key="imgCloseHover" UriSource="/Resources/WindowBoxes/close.hover.png"/>
+    <BitmapImage x:Key="imgBaseMsgErr" UriSource="/Resources/BaseMsgErr.png"/>
+    <BitmapImage x:Key="imgBaseMsgInfo" UriSource="/Resources/BaseMsgInfo.png"/>
+    <BitmapImage x:Key="imgBaseMsgQue" UriSource="/Resources/BaseMsgQue.png"/>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/29WxOrderWpf/UserControls/UcImageButton.xaml.cs b/29WxOrderWpf/UserControls/UcImageButton.cs
similarity index 81%
rename from 29WxOrderWpf/UserControls/UcImageButton.xaml.cs
rename to 29WxOrderWpf/UserControls/UcImageButton.cs
index 91ac732..d4149d8 100644
--- a/29WxOrderWpf/UserControls/UcImageButton.xaml.cs
+++ b/29WxOrderWpf/UserControls/UcImageButton.cs
@@ -5,24 +5,14 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace _29WxOrderWpf.UserControls
 {
-    /// <summary>
-    /// UcImageButton.xaml 的交互逻辑
-    /// </summary>
-    public partial class UcImageButton : Button
+    public class UcImageButton : Button
     {
         public UcImageButton()
         {
-            InitializeComponent();
             this.DataContext = this;
         }
 
diff --git a/29WxOrderWpf/UserControls/UcImageButton.xaml b/29WxOrderWpf/UserControls/UcImageButton.xaml
deleted file mode 100644
index f1b9688..0000000
--- a/29WxOrderWpf/UserControls/UcImageButton.xaml
+++ /dev/null
@@ -1,8 +0,0 @@
-<Button x:Class="_29WxOrderWpf.UserControls.UcImageButton"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:_29WxOrderWpf.UserControls"
-             mc:Ignorable="d" Width="30" Height="22">
-</Button>
diff --git a/29WxOrderWpf/UserControls/WindowBoxes.xaml b/29WxOrderWpf/UserControls/UcWindowBoxes.xaml
similarity index 67%
rename from 29WxOrderWpf/UserControls/WindowBoxes.xaml
rename to 29WxOrderWpf/UserControls/UcWindowBoxes.xaml
index b5161db..ac5c62c 100644
--- a/29WxOrderWpf/UserControls/WindowBoxes.xaml
+++ b/29WxOrderWpf/UserControls/UcWindowBoxes.xaml
@@ -1,18 +1,36 @@
-<UserControl x:Class="_29WxOrderWpf.UserControls.WindowBoxes"
+<UserControl x:Class="_29WxOrderWpf.UserControls.UcWindowBoxes"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:_29WxOrderWpf.UserControls"
              mc:Ignorable="d" Width="Auto" Height="Auto"
-             d:DesignHeight="50" d:DesignWidth="300" Background="Black" Loaded="WindowBoxes_Loaded">
-    <Grid>
+             d:DesignHeight="50" d:DesignWidth="300" Background="Transparent" Loaded="WindowBoxes_Loaded">
+    <Grid Background="Transparent">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto"></ColumnDefinition>
             <ColumnDefinition Width="Auto"></ColumnDefinition>
             <ColumnDefinition Width="Auto"></ColumnDefinition>
             <ColumnDefinition Width="Auto"></ColumnDefinition>
         </Grid.ColumnDefinitions>
+
+        <!--<Border Background="{StaticResource imgBrushCloseHover}" Width="17" Height="17" Margin="4">
+        </Border>
+        <Border Grid.Column="1" Width="17" Height="17" Margin="4">
+            <Image Source="{StaticResource imgCloseHover}"/>
+        </Border>-->
+
+        <!--不使用静态资源，在用户控件嵌套时，会发生预览错误-->
+        <local:UcImageButton x:Name="btnMin" Grid.Column="0" Width="17" Height="17" Background="Transparent" BorderThickness="0" Margin="4"
+                             ButtonImage="{StaticResource imgMin}" MouseOverButtonImage="{StaticResource imgMinHover}" MousePressButtonImage="{StaticResource imgMinHover}"/>
+        <local:UcImageButton x:Name="btnMax" Grid.Column="1" Width="17" Height="17" Background="Transparent" BorderThickness="0" Visibility="Collapsed" Margin="4"
+                             ButtonImage="{StaticResource imgMax}" MouseOverButtonImage="{StaticResource imgMaxHover}" MousePressButtonImage="{StaticResource imgMaxHover}"/>
+        <local:UcImageButton x:Name="btnNormal" Grid.Column="2" Width="17" Height="17" Background="Transparent" BorderThickness="0" Visibility="Collapsed" Margin="4"
+                             ButtonImage="{StaticResource imgNormal}" MouseOverButtonImage="{StaticResource imgNormalHover}" MousePressButtonImage="{StaticResource imgNormalHover}"/>
+        <local:UcImageButton x:Name="btnClose" Grid.Column="3" Width="17" Height="17" Background="Transparent" BorderThickness="0" Margin="4"
+                             ButtonImage="{StaticResource imgClose}" MouseOverButtonImage="{StaticResource imgCloseHover}" MousePressButtonImage="{StaticResource imgCloseHover}"/>
+
+
         <!--<local:UcImageButton x:Name="btnMin" Grid.Column="0" Width="17" Height="17" Background="Transparent" BorderThickness="0" Margin="4"
                              ButtonImage="/Resources/WindowBoxes/min.png" 
                              MouseOverButtonImage="/Resources/WindowBoxes/min.hover.png"
@@ -29,8 +47,9 @@
                              ButtonImage="/Resources/WindowBoxes/close.png" 
                              MouseOverButtonImage="/Resources/WindowBoxes/close.hover.png"
                              MousePressButtonImage="/Resources/WindowBoxes/close.hover.png" />-->
+        
 
-        <Button x:Name="btnMin" Grid.Column="0" Width="17" Height="17" Background="Transparent" BorderThickness="0" Margin="4">
+        <!--<Button x:Name="btnMin" Grid.Column="0" Width="17" Height="17" Background="Transparent" BorderThickness="0" Margin="4">
             <Border>
                 <Grid>
                     <Image Source="/Resources/WindowBoxes/min.png" Stretch="Uniform"/>
@@ -61,6 +80,6 @@
                     <Image Source="/Resources/WindowBoxes/close.hover.png" Stretch="Uniform" Visibility="Hidden"></Image>
                 </Grid>
             </Border>
-        </Button>
+        </Button>-->
     </Grid>
 </UserControl>
diff --git a/29WxOrderWpf/UserControls/WindowBoxes.xaml.cs b/29WxOrderWpf/UserControls/UcWindowBoxes.xaml.cs
similarity index 95%
rename from 29WxOrderWpf/UserControls/WindowBoxes.xaml.cs
rename to 29WxOrderWpf/UserControls/UcWindowBoxes.xaml.cs
index c93581c..fa0d743 100644
--- a/29WxOrderWpf/UserControls/WindowBoxes.xaml.cs
+++ b/29WxOrderWpf/UserControls/UcWindowBoxes.xaml.cs
@@ -18,10 +18,10 @@ namespace _29WxOrderWpf.UserControls
     /// <summary>
     /// WindowBox.xaml 的交互逻辑
     /// </summary>
-    public partial class WindowBoxes : UserControl
+    public partial class UcWindowBoxes : UserControl
     {
         public static readonly DependencyProperty MaxBoxVisibilityProperty =
-            DependencyProperty.Register("MaxBoxVisibility", typeof(Visibility), typeof(WindowBoxes),
+            DependencyProperty.Register("MaxBoxVisibility", typeof(Visibility), typeof(UcWindowBoxes),
             new PropertyMetadata(default(Visibility)));
         public Visibility MaxBoxVisibility
         {
@@ -34,7 +34,7 @@ namespace _29WxOrderWpf.UserControls
         }
 
         public static readonly DependencyProperty MinBoxVisibilityProperty =
-            DependencyProperty.Register("MinBoxVisibility", typeof(Visibility), typeof(WindowBoxes),
+            DependencyProperty.Register("MinBoxVisibility", typeof(Visibility), typeof(UcWindowBoxes),
             new PropertyMetadata(default(Visibility)));
         public Visibility MinBoxVisibility
         {
@@ -42,7 +42,7 @@ namespace _29WxOrderWpf.UserControls
             set { SetValue(MinBoxVisibilityProperty, value); btnMin.Visibility = value; }
         }
 
-        public WindowBoxes()
+        public UcWindowBoxes()
         {
             InitializeComponent();
             this.DataContext = this;