From dd5b526fd23c063d2676988d672e191075a07228 Mon Sep 17 00:00:00 2001
From: wule <jtt_fan@qq.com>
Date: Fri, 11 Sep 2026 11:53:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A7=E4=BB=B6=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 29WxOrderWpf/29WxOrderWpf.csproj                     |  5 -----
 29WxOrderWpf/Views/AutoBuyInstructionView.xaml‌       | 12 ------------
 29WxOrderWpf/Views/AutoBuyInstructionView‌.xaml       | 12 ++++++++++++
 ...onView.xaml.cs => AutoBuyInstructionView‌.xaml.cs} |  5 +++--
 4 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 29WxOrderWpf/Views/AutoBuyInstructionView.xaml‌
 create mode 100644 29WxOrderWpf/Views/AutoBuyInstructionView‌.xaml
 rename 29WxOrderWpf/Views/{AutoBuyInstructionView.xaml.cs => AutoBuyInstructionView‌.xaml.cs} (78%)

diff --git a/29WxOrderWpf/29WxOrderWpf.csproj b/29WxOrderWpf/29WxOrderWpf.csproj
index 4d7e693..45a19db 100644
--- a/29WxOrderWpf/29WxOrderWpf.csproj
+++ b/29WxOrderWpf/29WxOrderWpf.csproj
@@ -71,10 +71,5 @@
     <Resource Include="Ctrls\PDDInvoice\Resources\invoice.js" />
     <Resource Include="gear.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <None Update="Views\AutoBuyInstructionView.xaml‌">
-      <Generator>MSBuild:Compile</Generator>
-    </None>
-  </ItemGroup>
 
 </Project>
diff --git a/29WxOrderWpf/Views/AutoBuyInstructionView.xaml‌ b/29WxOrderWpf/Views/AutoBuyInstructionView.xaml‌
deleted file mode 100644
index ffc41ec..0000000
--- a/29WxOrderWpf/Views/AutoBuyInstructionView.xaml‌
+++ /dev/null
@@ -1,12 +0,0 @@
-<Window x:Class="_29WxOrderWpf.Views.AutoBuyInstructionView"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:_29WxOrderWpf.Views"
-        mc:Ignorable="d"
-        Title="自动拍单详情说明及密码设定" Height="450" Width="800">
-    <Grid>
-        
-    </Grid>
-</Window>
diff --git a/29WxOrderWpf/Views/AutoBuyInstructionView‌.xaml b/29WxOrderWpf/Views/AutoBuyInstructionView‌.xaml
new file mode 100644
index 0000000..21cd768
--- /dev/null
+++ b/29WxOrderWpf/Views/AutoBuyInstructionView‌.xaml
@@ -0,0 +1,12 @@
+<UserControl x:Class="_29WxOrderWpf.Views.AutoBuyInstructionView"
+             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.Views"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>
diff --git a/29WxOrderWpf/Views/AutoBuyInstructionView.xaml.cs b/29WxOrderWpf/Views/AutoBuyInstructionView‌.xaml.cs
similarity index 78%
rename from 29WxOrderWpf/Views/AutoBuyInstructionView.xaml.cs
rename to 29WxOrderWpf/Views/AutoBuyInstructionView‌.xaml.cs
index 4fa04fb..2634afc 100644
--- a/29WxOrderWpf/Views/AutoBuyInstructionView.xaml.cs
+++ b/29WxOrderWpf/Views/AutoBuyInstructionView‌.xaml.cs
@@ -10,14 +10,15 @@ 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.Views
 {
     /// <summary>
-    /// AutoBuyInstructionView.xaml 的交互逻辑
+    /// AutoBuyInstructionView_.xaml 的交互逻辑
     /// </summary>
-    public partial class AutoBuyInstructionView : Window
+    public partial class AutoBuyInstructionView : UserControl
     {
         public AutoBuyInstructionView()
         {