From 1eb53152616732f8864893e9379ecb67d8f6085f Mon Sep 17 00:00:00 2001
From: Chfei <chaihongfei@126.com>
Date: Sat, 17 Oct 2026 18:16:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=B8=BB=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E4=B8=8B=E7=9A=84Comm=E6=96=87=E4=BB=B6=E5=A4=B9=20?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=20Frameork=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 29WxOrderWpf/29WxOrderWpf.csproj              |  4 +
 29WxOrderWpf/App.xaml                         | 77 +++++++++----------
 29WxOrderWpf/App.xaml.cs                      | 21 ++---
 29WxOrderWpf/Common/DialogWindow.xaml         | 23 ------
 29WxOrderWpf/Common/InputDialog.xaml          | 65 ----------------
 .../Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml  |  2 +-
 .../BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs     |  2 +-
 .../Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs  |  3 +-
 .../BuyerCtrls/TaobaoBuyOrderViewModel.cs     |  2 +-
 .../Ctrls/Commons/ShopFilterComboBox.xaml.cs  |  2 +-
 .../Ctrls/OrderCtrls/OrderListCtrl.Command.cs |  6 +-
 .../Ctrls/OrderCtrls/OrderListCtrl.xaml       |  2 +-
 .../Ctrls/OrderCtrls/OrderListCtrl.xaml.cs    |  4 +-
 .../OrderCtrls/OrderListRowItemCtrl.xaml.cs   |  2 +-
 .../Ctrls/OrderCtrls/OrderTaskDialogView.xaml |  2 +-
 .../OrderCtrls/OrderTaskDialogView.xaml.cs    |  2 +-
 .../Ctrls/PDDInvoice/PDDInvoiceDialog.xaml.cs |  6 +-
 .../Ctrls/PDDInvoice/PDDInvoiceView.xaml      |  4 +-
 .../ViewModels/PDDInvoiceViewModel.Browser.cs |  2 +-
 .../ViewModels/PDDInvoiceViewModel.cs         |  8 +-
 .../PeriodRevenueStatisticsView.xaml          |  2 +-
 .../Statistics/ShopRevenueStatisticsView.xaml |  2 +-
 .../Ctrls/Statistics/ShowOrderDialogView.xaml |  2 +-
 .../Statistics/ShowOrderDialogView.xaml.cs    |  3 +-
 .../PeriodRevenueStatisticsViewModel.cs       |  4 +-
 .../ShopRevenueStatisticsViewModel.cs         |  4 +-
 29WxOrderWpf/OrderSupportTicketWindow.xaml    | 14 ++++
 29WxOrderWpf/OrderSupportTicketWindow.xaml.cs | 26 +++++++
 .../BaiduGetWaybillInfoViewModel.cs           |  2 +-
 29WxOrderWpf/ViewModels/BuyMapSkuViewModel.cs |  2 +-
 .../ViewModels/ChangePickNoViewModel.cs       |  2 +-
 .../ViewModels/ChangeWaybillViewModel.cs      |  2 +-
 .../ViewModels/EWaybillPathViewModel.cs       |  2 +-
 .../ViewModels/PddMobileLoginViewModel.cs     |  2 +-
 .../ViewModels/TaobaoLoginViewModel.cs        |  2 +-
 .../TransitExtraPackagesViewModel.cs          |  2 +-
 .../Views/AutoBuyIntroductionView‌.xaml        |  2 +-
 .../Views/BaiduGetWaybillInfoView.xaml        |  2 +-
 29WxOrderWpf/Views/PddMobileLoginView.xaml    |  2 +-
 29WxOrderWpf/Views/TaobaoLoginView.xaml       |  2 +-
 .../Windows/LoginWindows/LoginWindow.xaml.cs  |  2 +-
 Work/29WxOrderWork.csproj                     |  2 +-
 WxOrder.Framework/AssemblyInfo.cs             |  7 ++
 .../Commons}/AsyncDelegateCommand.cs          |  3 +-
 .../Commons}/AsyncDelegateCommand{T}.cs       |  3 +-
 .../Commons}/DebugVisibility.cs               |  2 +-
 .../Commons}/DelegateCommand.cs               |  2 +-
 .../Commons}/DelegateCommandBase.cs           |  2 +-
 .../Commons}/DelegateCommand{T}.cs            |  2 +-
 WxOrder.Framework/Commons/DialogWindow.xaml   | 23 ++++++
 .../Commons}/DialogWindow.xaml.cs             |  7 +-
 .../Commons}/DialogWindowProperty.cs          |  2 +-
 .../Commons}/Dialogs/ButtonResult.cs          |  2 +-
 .../Commons}/Dialogs/Dialog.cs                |  2 +-
 .../Commons}/Dialogs/DialogParameters.cs      |  4 +-
 .../Commons}/Dialogs/DialogResult.cs          |  2 +-
 .../Commons}/Dialogs/DialogService.cs         |  6 +-
 .../Commons}/Dialogs/IDialogAware.cs          |  2 +-
 .../Commons}/Dialogs/IDialogParameters.cs     |  2 +-
 .../Commons}/Dialogs/IDialogResult.cs         |  2 +-
 .../Commons}/Dialogs/IDialogWindow.cs         |  2 +-
 .../Commons}/Dialogs/IParameters.cs           |  2 +-
 .../Commons}/Dialogs/ParametersBase.cs        |  2 +-
 .../Commons}/Dialogs/ParametersExtensions.cs  |  2 +-
 .../Commons}/EnvironmentHelper.cs             |  2 +-
 .../Commons}/IAsyncCommand.cs                 |  2 +-
 WxOrder.Framework/Commons/InputDialog.xaml    | 65 ++++++++++++++++
 .../Commons}/InputDialog.xaml.cs              |  2 +-
 .../Commons}/ScrollViewerBehavior.cs          |  2 +-
 .../Commons}/pinyin/Data/PinyinCode1.cs       |  2 +-
 .../Commons}/pinyin/Data/PinyinCode2.cs       |  2 +-
 .../Commons}/pinyin/Data/PinyinCode3.cs       |  2 +-
 .../Commons}/pinyin/Data/PinyinData.cs        |  2 +-
 .../Commons}/pinyin/Engine.cs                 |  4 +-
 .../Commons}/pinyin/IPinyinDict.cs            |  2 +-
 .../Commons}/pinyin/PinyinDict.cs             |  2 +-
 .../Commons}/pinyin/PinyinHelper.cs           |  2 +-
 WxOrder.Framework/PDDAPI/PddApi.cs            |  3 +-
 78 files changed, 274 insertions(+), 227 deletions(-)
 delete mode 100644 29WxOrderWpf/Common/DialogWindow.xaml
 delete mode 100644 29WxOrderWpf/Common/InputDialog.xaml
 create mode 100644 29WxOrderWpf/OrderSupportTicketWindow.xaml
 create mode 100644 29WxOrderWpf/OrderSupportTicketWindow.xaml.cs
 create mode 100644 WxOrder.Framework/AssemblyInfo.cs
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/AsyncDelegateCommand.cs (99%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/AsyncDelegateCommand{T}.cs (99%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/DebugVisibility.cs (97%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/DelegateCommand.cs (99%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/DelegateCommandBase.cs (99%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/DelegateCommand{T}.cs (99%)
 create mode 100644 WxOrder.Framework/Commons/DialogWindow.xaml
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/DialogWindow.xaml.cs (96%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/DialogWindowProperty.cs (99%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/Dialogs/ButtonResult.cs (94%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/Dialogs/Dialog.cs (98%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/Dialogs/DialogParameters.cs (92%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/Dialogs/DialogResult.cs (96%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/Dialogs/DialogService.cs (98%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/Dialogs/IDialogAware.cs (96%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/Dialogs/IDialogParameters.cs (98%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/Dialogs/IDialogResult.cs (90%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/Dialogs/IDialogWindow.cs (97%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/Dialogs/IParameters.cs (98%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/Dialogs/ParametersBase.cs (99%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/Dialogs/ParametersExtensions.cs (99%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/EnvironmentHelper.cs (97%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/IAsyncCommand.cs (96%)
 create mode 100644 WxOrder.Framework/Commons/InputDialog.xaml
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/InputDialog.xaml.cs (99%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/ScrollViewerBehavior.cs (98%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/pinyin/Data/PinyinCode1.cs (99%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/pinyin/Data/PinyinCode2.cs (99%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/pinyin/Data/PinyinCode3.cs (99%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/pinyin/Data/PinyinData.cs (98%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/pinyin/Engine.cs (98%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/pinyin/IPinyinDict.cs (87%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/pinyin/PinyinDict.cs (94%)
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/pinyin/PinyinHelper.cs (97%)

diff --git a/29WxOrderWpf/29WxOrderWpf.csproj b/29WxOrderWpf/29WxOrderWpf.csproj
index a8890b8..52569a0 100644
--- a/29WxOrderWpf/29WxOrderWpf.csproj
+++ b/29WxOrderWpf/29WxOrderWpf.csproj
@@ -59,6 +59,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\AllBase\29WxOrderAllBase.csproj" />
+    <ProjectReference Include="..\OrderSupportTicket\OrderSupportTicket.csproj" />
     <ProjectReference Include="..\Work\29WxOrderWork.csproj" />
     <ProjectReference Include="..\WxOrder.Framework\WxOrder.Framework.csproj" />
   </ItemGroup>
@@ -83,5 +84,8 @@
       <SubType>Code</SubType>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Common\" />
+  </ItemGroup>
 
 </Project>
diff --git a/29WxOrderWpf/App.xaml b/29WxOrderWpf/App.xaml
index d3fae9d..efe0cd7 100644
--- a/29WxOrderWpf/App.xaml
+++ b/29WxOrderWpf/App.xaml
@@ -1,42 +1,41 @@
 <Application
-	x:Class="_29WxOrderWpf.App"
-	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:converters="clr-namespace:_29WxOrderWpf.Converters"
-	xmlns:local="clr-namespace:_29WxOrderWpf"
-	StartupUri="MainWindow.xaml">
-	<Application.Resources>
-		<ResourceDictionary>
-			<converters:HasValueToVisibilityConverter x:Key="hasValueToVisibilityConverter" />
-			<converters:HasTextToVisibilityConverter x:Key="HasTextVisibility" />
-			<converters:TextEllipsisConverter x:Key="TextEllipsisConverter" />
-			<converters:TextEllipsisConverter26 x:Key="TextEllipsisConverter26" />
-			<converters:TextEllipsisConverter8 x:Key="TextEllipsisConverter8" />
-			<converters:NotHasTextToVisibilityConverter x:Key="NotHasTextVisibility" />
-			<converters:VisibleToVisibilityConverter x:Key="visibleToVisibilityConverter" />
-			<converters:ImageUrlToBitmapImageConverter x:Key="ImageUrlToBitmapImage" />
-			<converters:ValueMinus24Converter x:Key="ValueMinus24Converter" />
-			<converters:FenToYuanConverter x:Key="FenToYuanConverter" />
-			<converters:StatusToColorBrushConverter x:Key="statusToColorBrushConverter" />
-			<converters:ListBoxIndexConverter x:Key="listBoxIndexConverter" />
-			<converters:FlagColorConverter x:Key="flagColorConverter" />
-			<ResourceDictionary.MergedDictionaries>
-				<ResourceDictionary Source="Styles/BaseWindowStyle.xaml" />
-				<ResourceDictionary Source="Styles/BaseDataGridStyle.xaml" />
-				<ResourceDictionary Source="Styles/BaseButtonStyle.xaml" />
-				<ResourceDictionary Source="Styles/BaseTextBoxStyle.xaml" />
-				<ResourceDictionary Source="Styles/BaseComboBoxStyle.xaml" />
-				<ResourceDictionary Source="Styles/UcImageButtonStyle.xaml" />
-				<ResourceDictionary Source="Styles/UcWaterMarkTextBoxStyle.xaml" />
-				<ResourceDictionary Source="Styles/StaticImageDictionary.xaml" />
-				<ResourceDictionary Source="Styles/StaticColorBrushDictionary.xaml" />
-				<ResourceDictionary Source="Styles/StaticImageBrushDictionary.xaml" />
-				<!--  可以添加更多资源字典  -->
-				<ResourceDictionary Source="/Ctrls/Statistics/General.xaml" />
+    x:Class="_29WxOrderWpf.App"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:_29WxOrderWpf.Converters"
+    xmlns:local="clr-namespace:_29WxOrderWpf">
+    <Application.Resources>
+        <ResourceDictionary>
+            <converters:HasValueToVisibilityConverter x:Key="hasValueToVisibilityConverter" />
+            <converters:HasTextToVisibilityConverter x:Key="HasTextVisibility" />
+            <converters:TextEllipsisConverter x:Key="TextEllipsisConverter" />
+            <converters:TextEllipsisConverter26 x:Key="TextEllipsisConverter26" />
+            <converters:TextEllipsisConverter8 x:Key="TextEllipsisConverter8" />
+            <converters:NotHasTextToVisibilityConverter x:Key="NotHasTextVisibility" />
+            <converters:VisibleToVisibilityConverter x:Key="visibleToVisibilityConverter" />
+            <converters:ImageUrlToBitmapImageConverter x:Key="ImageUrlToBitmapImage" />
+            <converters:ValueMinus24Converter x:Key="ValueMinus24Converter" />
+            <converters:FenToYuanConverter x:Key="FenToYuanConverter" />
+            <converters:StatusToColorBrushConverter x:Key="statusToColorBrushConverter" />
+            <converters:ListBoxIndexConverter x:Key="listBoxIndexConverter" />
+            <converters:FlagColorConverter x:Key="flagColorConverter" />
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="Styles/BaseWindowStyle.xaml" />
+                <ResourceDictionary Source="Styles/BaseDataGridStyle.xaml" />
+                <ResourceDictionary Source="Styles/BaseButtonStyle.xaml" />
+                <ResourceDictionary Source="Styles/BaseTextBoxStyle.xaml" />
+                <ResourceDictionary Source="Styles/BaseComboBoxStyle.xaml" />
+                <ResourceDictionary Source="Styles/UcImageButtonStyle.xaml" />
+                <ResourceDictionary Source="Styles/UcWaterMarkTextBoxStyle.xaml" />
+                <ResourceDictionary Source="Styles/StaticImageDictionary.xaml" />
+                <ResourceDictionary Source="Styles/StaticColorBrushDictionary.xaml" />
+                <ResourceDictionary Source="Styles/StaticImageBrushDictionary.xaml" />
+                <!--  可以添加更多资源字典  -->
+                <ResourceDictionary Source="/Ctrls/Statistics/General.xaml" />
 
-				<ResourceDictionary Source="pack://application:,,,/WxOrder.Framework;component/Resources/Theme.xaml" />
-				<ResourceDictionary Source="Styles/TabControlStyle.xaml" />
-			</ResourceDictionary.MergedDictionaries>
-		</ResourceDictionary>
-	</Application.Resources>
+                <ResourceDictionary Source="pack://application:,,,/WxOrder.Framework;component/Resources/Theme.xaml" />
+                <ResourceDictionary Source="Styles/TabControlStyle.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
 </Application>
diff --git a/29WxOrderWpf/App.xaml.cs b/29WxOrderWpf/App.xaml.cs
index 4070f92..490f111 100644
--- a/29WxOrderWpf/App.xaml.cs
+++ b/29WxOrderWpf/App.xaml.cs
@@ -141,17 +141,20 @@ namespace _29WxOrderWpf
 #endif
                 Cef.Initialize(settings);
             }
-            #endregion
-        }
+			#endregion
 
-        //static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
-        //{
-        //    string str = GetExceptionMsg(e.Exception, e.ToString());
-        //    NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
-        //    BaseMsgWindow.ShowError(str, "系统错误");
-        //}
+			//new MainWindow().Show();
+			new OrderSupportTicketWindow().Show();
+		}
 
-        private void Current_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
+		//static void Application_ThreadException(object sender, System.Threading.ThreadExceptionEventArgs e)
+		//{
+		//    string str = GetExceptionMsg(e.Exception, e.ToString());
+		//    NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
+		//    BaseMsgWindow.ShowError(str, "系统错误");
+		//}
+
+		private void Current_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e)
         {
             string str = GetExceptionMsg(e.Exception, e.ToString());
             NaiBa.Util.Helper.LogHelper.WriteWithTime("SystemError:" + str);
diff --git a/29WxOrderWpf/Common/DialogWindow.xaml b/29WxOrderWpf/Common/DialogWindow.xaml
deleted file mode 100644
index 9bb6e07..0000000
--- a/29WxOrderWpf/Common/DialogWindow.xaml
+++ /dev/null
@@ -1,23 +0,0 @@
-<Window
-	x:Class="_29WxOrderWpf.Common.DialogWindow"
-	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:local="clr-namespace:_29WxOrderWpf.Common"
-	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	Title="{Binding Title}"
-	d:DesignHeight="450"
-	d:DesignWidth="800"
-	Background="#FFFFFF"
-	WindowStartupLocation="CenterOwner"
-	mc:Ignorable="d">
-	<Window.Resources>
-		<Style x:Key="DialogWindowStyle" TargetType="Window">
-			<Setter Property="Tag" Value="Default" />
-			<Setter Property="ResizeMode" Value="NoResize" />
-			<Setter Property="ShowInTaskbar" Value="False" />
-			<Setter Property="WindowChrome.GlassFrameThickness" Value="-1" />
-		</Style>
-	</Window.Resources>
-	<Grid />
-</Window>
diff --git a/29WxOrderWpf/Common/InputDialog.xaml b/29WxOrderWpf/Common/InputDialog.xaml
deleted file mode 100644
index 16b8e1d..0000000
--- a/29WxOrderWpf/Common/InputDialog.xaml
+++ /dev/null
@@ -1,65 +0,0 @@
-<Window
-	x:Class="_29WxOrderWpf.Common.InputDialog"
-	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:local="clr-namespace:_29WxOrderWpf.Common"
-	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	Title="输入"
-	Width="360"
-	ContentRendered="Window_ContentRendered"
-	ResizeMode="NoResize"
-	ShowInTaskbar="False"
-	SizeToContent="Height"
-	WindowStartupLocation="CenterOwner"
-	mc:Ignorable="d">
-	
-	<Grid Margin="16">
-		<Grid.RowDefinitions>
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="Auto" />
-			<RowDefinition Height="Auto" />
-		</Grid.RowDefinitions>
-
-		<TextBlock
-			x:Name="PromptText"
-			Grid.Row="0"
-			Margin="0,0,0,8"
-			TextWrapping="Wrap" />
-
-		<TextBox
-			x:Name="InputBox"
-			Grid.Row="1"
-			Height="26"
-			VerticalContentAlignment="Center"
-			PreviewTextInput="InputBox_PreviewTextInput" />
-
-		<TextBlock
-			x:Name="ErrorText"
-			Grid.Row="2"
-			Margin="0,6,0,0"
-			Foreground="Red"
-			TextWrapping="Wrap"
-			Visibility="Collapsed" />
-
-		<StackPanel
-			Grid.Row="3"
-			Margin="0,16,0,0"
-			HorizontalAlignment="Right"
-			Orientation="Horizontal">
-			<Button
-				Width="80"
-				Height="28"
-				Click="Ok_Click"
-				Content="确定"
-				IsDefault="True" />
-			<Button
-				Width="80"
-				Height="28"
-				Margin="8,0,0,0"
-				Content="取消"
-				IsCancel="True" />
-		</StackPanel>
-	</Grid>
-</Window>
diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml
index 82b1b81..490c18c 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml
@@ -2,7 +2,7 @@
 	x:Class="_29WxOrderWpf.Ctrls.BuyerCtrls.PDDBuyerSelectCtrl"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:c="clr-namespace:_29WxOrderWpf.Common"
+	xmlns:c="WxOrder.Framework"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.BuyerCtrls"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs
index 31a28df..190a616 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerSelectCtrl.xaml.cs
@@ -1,5 +1,4 @@
 using _29WxOrderWpf.BaseWindows;
-using _29WxOrderWpf.Common;
 using _29WxOrderWpf.Ctrls.OrderCtrls;
 using _29WxOrderWpf.ViewModels;
 using _29WxOrderWpf.Views;
@@ -25,6 +24,7 @@ using System.Windows.Shapes;
 using TemuKJD.ToolForms;
 using Work;
 using Work.BaseForms;
+using WxOrder.Framework.Commons;
 
 namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 {
diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs
index 926f688..176a3d9 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PddBuyOrderViewModel.cs
@@ -1,6 +1,6 @@
 using _29WxOrderWpf.BaseWindows;
 using _29WxOrderWpf.CefHelper;
-using _29WxOrderWpf.Commands;
+using WxOrder.Framework.Commons;
 using _29WxOrderWpf.ViewModels;
 using AllBase;
 using AllBase.Helper;
@@ -31,7 +31,6 @@ using Work;
 using Work._29Tools.BLL;
 using Work._29Tools.CefTools;
 using Work.BaseForms;
-using WxOrder.Framework.Commons;
 using WxOrder.Framework.Helpers;
 using static AllBase.DouYinModel.Result.DouOrderListInfo;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement.ListView;
diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs
index 13bb041..7cc6412 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/TaobaoBuyOrderViewModel.cs
@@ -1,6 +1,6 @@
 using _29WxOrderWpf.BaseWindows;
 using _29WxOrderWpf.CefHelper;
-using _29WxOrderWpf.Commands;
+using WxOrder.Framework.Commons;
 using _29WxOrderWpf.ViewModels;
 using AllBase;
 using AllBase.Helper;
diff --git a/29WxOrderWpf/Ctrls/Commons/ShopFilterComboBox.xaml.cs b/29WxOrderWpf/Ctrls/Commons/ShopFilterComboBox.xaml.cs
index 5eef533..d70243d 100644
--- a/29WxOrderWpf/Ctrls/Commons/ShopFilterComboBox.xaml.cs
+++ b/29WxOrderWpf/Ctrls/Commons/ShopFilterComboBox.xaml.cs
@@ -11,7 +11,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using TinyPinyin;
+using WxOrder.Framework.Commons.pinyin;
 
 namespace _29WxOrderWpf.Ctrls.Commons
 {
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.Command.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.Command.cs
index 6753aab..59acae4 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.Command.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.Command.cs
@@ -1,13 +1,12 @@
 using _29WxOrderWpf.BaseWindows;
-using _29WxOrderWpf.Commands;
-using _29WxOrderWpf.Common;
+using WxOrder.Framework.Commons;
+using WxOrder.Framework.Commons;
 using _29WxOrderWpf.Ctrls.PDDInvoice;
 using _29WxOrderWpf.Ctrls.Statistics;
 using _29WxOrderWpf.Services;
 using AllBase.Helper;
 using AllBase.Model.DBModel;
 using NaiBa.Util.Extension;
-using Prism.Services.Dialogs;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -16,6 +15,7 @@ using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
 using Work._29Tools.BLL;
+using WxOrder.Framework.Commons.Dialogs;
 using static _29WxOrderWpf.Services.ShipGiftService;
 
 namespace _29WxOrderWpf.Ctrls.OrderCtrls;
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
index 34fe3a6..f3bb795 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
@@ -2,7 +2,7 @@
 	x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListCtrl"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:c="clr-namespace:_29WxOrderWpf.Common"
+	xmlns:c="WxOrder.Framework"
 	xmlns:converters="clr-namespace:_29WxOrderWpf.Converters"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
index bf8ed13..b2295d6 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
@@ -1,6 +1,6 @@
 using _29WxOrderWpf.BaseWindows;
-using _29WxOrderWpf.Commands;
-using _29WxOrderWpf.Common;
+using WxOrder.Framework.Commons;
+using WxOrder.Framework.Commons;
 using _29WxOrderWpf.Ctrls.BuyerCtrls;
 using _29WxOrderWpf.Ctrls.Statistics;
 using _29WxOrderWpf.Services;
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
index a866649..23ed643 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
@@ -1,5 +1,5 @@
 using _29WxOrderWpf.BaseWindows;
-using _29WxOrderWpf.Common;
+using WxOrder.Framework.Commons;
 using _29WxOrderWpf.Converters;
 using _29WxOrderWpf.Ctrls.BuyerCtrls;
 using _29WxOrderWpf.UserControls;
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml
index d4017d5..fe96efa 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml
@@ -2,7 +2,7 @@
 	x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderTaskDialogView"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:comn="clr-namespace:_29WxOrderWpf.Common"
+	xmlns:comn="WxOrder.Framework"
 	xmlns:converters="clr-namespace:_29WxOrderWpf.Converters"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml.cs
index 4b28d1b..60b1391 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml.cs
@@ -1,4 +1,4 @@
-using _29WxOrderWpf.Commands;
+using WxOrder.Framework.Commons;
 using _29WxOrderWpf.Services;
 using AllBase.Model.MvvmBaseClasses;
 using AllBase.Util;
diff --git a/29WxOrderWpf/Ctrls/PDDInvoice/PDDInvoiceDialog.xaml.cs b/29WxOrderWpf/Ctrls/PDDInvoice/PDDInvoiceDialog.xaml.cs
index 4aa6a26..2e801b1 100644
--- a/29WxOrderWpf/Ctrls/PDDInvoice/PDDInvoiceDialog.xaml.cs
+++ b/29WxOrderWpf/Ctrls/PDDInvoice/PDDInvoiceDialog.xaml.cs
@@ -1,7 +1,6 @@
-using _29WxOrderWpf.Commands;
-using _29WxOrderWpf.Common;
+using WxOrder.Framework.Commons;
+using WxOrder.Framework.Commons;
 using _29WxOrderWpf.Ctrls.PDDInvoice.ViewModels;
-using Prism.Services.Dialogs;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -17,6 +16,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
 using WPFCommon.Models;
+using WxOrder.Framework.Commons.Dialogs;
 using static Org.BouncyCastle.Math.EC.ECCurve;
 
 namespace _29WxOrderWpf.Ctrls.PDDInvoice;
diff --git a/29WxOrderWpf/Ctrls/PDDInvoice/PDDInvoiceView.xaml b/29WxOrderWpf/Ctrls/PDDInvoice/PDDInvoiceView.xaml
index 01b5f55..5550e9a 100644
--- a/29WxOrderWpf/Ctrls/PDDInvoice/PDDInvoiceView.xaml
+++ b/29WxOrderWpf/Ctrls/PDDInvoice/PDDInvoiceView.xaml
@@ -2,8 +2,8 @@
 	x:Class="_29WxOrderWpf.Ctrls.PDDInvoice.PDDInvoiceView"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:comm="clr-namespace:_29WxOrderWpf.Common"
-	xmlns:common="clr-namespace:_29WxOrderWpf.Common"
+	xmlns:comm="WxOrder.Framework"
+	xmlns:common="WxOrder.Framework"
 	xmlns:converters="clr-namespace:_29WxOrderWpf.Converters"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/29WxOrderWpf/Ctrls/PDDInvoice/ViewModels/PDDInvoiceViewModel.Browser.cs b/29WxOrderWpf/Ctrls/PDDInvoice/ViewModels/PDDInvoiceViewModel.Browser.cs
index bbd6640..fe9b8a5 100644
--- a/29WxOrderWpf/Ctrls/PDDInvoice/ViewModels/PDDInvoiceViewModel.Browser.cs
+++ b/29WxOrderWpf/Ctrls/PDDInvoice/ViewModels/PDDInvoiceViewModel.Browser.cs
@@ -1,5 +1,5 @@
 using _29WxOrderWpf.CefHelper;
-using _29WxOrderWpf.Commands;
+using WxOrder.Framework.Commons;
 using AllBase;
 using CefSharp;
 using CefSharp.Handler;
diff --git a/29WxOrderWpf/Ctrls/PDDInvoice/ViewModels/PDDInvoiceViewModel.cs b/29WxOrderWpf/Ctrls/PDDInvoice/ViewModels/PDDInvoiceViewModel.cs
index 7bc83ff..3fa9299 100644
--- a/29WxOrderWpf/Ctrls/PDDInvoice/ViewModels/PDDInvoiceViewModel.cs
+++ b/29WxOrderWpf/Ctrls/PDDInvoice/ViewModels/PDDInvoiceViewModel.cs
@@ -1,7 +1,7 @@
 using _29WxOrderWpf.BaseWindows;
 using _29WxOrderWpf.CefHelper;
-using _29WxOrderWpf.Commands;
-using _29WxOrderWpf.Common;
+using WxOrder.Framework.Commons;
+using WxOrder.Framework.Commons;
 using _29WxOrderWpf.Ctrls.Statistics;
 using AllBase;
 using AllBase.Helper;
@@ -11,11 +11,9 @@ using AllBase.Util;
 using CefSharp;
 using CefSharp.Handler;
 using CefSharp.Wpf;
-using MAX.Core.Helpers;
 using NaiBa.Util.Extension;
 using Newtonsoft.Json;
 using NPOI.SS.Formula.Functions;
-using Prism.Services.Dialogs;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -38,6 +36,8 @@ using Work.BaseForms;
 using WPFCommon.Converters;
 using WPFCommon.Helpers;
 using WPFCommon.Models;
+using WxOrder.Framework.Commons;
+using WxOrder.Framework.Commons.Dialogs;
 using WxOrder.Framework.Helpers;
 
 namespace _29WxOrderWpf.Ctrls.PDDInvoice.ViewModels;
diff --git a/29WxOrderWpf/Ctrls/Statistics/PeriodRevenueStatisticsView.xaml b/29WxOrderWpf/Ctrls/Statistics/PeriodRevenueStatisticsView.xaml
index 98175af..ecd6f7f 100644
--- a/29WxOrderWpf/Ctrls/Statistics/PeriodRevenueStatisticsView.xaml
+++ b/29WxOrderWpf/Ctrls/Statistics/PeriodRevenueStatisticsView.xaml
@@ -2,7 +2,7 @@
 	x:Class="_29WxOrderWpf.Ctrls.Statistics.PeriodRevenueStatisticsView"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:common="clr-namespace:_29WxOrderWpf.Common"
+	xmlns:common="WxOrder.Framework"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:stat="clr-namespace:_29WxOrderWpf.Ctrls.Statistics"
diff --git a/29WxOrderWpf/Ctrls/Statistics/ShopRevenueStatisticsView.xaml b/29WxOrderWpf/Ctrls/Statistics/ShopRevenueStatisticsView.xaml
index 7396f25..ea5c7ee 100644
--- a/29WxOrderWpf/Ctrls/Statistics/ShopRevenueStatisticsView.xaml
+++ b/29WxOrderWpf/Ctrls/Statistics/ShopRevenueStatisticsView.xaml
@@ -7,7 +7,7 @@
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:stat="clr-namespace:_29WxOrderWpf.Ctrls.Statistics"
 	xmlns:vm="clr-namespace:_29WxOrderWpf.Ctrls.Statistics.ViewModels"
-	xmlns:wpf="clr-namespace:_29WxOrderWpf.Common"
+	xmlns:wpf="WxOrder.Framework"
 	Width="1600"
 	d:Background="#F5F7FB"
 	d:DataContext="{d:DesignInstance Type=vm:ShopRevenueStatisticsViewModel,
diff --git a/29WxOrderWpf/Ctrls/Statistics/ShowOrderDialogView.xaml b/29WxOrderWpf/Ctrls/Statistics/ShowOrderDialogView.xaml
index a4e4e65..d77156b 100644
--- a/29WxOrderWpf/Ctrls/Statistics/ShowOrderDialogView.xaml
+++ b/29WxOrderWpf/Ctrls/Statistics/ShowOrderDialogView.xaml
@@ -2,7 +2,7 @@
 	x:Class="_29WxOrderWpf.Ctrls.Statistics.ShowOrderDialogView"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:comn="clr-namespace:_29WxOrderWpf.Common"
+	xmlns:comn="WxOrder.Framework"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.Statistics"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/29WxOrderWpf/Ctrls/Statistics/ShowOrderDialogView.xaml.cs b/29WxOrderWpf/Ctrls/Statistics/ShowOrderDialogView.xaml.cs
index 3d77b33..438f9c6 100644
--- a/29WxOrderWpf/Ctrls/Statistics/ShowOrderDialogView.xaml.cs
+++ b/29WxOrderWpf/Ctrls/Statistics/ShowOrderDialogView.xaml.cs
@@ -1,6 +1,5 @@
 using _29WxOrderWpf.BaseWindows;
-using _29WxOrderWpf.Commands;
-using _29WxOrderWpf.Common;
+using WxOrder.Framework.Commons;
 using _29WxOrderWpf.Ctrls.Statistics.Models;
 using _29WxOrderWpf.Ctrls.Statistics.Services;
 using _29WxOrderWpf.ToolCtrls;
diff --git a/29WxOrderWpf/Ctrls/Statistics/ViewModels/PeriodRevenueStatisticsViewModel.cs b/29WxOrderWpf/Ctrls/Statistics/ViewModels/PeriodRevenueStatisticsViewModel.cs
index ccc03c0..55a302f 100644
--- a/29WxOrderWpf/Ctrls/Statistics/ViewModels/PeriodRevenueStatisticsViewModel.cs
+++ b/29WxOrderWpf/Ctrls/Statistics/ViewModels/PeriodRevenueStatisticsViewModel.cs
@@ -1,5 +1,4 @@
-using _29WxOrderWpf.Commands;
-using _29WxOrderWpf.Common;
+using WxOrder.Framework.Commons;
 using _29WxOrderWpf.Ctrls.Statistics.Models;
 using _29WxOrderWpf.Ctrls.Statistics.Services;
 using AllBase.Model.MvvmBaseClasses;
@@ -10,6 +9,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Input;
+using WxOrder.Framework.Commons;
 
 namespace _29WxOrderWpf.Ctrls.Statistics.ViewModels
 {
diff --git a/29WxOrderWpf/Ctrls/Statistics/ViewModels/ShopRevenueStatisticsViewModel.cs b/29WxOrderWpf/Ctrls/Statistics/ViewModels/ShopRevenueStatisticsViewModel.cs
index 5b88df9..fbd9694 100644
--- a/29WxOrderWpf/Ctrls/Statistics/ViewModels/ShopRevenueStatisticsViewModel.cs
+++ b/29WxOrderWpf/Ctrls/Statistics/ViewModels/ShopRevenueStatisticsViewModel.cs
@@ -1,5 +1,5 @@
-using _29WxOrderWpf.Commands;
-using _29WxOrderWpf.Common;
+using WxOrder.Framework.Commons;
+using WxOrder.Framework.Commons;
 using _29WxOrderWpf.Ctrls.Statistics.Models;
 using _29WxOrderWpf.Ctrls.Statistics.Services;
 using AllBase.Model.MvvmBaseClasses;
diff --git a/29WxOrderWpf/OrderSupportTicketWindow.xaml b/29WxOrderWpf/OrderSupportTicketWindow.xaml
new file mode 100644
index 0000000..c909806
--- /dev/null
+++ b/29WxOrderWpf/OrderSupportTicketWindow.xaml
@@ -0,0 +1,14 @@
+<Window
+    x:Class="_29WxOrderWpf.OrderSupportTicketWindow"
+    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:local="clr-namespace:_29WxOrderWpf"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ost="clr-namespace:OrderSupportTicket.Views;assembly=OrderSupportTicket"
+    Title="OrderSupportTicketWindow"
+    Width="800"
+    Height="650"
+    mc:Ignorable="d">
+    <ost:OrderSupportTicketView />
+</Window>
diff --git a/29WxOrderWpf/OrderSupportTicketWindow.xaml.cs b/29WxOrderWpf/OrderSupportTicketWindow.xaml.cs
new file mode 100644
index 0000000..4da3cd5
--- /dev/null
+++ b/29WxOrderWpf/OrderSupportTicketWindow.xaml.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+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.Shapes;
+
+namespace _29WxOrderWpf;
+
+/// <summary>
+/// OrderSupportTicketWindow.xaml 的交互逻辑
+/// </summary>
+public partial class OrderSupportTicketWindow : Window
+{
+	public OrderSupportTicketWindow()
+	{
+		InitializeComponent();
+	}
+}
diff --git a/29WxOrderWpf/ViewModels/BaiduGetWaybillInfoViewModel.cs b/29WxOrderWpf/ViewModels/BaiduGetWaybillInfoViewModel.cs
index 5758a81..9c6701a 100644
--- a/29WxOrderWpf/ViewModels/BaiduGetWaybillInfoViewModel.cs
+++ b/29WxOrderWpf/ViewModels/BaiduGetWaybillInfoViewModel.cs
@@ -1,5 +1,5 @@
 using _29WxOrderWpf.CefHelper;
-using _29WxOrderWpf.Commands;
+using WxOrder.Framework.Commons;
 using _29WxOrderWpf.Ctrls.OrderCtrls;
 using AllBase;
 using AllBase.Helper;
diff --git a/29WxOrderWpf/ViewModels/BuyMapSkuViewModel.cs b/29WxOrderWpf/ViewModels/BuyMapSkuViewModel.cs
index 0f80f7a..08120b4 100644
--- a/29WxOrderWpf/ViewModels/BuyMapSkuViewModel.cs
+++ b/29WxOrderWpf/ViewModels/BuyMapSkuViewModel.cs
@@ -1,5 +1,5 @@
 using _29WxOrderWpf.BaseWindows;
-using _29WxOrderWpf.Commands;
+using WxOrder.Framework.Commons;
 using AllBase;
 using AllBase.Helper;
 using AllBase.Model.DBModel;
diff --git a/29WxOrderWpf/ViewModels/ChangePickNoViewModel.cs b/29WxOrderWpf/ViewModels/ChangePickNoViewModel.cs
index f94b4a1..423f3ba 100644
--- a/29WxOrderWpf/ViewModels/ChangePickNoViewModel.cs
+++ b/29WxOrderWpf/ViewModels/ChangePickNoViewModel.cs
@@ -1,5 +1,5 @@
 using _29WxOrderWpf.BaseWindows;
-using _29WxOrderWpf.Commands;
+using WxOrder.Framework.Commons;
 using AllBase;
 using AllBase.Model.DBModel;
 using AllBase.Model.MvvmBaseClasses;
diff --git a/29WxOrderWpf/ViewModels/ChangeWaybillViewModel.cs b/29WxOrderWpf/ViewModels/ChangeWaybillViewModel.cs
index b2ab866..426f335 100644
--- a/29WxOrderWpf/ViewModels/ChangeWaybillViewModel.cs
+++ b/29WxOrderWpf/ViewModels/ChangeWaybillViewModel.cs
@@ -1,5 +1,5 @@
 using _29WxOrderWpf.BaseWindows;
-using _29WxOrderWpf.Commands;
+using WxOrder.Framework.Commons;
 using AllBase;
 using AllBase.Model.DBModel;
 using AllBase.Model.MvvmBaseClasses;
diff --git a/29WxOrderWpf/ViewModels/EWaybillPathViewModel.cs b/29WxOrderWpf/ViewModels/EWaybillPathViewModel.cs
index e919e0d..7ad0989 100644
--- a/29WxOrderWpf/ViewModels/EWaybillPathViewModel.cs
+++ b/29WxOrderWpf/ViewModels/EWaybillPathViewModel.cs
@@ -1,5 +1,5 @@
 using _29WxOrderWpf.BaseWindows;
-using _29WxOrderWpf.Commands;
+using WxOrder.Framework.Commons;
 using AllBase;
 using AllBase.Model.DBModel;
 using AllBase.Model.MvvmBaseClasses;
diff --git a/29WxOrderWpf/ViewModels/PddMobileLoginViewModel.cs b/29WxOrderWpf/ViewModels/PddMobileLoginViewModel.cs
index 8a6742d..464ada0 100644
--- a/29WxOrderWpf/ViewModels/PddMobileLoginViewModel.cs
+++ b/29WxOrderWpf/ViewModels/PddMobileLoginViewModel.cs
@@ -1,5 +1,5 @@
 using _29WxOrderWpf.CefHelper;
-using _29WxOrderWpf.Commands;
+using WxOrder.Framework.Commons;
 using AllBase;
 using AllBase.Helper;
 using AllBase.Model.DBModel;
diff --git a/29WxOrderWpf/ViewModels/TaobaoLoginViewModel.cs b/29WxOrderWpf/ViewModels/TaobaoLoginViewModel.cs
index b7afc2a..4a7cc39 100644
--- a/29WxOrderWpf/ViewModels/TaobaoLoginViewModel.cs
+++ b/29WxOrderWpf/ViewModels/TaobaoLoginViewModel.cs
@@ -1,5 +1,5 @@
 using _29WxOrderWpf.CefHelper;
-using _29WxOrderWpf.Commands;
+using WxOrder.Framework.Commons;
 using AllBase;
 using AllBase.Helper;
 using AllBase.Model.DBModel;
diff --git a/29WxOrderWpf/ViewModels/TransitExtraPackagesViewModel.cs b/29WxOrderWpf/ViewModels/TransitExtraPackagesViewModel.cs
index 64c76ac..5ae4caa 100644
--- a/29WxOrderWpf/ViewModels/TransitExtraPackagesViewModel.cs
+++ b/29WxOrderWpf/ViewModels/TransitExtraPackagesViewModel.cs
@@ -1,5 +1,5 @@
 using _29WxOrderWpf.BaseWindows;
-using _29WxOrderWpf.Commands;
+using WxOrder.Framework.Commons;
 using _29WxOrderWpf.Ctrls.OrderCtrls;
 using AllBase;
 using AllBase.Helper;
diff --git a/29WxOrderWpf/Views/AutoBuyIntroductionView‌.xaml b/29WxOrderWpf/Views/AutoBuyIntroductionView‌.xaml
index 0597505..d912bd2 100644
--- a/29WxOrderWpf/Views/AutoBuyIntroductionView‌.xaml
+++ b/29WxOrderWpf/Views/AutoBuyIntroductionView‌.xaml
@@ -3,7 +3,7 @@
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:UserControls="clr-namespace:_29WxOrderWpf.UserControls"
-	xmlns:comn="clr-namespace:_29WxOrderWpf.Common"
+	xmlns:comn="WxOrder.Framework"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:local="clr-namespace:_29WxOrderWpf.Views"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
diff --git a/29WxOrderWpf/Views/BaiduGetWaybillInfoView.xaml b/29WxOrderWpf/Views/BaiduGetWaybillInfoView.xaml
index b22acb5..2a0ffdd 100644
--- a/29WxOrderWpf/Views/BaiduGetWaybillInfoView.xaml
+++ b/29WxOrderWpf/Views/BaiduGetWaybillInfoView.xaml
@@ -3,7 +3,7 @@
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:basewindows="clr-namespace:_29WxOrderWpf.BaseWindows"
-	xmlns:comn="clr-namespace:_29WxOrderWpf.Common"
+	xmlns:comn="WxOrder.Framework"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:wpf="WPFCommon"
diff --git a/29WxOrderWpf/Views/PddMobileLoginView.xaml b/29WxOrderWpf/Views/PddMobileLoginView.xaml
index ffa6e80..00104f6 100644
--- a/29WxOrderWpf/Views/PddMobileLoginView.xaml
+++ b/29WxOrderWpf/Views/PddMobileLoginView.xaml
@@ -3,7 +3,7 @@
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:basewindows="clr-namespace:_29WxOrderWpf.BaseWindows"
-	xmlns:comn="clr-namespace:_29WxOrderWpf.Common"
+	xmlns:comn="WxOrder.Framework"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:wpf="WPFCommon"
diff --git a/29WxOrderWpf/Views/TaobaoLoginView.xaml b/29WxOrderWpf/Views/TaobaoLoginView.xaml
index 29ffd6d..ad7d664 100644
--- a/29WxOrderWpf/Views/TaobaoLoginView.xaml
+++ b/29WxOrderWpf/Views/TaobaoLoginView.xaml
@@ -3,7 +3,7 @@
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:basewindows="clr-namespace:_29WxOrderWpf.BaseWindows"
-	xmlns:comn="clr-namespace:_29WxOrderWpf.Common"
+	xmlns:comn="WxOrder.Framework"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	xmlns:wpf="WPFCommon"
diff --git a/29WxOrderWpf/Windows/LoginWindows/LoginWindow.xaml.cs b/29WxOrderWpf/Windows/LoginWindows/LoginWindow.xaml.cs
index 051bd98..f8e19f6 100644
--- a/29WxOrderWpf/Windows/LoginWindows/LoginWindow.xaml.cs
+++ b/29WxOrderWpf/Windows/LoginWindows/LoginWindow.xaml.cs
@@ -2,7 +2,6 @@
 using _29WxOrderWpf.UserControls;
 using AllBase;
 using AllBase.DouYinModel.Param.LoginManage;
-using MAX.Core.Helpers;
 using NaiBa.Util;
 using NaiBa.Util.Extension;
 using NaiBa.Util.Helper;
@@ -23,6 +22,7 @@ using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 using Work;
 using Work.BaseForms;
+using WxOrder.Framework.Commons;
 
 namespace _29WxOrderWpf.Windows.LoginWindows
 {
diff --git a/Work/29WxOrderWork.csproj b/Work/29WxOrderWork.csproj
index 2342b43..b849699 100644
--- a/Work/29WxOrderWork.csproj
+++ b/Work/29WxOrderWork.csproj
@@ -7,7 +7,7 @@
 		<AppDesignerFolder>Properties</AppDesignerFolder>
 		<RootNamespace>Work</RootNamespace>
 		<AssemblyName>29WxOrderWork</AssemblyName>
-
+		<LangVersion>12</LangVersion>
 		<UseWindowsForms>true</UseWindowsForms>
 		<Deterministic>true</Deterministic>
 		<UseWPF>true</UseWPF>
diff --git a/WxOrder.Framework/AssemblyInfo.cs b/WxOrder.Framework/AssemblyInfo.cs
new file mode 100644
index 0000000..fc6cf9b
--- /dev/null
+++ b/WxOrder.Framework/AssemblyInfo.cs
@@ -0,0 +1,7 @@
+using System.Windows.Markup;
+
+[assembly: XmlnsDefinition("WxOrder.Framework", "WxOrder.Framework")]
+
+[assembly: XmlnsDefinition("WxOrder.Framework", "WxOrder.Framework.Commons")]
+
+[assembly: XmlnsPrefix("WxOrder.Framework", "of")]
\ No newline at end of file
diff --git a/29WxOrderWpf/Common/AsyncDelegateCommand.cs b/WxOrder.Framework/Commons/AsyncDelegateCommand.cs
similarity index 99%
rename from 29WxOrderWpf/Common/AsyncDelegateCommand.cs
rename to WxOrder.Framework/Commons/AsyncDelegateCommand.cs
index 993112b..04bb585 100644
--- a/29WxOrderWpf/Common/AsyncDelegateCommand.cs
+++ b/WxOrder.Framework/Commons/AsyncDelegateCommand.cs
@@ -5,10 +5,9 @@ using System.Threading.Tasks;
 using System.Windows.Input;
 using System.Reflection.Emit;
 using System.Resources;
-using _29WxOrderWpf.Commands;
 
 
-namespace _29WxOrderWpf.Common
+namespace WxOrder.Framework.Commons
 {
 
     /// <summary>
diff --git a/29WxOrderWpf/Common/AsyncDelegateCommand{T}.cs b/WxOrder.Framework/Commons/AsyncDelegateCommand{T}.cs
similarity index 99%
rename from 29WxOrderWpf/Common/AsyncDelegateCommand{T}.cs
rename to WxOrder.Framework/Commons/AsyncDelegateCommand{T}.cs
index 6595c82..be43b1a 100644
--- a/29WxOrderWpf/Common/AsyncDelegateCommand{T}.cs
+++ b/WxOrder.Framework/Commons/AsyncDelegateCommand{T}.cs
@@ -5,9 +5,8 @@ using System.Threading.Tasks;
 using System.Windows.Input;
 using System.Reflection.Emit;
 using System.Resources;
-using _29WxOrderWpf.Commands;
 
-namespace _29WxOrderWpf.Common
+namespace WxOrder.Framework.Commons
 {
     /// <summary>
     /// Provides an implementation of the <see cref="IAsyncCommand"/> with a generic parameter type.
diff --git a/29WxOrderWpf/Common/DebugVisibility.cs b/WxOrder.Framework/Commons/DebugVisibility.cs
similarity index 97%
rename from 29WxOrderWpf/Common/DebugVisibility.cs
rename to WxOrder.Framework/Commons/DebugVisibility.cs
index cc604a7..b95c498 100644
--- a/29WxOrderWpf/Common/DebugVisibility.cs
+++ b/WxOrder.Framework/Commons/DebugVisibility.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace _29WxOrderWpf.Common
+namespace WxOrder.Framework.Commons
 {
 	public static class DebugVisibility
 	{
diff --git a/29WxOrderWpf/Common/DelegateCommand.cs b/WxOrder.Framework/Commons/DelegateCommand.cs
similarity index 99%
rename from 29WxOrderWpf/Common/DelegateCommand.cs
rename to WxOrder.Framework/Commons/DelegateCommand.cs
index 498d8db..81f630b 100644
--- a/29WxOrderWpf/Common/DelegateCommand.cs
+++ b/WxOrder.Framework/Commons/DelegateCommand.cs
@@ -2,7 +2,7 @@ using System;
 using System.Linq.Expressions;
 using System.Windows.Input;
 
-namespace _29WxOrderWpf.Commands
+namespace WxOrder.Framework.Commons
 {
     /// <summary>
     /// An <see cref="ICommand"/> whose delegates do not take any parameters for <see cref="Execute()"/> and <see cref="CanExecute()"/>.
diff --git a/29WxOrderWpf/Common/DelegateCommandBase.cs b/WxOrder.Framework/Commons/DelegateCommandBase.cs
similarity index 99%
rename from 29WxOrderWpf/Common/DelegateCommandBase.cs
rename to WxOrder.Framework/Commons/DelegateCommandBase.cs
index 3f26b66..72c8dfe 100644
--- a/29WxOrderWpf/Common/DelegateCommandBase.cs
+++ b/WxOrder.Framework/Commons/DelegateCommandBase.cs
@@ -8,7 +8,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace _29WxOrderWpf.Commands
+namespace WxOrder.Framework.Commons
 {
     public abstract class DelegateCommandBase : ICommand
     {
diff --git a/29WxOrderWpf/Common/DelegateCommand{T}.cs b/WxOrder.Framework/Commons/DelegateCommand{T}.cs
similarity index 99%
rename from 29WxOrderWpf/Common/DelegateCommand{T}.cs
rename to WxOrder.Framework/Commons/DelegateCommand{T}.cs
index 8e29aa6..b618be4 100644
--- a/29WxOrderWpf/Common/DelegateCommand{T}.cs
+++ b/WxOrder.Framework/Commons/DelegateCommand{T}.cs
@@ -3,7 +3,7 @@ using System.Linq.Expressions;
 using System.Reflection;
 using System.Windows.Input;
 
-namespace _29WxOrderWpf.Commands
+namespace WxOrder.Framework.Commons
 {
    
     public class DelegateCommand<T> : DelegateCommandBase
diff --git a/WxOrder.Framework/Commons/DialogWindow.xaml b/WxOrder.Framework/Commons/DialogWindow.xaml
new file mode 100644
index 0000000..5168be7
--- /dev/null
+++ b/WxOrder.Framework/Commons/DialogWindow.xaml
@@ -0,0 +1,23 @@
+<Window
+    x:Class="WxOrder.Framework.Commons.DialogWindow"
+    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:local="clr-namespace:WxOrder.Framework.Commons"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="{Binding Title}"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    Background="#FFFFFF"
+    WindowStartupLocation="CenterOwner"
+    mc:Ignorable="d">
+    <Window.Resources>
+        <Style x:Key="DialogWindowStyle" TargetType="Window">
+            <Setter Property="Tag" Value="Default" />
+            <Setter Property="ResizeMode" Value="NoResize" />
+            <Setter Property="ShowInTaskbar" Value="False" />
+            <Setter Property="WindowChrome.GlassFrameThickness" Value="-1" />
+        </Style>
+    </Window.Resources>
+    <Grid />
+</Window>
diff --git a/29WxOrderWpf/Common/DialogWindow.xaml.cs b/WxOrder.Framework/Commons/DialogWindow.xaml.cs
similarity index 96%
rename from 29WxOrderWpf/Common/DialogWindow.xaml.cs
rename to WxOrder.Framework/Commons/DialogWindow.xaml.cs
index 52c9b84..f63a547 100644
--- a/29WxOrderWpf/Common/DialogWindow.xaml.cs
+++ b/WxOrder.Framework/Commons/DialogWindow.xaml.cs
@@ -1,5 +1,4 @@
-using Prism.Services.Dialogs;
-using System;
+using System;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Runtime.Remoting.Contexts;
@@ -7,10 +6,12 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Interop;
+using WxOrder.Framework.Commons;
+using WxOrder.Framework.Commons.Dialogs;
 
 
 
-namespace _29WxOrderWpf.Common
+namespace WxOrder.Framework.Commons
 {
 	/// <summary>
 	/// DialogWindow.xaml 的交互逻辑
diff --git a/29WxOrderWpf/Common/DialogWindowProperty.cs b/WxOrder.Framework/Commons/DialogWindowProperty.cs
similarity index 99%
rename from 29WxOrderWpf/Common/DialogWindowProperty.cs
rename to WxOrder.Framework/Commons/DialogWindowProperty.cs
index 6da4875..5abcaa7 100644
--- a/29WxOrderWpf/Common/DialogWindowProperty.cs
+++ b/WxOrder.Framework/Commons/DialogWindowProperty.cs
@@ -5,7 +5,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
 
-namespace _29WxOrderWpf.Common
+namespace WxOrder.Framework.Commons
 {
 	/// <summary>
 	/// 弹出窗口属性值
diff --git a/29WxOrderWpf/Common/Dialogs/ButtonResult.cs b/WxOrder.Framework/Commons/Dialogs/ButtonResult.cs
similarity index 94%
rename from 29WxOrderWpf/Common/Dialogs/ButtonResult.cs
rename to WxOrder.Framework/Commons/Dialogs/ButtonResult.cs
index eeaa6ea..d967767 100644
--- a/29WxOrderWpf/Common/Dialogs/ButtonResult.cs
+++ b/WxOrder.Framework/Commons/Dialogs/ButtonResult.cs
@@ -1,4 +1,4 @@
-namespace Prism.Services.Dialogs
+namespace WxOrder.Framework.Commons.Dialogs
 {
     /// <summary>
     /// The result of the dialog.
diff --git a/29WxOrderWpf/Common/Dialogs/Dialog.cs b/WxOrder.Framework/Commons/Dialogs/Dialog.cs
similarity index 98%
rename from 29WxOrderWpf/Common/Dialogs/Dialog.cs
rename to WxOrder.Framework/Commons/Dialogs/Dialog.cs
index caf978e..ebe4228 100644
--- a/29WxOrderWpf/Common/Dialogs/Dialog.cs
+++ b/WxOrder.Framework/Commons/Dialogs/Dialog.cs
@@ -6,7 +6,7 @@ using Microsoft.UI.Xaml;
 using System.Windows;
 #endif
 
-namespace Prism.Services.Dialogs
+namespace WxOrder.Framework.Commons.Dialogs
 {
     /// <summary>
     /// This class contains <see cref="IDialogWindow"/> attached properties.
diff --git a/29WxOrderWpf/Common/Dialogs/DialogParameters.cs b/WxOrder.Framework/Commons/Dialogs/DialogParameters.cs
similarity index 92%
rename from 29WxOrderWpf/Common/Dialogs/DialogParameters.cs
rename to WxOrder.Framework/Commons/Dialogs/DialogParameters.cs
index b853673..1f09a2a 100644
--- a/29WxOrderWpf/Common/Dialogs/DialogParameters.cs
+++ b/WxOrder.Framework/Commons/Dialogs/DialogParameters.cs
@@ -1,6 +1,4 @@
-using Prism.Common;
-
-namespace Prism.Services.Dialogs
+namespace WxOrder.Framework.Commons.Dialogs
 {
     /// <summary>
     /// Represents Dialog parameters.
diff --git a/29WxOrderWpf/Common/Dialogs/DialogResult.cs b/WxOrder.Framework/Commons/Dialogs/DialogResult.cs
similarity index 96%
rename from 29WxOrderWpf/Common/Dialogs/DialogResult.cs
rename to WxOrder.Framework/Commons/Dialogs/DialogResult.cs
index f0c9a8c..841f249 100644
--- a/29WxOrderWpf/Common/Dialogs/DialogResult.cs
+++ b/WxOrder.Framework/Commons/Dialogs/DialogResult.cs
@@ -1,4 +1,4 @@
-namespace Prism.Services.Dialogs
+namespace WxOrder.Framework.Commons.Dialogs
 {
     /// <summary>
     /// An <see cref="IDialogResult"/> that contains <see cref="IDialogParameters"/> from the dialog
diff --git a/29WxOrderWpf/Common/Dialogs/DialogService.cs b/WxOrder.Framework/Commons/Dialogs/DialogService.cs
similarity index 98%
rename from 29WxOrderWpf/Common/Dialogs/DialogService.cs
rename to WxOrder.Framework/Commons/Dialogs/DialogService.cs
index aa80c0e..f9c4675 100644
--- a/29WxOrderWpf/Common/Dialogs/DialogService.cs
+++ b/WxOrder.Framework/Commons/Dialogs/DialogService.cs
@@ -1,11 +1,9 @@
-using _29WxOrderWpf.Common;
-using Prism.Common;
-using System;
+using System;
 using System.ComponentModel;
 using System.Linq;
 using System.Windows;
 
-namespace Prism.Services.Dialogs
+namespace WxOrder.Framework.Commons.Dialogs
 {
 	/// <summary>
 	/// 静态弹窗服务：不依赖容器，直接传入 View 实例弹出。
diff --git a/29WxOrderWpf/Common/Dialogs/IDialogAware.cs b/WxOrder.Framework/Commons/Dialogs/IDialogAware.cs
similarity index 96%
rename from 29WxOrderWpf/Common/Dialogs/IDialogAware.cs
rename to WxOrder.Framework/Commons/Dialogs/IDialogAware.cs
index 7117f57..f43bf50 100644
--- a/29WxOrderWpf/Common/Dialogs/IDialogAware.cs
+++ b/WxOrder.Framework/Commons/Dialogs/IDialogAware.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Prism.Services.Dialogs
+namespace WxOrder.Framework.Commons.Dialogs
 {
     /// <summary>
     /// Interface that provides dialog functions and events to ViewModels.
diff --git a/29WxOrderWpf/Common/Dialogs/IDialogParameters.cs b/WxOrder.Framework/Commons/Dialogs/IDialogParameters.cs
similarity index 98%
rename from 29WxOrderWpf/Common/Dialogs/IDialogParameters.cs
rename to WxOrder.Framework/Commons/Dialogs/IDialogParameters.cs
index 0083505..a3035a2 100644
--- a/29WxOrderWpf/Common/Dialogs/IDialogParameters.cs
+++ b/WxOrder.Framework/Commons/Dialogs/IDialogParameters.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace Prism.Services.Dialogs
+namespace WxOrder.Framework.Commons.Dialogs
 {
     /// <summary>
     /// Represents Dialog parameters.
diff --git a/29WxOrderWpf/Common/Dialogs/IDialogResult.cs b/WxOrder.Framework/Commons/Dialogs/IDialogResult.cs
similarity index 90%
rename from 29WxOrderWpf/Common/Dialogs/IDialogResult.cs
rename to WxOrder.Framework/Commons/Dialogs/IDialogResult.cs
index 1fefeb9..c87bbb8 100644
--- a/29WxOrderWpf/Common/Dialogs/IDialogResult.cs
+++ b/WxOrder.Framework/Commons/Dialogs/IDialogResult.cs
@@ -1,4 +1,4 @@
-namespace Prism.Services.Dialogs
+namespace WxOrder.Framework.Commons.Dialogs
 {
     /// <summary>
     /// Contains <see cref="IDialogParameters"/> from the dialog
diff --git a/29WxOrderWpf/Common/Dialogs/IDialogWindow.cs b/WxOrder.Framework/Commons/Dialogs/IDialogWindow.cs
similarity index 97%
rename from 29WxOrderWpf/Common/Dialogs/IDialogWindow.cs
rename to WxOrder.Framework/Commons/Dialogs/IDialogWindow.cs
index 69905d6..4ad86d1 100644
--- a/29WxOrderWpf/Common/Dialogs/IDialogWindow.cs
+++ b/WxOrder.Framework/Commons/Dialogs/IDialogWindow.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Windows;
 
-namespace Prism.Services.Dialogs
+namespace WxOrder.Framework.Commons.Dialogs
 {
     /// <summary>
     /// Interface for a dialog hosting window.
diff --git a/29WxOrderWpf/Common/Dialogs/IParameters.cs b/WxOrder.Framework/Commons/Dialogs/IParameters.cs
similarity index 98%
rename from 29WxOrderWpf/Common/Dialogs/IParameters.cs
rename to WxOrder.Framework/Commons/Dialogs/IParameters.cs
index 2202587..c20aefa 100644
--- a/29WxOrderWpf/Common/Dialogs/IParameters.cs
+++ b/WxOrder.Framework/Commons/Dialogs/IParameters.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Prism.Common
+namespace WxOrder.Framework.Commons.Dialogs
 {
     /// <summary>
     /// Defines a contract for specifying values associated with a unique key.
diff --git a/29WxOrderWpf/Common/Dialogs/ParametersBase.cs b/WxOrder.Framework/Commons/Dialogs/ParametersBase.cs
similarity index 99%
rename from 29WxOrderWpf/Common/Dialogs/ParametersBase.cs
rename to WxOrder.Framework/Commons/Dialogs/ParametersBase.cs
index 2bbd7b2..b134c60 100644
--- a/29WxOrderWpf/Common/Dialogs/ParametersBase.cs
+++ b/WxOrder.Framework/Commons/Dialogs/ParametersBase.cs
@@ -5,7 +5,7 @@ using System.ComponentModel;
 using System.Linq;
 using System.Text;
 
-namespace Prism.Common
+namespace WxOrder.Framework.Commons.Dialogs
 {
     /// <summary>
     /// This is a generic parameters base class used for Dialog Parameters and Navigation Parameters.
diff --git a/29WxOrderWpf/Common/Dialogs/ParametersExtensions.cs b/WxOrder.Framework/Commons/Dialogs/ParametersExtensions.cs
similarity index 99%
rename from 29WxOrderWpf/Common/Dialogs/ParametersExtensions.cs
rename to WxOrder.Framework/Commons/Dialogs/ParametersExtensions.cs
index 644da68..be9ff16 100644
--- a/29WxOrderWpf/Common/Dialogs/ParametersExtensions.cs
+++ b/WxOrder.Framework/Commons/Dialogs/ParametersExtensions.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 
-namespace Prism.Common
+namespace WxOrder.Framework.Commons.Dialogs
 {
     /// <summary>
     /// Extension methods for Navigation or Dialog parameters
diff --git a/29WxOrderWpf/Common/EnvironmentHelper.cs b/WxOrder.Framework/Commons/EnvironmentHelper.cs
similarity index 97%
rename from 29WxOrderWpf/Common/EnvironmentHelper.cs
rename to WxOrder.Framework/Commons/EnvironmentHelper.cs
index b11c372..3a0a409 100644
--- a/29WxOrderWpf/Common/EnvironmentHelper.cs
+++ b/WxOrder.Framework/Commons/EnvironmentHelper.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace MAX.Core.Helpers;
+namespace WxOrder.Framework.Commons;
 public class EnvironmentHelper
 {
 	private static string? _currentEnvironment;
diff --git a/29WxOrderWpf/Common/IAsyncCommand.cs b/WxOrder.Framework/Commons/IAsyncCommand.cs
similarity index 96%
rename from 29WxOrderWpf/Common/IAsyncCommand.cs
rename to WxOrder.Framework/Commons/IAsyncCommand.cs
index d54b7c3..40f9da8 100644
--- a/29WxOrderWpf/Common/IAsyncCommand.cs
+++ b/WxOrder.Framework/Commons/IAsyncCommand.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace _29WxOrderWpf.Common
+namespace WxOrder.Framework.Commons
 {
 
     /// <summary>
diff --git a/WxOrder.Framework/Commons/InputDialog.xaml b/WxOrder.Framework/Commons/InputDialog.xaml
new file mode 100644
index 0000000..3980c45
--- /dev/null
+++ b/WxOrder.Framework/Commons/InputDialog.xaml
@@ -0,0 +1,65 @@
+<Window
+    x:Class="WxOrder.Framework.Commons.InputDialog"
+    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:local="clr-namespace:WxOrder.Framework.Commons"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Title="输入"
+    Width="360"
+    ContentRendered="Window_ContentRendered"
+    ResizeMode="NoResize"
+    ShowInTaskbar="False"
+    SizeToContent="Height"
+    WindowStartupLocation="CenterOwner"
+    mc:Ignorable="d">
+
+    <Grid Margin="16">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <TextBlock
+            x:Name="PromptText"
+            Grid.Row="0"
+            Margin="0,0,0,8"
+            TextWrapping="Wrap" />
+
+        <TextBox
+            x:Name="InputBox"
+            Grid.Row="1"
+            Height="26"
+            VerticalContentAlignment="Center"
+            PreviewTextInput="InputBox_PreviewTextInput" />
+
+        <TextBlock
+            x:Name="ErrorText"
+            Grid.Row="2"
+            Margin="0,6,0,0"
+            Foreground="Red"
+            TextWrapping="Wrap"
+            Visibility="Collapsed" />
+
+        <StackPanel
+            Grid.Row="3"
+            Margin="0,16,0,0"
+            HorizontalAlignment="Right"
+            Orientation="Horizontal">
+            <Button
+                Width="80"
+                Height="28"
+                Click="Ok_Click"
+                Content="确定"
+                IsDefault="True" />
+            <Button
+                Width="80"
+                Height="28"
+                Margin="8,0,0,0"
+                Content="取消"
+                IsCancel="True" />
+        </StackPanel>
+    </Grid>
+</Window>
diff --git a/29WxOrderWpf/Common/InputDialog.xaml.cs b/WxOrder.Framework/Commons/InputDialog.xaml.cs
similarity index 99%
rename from 29WxOrderWpf/Common/InputDialog.xaml.cs
rename to WxOrder.Framework/Commons/InputDialog.xaml.cs
index 4a355e0..13deedc 100644
--- a/29WxOrderWpf/Common/InputDialog.xaml.cs
+++ b/WxOrder.Framework/Commons/InputDialog.xaml.cs
@@ -14,7 +14,7 @@ using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using System.Windows.Shapes;
 
-namespace _29WxOrderWpf.Common;
+namespace WxOrder.Framework.Commons;
 
 public enum InputType
 {
diff --git a/29WxOrderWpf/Common/ScrollViewerBehavior.cs b/WxOrder.Framework/Commons/ScrollViewerBehavior.cs
similarity index 98%
rename from 29WxOrderWpf/Common/ScrollViewerBehavior.cs
rename to WxOrder.Framework/Commons/ScrollViewerBehavior.cs
index 9a564d4..a2f0711 100644
--- a/29WxOrderWpf/Common/ScrollViewerBehavior.cs
+++ b/WxOrder.Framework/Commons/ScrollViewerBehavior.cs
@@ -3,7 +3,7 @@ using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 
-namespace _29WxOrderWpf.Common
+namespace WxOrder.Framework.Commons
 {
 	/// <summary>
 	/// 让页面级 ScrollViewer 在鼠标悬停在子控件（如 DataGrid、图表等）上时也能随鼠标滚轮滚动。
diff --git a/29WxOrderWpf/Common/pinyin/Data/PinyinCode1.cs b/WxOrder.Framework/Commons/pinyin/Data/PinyinCode1.cs
similarity index 99%
rename from 29WxOrderWpf/Common/pinyin/Data/PinyinCode1.cs
rename to WxOrder.Framework/Commons/pinyin/Data/PinyinCode1.cs
index e10e777..e4bf6fe 100644
--- a/29WxOrderWpf/Common/pinyin/Data/PinyinCode1.cs
+++ b/WxOrder.Framework/Commons/pinyin/Data/PinyinCode1.cs
@@ -1,4 +1,4 @@
-namespace TinyPinyin.Data
+namespace WxOrder.Framework.Commons.pinyin.Data
 {
     public static class PinyinCode1
     {
diff --git a/29WxOrderWpf/Common/pinyin/Data/PinyinCode2.cs b/WxOrder.Framework/Commons/pinyin/Data/PinyinCode2.cs
similarity index 99%
rename from 29WxOrderWpf/Common/pinyin/Data/PinyinCode2.cs
rename to WxOrder.Framework/Commons/pinyin/Data/PinyinCode2.cs
index 2e3fc75..257d349 100644
--- a/29WxOrderWpf/Common/pinyin/Data/PinyinCode2.cs
+++ b/WxOrder.Framework/Commons/pinyin/Data/PinyinCode2.cs
@@ -1,4 +1,4 @@
-namespace TinyPinyin.Data
+namespace WxOrder.Framework.Commons.pinyin.Data
 {
     public static class PinyinCode2
     {
diff --git a/29WxOrderWpf/Common/pinyin/Data/PinyinCode3.cs b/WxOrder.Framework/Commons/pinyin/Data/PinyinCode3.cs
similarity index 99%
rename from 29WxOrderWpf/Common/pinyin/Data/PinyinCode3.cs
rename to WxOrder.Framework/Commons/pinyin/Data/PinyinCode3.cs
index aefadb6..c2a3e8e 100644
--- a/29WxOrderWpf/Common/pinyin/Data/PinyinCode3.cs
+++ b/WxOrder.Framework/Commons/pinyin/Data/PinyinCode3.cs
@@ -1,4 +1,4 @@
-namespace TinyPinyin.Data
+namespace WxOrder.Framework.Commons.pinyin.Data
 {
     public static class PinyinCode3
     {
diff --git a/29WxOrderWpf/Common/pinyin/Data/PinyinData.cs b/WxOrder.Framework/Commons/pinyin/Data/PinyinData.cs
similarity index 98%
rename from 29WxOrderWpf/Common/pinyin/Data/PinyinData.cs
rename to WxOrder.Framework/Commons/pinyin/Data/PinyinData.cs
index 343f8a3..14a533d 100644
--- a/29WxOrderWpf/Common/pinyin/Data/PinyinData.cs
+++ b/WxOrder.Framework/Commons/pinyin/Data/PinyinData.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace TinyPinyin.Data
+namespace WxOrder.Framework.Commons.pinyin.Data
 {
     public static class PinyinData
     {
diff --git a/29WxOrderWpf/Common/pinyin/Engine.cs b/WxOrder.Framework/Commons/pinyin/Engine.cs
similarity index 98%
rename from 29WxOrderWpf/Common/pinyin/Engine.cs
rename to WxOrder.Framework/Commons/pinyin/Engine.cs
index 0e93636..4fb8c08 100644
--- a/29WxOrderWpf/Common/pinyin/Engine.cs
+++ b/WxOrder.Framework/Commons/pinyin/Engine.cs
@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using TinyPinyin.Data;
+using WxOrder.Framework.Commons.pinyin.Data;
 
-namespace TinyPinyin
+namespace WxOrder.Framework.Commons.pinyin
 {
     public static class Engine
     {
diff --git a/29WxOrderWpf/Common/pinyin/IPinyinDict.cs b/WxOrder.Framework/Commons/pinyin/IPinyinDict.cs
similarity index 87%
rename from 29WxOrderWpf/Common/pinyin/IPinyinDict.cs
rename to WxOrder.Framework/Commons/pinyin/IPinyinDict.cs
index 7fc0e83..0909437 100644
--- a/29WxOrderWpf/Common/pinyin/IPinyinDict.cs
+++ b/WxOrder.Framework/Commons/pinyin/IPinyinDict.cs
@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace TinyPinyin
+namespace WxOrder.Framework.Commons.pinyin
 {
     public interface IPinyinDict
     {
diff --git a/29WxOrderWpf/Common/pinyin/PinyinDict.cs b/WxOrder.Framework/Commons/pinyin/PinyinDict.cs
similarity index 94%
rename from 29WxOrderWpf/Common/pinyin/PinyinDict.cs
rename to WxOrder.Framework/Commons/pinyin/PinyinDict.cs
index ac3d4a3..5b5186e 100644
--- a/29WxOrderWpf/Common/pinyin/PinyinDict.cs
+++ b/WxOrder.Framework/Commons/pinyin/PinyinDict.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace TinyPinyin
+namespace WxOrder.Framework.Commons.pinyin
 {
     public abstract class PinyinDict : IPinyinDict
     {
diff --git a/29WxOrderWpf/Common/pinyin/PinyinHelper.cs b/WxOrder.Framework/Commons/pinyin/PinyinHelper.cs
similarity index 97%
rename from 29WxOrderWpf/Common/pinyin/PinyinHelper.cs
rename to WxOrder.Framework/Commons/pinyin/PinyinHelper.cs
index 3460e8f..6bbada8 100644
--- a/29WxOrderWpf/Common/pinyin/PinyinHelper.cs
+++ b/WxOrder.Framework/Commons/pinyin/PinyinHelper.cs
@@ -1,6 +1,6 @@
 using System.Linq;
 
-namespace TinyPinyin
+namespace WxOrder.Framework.Commons.pinyin
 {
     public static class PinyinHelper
     {
diff --git a/WxOrder.Framework/PDDAPI/PddApi.cs b/WxOrder.Framework/PDDAPI/PddApi.cs
index 91190b5..070c74a 100644
--- a/WxOrder.Framework/PDDAPI/PddApi.cs
+++ b/WxOrder.Framework/PDDAPI/PddApi.cs
@@ -1,8 +1,9 @@
 using System;
 using System.Net;
 using System.Text;
+using WxOrder.Framework.Helpers;
 
-namespace WxOrder.Framework.Helpers
+namespace WxOrder.Framework.PDDAPI
 {
 	/// <summary>
 	/// 拼多多API请求类