From cef6300e8e6c51735d26bf24e22719970c36cec0 Mon Sep 17 00:00:00 2001
From: chfei <chaihongfei@126.com>
Date: Wed, 19 Aug 2026 15:35:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=20=E5=90=8C=E6=AD=A5=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 29WxOrder.sln                                 |   21 +
 .../Converters/OrderTaskStatusConverter.cs    |   36 +
 .../Ctrls/OrderCtrls/OrderListCtrl.xaml       | 2332 +++++++++--------
 .../Ctrls/OrderCtrls/OrderListCtrl.xaml.cs    |  203 +-
 .../Ctrls/OrderCtrls/OrderTaskDialogView.xaml |  241 ++
 .../OrderCtrls/OrderTaskDialogView.xaml.cs    |  185 ++
 .../Services/ShopRevenueStatisticsService.cs  |    9 +-
 29WxOrderWpf/Services/PullWXOrderService.cs   |  184 ++
 29WxOrderWpf/Services/ShipGiftService.cs      |   43 +-
 29WxOrderWpf/ViewModels/OrderTaskViewModel.cs |   42 +
 Work/29WxOrderWork.csproj                     |   12 +
 Work/ERP.API/ERPConfig.cs                     |   13 +
 Work/ERP.API/ERPHttp.cs                       |   40 +
 Work/ERP.API/Orders/PullWXOrderServiceApi.cs  |  186 ++
 Work/ERP.API/Orders/ShipGiftServiceApi.cs     |   39 +
 Work/ERP.API/TaskStatus.cs                    |   26 +
 Work/KJDServer.API/KJDServerHttp.cs           |  112 +
 Work/KJDServer.API/Models/OrderTask.cs        |   43 +
 .../WXOrder/WxOrderServiceApi.cs              |   30 +
 Work/_29Tools/BLL/HttpResponseWXBLL.cs        |   21 +-
 .../Commons}/Result.cs                        |    2 +-
 WxOrder.Framework/WxOrder.Framework.csproj    |    8 +
 test/WXOrder.Test/PullWXOrder.Test.cs         |   28 +
 test/WXOrder.Test/WXOrder.Test.csproj         |   29 +
 24 files changed, 2674 insertions(+), 1211 deletions(-)
 create mode 100644 29WxOrderWpf/Converters/OrderTaskStatusConverter.cs
 create mode 100644 29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml
 create mode 100644 29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml.cs
 create mode 100644 29WxOrderWpf/Services/PullWXOrderService.cs
 create mode 100644 29WxOrderWpf/ViewModels/OrderTaskViewModel.cs
 create mode 100644 Work/ERP.API/ERPConfig.cs
 create mode 100644 Work/ERP.API/ERPHttp.cs
 create mode 100644 Work/ERP.API/Orders/PullWXOrderServiceApi.cs
 create mode 100644 Work/ERP.API/Orders/ShipGiftServiceApi.cs
 create mode 100644 Work/ERP.API/TaskStatus.cs
 create mode 100644 Work/KJDServer.API/KJDServerHttp.cs
 create mode 100644 Work/KJDServer.API/Models/OrderTask.cs
 create mode 100644 Work/KJDServer.API/WXOrder/WxOrderServiceApi.cs
 rename {29WxOrderWpf/Common => WxOrder.Framework/Commons}/Result.cs (91%)
 create mode 100644 test/WXOrder.Test/PullWXOrder.Test.cs
 create mode 100644 test/WXOrder.Test/WXOrder.Test.csproj

diff --git a/29WxOrder.sln b/29WxOrder.sln
index d2c7bd8..cbb0fa1 100644
--- a/29WxOrder.sln
+++ b/29WxOrder.sln
@@ -21,6 +21,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_SolutionItems", "_Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WxOrder.Framework", "WxOrder.Framework\WxOrder.Framework.csproj", "{3123963C-A0EC-4AD5-9916-DC063F73490B}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".test", ".test", "{14261B9B-E3EA-4BC0-B08D-4B3591AC13E5}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WXOrder.Test", "test\WXOrder.Test\WXOrder.Test.csproj", "{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,6 +101,22 @@ Global
 		{3123963C-A0EC-4AD5-9916-DC063F73490B}.Release|x64.Build.0 = Release|Any CPU
 		{3123963C-A0EC-4AD5-9916-DC063F73490B}.Release|x86.ActiveCfg = Release|Any CPU
 		{3123963C-A0EC-4AD5-9916-DC063F73490B}.Release|x86.Build.0 = Release|Any CPU
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}.Debug|x64.Build.0 = Debug|Any CPU
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}.Debug|x86.Build.0 = Debug|Any CPU
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}.Release|x64.ActiveCfg = Release|Any CPU
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}.Release|x64.Build.0 = Release|Any CPU
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}.Release|x86.ActiveCfg = Release|Any CPU
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -105,6 +125,7 @@ Global
 		{6461D807-B1C8-45F0-B388-E0CA1A418DE0} = {4A54DC2A-B47C-4ED1-A482-EE60161DB2C3}
 		{1AD45D66-6872-4522-ACF0-04E2C0514048} = {4A54DC2A-B47C-4ED1-A482-EE60161DB2C3}
 		{5A410EB5-06AD-97BB-2314-9D7A808E12F7} = {1A7830FA-AC8F-40FB-A232-F0626812B8BE}
+		{3790EC79-EA1D-4660-AB0D-EA0DE4FF77B7} = {14261B9B-E3EA-4BC0-B08D-4B3591AC13E5}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {38687A61-0347-49AC-98C7-E7F7148C0234}
diff --git a/29WxOrderWpf/Converters/OrderTaskStatusConverter.cs b/29WxOrderWpf/Converters/OrderTaskStatusConverter.cs
new file mode 100644
index 0000000..d852de0
--- /dev/null
+++ b/29WxOrderWpf/Converters/OrderTaskStatusConverter.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using Work.ERP.API;
+
+namespace _29WxOrderWpf.Converters
+{
+	/// <summary>
+	/// 订单任务状态转换：<see cref="Work.KJDServer.API.Models.OrderTask.Status"/> (int) → 中文描述。
+	/// 1=执行中，2=已完成，3=已人为中断。
+	/// </summary>
+	public class OrderTaskStatusConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (value is int status)
+			{
+				switch ((TaskStatus)status)
+				{
+					case TaskStatus.Executing:
+						return "执行中";
+					case TaskStatus.Completed:
+						return "已完成";
+					case TaskStatus.ManuallyInterrupted:
+						return "已中断";
+				}
+			}
+			return value?.ToString() ?? string.Empty;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotSupportedException();
+		}
+	}
+}
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
index f6c080a..381a983 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
@@ -1,1191 +1,1209 @@
 <UserControl
-    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:converters="clr-namespace:_29WxOrderWpf.Converters"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:usercontrols="clr-namespace:_29WxOrderWpf.UserControls"
-    xmlns:utils="clr-namespace:_29WxOrderWpf.Utils"
-    d:DesignHeight="450"
-    d:DesignWidth="1560"
-    Loaded="Window_Loaded"
-    mc:Ignorable="d">
+	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:converters="clr-namespace:_29WxOrderWpf.Converters"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:usercontrols="clr-namespace:_29WxOrderWpf.UserControls"
+	xmlns:utils="clr-namespace:_29WxOrderWpf.Utils"
+	xmlns:wpf="WPFCommon"
+	d:DesignHeight="450"
+	d:DesignWidth="1560"
+	Loaded="Window_Loaded"
+	mc:Ignorable="d">
 
 
-    <Grid x:Name="gridOrderListCtrl" Background="{StaticResource ListCtrlBackColorBrush}">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="45" />
-            <RowDefinition Height="auto" />
-            <RowDefinition Height="auto" />
-            <RowDefinition Height="40" />
-            <RowDefinition Height="*" />
-            <RowDefinition Height="18" />
-        </Grid.RowDefinitions>
-        <Grid x:Name="gridSearch" Margin="8,0,8,-2">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="1.2*" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="0.85*" />
-                <ColumnDefinition Width="0.85*" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="1.4*" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="Auto" />
-            </Grid.ColumnDefinitions>
+	<Grid x:Name="gridOrderListCtrl" Background="{StaticResource ListCtrlBackColorBrush}">
+		<Grid.RowDefinitions>
+			<RowDefinition Height="45" />
+			<RowDefinition Height="auto" />
+			<RowDefinition Height="auto" />
+			<RowDefinition Height="40" />
+			<RowDefinition Height="*" />
+			<RowDefinition Height="18" />
+		</Grid.RowDefinitions>
+		<Grid x:Name="gridSearch" Margin="8,0,8,-2">
+			<Grid.ColumnDefinitions>
+				<ColumnDefinition Width="*" />
+				<ColumnDefinition Width="1.2*" />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="*" />
+				<ColumnDefinition Width="*" />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="0.85*" />
+				<ColumnDefinition Width="0.85*" />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="*" />
+				<ColumnDefinition Width="1.4*" />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+				<ColumnDefinition Width="Auto" />
+			</Grid.ColumnDefinitions>
 
 
-            <usercontrols:UcWaterMarkTextBox
-                x:Name="txtOrderId"
-                Grid.Column="0"
-                Height="28"
-                Margin="0,0,8,0"
-                WaterMark="店铺单号" />
+			<usercontrols:UcWaterMarkTextBox
+				x:Name="txtOrderId"
+				Grid.Column="0"
+				Height="28"
+				Margin="0,0,8,0"
+				WaterMark="店铺单号" />
 
-            <usercontrols:UcWaterMarkTextBox
-                x:Name="txtSearchAll"
-                Grid.Column="1"
-                Height="28"
-                Margin="0,0,8,0"
-                TextChanged="txtSearchAll_TextChanged"
-                WaterMark="买手/仓库/退货物流 采购/退款单号" />
+			<usercontrols:UcWaterMarkTextBox
+				x:Name="txtSearchAll"
+				Grid.Column="1"
+				Height="28"
+				Margin="0,0,8,0"
+				TextChanged="txtSearchAll_TextChanged"
+				WaterMark="买手/仓库/退货物流 采购/退款单号" />
 
-            <!--  选择标题筛选类型  -->
-            <Border
-                Grid.Column="2"
-                Height="28"
-                Margin="0,0,0,0"
-                VerticalAlignment="Center"
-                BorderBrush="{StaticResource pageColorBrush}"
-                BorderThickness="1,1,1,1"
-                CornerRadius="4,0,0,4" />
-            <ComboBox
-                x:Name="cmbFilterGoodsNameType"
-                Grid.Column="2"
-                Width="70"
-                Height="28"
-                Margin="4,0,4,0"
-                VerticalContentAlignment="Center"
-                BorderBrush="Transparent"
-                SelectedIndex="0"
-                SelectionChanged="cmbFilterGoodsNameType_SelectionChanged"
-                Style="{StaticResource RoundedComboBox}"
-                Text="标题包含">
-                <ComboBoxItem>
-                    <TextBlock>标题包含</TextBlock>
-                </ComboBoxItem>
-                <ComboBoxItem>
-                    <TextBlock>标题不含</TextBlock>
-                </ComboBoxItem>
-            </ComboBox>
-            <Border
-                Grid.Column="3"
-                Height="28"
-                Margin="0,0,8,0"
-                VerticalAlignment="Center"
-                BorderBrush="{StaticResource pageColorBrush}"
-                BorderThickness="0,1,1,1"
-                CornerRadius="0,4,4,0" />
-            <usercontrols:UcWaterMarkTextBox
-                x:Name="txtFilterGoodsName"
-                Grid.Column="3"
-                Height="28"
-                Margin="0,0,8,0"
-                TextBorderThickness="0"
-                TextChanged="txtGoodsNameFilter_TextChanged"
-                WaterMark="商品标题" />
+			<!--  选择标题筛选类型  -->
+			<Border
+				Grid.Column="2"
+				Height="28"
+				Margin="0,0,0,0"
+				VerticalAlignment="Center"
+				BorderBrush="{StaticResource pageColorBrush}"
+				BorderThickness="1,1,1,1"
+				CornerRadius="4,0,0,4" />
+			<ComboBox
+				x:Name="cmbFilterGoodsNameType"
+				Grid.Column="2"
+				Width="70"
+				Height="28"
+				Margin="4,0,4,0"
+				VerticalContentAlignment="Center"
+				BorderBrush="Transparent"
+				SelectedIndex="0"
+				SelectionChanged="cmbFilterGoodsNameType_SelectionChanged"
+				Style="{StaticResource RoundedComboBox}"
+				Text="标题包含">
+				<ComboBoxItem>
+					<TextBlock>标题包含</TextBlock>
+				</ComboBoxItem>
+				<ComboBoxItem>
+					<TextBlock>标题不含</TextBlock>
+				</ComboBoxItem>
+			</ComboBox>
+			<Border
+				Grid.Column="3"
+				Height="28"
+				Margin="0,0,8,0"
+				VerticalAlignment="Center"
+				BorderBrush="{StaticResource pageColorBrush}"
+				BorderThickness="0,1,1,1"
+				CornerRadius="0,4,4,0" />
+			<usercontrols:UcWaterMarkTextBox
+				x:Name="txtFilterGoodsName"
+				Grid.Column="3"
+				Height="28"
+				Margin="0,0,8,0"
+				TextBorderThickness="0"
+				TextChanged="txtGoodsNameFilter_TextChanged"
+				WaterMark="商品标题" />
 
-            <usercontrols:UcWaterMarkTextBox
-                x:Name="txtShopName"
-                Grid.Column="4"
-                Height="28"
-                Margin="0,0,-6,0"
-                TextWrapping="NoWrap"
-                WaterMark="全部店铺" />
-            <Button
-                x:Name="btnMultiShopChoice"
-                Grid.Column="5"
-                Width="28"
-                Height="28"
-                Margin="0,0,8,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                Click="btnMultiShopChoice_Click"
-                Content=" ... "
-                Style="{StaticResource BasePageButtonLeftSquareStyle}" />
+			<usercontrols:UcWaterMarkTextBox
+				x:Name="txtShopName"
+				Grid.Column="4"
+				Height="28"
+				Margin="0,0,-6,0"
+				TextWrapping="NoWrap"
+				WaterMark="全部店铺" />
+			<Button
+				x:Name="btnMultiShopChoice"
+				Grid.Column="5"
+				Width="28"
+				Height="28"
+				Margin="0,0,8,0"
+				HorizontalAlignment="Left"
+				VerticalAlignment="Center"
+				Click="btnMultiShopChoice_Click"
+				Content=" ... "
+				Style="{StaticResource BasePageButtonLeftSquareStyle}" />
 
-            <!--  选择时间  -->
-            <Border
-                Grid.Column="6"
-                Height="28"
-                Margin="0,0,0,0"
-                VerticalAlignment="Center"
-                BorderBrush="{StaticResource pageColorBrush}"
-                BorderThickness="1,1,1,1"
-                CornerRadius="4,0,0,4" />
-            <ComboBox
-                x:Name="cmbTimeType"
-                Grid.Column="6"
-                Width="70"
-                Height="28"
-                Margin="4,0,4,0"
-                VerticalContentAlignment="Center"
-                BorderBrush="Transparent"
-                SelectedIndex="0"
-                Style="{StaticResource RoundedComboBox}"
-                Text="更新时间">
-                <ComboBoxItem>
-                    <TextBlock>更新时间</TextBlock>
-                </ComboBoxItem>
-                <ComboBoxItem>
-                    <TextBlock>成交时间</TextBlock>
-                </ComboBoxItem>
-            </ComboBox>
+			<!--  选择时间  -->
+			<Border
+				Grid.Column="6"
+				Height="28"
+				Margin="0,0,0,0"
+				VerticalAlignment="Center"
+				BorderBrush="{StaticResource pageColorBrush}"
+				BorderThickness="1,1,1,1"
+				CornerRadius="4,0,0,4" />
+			<ComboBox
+				x:Name="cmbTimeType"
+				Grid.Column="6"
+				Width="70"
+				Height="28"
+				Margin="4,0,4,0"
+				VerticalContentAlignment="Center"
+				BorderBrush="Transparent"
+				SelectedIndex="0"
+				Style="{StaticResource RoundedComboBox}"
+				Text="更新时间">
+				<ComboBoxItem>
+					<TextBlock>更新时间</TextBlock>
+				</ComboBoxItem>
+				<ComboBoxItem>
+					<TextBlock>成交时间</TextBlock>
+				</ComboBoxItem>
+			</ComboBox>
 
-            <!--  开始时间  -->
-            <Border
-                Grid.Column="7"
-                Height="28"
-                Margin="0,0,10,0"
-                VerticalAlignment="Center"
-                BorderBrush="{StaticResource pageColorBrush}"
-                BorderThickness="0,1,1,1"
-                CornerRadius="0,0,0,0" />
-            <DatePicker
-                x:Name="dateStart"
-                Grid.Column="7"
-                Margin="0,0,14,0"
-                VerticalAlignment="Center"
-                BorderThickness="0" />
+			<!--  开始时间  -->
+			<Border
+				Grid.Column="7"
+				Height="28"
+				Margin="0,0,10,0"
+				VerticalAlignment="Center"
+				BorderBrush="{StaticResource pageColorBrush}"
+				BorderThickness="0,1,1,1"
+				CornerRadius="0,0,0,0" />
+			<DatePicker
+				x:Name="dateStart"
+				Grid.Column="7"
+				Margin="0,0,14,0"
+				VerticalAlignment="Center"
+				BorderThickness="0" />
 
-            <!--  结束时间  -->
-            <Border
-                Grid.Column="8"
-                Height="28"
-                Margin="-10,0,0,0"
-                VerticalAlignment="Center"
-                BorderBrush="{StaticResource pageColorBrush}"
-                BorderThickness="0,1,1,1"
-                CornerRadius="0,4,4,0" />
-            <DatePicker
-                x:Name="dateEnd"
-                Grid.Column="8"
-                Margin="10,0,4,0"
-                VerticalAlignment="Center"
-                BorderThickness="0" />
-            <CheckBox
-                x:Name="chkEndDate"
-                Grid.Column="8"
-                Margin="-6,0"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Center"
-                BorderBrush="{StaticResource mainColorBrush}"
-                FontSize="12" />
+			<!--  结束时间  -->
+			<Border
+				Grid.Column="8"
+				Height="28"
+				Margin="-10,0,0,0"
+				VerticalAlignment="Center"
+				BorderBrush="{StaticResource pageColorBrush}"
+				BorderThickness="0,1,1,1"
+				CornerRadius="0,4,4,0" />
+			<DatePicker
+				x:Name="dateEnd"
+				Grid.Column="8"
+				Margin="10,0,4,0"
+				VerticalAlignment="Center"
+				BorderThickness="0" />
+			<CheckBox
+				x:Name="chkEndDate"
+				Grid.Column="8"
+				Margin="-6,0"
+				HorizontalAlignment="Left"
+				VerticalAlignment="Center"
+				BorderBrush="{StaticResource mainColorBrush}"
+				FontSize="12" />
 
-            <Button
-                x:Name="btnFilter"
-                Grid.Column="9"
-                Height="28"
-                MinWidth="48"
-                Margin="8,0,0,0"
-                Padding="4"
-                Click="btnFilter_Click"
-                Content="过滤"
-                Style="{StaticResource BasePageButtonStyle}" />
-            <Button
-                x:Name="btnSearch"
-                Grid.Column="10"
-                Height="28"
-                MinWidth="78"
-                Margin="4,0,4,0"
-                Padding="4"
-                Click="btnSearch_Click"
-                Content="读单"
-                IsEnabled="False"
-                Style="{StaticResource BasePageButtonStyle}" />
+			<Button
+				x:Name="btnFilter"
+				Grid.Column="9"
+				Height="28"
+				MinWidth="48"
+				Margin="8,0,0,0"
+				Padding="4"
+				Click="btnFilter_Click"
+				Content="过滤"
+				Style="{StaticResource BasePageButtonStyle}" />
+			<Button
+				x:Name="btnSearch"
+				Grid.Column="10"
+				Height="28"
+				MinWidth="78"
+				Margin="4,0,4,0"
+				Padding="4"
+				Click="btnSearch_Click"
+				Content="读单"
+				IsEnabled="False"
+				Style="{StaticResource BasePageButtonStyle}" />
 
-            <WrapPanel
-                Grid.Column="11"
-                Width="192"
-                VerticalAlignment="Center">
-                <Image
-                    x:Name="imgLoading"
-                    Grid.Column="10"
-                    Width="20"
-                    Height="20"
-                    Margin="0"
-                    IsEnabled="False"
-                    Source="{StaticResource imgLoadingPic}">
-                    <Image.RenderTransform>
-                        <RotateTransform Angle="45" CenterX="10" CenterY="10" />
-                    </Image.RenderTransform>
-                    <Image.Triggers>
-                        <EventTrigger RoutedEvent="Image.Loaded">
-                            <BeginStoryboard>
-                                <Storyboard>
-                                    <DoubleAnimation
-                                        RepeatBehavior="Forever"
-                                        Storyboard.TargetName="imgLoading"
-                                        Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
-                                        From="0"
-                                        To="360"
-                                        Duration="0:0:3" />
-                                </Storyboard>
-                            </BeginStoryboard>
-                        </EventTrigger>
-                    </Image.Triggers>
-                </Image>
-                <CheckBox
-                    x:Name="chkAutoReadOrder"
-                    Margin="2,0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    BorderBrush="{StaticResource mainColorBrush}"
-                    Checked="chkAutoReadBuyerOrder_CheckedChanged"
-                    Content="自动读单"
-                    FontSize="12"
-                    IsChecked="true"
-                    Unchecked="chkAutoReadBuyerOrder_CheckedChanged" />
+			<WrapPanel
+				Grid.Column="11"
+				Width="192"
+				VerticalAlignment="Center">
+				<Image
+					x:Name="imgLoading"
+					Grid.Column="10"
+					Width="20"
+					Height="20"
+					Margin="0"
+					IsEnabled="False"
+					Source="{StaticResource imgLoadingPic}">
+					<Image.RenderTransform>
+						<RotateTransform Angle="45" CenterX="10" CenterY="10" />
+					</Image.RenderTransform>
+					<Image.Triggers>
+						<EventTrigger RoutedEvent="Image.Loaded">
+							<BeginStoryboard>
+								<Storyboard>
+									<DoubleAnimation
+										RepeatBehavior="Forever"
+										Storyboard.TargetName="imgLoading"
+										Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
+										From="0"
+										To="360"
+										Duration="0:0:3" />
+								</Storyboard>
+							</BeginStoryboard>
+						</EventTrigger>
+					</Image.Triggers>
+				</Image>
+				<CheckBox
+					x:Name="chkAutoReadOrder"
+					Margin="2,0"
+					HorizontalAlignment="Left"
+					VerticalAlignment="Center"
+					BorderBrush="{StaticResource mainColorBrush}"
+					Checked="chkAutoReadBuyerOrder_CheckedChanged"
+					Content="自动读单"
+					FontSize="12"
+					IsChecked="true"
+					Unchecked="chkAutoReadBuyerOrder_CheckedChanged" />
 
-                <CheckBox
-                    x:Name="chkHideGreenFlag"
-                    Grid.Column="12"
-                    Margin="2,0"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    BorderBrush="{StaticResource mainColorBrush}"
-                    Click="chkHideGreenFlag_Click"
-                    Content="隐藏标记订单"
-                    FontSize="12"
-                    IsChecked="true" />
-            </WrapPanel>
+				<CheckBox
+					x:Name="chkHideGreenFlag"
+					Grid.Column="12"
+					Margin="2,0"
+					HorizontalAlignment="Left"
+					VerticalAlignment="Center"
+					BorderBrush="{StaticResource mainColorBrush}"
+					Click="chkHideGreenFlag_Click"
+					Content="隐藏标记订单"
+					FontSize="12"
+					IsChecked="true" />
+			</WrapPanel>
 
 
-            <Button
-                Grid.Column="13"
-                Width="60"
-                Height="28"
-                Padding="4"
-                HorizontalAlignment="Center"
-                Click="btn_ShowShopRevenueStatisticsView"
-                Content="利润统计"
-                Style="{StaticResource BasePageButtonStyle}" />
-        </Grid>
+			<Button
+				Grid.Column="13"
+				Width="60"
+				Height="28"
+				Padding="4"
+				HorizontalAlignment="Center"
+				Click="btn_ShowShopRevenueStatisticsView"
+				Content="利润统计"
+				Style="{StaticResource BasePageButtonStyle}" />
+		</Grid>
 
-        <Border
-            x:Name="filterConfig"
-            Grid.Row="1"
-            Margin="8,0">
-            <WrapPanel x:Name="wpFilter" VerticalAlignment="Top">
-                <CheckBox
-                    x:Name="chkOnlyWarehouseOrder"
-                    Margin="0,2,3,2"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    VerticalContentAlignment="Center"
-                    BorderBrush="{StaticResource mainColorBrush}"
-                    Checked="chkSubFilterSonditions_Checked"
-                    Content="过滤非本系统订单"
-                    FontSize="12"
-                    IsChecked="true"
-                    Unchecked="chkSubFilterSonditions_Checked" />
-                <CheckBox
-                    x:Name="chkNoMultiOrder"
-                    Margin="0,2,0,2"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    VerticalContentAlignment="Center"
-                    BorderBrush="{StaticResource mainColorBrush}"
-                    Checked="chkSubFilterSonditions_Checked"
-                    Content="过滤多商品订单"
-                    FontSize="12"
-                    IsChecked="true"
-                    Unchecked="chkSubFilterSonditions_Checked" />
-                <Polyline
-                    Grid.Column="5"
-                    Width="10"
-                    Margin="2,0"
-                    VerticalAlignment="Center"
-                    Points="5,0 5,4 5,0"
-                    Stroke="{StaticResource mainColorBrush}"
-                    StrokeThickness="2" />
-                <CheckBox
-                    x:Name="chkTransitOrder"
-                    Margin="0,2,3,2"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    VerticalContentAlignment="Center"
-                    BorderBrush="{StaticResource mainColorBrush}"
-                    Checked="chkSubFilterSonditions_Checked"
-                    Content="云仓"
-                    FontSize="12"
-                    IsChecked="true"
-                    Unchecked="chkSubFilterSonditions_Checked" />
-                <CheckBox
-                    x:Name="chkDirectOrder"
-                    Margin="0,2,3,2"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    VerticalContentAlignment="Center"
-                    BorderBrush="{StaticResource mainColorBrush}"
-                    Checked="chkSubFilterSonditions_Checked"
-                    Content="直发"
-                    FontSize="12"
-                    IsChecked="true"
-                    Unchecked="chkSubFilterSonditions_Checked" />
-                <CheckBox
-                    x:Name="chkTransitChangeDirectOrder"
-                    Margin="0,2,0,2"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    VerticalContentAlignment="Center"
-                    BorderBrush="{StaticResource mainColorBrush}"
-                    Checked="chkSubFilterSonditions_Checked"
-                    Content="云改直"
-                    FontSize="12"
-                    IsChecked="true"
-                    Unchecked="chkSubFilterSonditions_Checked" />
-                <Polyline
-                    Grid.Column="5"
-                    Width="10"
-                    Margin="2,0"
-                    VerticalAlignment="Center"
-                    Points="5,0 5,4 5,0"
-                    Stroke="{StaticResource mainColorBrush}"
-                    StrokeThickness="2" />
-                <CheckBox
-                    x:Name="chkFilterRemark"
-                    Margin="0,2,3,2"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center"
-                    VerticalContentAlignment="Center"
-                    BorderBrush="{StaticResource mainColorBrush}"
-                    Checked="chkSubFilterSonditions_Checked"
-                    Content="过滤备注"
-                    FontSize="12"
-                    IsChecked="False"
-                    Unchecked="chkSubFilterSonditions_Checked" />
-                <WrapPanel>
-                    <Border
-                        Height="22"
-                        Margin="0,2,0,2"
-                        VerticalAlignment="Center"
-                        BorderBrush="{StaticResource pageColorBrush}"
-                        BorderThickness="1,1,1,1"
-                        CornerRadius="4,0,0,4">
-                        <ComboBox
-                            x:Name="cmbFilterRemark"
-                            Width="94"
-                            Height="20"
-                            Margin="4,0,4,0"
-                            VerticalContentAlignment="Center"
-                            BorderBrush="Transparent"
-                            SelectedIndex="0"
-                            Style="{StaticResource RoundedComboBox}"
-                            Text="成交时间">
-                            <ComboBoxItem>
-                                <TextBlock Margin="0,-2">店铺备注包含</TextBlock>
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Margin="0,-2">软件备注包含</TextBlock>
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Margin="0,-2">店铺备注不含</TextBlock>
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Margin="0,-2">软件备注不含</TextBlock>
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </Border>
-                    <Border
-                        Grid.Column="7"
-                        Height="22"
-                        Margin="-2,0,0,0"
-                        VerticalAlignment="Center"
-                        BorderBrush="{StaticResource pageColorBrush}"
-                        BorderThickness="0,1,1,1"
-                        CornerRadius="0,4,4,0">
-                        <TextBox
-                            x:Name="txtFilterRemark"
-                            Width="100"
-                            Margin="3,1"
-                            VerticalAlignment="Center"
-                            VerticalContentAlignment="Center"
-                            BorderBrush="Transparent"
-                            BorderThickness="0"
-                            TextChanged="txtFilterRemark_TextChanged"
-                            ToolTip="{Binding Text, RelativeSource={RelativeSource Self}}" />
-                    </Border>
-                    <Button
-                        Grid.Column="4"
-                        Width="22"
-                        Height="22"
-                        Margin="-4,2,0,2"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Center"
-                        Click="btnMultiRemark_Click"
-                        Content=" ... "
-                        Style="{StaticResource BasePageButtonLeftSquareStyle}" />
-                </WrapPanel>
+		<Border
+			x:Name="filterConfig"
+			Grid.Row="1"
+			Margin="8,0">
+			<WrapPanel x:Name="wpFilter" VerticalAlignment="Top">
+				<CheckBox
+					x:Name="chkOnlyWarehouseOrder"
+					Margin="0,2,3,2"
+					HorizontalAlignment="Left"
+					VerticalAlignment="Center"
+					VerticalContentAlignment="Center"
+					BorderBrush="{StaticResource mainColorBrush}"
+					Checked="chkSubFilterSonditions_Checked"
+					Content="过滤非本系统订单"
+					FontSize="12"
+					IsChecked="true"
+					Unchecked="chkSubFilterSonditions_Checked" />
+				<CheckBox
+					x:Name="chkNoMultiOrder"
+					Margin="0,2,0,2"
+					HorizontalAlignment="Left"
+					VerticalAlignment="Center"
+					VerticalContentAlignment="Center"
+					BorderBrush="{StaticResource mainColorBrush}"
+					Checked="chkSubFilterSonditions_Checked"
+					Content="过滤多商品订单"
+					FontSize="12"
+					IsChecked="true"
+					Unchecked="chkSubFilterSonditions_Checked" />
+				<Polyline
+					Grid.Column="5"
+					Width="10"
+					Margin="2,0"
+					VerticalAlignment="Center"
+					Points="5,0 5,4 5,0"
+					Stroke="{StaticResource mainColorBrush}"
+					StrokeThickness="2" />
+				<CheckBox
+					x:Name="chkTransitOrder"
+					Margin="0,2,3,2"
+					HorizontalAlignment="Left"
+					VerticalAlignment="Center"
+					VerticalContentAlignment="Center"
+					BorderBrush="{StaticResource mainColorBrush}"
+					Checked="chkSubFilterSonditions_Checked"
+					Content="云仓"
+					FontSize="12"
+					IsChecked="true"
+					Unchecked="chkSubFilterSonditions_Checked" />
+				<CheckBox
+					x:Name="chkDirectOrder"
+					Margin="0,2,3,2"
+					HorizontalAlignment="Left"
+					VerticalAlignment="Center"
+					VerticalContentAlignment="Center"
+					BorderBrush="{StaticResource mainColorBrush}"
+					Checked="chkSubFilterSonditions_Checked"
+					Content="直发"
+					FontSize="12"
+					IsChecked="true"
+					Unchecked="chkSubFilterSonditions_Checked" />
+				<CheckBox
+					x:Name="chkTransitChangeDirectOrder"
+					Margin="0,2,0,2"
+					HorizontalAlignment="Left"
+					VerticalAlignment="Center"
+					VerticalContentAlignment="Center"
+					BorderBrush="{StaticResource mainColorBrush}"
+					Checked="chkSubFilterSonditions_Checked"
+					Content="云改直"
+					FontSize="12"
+					IsChecked="true"
+					Unchecked="chkSubFilterSonditions_Checked" />
+				<Polyline
+					Grid.Column="5"
+					Width="10"
+					Margin="2,0"
+					VerticalAlignment="Center"
+					Points="5,0 5,4 5,0"
+					Stroke="{StaticResource mainColorBrush}"
+					StrokeThickness="2" />
+				<CheckBox
+					x:Name="chkFilterRemark"
+					Margin="0,2,3,2"
+					HorizontalAlignment="Left"
+					VerticalAlignment="Center"
+					VerticalContentAlignment="Center"
+					BorderBrush="{StaticResource mainColorBrush}"
+					Checked="chkSubFilterSonditions_Checked"
+					Content="过滤备注"
+					FontSize="12"
+					IsChecked="False"
+					Unchecked="chkSubFilterSonditions_Checked" />
+				<WrapPanel>
+					<Border
+						Height="22"
+						Margin="0,2,0,2"
+						VerticalAlignment="Center"
+						BorderBrush="{StaticResource pageColorBrush}"
+						BorderThickness="1,1,1,1"
+						CornerRadius="4,0,0,4">
+						<ComboBox
+							x:Name="cmbFilterRemark"
+							Width="94"
+							Height="20"
+							Margin="4,0,4,0"
+							VerticalContentAlignment="Center"
+							BorderBrush="Transparent"
+							SelectedIndex="0"
+							Style="{StaticResource RoundedComboBox}"
+							Text="成交时间">
+							<ComboBoxItem>
+								<TextBlock Margin="0,-2">店铺备注包含</TextBlock>
+							</ComboBoxItem>
+							<ComboBoxItem>
+								<TextBlock Margin="0,-2">软件备注包含</TextBlock>
+							</ComboBoxItem>
+							<ComboBoxItem>
+								<TextBlock Margin="0,-2">店铺备注不含</TextBlock>
+							</ComboBoxItem>
+							<ComboBoxItem>
+								<TextBlock Margin="0,-2">软件备注不含</TextBlock>
+							</ComboBoxItem>
+						</ComboBox>
+					</Border>
+					<Border
+						Grid.Column="7"
+						Height="22"
+						Margin="-2,0,0,0"
+						VerticalAlignment="Center"
+						BorderBrush="{StaticResource pageColorBrush}"
+						BorderThickness="0,1,1,1"
+						CornerRadius="0,4,4,0">
+						<TextBox
+							x:Name="txtFilterRemark"
+							Width="100"
+							Margin="3,1"
+							VerticalAlignment="Center"
+							VerticalContentAlignment="Center"
+							BorderBrush="Transparent"
+							BorderThickness="0"
+							TextChanged="txtFilterRemark_TextChanged"
+							ToolTip="{Binding Text, RelativeSource={RelativeSource Self}}" />
+					</Border>
+					<Button
+						Grid.Column="4"
+						Width="22"
+						Height="22"
+						Margin="-4,2,0,2"
+						HorizontalAlignment="Right"
+						VerticalAlignment="Center"
+						Click="btnMultiRemark_Click"
+						Content=" ... "
+						Style="{StaticResource BasePageButtonLeftSquareStyle}" />
+				</WrapPanel>
 
-                <WrapPanel Margin="18,0,4,0" VerticalAlignment="Center">
-                    <TextBlock
-                        VerticalAlignment="Center"
-                        FontSize="12"
-                        Text="礼品选择：" />
-                    <ComboBox
-                        x:Name="cb_gift"
-                        Width="100"
-                        Height="22"
-                        FontSize="12"
-                        SelectedIndex="0"
-                        SelectionChanged="ComboBox_SelectionChanged"
-                        Style="{StaticResource RoundedComboBox}">
-                        <ComboBoxItem Content="1.55" />
-                        <ComboBoxItem Content="1.6" />
-                    </ComboBox>
-                </WrapPanel>
-            </WrapPanel>
-        </Border>
-        <Grid
-            x:Name="gridListHeader"
-            Grid.Row="2"
-            Margin="8,2,8,0">
-            <TabControl
-                x:Name="tabOrderType"
-                VerticalAlignment="Stretch"
-                FontSize="16"
-                SelectionChanged="tabOrderType_SelectionChanged">
-                <TabControl.Resources>
-                    <Style TargetType="{x:Type TabControl}">
-                        <Setter Property="Template">
-                            <Setter.Value>
-                                <ControlTemplate TargetType="{x:Type TabControl}">
-                                    <Grid>
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="*" />
-                                        </Grid.RowDefinitions>
-                                        <Border
-                                            Grid.Row="1"
-                                            MinHeight="4"
-                                            Background="#f8f8f9"
-                                            BorderBrush="#e0e0e0"
-                                            BorderThickness="1,1,1,0"
-                                            CornerRadius="0,4,0,0">
-                                            <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" />
-                                        </Border>
-                                        <Border
-                                            Margin="0,0,0,0"
-                                            HorizontalAlignment="Left"
-                                            Background="#e8e8e9"
-                                            BorderBrush="#e1e1e1"
-                                            BorderThickness="1,1,1,0"
-                                            CornerRadius="4,4,0,0"
-                                            Cursor="Hand">
-                                            <TabPanel
-                                                x:Name="HeaderPanel"
-                                                Background="Transparent"
-                                                IsItemsHost="True" />
-                                        </Border>
-                                    </Grid>
-                                </ControlTemplate>
-                            </Setter.Value>
-                        </Setter>
-                    </Style>
-                    <Style TargetType="TabItem">
-                        <Setter Property="Template">
-                            <Setter.Value>
-                                <ControlTemplate TargetType="TabItem">
-                                    <Border
-                                        Name="Border"
-                                        Margin="-1,-2,-1,0"
-                                        BorderThickness="1,1,1,0"
-                                        CornerRadius="4,4,0,0">
-                                        <ContentPresenter
-                                            x:Name="ContentSite"
-                                            Margin="10,5"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            ContentSource="Header" />
-                                    </Border>
-                                    <ControlTemplate.Triggers>
-                                        <Trigger Property="IsSelected" Value="True">
-                                            <Setter TargetName="Border" Property="Background" Value="#f8f8f9" />
-                                            <Setter TargetName="Border" Property="BorderBrush" Value="#e0e0e0" />
-                                            <Setter TargetName="Border" Property="Margin" Value="-1,-3,-1,-1" />
-                                            <Setter Property="Foreground" Value="{StaticResource pageColorBrush}" />
-                                            <Setter Property="Panel.ZIndex" Value="100" />
-                                        </Trigger>
-                                        <Trigger Property="IsSelected" Value="False">
-                                            <Setter TargetName="Border" Property="Background" Value="Transparent" />
-                                            <Setter Property="Foreground" Value="#999999" />
-                                        </Trigger>
-                                    </ControlTemplate.Triggers>
-                                </ControlTemplate>
-                            </Setter.Value>
-                        </Setter>
-                    </Style>
-                </TabControl.Resources>
-                <TabItem
-                    MinWidth="60"
-                    Background="Transparent"
-                    BorderBrush="Transparent"
-                    Header="待采购"
-                    SizeChanged="TabItem_SizeChanged">
-                    <Border
-                        Padding="0,10"
-                        BorderBrush="#e0e0e0"
-                        BorderThickness="0,0,0,1">
-                        <WrapPanel>
-                            <CheckBox
-                                x:Name="chkMapProdOnly"
-                                Margin="8,0,4,0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkMapProdOnly_Click"
-                                Content="已关联拍单"
-                                FontSize="12" />
-                            <CheckBox
-                                x:Name="chkNoMapProdOnly"
-                                Margin="8,0,4,0"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkNoMapProdOnly_Click"
-                                Content="未关联拍单"
-                                FontSize="12" />
+				<wpf:TitleContent
+					Title="礼品选择"
+					Margin="18,0,4,0"
+					Placement="Left"
+					TitleVerticalAlignment="Center">
+					<ComboBox
+						x:Name="cb_gift"
+						Width="100"
+						SelectedIndex="0"
+						SelectionChanged="ComboBox_SelectionChanged"
+						Style="{StaticResource RoundedComboBox}">
+						<ComboBoxItem Content="1.55" />
+						<ComboBoxItem Content="1.6" />
+					</ComboBox>
+				</wpf:TitleContent>
+				<Button
+					Height="22"
+					MinWidth="48"
+					Padding="4"
+					c:DebugVisibility.Enable="True"
+					Command="{Binding PullWXOrderCommand}"
+					Content="同步订单"
+					Style="{StaticResource BasePageButtonStyle}"
+					ToolTip="同步选中的订单或选中的店铺" />
+			</WrapPanel>
+		</Border>
+		<Grid
+			x:Name="gridListHeader"
+			Grid.Row="2"
+			Margin="8,2,8,0">
+			<TabControl
+				x:Name="tabOrderType"
+				VerticalAlignment="Stretch"
+				FontSize="16"
+				SelectionChanged="tabOrderType_SelectionChanged">
+				<TabControl.Resources>
+					<Style TargetType="{x:Type TabControl}">
+						<Setter Property="Template">
+							<Setter.Value>
+								<ControlTemplate TargetType="{x:Type TabControl}">
+									<Grid>
+										<Grid.RowDefinitions>
+											<RowDefinition Height="Auto" />
+											<RowDefinition Height="*" />
+										</Grid.RowDefinitions>
+										<Border
+											Grid.Row="1"
+											MinHeight="4"
+											Background="#f8f8f9"
+											BorderBrush="#e0e0e0"
+											BorderThickness="1,1,1,0"
+											CornerRadius="0,4,0,0">
+											<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" />
+										</Border>
+										<Border
+											Margin="0,0,0,0"
+											HorizontalAlignment="Left"
+											Background="#e8e8e9"
+											BorderBrush="#e1e1e1"
+											BorderThickness="1,1,1,0"
+											CornerRadius="4,4,0,0"
+											Cursor="Hand">
+											<TabPanel
+												x:Name="HeaderPanel"
+												Background="Transparent"
+												IsItemsHost="True" />
+										</Border>
+									</Grid>
+								</ControlTemplate>
+							</Setter.Value>
+						</Setter>
+					</Style>
+					<Style TargetType="TabItem">
+						<Setter Property="Template">
+							<Setter.Value>
+								<ControlTemplate TargetType="TabItem">
+									<Border
+										Name="Border"
+										Margin="-1,-2,-1,0"
+										BorderThickness="1,1,1,0"
+										CornerRadius="4,4,0,0">
+										<ContentPresenter
+											x:Name="ContentSite"
+											Margin="10,5"
+											HorizontalAlignment="Center"
+											VerticalAlignment="Center"
+											ContentSource="Header" />
+									</Border>
+									<ControlTemplate.Triggers>
+										<Trigger Property="IsSelected" Value="True">
+											<Setter TargetName="Border" Property="Background" Value="#f8f8f9" />
+											<Setter TargetName="Border" Property="BorderBrush" Value="#e0e0e0" />
+											<Setter TargetName="Border" Property="Margin" Value="-1,-3,-1,-1" />
+											<Setter Property="Foreground" Value="{StaticResource pageColorBrush}" />
+											<Setter Property="Panel.ZIndex" Value="100" />
+										</Trigger>
+										<Trigger Property="IsSelected" Value="False">
+											<Setter TargetName="Border" Property="Background" Value="Transparent" />
+											<Setter Property="Foreground" Value="#999999" />
+										</Trigger>
+									</ControlTemplate.Triggers>
+								</ControlTemplate>
+							</Setter.Value>
+						</Setter>
+					</Style>
+				</TabControl.Resources>
+				<TabItem
+					MinWidth="60"
+					Background="Transparent"
+					BorderBrush="Transparent"
+					Header="待采购"
+					SizeChanged="TabItem_SizeChanged">
+					<Border
+						Padding="0,10"
+						BorderBrush="#e0e0e0"
+						BorderThickness="0,0,0,1">
+						<WrapPanel>
+							<CheckBox
+								x:Name="chkMapProdOnly"
+								Margin="8,0,4,0"
+								HorizontalAlignment="Left"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkMapProdOnly_Click"
+								Content="已关联拍单"
+								FontSize="12" />
+							<CheckBox
+								x:Name="chkNoMapProdOnly"
+								Margin="8,0,4,0"
+								HorizontalAlignment="Left"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkNoMapProdOnly_Click"
+								Content="未关联拍单"
+								FontSize="12" />
 
 
-                            <Button
-                                Width="Auto"
-                                Height="22"
-                                MinWidth="48"
-                                Margin="8,0,4,0"
-                                Padding="4,0"
-                                Command="{Binding MultipleShipGiftCommand}"
-                                Content="批量礼品单"
-                                FontSize="12"
-                                Style="{StaticResource BasePageButtonStyle}" />
-                        </WrapPanel>
-                    </Border>
-                </TabItem>
-                <TabItem
-                    MinWidth="60"
-                    Header="待发货"
-                    SizeChanged="TabItem_SizeChanged" />
-                <TabItem
-                    MinWidth="60"
-                    Background="Transparent"
-                    BorderBrush="Transparent"
-                    Header="待收货"
-                    SizeChanged="TabItem_SizeChanged">
-                    <Border
-                        Margin="4,0,4,4"
-                        BorderBrush="#e0e0e0"
-                        BorderThickness="0,0,0,1">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <CheckBox
-                                x:Name="chkWaitReceiveBuyerIsNotSend"
-                                Margin="6,8"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkWaitReceiveBuyerStatus_Click"
-                                Content="买手未发货"
-                                FontSize="12" />
-                            <CheckBox
-                                x:Name="chkWaitReceiveBuyerIsSend"
-                                Grid.Column="1"
-                                Margin="6,8"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkWaitReceiveBuyerStatus_Click"
-                                Content="买手已发货"
-                                FontSize="12" />
-                            <CheckBox
-                                x:Name="chkWaitReceiveBuyerIsInWarehouse"
-                                Grid.Column="2"
-                                Margin="6,8"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkWaitReceiveBuyerStatus_Click"
-                                Content="货物已入库"
-                                FontSize="12" />
-                            <Polyline
-                                Grid.Column="3"
-                                Width="10"
-                                Margin="5,0"
-                                VerticalAlignment="Center"
-                                Points="5,0 5,8 5,0"
-                                Stroke="{StaticResource mainColorBrush}"
-                                StrokeThickness="2" />
+							<Button
+								Width="Auto"
+								Height="22"
+								MinWidth="48"
+								Margin="8,0,4,0"
+								Padding="4,0"
+								Command="{Binding MultipleShipGiftCommand}"
+								Content="批量礼品单"
+								FontSize="12"
+								Style="{StaticResource BasePageButtonStyle}" />
+						</WrapPanel>
+					</Border>
+				</TabItem>
+				<TabItem
+					MinWidth="60"
+					Header="待发货"
+					SizeChanged="TabItem_SizeChanged" />
+				<TabItem
+					MinWidth="60"
+					Background="Transparent"
+					BorderBrush="Transparent"
+					Header="待收货"
+					SizeChanged="TabItem_SizeChanged">
+					<Border
+						Margin="4,0,4,4"
+						BorderBrush="#e0e0e0"
+						BorderThickness="0,0,0,1">
+						<Grid>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<CheckBox
+								x:Name="chkWaitReceiveBuyerIsNotSend"
+								Margin="6,8"
+								HorizontalAlignment="Left"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkWaitReceiveBuyerStatus_Click"
+								Content="买手未发货"
+								FontSize="12" />
+							<CheckBox
+								x:Name="chkWaitReceiveBuyerIsSend"
+								Grid.Column="1"
+								Margin="6,8"
+								HorizontalAlignment="Left"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkWaitReceiveBuyerStatus_Click"
+								Content="买手已发货"
+								FontSize="12" />
+							<CheckBox
+								x:Name="chkWaitReceiveBuyerIsInWarehouse"
+								Grid.Column="2"
+								Margin="6,8"
+								HorizontalAlignment="Left"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkWaitReceiveBuyerStatus_Click"
+								Content="货物已入库"
+								FontSize="12" />
+							<Polyline
+								Grid.Column="3"
+								Width="10"
+								Margin="5,0"
+								VerticalAlignment="Center"
+								Points="5,0 5,8 5,0"
+								Stroke="{StaticResource mainColorBrush}"
+								StrokeThickness="2" />
 
-                            <CheckBox
-                                x:Name="chkWaitReceiveWarehouseIsNotPickup"
-                                Grid.Column="4"
-                                Margin="6,8"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkWaitReceiveWarehouseStatus_Click"
-                                Content="中转未取号"
-                                FontSize="12"
-                                Visibility="Collapsed" />
-                            <CheckBox
-                                x:Name="chkWaitReceiveWarehouseIsPickup"
-                                Grid.Column="5"
-                                Margin="6,8"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkWaitReceiveWarehouseStatus_Click"
-                                Content="中转已取号"
-                                FontSize="12" />
-                            <CheckBox
-                                x:Name="chkWaitReceiveWarehouseIsSendOut"
-                                Grid.Column="6"
-                                Margin="6,8"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkWaitReceiveWarehouseStatus_Click"
-                                Content="中转已出库"
-                                FontSize="12" />
-                        </Grid>
-                    </Border>
-                </TabItem>
-                <TabItem
-                    MinWidth="60"
-                    Background="Transparent"
-                    BorderBrush="Transparent"
-                    Foreground="#FFEE0099"
-                    Header="异常单"
-                    SizeChanged="TabItem_SizeChanged" />
-                <TabItem
-                    MinWidth="60"
-                    Background="#FF6666"
-                    BorderBrush="Transparent"
-                    Foreground="#FF6666"
-                    Header="需处理售后单"
-                    SizeChanged="TabItem_SizeChanged">
-                    <Border
-                        Margin="4,0,4,4"
-                        BorderBrush="#e0e0e0"
-                        BorderThickness="0,0,0,1">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <CheckBox
-                                x:Name="chkEmergencyBuyerWaitAfterSale"
-                                Grid.Column="0"
-                                Margin="6,8"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkEmergencyBuyerAfterSale_Click"
-                                Content="买手待申请售后"
-                                FontSize="12" />
-                            <Button
-                                x:Name="btnBatchRefund"
-                                Grid.Column="1"
-                                Height="20"
-                                MinWidth="48"
-                                Margin="0,0,0,0"
-                                Padding="4,0"
-                                Click="btnBatchRefund_Click"
-                                Content="批量申请买手售后"
-                                FontSize="12"
-                                Style="{StaticResource BasePageButtonStyle}" />
+							<CheckBox
+								x:Name="chkWaitReceiveWarehouseIsNotPickup"
+								Grid.Column="4"
+								Margin="6,8"
+								HorizontalAlignment="Left"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkWaitReceiveWarehouseStatus_Click"
+								Content="中转未取号"
+								FontSize="12"
+								Visibility="Collapsed" />
+							<CheckBox
+								x:Name="chkWaitReceiveWarehouseIsPickup"
+								Grid.Column="5"
+								Margin="6,8"
+								HorizontalAlignment="Left"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkWaitReceiveWarehouseStatus_Click"
+								Content="中转已取号"
+								FontSize="12" />
+							<CheckBox
+								x:Name="chkWaitReceiveWarehouseIsSendOut"
+								Grid.Column="6"
+								Margin="6,8"
+								HorizontalAlignment="Left"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkWaitReceiveWarehouseStatus_Click"
+								Content="中转已出库"
+								FontSize="12" />
+						</Grid>
+					</Border>
+				</TabItem>
+				<TabItem
+					MinWidth="60"
+					Background="Transparent"
+					BorderBrush="Transparent"
+					Foreground="#FFEE0099"
+					Header="异常单"
+					SizeChanged="TabItem_SizeChanged" />
+				<TabItem
+					MinWidth="60"
+					Background="#FF6666"
+					BorderBrush="Transparent"
+					Foreground="#FF6666"
+					Header="需处理售后单"
+					SizeChanged="TabItem_SizeChanged">
+					<Border
+						Margin="4,0,4,4"
+						BorderBrush="#e0e0e0"
+						BorderThickness="0,0,0,1">
+						<Grid>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<CheckBox
+								x:Name="chkEmergencyBuyerWaitAfterSale"
+								Grid.Column="0"
+								Margin="6,8"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkEmergencyBuyerAfterSale_Click"
+								Content="买手待申请售后"
+								FontSize="12" />
+							<Button
+								x:Name="btnBatchRefund"
+								Grid.Column="1"
+								Height="20"
+								MinWidth="48"
+								Margin="0,0,0,0"
+								Padding="4,0"
+								Click="btnBatchRefund_Click"
+								Content="批量申请买手售后"
+								FontSize="12"
+								Style="{StaticResource BasePageButtonStyle}" />
 
-                            <CheckBox
-                                x:Name="chkEmergencyBuyerWaitSendBack"
-                                Grid.Column="2"
-                                Margin="6,8"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkEmergencyBuyerAfterSale_Click"
-                                Content="买手待退货"
-                                FontSize="12" />
-                            <CheckBox
-                                x:Name="chkEmergencyBuyerWaitSupplierRefund"
-                                Grid.Column="3"
-                                Margin="6,8"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkEmergencyBuyerAfterSale_Click"
-                                Content="买手已寄出待商家退款"
-                                FontSize="12" />
-                            <CheckBox
-                                x:Name="chkEmergencyBuyerRefundFail"
-                                Grid.Column="4"
-                                Margin="6,8"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkEmergencyBuyerAfterSale_Click"
-                                Content="买手退款失败"
-                                FontSize="12" />
-                            <Polyline
-                                Grid.Column="5"
-                                Width="10"
-                                Margin="5,0"
-                                VerticalAlignment="Center"
-                                Points="5,0 5,8 5,0"
-                                Stroke="{StaticResource mainColorBrush}"
-                                StrokeThickness="2" />
+							<CheckBox
+								x:Name="chkEmergencyBuyerWaitSendBack"
+								Grid.Column="2"
+								Margin="6,8"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkEmergencyBuyerAfterSale_Click"
+								Content="买手待退货"
+								FontSize="12" />
+							<CheckBox
+								x:Name="chkEmergencyBuyerWaitSupplierRefund"
+								Grid.Column="3"
+								Margin="6,8"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkEmergencyBuyerAfterSale_Click"
+								Content="买手已寄出待商家退款"
+								FontSize="12" />
+							<CheckBox
+								x:Name="chkEmergencyBuyerRefundFail"
+								Grid.Column="4"
+								Margin="6,8"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkEmergencyBuyerAfterSale_Click"
+								Content="买手退款失败"
+								FontSize="12" />
+							<Polyline
+								Grid.Column="5"
+								Width="10"
+								Margin="5,0"
+								VerticalAlignment="Center"
+								Points="5,0 5,8 5,0"
+								Stroke="{StaticResource mainColorBrush}"
+								StrokeThickness="2" />
 
-                            <CheckBox
-                                x:Name="chkEmergencyShopCustomRefundHasWaybill"
-                                Grid.Column="6"
-                                Margin="6,8"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkEmergencyShopCustomRefundWaybill_Click"
-                                Content="店铺客户有退货单号"
-                                FontSize="12" />
-                            <CheckBox
-                                x:Name="chkEmergencyShopCustomRefundNoWaybill"
-                                Grid.Column="7"
-                                Margin="6,8"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkEmergencyShopCustomRefundWaybill_Click"
-                                Content="店铺客户无退货单号"
-                                FontSize="12" />
-                            <Polyline
-                                Grid.Column="8"
-                                Width="10"
-                                Margin="5,0"
-                                VerticalAlignment="Center"
-                                Points="5,0 5,8 5,0"
-                                Stroke="{StaticResource mainColorBrush}"
-                                StrokeThickness="2" />
+							<CheckBox
+								x:Name="chkEmergencyShopCustomRefundHasWaybill"
+								Grid.Column="6"
+								Margin="6,8"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkEmergencyShopCustomRefundWaybill_Click"
+								Content="店铺客户有退货单号"
+								FontSize="12" />
+							<CheckBox
+								x:Name="chkEmergencyShopCustomRefundNoWaybill"
+								Grid.Column="7"
+								Margin="6,8"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkEmergencyShopCustomRefundWaybill_Click"
+								Content="店铺客户无退货单号"
+								FontSize="12" />
+							<Polyline
+								Grid.Column="8"
+								Width="10"
+								Margin="5,0"
+								VerticalAlignment="Center"
+								Points="5,0 5,8 5,0"
+								Stroke="{StaticResource mainColorBrush}"
+								StrokeThickness="2" />
 
-                            <CheckBox
-                                x:Name="chkEmergencyShopAfterSaleSuccess"
-                                Grid.Column="9"
-                                Margin="6,8"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkEmergencyShopAfterSale_Click"
-                                Content="店铺退款完成"
-                                FontSize="12" />
-                            <CheckBox
-                                x:Name="chkEmergencyShopInAfterSale"
-                                Grid.Column="10"
-                                Margin="6,8"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkEmergencyShopAfterSale_Click"
-                                Content="店铺退款中"
-                                FontSize="12" />
+							<CheckBox
+								x:Name="chkEmergencyShopAfterSaleSuccess"
+								Grid.Column="9"
+								Margin="6,8"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkEmergencyShopAfterSale_Click"
+								Content="店铺退款完成"
+								FontSize="12" />
+							<CheckBox
+								x:Name="chkEmergencyShopInAfterSale"
+								Grid.Column="10"
+								Margin="6,8"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkEmergencyShopAfterSale_Click"
+								Content="店铺退款中"
+								FontSize="12" />
 
-                            <Polyline
-                                Grid.Column="11"
-                                Width="10"
-                                Margin="5,0"
-                                VerticalAlignment="Center"
-                                Points="5,0 5,8 5,0"
-                                Stroke="{StaticResource mainColorBrush}"
-                                StrokeThickness="2" />
+							<Polyline
+								Grid.Column="11"
+								Width="10"
+								Margin="5,0"
+								VerticalAlignment="Center"
+								Points="5,0 5,8 5,0"
+								Stroke="{StaticResource mainColorBrush}"
+								StrokeThickness="2" />
 
-                            <CheckBox
-                                x:Name="chkEmergencyReturn"
-                                Grid.Column="12"
-                                Margin="6,8"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkEmergencyReturnOrRefund_Click"
-                                Content="退货退款"
-                                FontSize="12" />
-                            <CheckBox
-                                x:Name="chkEmergencyRefund"
-                                Grid.Column="13"
-                                Margin="6,8"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkEmergencyReturnOrRefund_Click"
-                                Content="仅退款"
-                                FontSize="12" />
-                        </Grid>
-                    </Border>
-                </TabItem>
-                <TabItem
-                    MinWidth="60"
-                    Background="Transparent"
-                    BorderBrush="Transparent"
-                    Foreground="#FF9966"
-                    Header="售后完成单"
-                    SizeChanged="TabItem_SizeChanged">
-                    <Border
-                        Margin="4,0,4,4"
-                        BorderBrush="#e0e0e0"
-                        BorderThickness="0,0,0,1">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="auto" />
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <CheckBox
-                                x:Name="chkAftersaleIsNotSend"
-                                Grid.Column="0"
-                                Margin="6,8"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkAftersaleSendStatus_Click"
-                                Content="未发货退货完成"
-                                FontSize="12" />
-                            <CheckBox
-                                x:Name="chkAftersaleIsSend"
-                                Grid.Column="1"
-                                Margin="6,8"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkAftersaleSendStatus_Click"
-                                Content="已发货退款完成"
-                                FontSize="12" />
-                            <Polyline
-                                Grid.Column="2"
-                                Width="10"
-                                Margin="5,0"
-                                VerticalAlignment="Center"
-                                Points="5,0 5,8 5,0"
-                                Stroke="{StaticResource mainColorBrush}"
-                                StrokeThickness="2" />
+							<CheckBox
+								x:Name="chkEmergencyReturn"
+								Grid.Column="12"
+								Margin="6,8"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkEmergencyReturnOrRefund_Click"
+								Content="退货退款"
+								FontSize="12" />
+							<CheckBox
+								x:Name="chkEmergencyRefund"
+								Grid.Column="13"
+								Margin="6,8"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkEmergencyReturnOrRefund_Click"
+								Content="仅退款"
+								FontSize="12" />
+						</Grid>
+					</Border>
+				</TabItem>
+				<TabItem
+					MinWidth="60"
+					Background="Transparent"
+					BorderBrush="Transparent"
+					Foreground="#FF9966"
+					Header="售后完成单"
+					SizeChanged="TabItem_SizeChanged">
+					<Border
+						Margin="4,0,4,4"
+						BorderBrush="#e0e0e0"
+						BorderThickness="0,0,0,1">
+						<Grid>
+							<Grid.ColumnDefinitions>
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="auto" />
+								<ColumnDefinition Width="*" />
+							</Grid.ColumnDefinitions>
+							<CheckBox
+								x:Name="chkAftersaleIsNotSend"
+								Grid.Column="0"
+								Margin="6,8"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkAftersaleSendStatus_Click"
+								Content="未发货退货完成"
+								FontSize="12" />
+							<CheckBox
+								x:Name="chkAftersaleIsSend"
+								Grid.Column="1"
+								Margin="6,8"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkAftersaleSendStatus_Click"
+								Content="已发货退款完成"
+								FontSize="12" />
+							<Polyline
+								Grid.Column="2"
+								Width="10"
+								Margin="5,0"
+								VerticalAlignment="Center"
+								Points="5,0 5,8 5,0"
+								Stroke="{StaticResource mainColorBrush}"
+								StrokeThickness="2" />
 
-                            <CheckBox
-                                x:Name="chkAftersaleBuyerIsBuy"
-                                Grid.Column="3"
-                                Margin="6,8"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkAftersaleBuyerStatus_Click"
-                                Content="买手号已拍单"
-                                FontSize="12" />
-                            <Polyline
-                                Grid.Column="4"
-                                Width="10"
-                                Margin="5,0"
-                                VerticalAlignment="Center"
-                                Points="5,0 5,8 5,0"
-                                Stroke="{StaticResource mainColorBrush}"
-                                StrokeThickness="2" />
+							<CheckBox
+								x:Name="chkAftersaleBuyerIsBuy"
+								Grid.Column="3"
+								Margin="6,8"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkAftersaleBuyerStatus_Click"
+								Content="买手号已拍单"
+								FontSize="12" />
+							<Polyline
+								Grid.Column="4"
+								Width="10"
+								Margin="5,0"
+								VerticalAlignment="Center"
+								Points="5,0 5,8 5,0"
+								Stroke="{StaticResource mainColorBrush}"
+								StrokeThickness="2" />
 
-                            <CheckBox
-                                x:Name="chkAftersaleWarehouseIsNotPickup"
-                                Grid.Column="5"
-                                Margin="6,8"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkAftersaleWarehouseStatus_Click"
-                                Content="中转仓未取号"
-                                FontSize="12" />
-                            <CheckBox
-                                x:Name="chkAftersaleWarehouseIsPickup"
-                                Grid.Column="6"
-                                Margin="6,8"
-                                VerticalAlignment="Center"
-                                BorderBrush="{StaticResource mainColorBrush}"
-                                Click="chkAftersaleWarehouseStatus_Click"
-                                Content="中转仓已取号"
-                                FontSize="12" />
-                        </Grid>
-                    </Border>
-                </TabItem>
-                <TabItem
-                    MinWidth="60"
-                    Background="Transparent"
-                    BorderBrush="Transparent"
-                    Header="全部订单"
-                    SizeChanged="TabItem_SizeChanged" />
-                <!--<TabItem Header="发货异常">
+							<CheckBox
+								x:Name="chkAftersaleWarehouseIsNotPickup"
+								Grid.Column="5"
+								Margin="6,8"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkAftersaleWarehouseStatus_Click"
+								Content="中转仓未取号"
+								FontSize="12" />
+							<CheckBox
+								x:Name="chkAftersaleWarehouseIsPickup"
+								Grid.Column="6"
+								Margin="6,8"
+								VerticalAlignment="Center"
+								BorderBrush="{StaticResource mainColorBrush}"
+								Click="chkAftersaleWarehouseStatus_Click"
+								Content="中转仓已取号"
+								FontSize="12" />
+						</Grid>
+					</Border>
+				</TabItem>
+				<TabItem
+					MinWidth="60"
+					Background="Transparent"
+					BorderBrush="Transparent"
+					Header="全部订单"
+					SizeChanged="TabItem_SizeChanged" />
+				<!--<TabItem Header="发货异常">
                     <Grid Background="#FFE5E5E5"/>
                 </TabItem>-->
-            </TabControl>
-            <TextBlock
-                Width="180"
-                Margin="10,-5,0,-5"
-                HorizontalAlignment="Right"
-                VerticalAlignment="Top"
-                FontSize="12"
-                Foreground="{StaticResource PageWarningBrushCC}"
-                Text="注：需中转仓订单，店铺后台勿自行发货，发货后中转仓将无法打单"
-                TextWrapping="Wrap" />
-        </Grid>
-        <Grid
-            x:Name="lstTitle"
-            Grid.Row="3"
-            Margin="8,0,8,0"
-            Background="{StaticResource ListHeadBackColorBrush}">
-            <Border BorderBrush="{StaticResource ListHeadBorderColorBrush}" BorderThickness="0,0,1,0">
-                <DataGrid
-                    x:Name="dgOrderHeader"
-                    Grid.ColumnSpan="100"
-                    Margin="0,0,28,0"
-                    AutoGenerateColumns="False"
-                    BorderThickness="0"
-                    CanUserReorderColumns="False"
-                    ColumnDisplayIndexChanged="dgOrderHeader_ColumnDisplayIndexChanged"
-                    ColumnHeaderHeight="{Binding ElementName=lstTitle, Path=ActualHeight}"
-                    LayoutUpdated="dgOrderHeader_LayoutUpdated">
-                    <DataGrid.Columns>
-                        <DataGridTextColumn
-                            Width="38"
-                            Header="序号"
-                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
-                        <DataGridTemplateColumn
-                            x:Name="colSelectAll"
-                            Width="26"
-                            Header="选择"
-                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}">
-                            <DataGridTemplateColumn.HeaderTemplate>
-                                <DataTemplate>
-                                    <Grid Width="14" Height="14">
-                                        <!--<CheckBox x:Name="headerCheckBox" BorderThickness="0" IsChecked="{Binding DataContext.AreAllSelected, RelativeSource={RelativeSource AncestorType=DataGrid},  UpdateSourceTrigger=PropertyChanged}" Checked="HeaderCheckBox_Checked" Unchecked="HeaderCheckBox_Unchecked"/>-->
-                                        <CheckBox
-                                            x:Name="chkSelectAll"
-                                            BorderThickness="0"
-                                            Checked="ChkSelectAll_Checked"
-                                            IsChecked="False"
-                                            IsThreeState="True"
-                                            Loaded="ChkSelectAll_Loaded"
-                                            Unchecked="ChkSelectAll_Unchecked" />
-                                        <Border
-                                            Width="14"
-                                            Height="14"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            Background="Transparent"
-                                            BorderBrush="{StaticResource mainColorBrush}"
-                                            BorderThickness="1"
-                                            IsHitTestVisible="False" />
-                                    </Grid>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.HeaderTemplate>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <!--<CheckBox IsChecked="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
-                                    <CheckBox HorizontalAlignment="Center" VerticalAlignment="Center" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTextColumn
-                            Width="185*"
-                            Header="店铺单号"
-                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
-                        <DataGridTextColumn
-                            Width="90*"
-                            Header="交易时间"
-                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
-                        <DataGridTextColumn
-                            Width="65*"
-                            Header="利润"
-                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
-                        <DataGridTextColumn
-                            Width="170*"
-                            Header="状态/地址"
-                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
-                        <DataGridTextColumn
-                            Width="140*"
-                            Header="单号"
-                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
-                        <DataGridTextColumn
-                            Width="130*"
-                            Header="备注"
-                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
-                        <DataGridTextColumn
-                            Width="72*"
-                            Header="    操作"
-                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
-                    </DataGrid.Columns>
-                </DataGrid>
-            </Border>
-        </Grid>
+			</TabControl>
+			<TextBlock
+				Width="180"
+				Margin="10,-5,0,-5"
+				HorizontalAlignment="Right"
+				VerticalAlignment="Top"
+				FontSize="12"
+				Foreground="{StaticResource PageWarningBrushCC}"
+				Text="注：需中转仓订单，店铺后台勿自行发货，发货后中转仓将无法打单"
+				TextWrapping="Wrap" />
+		</Grid>
+		<Grid
+			x:Name="lstTitle"
+			Grid.Row="3"
+			Margin="8,0,8,0"
+			Background="{StaticResource ListHeadBackColorBrush}">
+			<Border BorderBrush="{StaticResource ListHeadBorderColorBrush}" BorderThickness="0,0,1,0">
+				<DataGrid
+					x:Name="dgOrderHeader"
+					Grid.ColumnSpan="100"
+					Margin="0,0,28,0"
+					AutoGenerateColumns="False"
+					BorderThickness="0"
+					CanUserReorderColumns="False"
+					ColumnDisplayIndexChanged="dgOrderHeader_ColumnDisplayIndexChanged"
+					ColumnHeaderHeight="{Binding ElementName=lstTitle, Path=ActualHeight}"
+					LayoutUpdated="dgOrderHeader_LayoutUpdated">
+					<DataGrid.Columns>
+						<DataGridTextColumn
+							Width="38"
+							Header="序号"
+							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+						<DataGridTemplateColumn
+							x:Name="colSelectAll"
+							Width="26"
+							Header="选择"
+							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}">
+							<DataGridTemplateColumn.HeaderTemplate>
+								<DataTemplate>
+									<Grid Width="14" Height="14">
+										<!--<CheckBox x:Name="headerCheckBox" BorderThickness="0" IsChecked="{Binding DataContext.AreAllSelected, RelativeSource={RelativeSource AncestorType=DataGrid},  UpdateSourceTrigger=PropertyChanged}" Checked="HeaderCheckBox_Checked" Unchecked="HeaderCheckBox_Unchecked"/>-->
+										<CheckBox
+											x:Name="chkSelectAll"
+											BorderThickness="0"
+											Checked="ChkSelectAll_Checked"
+											IsChecked="False"
+											IsThreeState="True"
+											Loaded="ChkSelectAll_Loaded"
+											Unchecked="ChkSelectAll_Unchecked" />
+										<Border
+											Width="14"
+											Height="14"
+											HorizontalAlignment="Center"
+											VerticalAlignment="Center"
+											Background="Transparent"
+											BorderBrush="{StaticResource mainColorBrush}"
+											BorderThickness="1"
+											IsHitTestVisible="False" />
+									</Grid>
+								</DataTemplate>
+							</DataGridTemplateColumn.HeaderTemplate>
+							<DataGridTemplateColumn.CellTemplate>
+								<DataTemplate>
+									<!--<CheckBox IsChecked="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
+									<CheckBox HorizontalAlignment="Center" VerticalAlignment="Center" />
+								</DataTemplate>
+							</DataGridTemplateColumn.CellTemplate>
+						</DataGridTemplateColumn>
+						<DataGridTextColumn
+							Width="185*"
+							Header="店铺单号"
+							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+						<DataGridTextColumn
+							Width="90*"
+							Header="交易时间"
+							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+						<DataGridTextColumn
+							Width="65*"
+							Header="利润"
+							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+						<DataGridTextColumn
+							Width="170*"
+							Header="状态/地址"
+							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+						<DataGridTextColumn
+							Width="140*"
+							Header="单号"
+							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+						<DataGridTextColumn
+							Width="130*"
+							Header="备注"
+							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+						<DataGridTextColumn
+							Width="72*"
+							Header="    操作"
+							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+					</DataGrid.Columns>
+				</DataGrid>
+			</Border>
+		</Grid>
 
-        <!--  ItemsSource="{Binding lstFilterOrder}"  -->
-        <ListBox
-            x:Name="lbxOrder"
-            Grid.Row="4"
-            Margin="7,0,7,0"
-            HorizontalContentAlignment="Stretch"
-            BorderThickness="0"
-            ScrollViewer.CanContentScroll="True"
-            VirtualizingPanel.ScrollUnit="Pixel">
-            <!--  使用自定义属性模板去除ListBox高亮显示框  -->
-            <ListBox.ItemContainerStyle>
-                <Style TargetType="ListBoxItem">
-                    <Setter Property="Template">
-                        <Setter.Value>
-                            <ControlTemplate TargetType="ListBoxItem">
-                                <ContentPresenter
-                                    Content="{TemplateBinding Content}"
-                                    ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                    ContentTemplate="{TemplateBinding ContentTemplate}" />
-                            </ControlTemplate>
-                        </Setter.Value>
-                    </Setter>
-                </Style>
-            </ListBox.ItemContainerStyle>
-            <ListBox.ItemTemplate>
-                <DataTemplate>
-                    <!--  此处绑定将数据源传递给子自定义控件OrderListRowCtrl  -->
-                    <local:OrderListRowCtrl
-                        VerticalAlignment="Center"
-                        VerticalContentAlignment="Center"
-                        DataContext="{Binding}" />
-                </DataTemplate>
-            </ListBox.ItemTemplate>
-        </ListBox>
+		<!--  ItemsSource="{Binding lstFilterOrder}"  -->
+		<ListBox
+			x:Name="lbxOrder"
+			Grid.Row="4"
+			Margin="7,0,7,0"
+			HorizontalContentAlignment="Stretch"
+			BorderThickness="0"
+			ScrollViewer.CanContentScroll="True"
+			VirtualizingPanel.ScrollUnit="Pixel">
+			<!--  使用自定义属性模板去除ListBox高亮显示框  -->
+			<ListBox.ItemContainerStyle>
+				<Style TargetType="ListBoxItem">
+					<Setter Property="Template">
+						<Setter.Value>
+							<ControlTemplate TargetType="ListBoxItem">
+								<ContentPresenter
+									Content="{TemplateBinding Content}"
+									ContentStringFormat="{TemplateBinding ContentStringFormat}"
+									ContentTemplate="{TemplateBinding ContentTemplate}" />
+							</ControlTemplate>
+						</Setter.Value>
+					</Setter>
+				</Style>
+			</ListBox.ItemContainerStyle>
+			<ListBox.ItemTemplate>
+				<DataTemplate>
+					<!--  此处绑定将数据源传递给子自定义控件OrderListRowCtrl  -->
+					<local:OrderListRowCtrl
+						VerticalAlignment="Center"
+						VerticalContentAlignment="Center"
+						DataContext="{Binding}" />
+				</DataTemplate>
+			</ListBox.ItemTemplate>
+		</ListBox>
 
-        <Grid
-            x:Name="gridFooter"
-            Grid.Row="5"
-            Background="{StaticResource pageColorBrush}">
-            <ProgressBar
-                VerticalAlignment="Stretch"
-                d:IsIndeterminate="False"
-                d:Maximum="100"
-                d:Value="10"
-                Background="Transparent"
-                BorderThickness="0"
-                Foreground="#FFA680"
-                Maximum="{Binding ProgressMaximum}"
-                Value="{Binding ProgressValue}" />
-            <Grid>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="100*" />
-                </Grid.ColumnDefinitions>
+		<Grid
+			x:Name="gridFooter"
+			Grid.Row="5"
+			Background="{StaticResource pageColorBrush}">
+			<ProgressBar
+				VerticalAlignment="Stretch"
+				d:IsIndeterminate="False"
+				d:Maximum="100"
+				d:Value="10"
+				Background="Transparent"
+				BorderThickness="0"
+				Foreground="#FFA680"
+				Maximum="{Binding ProgressMaximum}"
+				Value="{Binding ProgressValue}" />
+			<Grid>
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="Auto" />
+					<ColumnDefinition Width="100*" />
+				</Grid.ColumnDefinitions>
 
-                <TextBox
-                    Grid.Row="2"
-                    Grid.Column="1"
-                    Margin="4,0,0,0"
-                    VerticalAlignment="Center"
-                    d:Text="共计：{}"
-                    Background="Transparent"
-                    BorderThickness="0"
-                    Foreground="White"
-                    IsReadOnly="True"
-                    Text="{Binding BottomMsg}" />
-            </Grid>
-        </Grid>
-        <Border
-            x:Name="borderFilterRemarkSelect"
-            Grid.RowSpan="10"
-            MinWidth="200"
-            MinHeight="200"
-            MaxWidth="400"
-            MaxHeight="400"
-            Margin="30,180,0,0"
-            HorizontalAlignment="Left"
-            VerticalAlignment="Top"
-            Background="White"
-            BorderBrush="{StaticResource pageColorBrush}"
-            BorderThickness="1,1,1,1"
-            CornerRadius="4">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition />
-                    <RowDefinition Height="40" />
-                </Grid.RowDefinitions>
-                <ScrollViewer Padding="2" VerticalScrollBarVisibility="Auto">
-                    <WrapPanel x:Name="wpFilterRemarkSelect" />
-                </ScrollViewer>
-                <Grid Grid.Row="2">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="Auto" />
-                    </Grid.ColumnDefinitions>
-                    <Button
-                        x:Name="btnFilterRemarkSelectAll"
-                        Grid.Row="4"
-                        Grid.Column="0"
-                        Height="22"
-                        Margin="6,0,4,0"
-                        Click="btnFilterRemarkSelectAll_Click"
-                        Content=" 全选 "
-                        Style="{StaticResource BasePageButtonStyle}" />
-                    <Button
-                        x:Name="btnFilterRemarkUnSelectAll"
-                        Grid.Row="4"
-                        Grid.Column="1"
-                        Height="22"
-                        Click="btnFilterRemarkUnSelectAll_Click"
-                        Content=" 全空 "
-                        Style="{StaticResource BasePageButtonStyle}" />
-                    <Button
-                        x:Name="btnApplyFilterRemark"
-                        Grid.Row="4"
-                        Grid.Column="6"
-                        Height="22"
-                        Click="btnApplyFilterRemark_Click"
-                        Content=" 确定 "
-                        Style="{StaticResource BasePageButtonStyle}" />
-                    <Button
-                        x:Name="btnCancelFilterRemark"
-                        Grid.Row="4"
-                        Grid.Column="7"
-                        Height="22"
-                        Margin="4,0,6,0"
-                        Click="btnCancelFilterRemark_Click"
-                        Content=" 取消 "
-                        Style="{StaticResource BasePageButtonLightStyle}" />
-                </Grid>
-            </Grid>
-        </Border>
-    </Grid>
+				<TextBox
+					Grid.Row="2"
+					Grid.Column="1"
+					Margin="4,0,0,0"
+					VerticalAlignment="Center"
+					d:Text="共计：{}"
+					Background="Transparent"
+					BorderThickness="0"
+					Foreground="White"
+					IsReadOnly="True"
+					Text="{Binding BottomMsg}" />
+			</Grid>
+			<Button
+				HorizontalAlignment="Right"
+				Background="Transparent"
+				Command="{Binding ShowTaskDialogViewCommand}"
+				Foreground="White"
+				ToolTip="任务列表">
+				<Button.Content>
+					<TextBlock Style="{StaticResource TextBlockIcon}" Text="{StaticResource txt-task_list_square_ltr}" />
+				</Button.Content>
+			</Button>
+		</Grid>
+		<Border
+			x:Name="borderFilterRemarkSelect"
+			Grid.RowSpan="10"
+			MinWidth="200"
+			MinHeight="200"
+			MaxWidth="400"
+			MaxHeight="400"
+			Margin="30,180,0,0"
+			HorizontalAlignment="Left"
+			VerticalAlignment="Top"
+			Background="White"
+			BorderBrush="{StaticResource pageColorBrush}"
+			BorderThickness="1,1,1,1"
+			CornerRadius="4">
+			<Grid>
+				<Grid.RowDefinitions>
+					<RowDefinition />
+					<RowDefinition Height="40" />
+				</Grid.RowDefinitions>
+				<ScrollViewer Padding="2" VerticalScrollBarVisibility="Auto">
+					<WrapPanel x:Name="wpFilterRemarkSelect" />
+				</ScrollViewer>
+				<Grid Grid.Row="2">
+					<Grid.ColumnDefinitions>
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="*" />
+						<ColumnDefinition Width="Auto" />
+						<ColumnDefinition Width="Auto" />
+					</Grid.ColumnDefinitions>
+					<Button
+						x:Name="btnFilterRemarkSelectAll"
+						Grid.Row="4"
+						Grid.Column="0"
+						Height="22"
+						Margin="6,0,4,0"
+						Click="btnFilterRemarkSelectAll_Click"
+						Content=" 全选 "
+						Style="{StaticResource BasePageButtonStyle}" />
+					<Button
+						x:Name="btnFilterRemarkUnSelectAll"
+						Grid.Row="4"
+						Grid.Column="1"
+						Height="22"
+						Click="btnFilterRemarkUnSelectAll_Click"
+						Content=" 全空 "
+						Style="{StaticResource BasePageButtonStyle}" />
+					<Button
+						x:Name="btnApplyFilterRemark"
+						Grid.Row="4"
+						Grid.Column="6"
+						Height="22"
+						Click="btnApplyFilterRemark_Click"
+						Content=" 确定 "
+						Style="{StaticResource BasePageButtonStyle}" />
+					<Button
+						x:Name="btnCancelFilterRemark"
+						Grid.Row="4"
+						Grid.Column="7"
+						Height="22"
+						Margin="4,0,6,0"
+						Click="btnCancelFilterRemark_Click"
+						Content=" 取消 "
+						Style="{StaticResource BasePageButtonLightStyle}" />
+				</Grid>
+			</Grid>
+		</Border>
+	</Grid>
 </UserControl>
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
index 70b13f0..5ff9fed 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
@@ -1,4 +1,5 @@
 using _29WxOrderWpf.BaseWindows;
+using _29WxOrderWpf.Commands;
 using _29WxOrderWpf.Common;
 using _29WxOrderWpf.Ctrls.BuyerCtrls;
 using _29WxOrderWpf.Ctrls.Statistics;
@@ -1936,25 +1937,36 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 				int errorCount = 0;
 				foreach (oms_wei_order_info item in list)
 				{
-					var rst = await WxApiBLL.WxSearchAndDropshipCancelAsync(item.Shop, item);
-					if (rst == "success")
+					try
 					{
-						var ret = await _shipGiftService.Send(item.order_id, giftType);
-						if (ret)
+						var rst = await WxApiBLL.WxSearchAndDropshipCancelAsync(item.Shop, item);
+						if (rst == "success")
 						{
-							sucessCount++;
-							item.gift_order_status = 1;
-							this.FilterOneOrder(item, true);
+							var ret = await _shipGiftService.Send(item.order_id, giftType);
+							if (ret)
+							{
+								sucessCount++;
+								item.gift_order_status = 1;
+								this.FilterOneOrder(item, true);
+							}
+							else
+							{
+								errorCount++;
+							}
 						}
 						else
 						{
 							errorCount++;
 						}
 					}
-					else
+					catch (Exception ex)
 					{
 						errorCount++;
 					}
+					finally
+					{
+						item.IsSelect = false;
+					}
 
 					SetProgress(index, count);
 					BottomMsg = $"礼品单发送进度:{index}/{count}\t\t{item.orderItems.FirstOrDefault()?.title ?? ""}";
@@ -1972,6 +1984,181 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 
 			}
 		}
+
+		/// <summary>
+		/// 拉取微信订单到任务列表
+		/// </summary>
+		public ICommand PullWXOrderCommand => new AsyncDelegateCommand(PullWXOrder);
+
+		private async Task PullWXOrder()
+		{
+			try
+			{
+				var isAfterSales = GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后单");//是否售后
+
+				var selectedShops = GlobalConfig.ShopLoginList.Where(a => a.IsSelect).ToList();
+				if (selectedShops.Count == 0)
+				{
+					selectedShops = GlobalConfig.ShopLoginList.ToList();
+				}
+
+				var selectedOrders = GlobalConfig.lstFilterOrder.Where(a => a.IsSelect).ToList();
+				int count = selectedOrders.Count;
+				if (count > 0 && isAfterSales == false)//非售后订单
+				{
+					if (BaseMsgWindow.ShowConfirm($"已选取:{count}个订单", "同步订单", MainWindow.Instance, MsgWindowLevel.MEDIUM).DialogResult == false) return;
+					BottomMsg = $"订单同步进度....";
+					int index = 1;
+					int sucessCount = 0;
+					int errorCount = 0;
+					foreach (var item in selectedOrders)
+					{
+						var ret = await PullWXOrderService.Instance.PullOrderDetailAsync(item.shop_id, item.order_id); ;
+						if (ret)
+						{
+							sucessCount++;
+							this.GetOrder(item.order_id);
+							SetProgress(index, count);
+							item.IsSelect = false;
+						}
+						else
+						{
+							errorCount++;
+						}
+						BottomMsg = $"订单同步进度:{index}/{count}\t\t{item.orderItems.FirstOrDefault()?.title ?? ""}";
+						index++;
+					}
+					BottomMsg = $"订单同步进度完成  成功：{sucessCount} 失败：{errorCount}  总数：{count}";
+				}
+				else if (count > 0 && isAfterSales == true)//售后订单
+				{
+					if (BaseMsgWindow.ShowConfirm($"已选取:{count}个售后订单", "同步订单", MainWindow.Instance, MsgWindowLevel.MEDIUM).DialogResult == false) return;
+					//var dictionaryResult = selectedOrders
+					//						.Where(o => o?.refundItems != null)
+					//						.SelectMany(o => o.refundItems
+					//							.Where(item => item != null)
+					//							.Select(item => new { o.shop_id, item.after_sale_order_id }))
+					//						.GroupBy(x => x.shop_id)
+					//						.ToDictionary(
+					//							g => g.Key,
+					//							g => g.Select(x => x.after_sale_order_id).ToArray()
+					//						);
+
+
+					//BottomMsg = $"售后订单同步进度....";
+					//foreach (var item in dictionaryResult)
+					//{
+					//	var ret = await PullWXOrderService.Instance.PullAfterSaleOrdersAsync(item.Key, item.Value);
+					//}
+					//BottomMsg = $"售后同步任务已发送,等待同步完成";	
+
+
+
+					int index = 1;
+					int sucessCount = 0;
+					int errorCount = 0;
+					BottomMsg = $"售后订单同步进度....";
+					foreach (KeyValuePair<long, List<oms_wei_order_info>> item in selectedOrders.GroupBy(a => a.shop_id).ToDictionary(a => a.Key, a => a.ToList()))
+					{
+						long shopid = item.Key;
+						string shopName = item.Value.FirstOrDefault()?.shop_name ?? "";
+						string[] afterSaleOrderIds = item.Value.SelectMany(a => a.refundItems).Where(a => a != null).Select(a => a.after_sale_order_id).ToArray();
+						var ret = await PullWXOrderService.Instance.PullAfterSaleOrdersAsync(shopid, afterSaleOrderIds);
+						if (ret)
+						{
+							sucessCount++;
+							SetProgress(index, count);
+							item.Value.ForEach(a => a.IsSelect = false);
+						}
+						else
+						{
+							errorCount++;
+						}
+						BottomMsg = $"售后订单同步进度:{index}/{count}\t\t{shopName}";
+						index++;
+
+					}
+					BottomMsg = $"售后同步任务已发送,等待同步完成";
+				}
+				else
+				{
+					count = selectedShops.Count;
+					string prefix = $"已选取:{count}个商铺";
+					if (count == GlobalConfig.ShopLoginList.Count)
+					{
+						prefix = "已选取全部商铺";
+					}
+
+
+					var startTime = dateStart.SelectedDate.Value;
+					var endTime = dateEnd.SelectedDate.Value;
+
+					string msg = "";
+					if (isAfterSales)
+					{
+						msg = $"{prefix}";
+					}
+					else
+					{
+						msg = $"{prefix}\n\n时间范围：{startTime.ToString("yyyy-MM-dd")}-{endTime.ToString("yyyy-MM-dd")}";
+					}
+
+					if (BaseMsgWindow.ShowConfirm(msg, $"{(isAfterSales ? "售后" : "")}同步订单", MainWindow.Instance, MsgWindowLevel.MEDIUM).DialogResult == false) return;
+
+					if ((endTime - startTime).Days > 7)
+					{
+						throw new Exception("时间范围最大7天");
+					}
+
+					var ret = false;
+					if (isAfterSales)
+					{
+						ret = await PullWXOrderService.Instance.PullRefundOrderByShopsAsync(selectedShops.Select(a => a.ErpShopId.ParseToLong()).ToArray(), startTime, endTime);
+					}
+					else
+					{
+						ret = await PullWXOrderService.Instance.PullOrderByShopIdsAndTimeRangeAsync(selectedShops.Select(a => a.ErpShopId.ParseToLong()).ToArray(), startTime, endTime);
+					}
+					if (ret)
+					{
+						BaseMsgWindow.ShowInfo("同步任务已发送,等待同步完成\n任务详情查看任务列表");
+					}
+					else
+					{
+						BaseMsgWindow.ShowError("同步任务失败");
+					}
+				}
+
+
+			}
+			catch (Exception ex)
+			{
+				BaseMsgWindow.ShowError("同步订单失败\n" + ex.Message, "Error");
+			}
+			//var service = PullWXOrderService.Instance;
+			//foreach (var item in list)
+			//{
+			//	await service.PullOrderDetailAsync(item.shop_id, item.order_id);
+			//}
+		}
+
+		private DialogWindow _taskDialog;
+		public ICommand ShowTaskDialogViewCommand => new DelegateCommand(ShowTaskDialogView);
+
+		private void ShowTaskDialogView()
+		{
+			if (_taskDialog == null)
+			{
+				_taskDialog = new DialogWindow()
+				{
+					Title = "任务列表",
+					Content = new OrderTaskDialogView(),
+
+				};
+				_taskDialog.Closed += (s, e) => _taskDialog = null;
+			}
+			_taskDialog.Show();
+		}
 	}
 
 	public class OrderFilterConfig
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml
new file mode 100644
index 0000000..309113b
--- /dev/null
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml
@@ -0,0 +1,241 @@
+<UserControl
+	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:converters="clr-namespace:_29WxOrderWpf.Converters"
+	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+	xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
+	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+	xmlns:wpf="clr-namespace:_29WxOrderWpf.Common"
+	xmlns:wpf1="WPFCommon"
+	d:Background="White"
+	d:DataContext="{d:DesignInstance Type=local:OrderTaskDialogViewModel}"
+	d:DesignHeight="600"
+	d:DesignWidth="1300"
+	wpf:DialogWindowProperty.Height="600"
+	wpf:DialogWindowProperty.ResizeMode="CanResizeWithGrip"
+	wpf:DialogWindowProperty.ShowMinButton="False"
+	wpf:DialogWindowProperty.Width="1300"
+	mc:Ignorable="d">
+	<UserControl.Resources>
+		<!--  单元格文字居中  -->
+		<Style x:Key="CenterCellTextStyle" TargetType="TextBlock">
+			<Setter Property="TextAlignment" Value="Center" />
+			<Setter Property="VerticalAlignment" Value="Center" />
+		</Style>
+
+		<!--  面板标题  -->
+		<Style x:Key="PanelTitleStyle" TargetType="TextBlock">
+			<Setter Property="FontSize" Value="16" />
+			<Setter Property="FontWeight" Value="Bold" />
+			<Setter Property="Foreground" Value="#333333" />
+		</Style>
+
+		<!--  工具栏按钮  -->
+		<Style x:Key="ToolBarButtonStyle" TargetType="Button">
+			<Setter Property="Height" Value="30" />
+			<Setter Property="Padding" Value="14,0" />
+			<Setter Property="Margin" Value="6,0,0,0" />
+			<Setter Property="Cursor" Value="Hand" />
+			<Setter Property="Foreground" Value="#333333" />
+			<Setter Property="Background" Value="White" />
+			<Setter Property="BorderBrush" Value="#D9D9D9" />
+			<Setter Property="BorderThickness" Value="1" />
+			<Setter Property="VerticalContentAlignment" Value="Center" />
+			<Setter Property="Template">
+				<Setter.Value>
+					<ControlTemplate TargetType="Button">
+						<Border
+							x:Name="btnBorder"
+							Padding="{TemplateBinding Padding}"
+							Background="{TemplateBinding Background}"
+							BorderBrush="{TemplateBinding BorderBrush}"
+							BorderThickness="{TemplateBinding BorderThickness}"
+							CornerRadius="4">
+							<ContentPresenter
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center"
+								Content="{TemplateBinding Content}"
+								ContentStringFormat="{TemplateBinding ContentStringFormat}"
+								ContentTemplate="{TemplateBinding ContentTemplate}" />
+						</Border>
+						<ControlTemplate.Triggers>
+							<Trigger Property="IsMouseOver" Value="True">
+								<Setter TargetName="btnBorder" Property="Background" Value="#F0F2F5" />
+							</Trigger>
+							<Trigger Property="IsPressed" Value="True">
+								<Setter TargetName="btnBorder" Property="Background" Value="#E4E7ED" />
+							</Trigger>
+							<Trigger Property="IsEnabled" Value="False">
+								<Setter Property="Opacity" Value="0.5" />
+							</Trigger>
+						</ControlTemplate.Triggers>
+					</ControlTemplate>
+				</Setter.Value>
+			</Setter>
+		</Style>
+		<!--  任务状态：int (1=执行中，2=已完成，3=已人为中断) → 中文描述  -->
+		<converters:OrderTaskStatusConverter x:Key="OrderTaskStatusConverter" />
+
+	</UserControl.Resources>
+
+	<Grid Background="#F5F7FB">
+		<Grid.RowDefinitions>
+			<RowDefinition Height="Auto" />
+			<RowDefinition Height="*" />
+			<RowDefinition Height="20" />
+		</Grid.RowDefinitions>
+
+		<!--  ============ 顶部工具栏 ============  -->
+		<Border
+			Grid.Row="0"
+			Padding="14,10"
+			Background="White"
+			BorderBrush="#E8EAED"
+			BorderThickness="0,0,0,1">
+			<Grid>
+				<Grid.ColumnDefinitions>
+					<ColumnDefinition Width="*" />
+					<ColumnDefinition Width="Auto" />
+				</Grid.ColumnDefinitions>
+				<StackPanel Orientation="Horizontal">
+					<TextBlock Style="{StaticResource PanelTitleStyle}" Text="订单同步任务列表" />
+					<CheckBox
+						Margin="20,0,0,0"
+						VerticalAlignment="Center"
+						Content="查看全部"
+						IsChecked="{Binding IsShowAll}" />
+				</StackPanel>
+				<!--<StackPanel Grid.Column="1" Orientation="Horizontal">
+					<Button
+						Command="{Binding ClearFinishedCommand}"
+						Content="清空已完成"
+						Style="{StaticResource ToolBarButtonStyle}" />
+					<Button
+						Command="{Binding ClearAllCommand}"
+						Content="清空全部"
+						Style="{StaticResource ToolBarButtonStyle}" />
+				</StackPanel>-->
+			</Grid>
+		</Border>
+
+		<!--  ============ 任务列表 ============  -->
+		<DataGrid
+			Grid.Row="1"
+			Margin="10,10,10,0"
+			d:ItemsSource="{d:SampleData ItemCount=10}"
+			AlternatingRowBackground="#FAFAFA"
+			AutoGenerateColumns="False"
+			Background="White"
+			BorderBrush="#E8EAED"
+			BorderThickness="1"
+			CanUserAddRows="False"
+			CanUserDeleteRows="False"
+			CanUserReorderColumns="False"
+			CanUserResizeRows="False"
+			ColumnHeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}"
+			FontSize="13"
+			Foreground="#333333"
+			GridLinesVisibility="Horizontal"
+			HeadersVisibility="Column"
+			HorizontalGridLinesBrush="#EEEEEE"
+			IsReadOnly="True"
+			ItemsSource="{Binding TasksView}"
+			RowHeight="40"
+			ScrollViewer.CanContentScroll="True"
+			ScrollViewer.HorizontalScrollBarVisibility="Auto"
+			ScrollViewer.VerticalScrollBarVisibility="Auto"
+			SelectionMode="Single"
+			SelectionUnit="FullRow">
+			<DataGrid.Columns>
+
+				<!--  任务描述  -->
+				<DataGridTextColumn
+					Width="1.5*"
+					MinWidth="120"
+					Binding="{Binding TaskDescribe}"
+					ElementStyle="{StaticResource CenterCellTextStyle}"
+					Header="任务描述" />
+				<!--  店铺  -->
+				<DataGridTextColumn
+					Width="1*"
+					MinWidth="100"
+					Binding="{Binding ShopName}"
+					ElementStyle="{StaticResource CenterCellTextStyle}"
+					Header="店铺" />
+
+
+				<!--  状态  -->
+				<DataGridTemplateColumn
+					Width="1*"
+					MinWidth="60"
+					Header="状态">
+					<DataGridTemplateColumn.CellTemplate>
+						<DataTemplate>
+							<TextBlock
+								HorizontalAlignment="Center"
+								VerticalAlignment="Center"
+								FontWeight="Bold"
+								Text="{Binding Status, Converter={StaticResource OrderTaskStatusConverter}}">
+								<TextBlock.Style>
+									<Style TargetType="TextBlock">
+										<Setter Property="Foreground" Value="#E6A23C" />
+										<Style.Triggers>
+											<DataTrigger Binding="{Binding Status}" Value="2">
+												<Setter Property="Foreground" Value="#67C23A" />
+											</DataTrigger>
+											<DataTrigger Binding="{Binding Status}" Value="3">
+												<Setter Property="Foreground" Value="#F56C6C" />
+											</DataTrigger>
+										</Style.Triggers>
+									</Style>
+								</TextBlock.Style>
+							</TextBlock>
+						</DataTemplate>
+					</DataGridTemplateColumn.CellTemplate>
+				</DataGridTemplateColumn>
+				<!--  失败原因  -->
+				<DataGridTextColumn
+					Width="2*"
+					MinWidth="150"
+					Binding="{Binding TaskFailReason}"
+					ElementStyle="{StaticResource CenterCellTextStyle}"
+					Header="失败原因" />
+
+
+				<!--  创建时间  -->
+				<DataGridTextColumn
+					Width="2*"
+					MinWidth="140"
+					Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+					ElementStyle="{StaticResource CenterCellTextStyle}"
+					Header="创建时间" />
+				<!--  更新时间  -->
+				<DataGridTextColumn
+					Width="2*"
+					MinWidth="140"
+					Binding="{Binding UpdateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
+					ElementStyle="{StaticResource CenterCellTextStyle}"
+					Header="更新时间" />
+				<!--  备注  -->
+				<DataGridTextColumn
+					Width="2*"
+					MinWidth="140"
+					Binding="{Binding Remark}"
+					ElementStyle="{StaticResource CenterCellTextStyle}"
+					Header="备注" />
+			</DataGrid.Columns>
+		</DataGrid>
+		<Border
+			Grid.Row="2"
+			Padding="10,0"
+			Background="White">
+			<Grid VerticalAlignment="Center">
+				<TextBlock
+					HorizontalAlignment="Right"
+					d:Text="距离下次刷新10秒"
+					Text="{Binding RefreshTime, StringFormat='距离下次刷新：{0}秒'}" />
+			</Grid>
+		</Border>
+	</Grid>
+</UserControl>
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml.cs
new file mode 100644
index 0000000..d211e2a
--- /dev/null
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderTaskDialogView.xaml.cs
@@ -0,0 +1,185 @@
+using _29WxOrderWpf.Commands;
+using _29WxOrderWpf.Services;
+using AllBase.Model.MvvmBaseClasses;
+using AllBase.Util;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Timers;
+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;
+using System.Windows.Threading;
+using Work.KJDServer.API.Models;
+using WPFCommon.Models;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement.TaskbarClock;
+
+namespace _29WxOrderWpf.Ctrls.OrderCtrls;
+
+/// <summary>
+/// OrderTaskDialogView.xaml 的交互逻辑
+/// </summary>
+public partial class OrderTaskDialogView : UserControl
+{
+	private readonly OrderTaskDialogViewModel _viewModel;
+
+	public OrderTaskDialogView()
+	{
+		InitializeComponent();
+		this.Loaded += OrderTaskDialogView_Loaded;
+		_viewModel = new OrderTaskDialogViewModel();
+		DataContext = _viewModel;
+	}
+
+	private async void OrderTaskDialogView_Loaded(object sender, RoutedEventArgs e)
+	{
+		await _viewModel.LoadTasks();
+	}
+}
+
+/// <summary>
+/// 任务列表 - ViewModel
+/// </summary>
+public class OrderTaskDialogViewModel : BindableBaseEx, IDisposable
+{
+	private DispatcherTimer _timer;
+	private const int RefreshIntervals = 10;
+	private int _timeCount = 0;
+	private readonly PullWXOrderService _service;
+	private readonly NotifyCollectionChangedEventHandler _collectionChangedHandler;
+
+
+	public OrderTaskDialogViewModel()
+		: this(PullWXOrderService.Instance)
+	{
+		_timer = new DispatcherTimer();
+		_timer.Interval = TimeSpan.FromSeconds(1);
+		_timer.Tick += _timer_Tick;
+		_timer.Start();
+	}
+
+	private async void _timer_Tick(object sender, EventArgs e)
+	{
+		_timeCount++;
+		if (_timeCount % RefreshIntervals == 0)
+		{
+			await LoadTasks();
+			_timeCount = 0;
+		}
+		RefreshTime = RefreshIntervals - _timeCount;
+	}
+
+	public OrderTaskDialogViewModel(PullWXOrderService service)
+	{
+		_service = service ?? PullWXOrderService.Instance;
+		Tasks = _service.Tasks;
+		_collectionChangedHandler = OnTasksCollectionChanged;
+		Tasks.CollectionChanged += _collectionChangedHandler;
+
+
+		ClearFinishedCommand = new DelegateCommand(ClearFinished);
+		ClearAllCommand = new DelegateCommand(ClearAll);
+
+		UpdateSummary();
+
+		TasksView = CollectionViewSource.GetDefaultView(Tasks);
+		TasksView.Filter = FilterTaskStatus;
+	}
+
+	public async Task LoadTasks()
+	{
+		await _service.GetTaskStatus();
+	}
+	private bool FilterTaskStatus(object obj)
+	{
+		if (obj is not OrderTask task)
+			return false;
+
+		if (IsShowAll == true)
+			return true;
+
+		return task.Status == 1 || task.Status == 3;
+	}
+
+	/// <summary>任务列表</summary>
+	public ObservableCollection<OrderTask> Tasks { get; }
+
+	public ICollectionView TasksView { get; }
+
+	/// <summary>清空已完成/失败任务</summary>
+	public ICommand ClearFinishedCommand { get; }
+
+	/// <summary>清空全部任务</summary>
+	public ICommand ClearAllCommand { get; }
+
+	/// <summary>汇总文字（总数/执行中/成功/失败）</summary>
+	public string SummaryText
+	{
+		get => GetValue<string>();
+		set => SetValue(value);
+	}
+	public int RefreshTime
+	{
+		get => GetValue<int>();
+		set => SetValue(value);
+	}
+	public bool IsShowAll
+	{
+		get => GetValue<bool>();
+		set
+		{
+			SetValue(value);
+			TasksView.Refresh();
+		}
+	}
+
+	private void ClearFinished()
+	{
+		_service.ClearFinished();
+	}
+
+	private void ClearAll()
+	{
+		if (System.Windows.MessageBox.Show("确定清空全部任务吗？", "提示", MessageBoxButton.OKCancel, MessageBoxImage.Question) != MessageBoxResult.OK)
+			return;
+		_service.ClearAll();
+	}
+
+	private void OnTasksCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+	{
+		UpdateSummary();
+	}
+
+	private void OnTaskPropertyChanged(object sender, PropertyChangedEventArgs e)
+	{
+		if (e.PropertyName == nameof(OrderTask.Status))
+			UpdateSummary();
+	}
+
+	private void UpdateSummary()
+	{
+		var items = Tasks;
+		//int running = items.Count(t => t.Status == OrderTask.Running);
+		//int success = items.Count(t => t.Status == OrderTask.Success);
+		//int failed = items.Count(t => t.Status == OrderTask.Failed);
+		//string.Format("任务总数：{0}    执行中：{1}    成功：{2}    失败：{3}",
+		//items.Length, running, success, failed);
+	}
+
+	public void Dispose()
+	{
+		_timer.Stop();
+		_timer = null;
+	}
+}
diff --git a/29WxOrderWpf/Ctrls/Statistics/Services/ShopRevenueStatisticsService.cs b/29WxOrderWpf/Ctrls/Statistics/Services/ShopRevenueStatisticsService.cs
index c9da6a5..7941294 100644
--- a/29WxOrderWpf/Ctrls/Statistics/Services/ShopRevenueStatisticsService.cs
+++ b/29WxOrderWpf/Ctrls/Statistics/Services/ShopRevenueStatisticsService.cs
@@ -1,5 +1,4 @@
-using _29WxOrderWpf.Common;
-using _29WxOrderWpf.Ctrls.Statistics.Models;
+using _29WxOrderWpf.Ctrls.Statistics.Models;
 using AllBase;
 using AllBase.Helper;
 using Newtonsoft.Json;
@@ -7,10 +6,12 @@ using Newtonsoft.Json.Linq;
 using Newtonsoft.Json.Serialization;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Work;
+using WxOrder.Framework.Commons;
 
 namespace _29WxOrderWpf.Ctrls.Statistics.Services
 {
@@ -131,7 +132,9 @@ namespace _29WxOrderWpf.Ctrls.Statistics.Services
 			// 总订单数（退款率分母）= 已付款订单 + 已退款订单，不含未付款的 10/250
 			int totalOrderCount = list.Count();
 			int refundOrderCount = refunded.Select(r => r.OrderId).Distinct().Count();
-
+			Debug.WriteLine($"计算利润:{(salesAmount - buyerPaymentAmount - platformFeeTotal)}");
+			Debug.WriteLine($"正常订单利润:{valid.Sum(r => (decimal)(r.Profit))/100}");
+			Debug.WriteLine($"售后订单利润:{refunded.Sum(r => (decimal)(r.Profit))/100}");
 			return new ShopRevenueSummary
 			{
 				SalesAmount = salesAmount,
diff --git a/29WxOrderWpf/Services/PullWXOrderService.cs b/29WxOrderWpf/Services/PullWXOrderService.cs
new file mode 100644
index 0000000..a69bae0
--- /dev/null
+++ b/29WxOrderWpf/Services/PullWXOrderService.cs
@@ -0,0 +1,184 @@
+using AllBase;
+using AllBase.Util;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Work.ERP.API;
+using Work.ERP.API.Orders;
+using Work.KJDServer.API.Models;
+using Work.KJDServer.API.WXOrder;
+using ServerTaskStatus = Work.ERP.API.TaskStatus;
+
+namespace _29WxOrderWpf.Services
+{
+	/// <summary>
+	/// 拉取微信订单 - 任务数据服务。
+	/// 维护一个任务列表，每次拉取操作都会记录为一条任务，供"任务列表"界面展示；
+	/// 拉取请求通过 <see cref="PullWXOrderServiceApi"/> 提交，提交后返回服务器任务ID；
+	/// 随后循环查询任务状态，直到完成/中断/超时。任务状态查询是另一个独立API
+	/// （查询 task 表），见 <see cref="QueryTaskAsync"/>（占位，需自行实现）。
+	/// </summary>
+	public class PullWXOrderService
+	{
+		/// <summary>循环查询服务器任务状态的间隔（秒）</summary>
+		private const int TaskStatusPollIntervalSeconds = 30;
+
+		/// <summary>循环查询服务器任务状态的最大等待时间</summary>
+		private static readonly TimeSpan TaskStatusMaxWait = TimeSpan.FromMinutes(10);
+		private static readonly Lazy<PullWXOrderService> _lazy = new Lazy<PullWXOrderService>(() => new PullWXOrderService());
+
+		/// <summary>单例（全局共享同一份任务列表）</summary>
+		public static PullWXOrderService Instance => _lazy.Value;
+
+		private readonly PullWXOrderServiceApi _erpApi = new PullWXOrderServiceApi();
+		private readonly WxOrderServiceApi _kjdApi = new WxOrderServiceApi();
+		private long _seq;
+
+		public PullWXOrderService()
+		{
+			Tasks = new ObservableCollection<OrderTask>();
+		}
+
+		/// <summary>任务列表（线程安全，界面可直接绑定）</summary>
+		public ObservableCollection<OrderTask> Tasks { get; }
+
+		/// <summary>
+		/// 拉取指定店铺的指定订单
+		/// </summary>
+		public async Task<bool> PullOrderDetailAsync(long shopId, string orderId)
+		{
+			return await _erpApi.PullOrderDetail(shopId, orderId);
+		}
+
+		///// <summary>
+		///// 拉取指定店铺的多个订单
+		///// </summary>
+		//public Task<PullWXOrderTaskItem> PullOrdersDetailAsync(long shopId, string[] orderIds)
+		//{
+		//	return RunTaskAsync("批量拉取订单", shopId.ToString(), string.Join(",", orderIds ?? new string[0]),
+		//		() => _erpApi.PullOrdersDetail(shopId, orderIds));
+		//}
+
+		/// <summary>
+		/// 按店铺与时间范围拉取订单
+		/// </summary>
+		public Task<bool> PullOrderByShopIdsAndTimeRangeAsync(long[] shopIds, DateTime startTime, DateTime endTime)
+		{
+			return _erpApi.PullOrderByShopIdsAndTimeRange(shopIds, startTime, endTime);
+		}
+
+		/// <summary>
+		/// 拉取指定店铺的售后订单
+		/// </summary>
+		public Task<bool> PullRefundOrderByShopsAsync(long[] shopIds, DateTime startTime, DateTime endTime)
+		{
+			return _erpApi.PullRefundOrder(shopIds, startTime, endTime);
+		}
+
+		/// <summary>
+		/// 拉取指定店铺的多个售后订单
+		/// </summary>
+		public Task<bool> PullAfterSaleOrdersAsync(long shopId, string[] afterSaleOrderIds)
+		{
+			return _erpApi.PullAfterSaleOrders(shopId, afterSaleOrderIds);
+		}
+
+
+		public async Task GetTaskStatus()
+		{
+			var tasks = await _kjdApi.GetWxTaskStatus();
+			if (tasks != null)
+			{
+				Tasks.Clear();
+				tasks.ForEach(a => Tasks.Add(a));
+			}
+		}
+
+		/// <summary>
+		/// 清空已完成/失败的任务（保留执行中的任务）
+		/// </summary>
+		public void ClearFinished()
+		{
+
+		}
+
+		/// <summary>
+		/// 清空所有任务
+		/// </summary>
+		public void ClearAll()
+		{
+			Tasks.Clear();
+		}
+
+		///// <summary>
+		///// 创建一个任务并执行：提交拉取请求获取服务器任务ID，再循环查询任务状态直至完成。
+		///// </summary>
+		//private async Task<PullWXOrderTaskItem> RunTaskAsync(string taskName, string shopIds, string orderIds, Func<Task<long>> action)
+		//{
+		//	var task = new PullWXOrderTaskItem
+		//	{
+		//		Id = Interlocked.Increment(ref _seq),
+		//		TaskName = taskName,
+		//		ShopIds = shopIds,
+		//		OrderIds = orderIds,
+		//		StartTime = DateTime.Now,
+		//		Status = PullWXOrderTaskStatus.Running
+		//	};
+		//	Tasks.Add(task);
+		//	try
+		//	{
+		//		long serverTaskId = await action();
+		//		task.ServerTaskId = serverTaskId;
+		//		if (serverTaskId > 0)
+		//		{
+		//			await PollTaskStatusAsync(task, serverTaskId);
+		//		}
+		//		else
+		//		{
+		//			// 服务器直接完成，无需轮询
+		//			task.EndTime = DateTime.Now;
+		//			task.Message = "成功";
+		//			task.Status = PullWXOrderTaskStatus.Success;
+		//		}
+		//	}
+		//	catch (Exception ex)
+		//	{
+		//		task.EndTime = DateTime.Now;
+		//		task.Message = ex.Message;
+		//		task.Status = PullWXOrderTaskStatus.Failed;
+		//	}
+		//	return task;
+		//}
+
+		/// <summary>
+		/// 循环查询服务器任务状态，直到完成/中断/超时。
+		/// 每次查询都会用 task 表的可用字段刷新任务列表展示内容（任务描述/进度/失败原因等）。
+		/// </summary>
+		private async Task PollTaskStatusAsync(OrderTask task, long serverTaskId)
+		{
+
+
+		}
+
+
+		/// <summary>
+		/// 查询服务器任务信息（对应 task 表，任务状态查询接口返回的数据）。
+		/// TODO：任务状态查询是另一个独立API，请在这里接入你自己的查询实现，
+		/// 返回 <see cref="TaskInfo"/>；task 表 status 字段：1=执行中(Executing)，2=已完成(Completed)，3=已人为中断(ManuallyInterrupted)。
+		/// </summary>
+		//private async Task<TaskInfo> QueryTaskAsync()
+		//{
+		//	await _kjdApi.GetWxTaskStatus();
+		//	// ===================== 请在这里接入你自己的任务状态查询API =====================
+		//	// 示例：
+		//	//   TaskInfo info = await 你的查询API.QueryTask(taskId);
+		//	//   return info;
+		//	// ===============================================================================
+		//	throw new NotImplementedException("任务状态查询API尚未实现，请在 PullWXOrderService.QueryTaskAsync 中接入");
+		//}
+	}
+}
diff --git a/29WxOrderWpf/Services/ShipGiftService.cs b/29WxOrderWpf/Services/ShipGiftService.cs
index 4652a09..6664594 100644
--- a/29WxOrderWpf/Services/ShipGiftService.cs
+++ b/29WxOrderWpf/Services/ShipGiftService.cs
@@ -11,6 +11,7 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
 using Work._29Tools.BLL;
+using Work.ERP.API.Orders;
 
 namespace _29WxOrderWpf.Services;
 
@@ -25,6 +26,11 @@ public class ShipGiftService
 		_155 = 2,
 		_160 = 5
 	}
+	private ShipGiftServiceApi _api;
+	public ShipGiftService()
+	{
+		_api = new ShipGiftServiceApi();
+	}
 	public async Task<bool> Send(string orderId, GiftType giftType)
 	{
 		var item = GlobalConfig.lstFilterOrder.FirstOrDefault(a => a.order_id == orderId);
@@ -58,30 +64,19 @@ public class ShipGiftService
 			amount += 12.15m;
 		}
 
-		string data = JsonConvert.SerializeObject(new
-		{
-			platformCode = "WEISHOP",
-			orderIds = new List<string> { orderId },
-			userId = BaseClass.UserId,
-			userName = BaseClass.UserName,
-			giftOrderType = (int)giftType,
-			amount = (int)(amount * 100),
-			oemAmount = (int)(BaseClass.OemGiftAmount * 100)
-		}); 
-		Debug.WriteLine($"礼品单:{data}");
-		string ret = await HttpResponseWXBLL.e57PostResponseAsync("https://po.e57.cn//prod-api/api/oms-api/gift/order/deliveryFor29Erp", data, "");
-		XmlDocument doc = new XmlDocument();
-		doc.LoadXml(ret);
+		//string data = JsonConvert.SerializeObject(new
+		//{
+		//	platformCode = "WEISHOP",
+		//	orderIds = new List<string> { orderId },
+		//	userId = BaseClass.UserId,
+		//	userName = BaseClass.UserName,
+		//	giftOrderType = (int)giftType,
+		//	amount = (int)(amount * 100),
+		//	oemAmount = (int)(BaseClass.OemGiftAmount * 100)
+		//});
+		var ret = await _api.SendShipGift([orderId], (int)giftType, amount, BaseClass.OemGiftAmount);
+		return ret;
 
-		//使用 Newtonsoft.Json 进行转换
-		string jsonText = JsonConvert.SerializeXmlNode(doc);
-		JObject jsonObject = JObject.Parse(jsonText);
-		int code = jsonObject["AjaxResult"]?["code"]?.Value<int>() ?? 0;
-		string msg = jsonObject["AjaxResult"]?["msg"]?.Value<string>() ?? "";
-		if (code == 200 && msg.ToUpper() == "SUCCESS")
-		{
-			return true;
-		}
-		return false;
+	
 	}
 }
diff --git a/29WxOrderWpf/ViewModels/OrderTaskViewModel.cs b/29WxOrderWpf/ViewModels/OrderTaskViewModel.cs
new file mode 100644
index 0000000..42748d0
--- /dev/null
+++ b/29WxOrderWpf/ViewModels/OrderTaskViewModel.cs
@@ -0,0 +1,42 @@
+//using Newtonsoft.Json;
+//using System;
+//using System.Collections.Generic;
+//using System.Linq;
+//using System.Text;
+//using System.Threading.Tasks;
+//using WPFCommon.Models;
+
+//namespace _29WxOrderWpf.ViewModels;
+
+//public class OrderTaskViewModel : BindableBaseEx
+//{
+//		public int Id { get; set; }
+
+//		public int TaskType { get; set; }
+
+//		public string TaskDescribe { get; set; }
+
+//		public string TaskShopIds { get; set; }
+
+//		public string TaskObjectIds { get; set; }
+
+//		public int SubTaskNum { get; set; }
+
+//		public int SuccessTaskNum { get; set; }
+
+//		public int FailTaskNum { get; set; }
+
+//		public int Status { get; set; }
+
+//		public string CreateBy { get; set; }
+
+//		public string UpdateBy { get; set; }
+
+//		public string Remark { get; set; }
+
+//		public string TaskFailReason { get; set; }
+
+//		public DateTime CreateTime { get; set; }
+
+//		public DateTime UpdateTime { get; set; }
+//}
\ No newline at end of file
diff --git a/Work/29WxOrderWork.csproj b/Work/29WxOrderWork.csproj
index 078c638..3699d32 100644
--- a/Work/29WxOrderWork.csproj
+++ b/Work/29WxOrderWork.csproj
@@ -227,6 +227,11 @@
     <Compile Include="BuyUsers\TaoBaoBuyUser.cs" />
     <Compile Include="CheckHecker.cs" />
     <Compile Include="CollectionClass.cs" />
+    <Compile Include="ERP.API\ERPConfig.cs" />
+    <Compile Include="ERP.API\ERPHttp.cs" />
+    <Compile Include="ERP.API\Orders\ShipGiftServiceApi.cs" />
+    <Compile Include="ERP.API\TaskStatus.cs" />
+    <Compile Include="ERP.API\Orders\PullWXOrderServiceApi.cs" />
     <Compile Include="GetPostTaobaoHtml.cs" />
     <Compile Include="DouYinHttpWebRequest.cs" />
     <Compile Include="Helper\CEFHelper.cs" />
@@ -234,6 +239,7 @@
     <Compile Include="Helper\WindowStyle.cs" />
     <Compile Include="ImgConvertToIcon.cs" />
     <Compile Include="Initialization.cs" />
+    <Compile Include="KJDServer.API\Models\OrderTask.cs" />
     <Compile Include="Model\BaseModel.cs" />
     <Compile Include="Model\ExpressBase.cs" />
     <Compile Include="MulitServicerSet.cs" />
@@ -263,6 +269,8 @@
       <DependentUpon>TokenForm.cs</DependentUpon>
     </Compile>
     <Compile Include="UserLogin.cs" />
+    <Compile Include="KJDServer.API\KJDServerHttp.cs" />
+    <Compile Include="KJDServer.API\WXOrder\WxOrderServiceApi.cs" />
     <Compile Include="_29Tools\BLL\HttpResponseBLL.cs" />
     <Compile Include="_29Tools\BLL\HttpResponseWXBLL.cs" />
     <Compile Include="_29Tools\BLL\HttpResponseYkdBLL.cs" />
@@ -317,6 +325,10 @@
       <Project>{6461d807-b1c8-45f0-b388-e0ca1a418de0}</Project>
       <Name>29WxOrderAllBase</Name>
     </ProjectReference>
+    <ProjectReference Include="..\WxOrder.Framework\WxOrder.Framework.csproj">
+      <Project>{3123963c-a0ec-4ad5-9916-dc063f73490b}</Project>
+      <Name>WxOrder.Framework</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\29wx.ico" />
diff --git a/Work/ERP.API/ERPConfig.cs b/Work/ERP.API/ERPConfig.cs
new file mode 100644
index 0000000..0a2c198
--- /dev/null
+++ b/Work/ERP.API/ERPConfig.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Work.ERP.API
+{
+	public class ERPConfig
+	{
+		public const string Domain = "https://po.e57.cn";
+	}
+}
diff --git a/Work/ERP.API/ERPHttp.cs b/Work/ERP.API/ERPHttp.cs
new file mode 100644
index 0000000..239680b
--- /dev/null
+++ b/Work/ERP.API/ERPHttp.cs
@@ -0,0 +1,40 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Work._29Tools.BLL;
+using WxOrder.Framework.Commons;
+
+namespace Work.ERP.API
+{
+	public class ERPHttp
+	{
+		public static string e57PostResponse(string _url, string _data)
+		{
+			return HttpResponseWXBLL.e57PostResponse(ERPConfig.Domain + _url, _data, "");
+		}
+		public static Task<string> e57PostResponseAsync(string _url, string _data)
+		{
+			return HttpResponseWXBLL.e57PostResponseAsync(ERPConfig.Domain + _url, _data);
+		}
+		public static async Task<T> e57PostResponseAsync<T>(string _url, string _data) where T : Result, new()
+		{
+			try
+			{
+				string content = await HttpResponseWXBLL.e57PostResponseAsync(ERPConfig.Domain + _url, _data);
+				return JsonConvert.DeserializeObject<T>(content);
+			}
+			catch (JsonException)
+			{
+				return new T { Code = 0, Msg = "数据解析失败" };
+			}
+			catch (Exception ex)
+			{
+				return new T { Code = 0, Msg = ex.Message };
+			}
+
+		}
+	}
+}
diff --git a/Work/ERP.API/Orders/PullWXOrderServiceApi.cs b/Work/ERP.API/Orders/PullWXOrderServiceApi.cs
new file mode 100644
index 0000000..cae7049
--- /dev/null
+++ b/Work/ERP.API/Orders/PullWXOrderServiceApi.cs
@@ -0,0 +1,186 @@
+using AllBase;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using WxOrder.Framework.Commons;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+
+namespace Work.ERP.API.Orders
+{
+	class PullWXOrderResult : Result
+	{
+
+		public List<FailedItem> Data { get; set; }
+		public class FailedItem
+		{
+			public long shopId { get; set; }
+			public string shopName { get; set; }
+			public string message { get; set; }
+		}
+	}
+	/// <summary>
+	/// 拉取微信订单
+	/// </summary>
+	public class PullWXOrderServiceApi
+	{
+		/// <summary>
+		/// 拉取指定店铺的指定订单
+		/// </summary>
+		/// <param name="shopId">店铺ID</param>
+		/// <param name="orderId">订单号</param>
+		/// <returns>服务器异步任务ID；为 0 表示服务器已直接完成</returns>
+		/// <exception cref="Exception"></exception>
+		public async Task<bool> PullOrderDetail(long shopId, string orderId)
+		{
+			string data = JsonConvert.SerializeObject(new
+			{
+				platformCode = "WEISHOP",
+				shopId = shopId,
+				orderId = orderId,
+				clientUserName = BaseClass.UserName
+			});
+			var result = await PostAndGetTaskIdAsync("/prod-api/api/oms-api/client/sync/pull_order_detail", data);
+			return result.Code == 200;
+		}
+
+		/// <summary>
+		/// 拉取指定店铺的订单列表
+		/// </summary>
+		/// <param name="shopId">店铺ID</param>
+		/// <param name="orderIds">订单号列表</param>
+		/// <returns>服务器异步任务ID；为 0 表示服务器已直接完成</returns>
+		/// <exception cref="Exception"></exception>
+		public async Task<bool> PullOrdersDetail(long shopId, string[] orderIds)
+		{
+			string data = JsonConvert.SerializeObject(new
+			{
+				platformCode = "WEISHOP",
+				shopId = shopId,
+				orderId = string.Join(",", orderIds),
+				clientUserName = BaseClass.UserName,
+
+			});
+			var result = await PostAndGetTaskIdAsync("/prod-api/api/oms-api/client/sync/pull_order_detail/batch", data);
+			if (result.Code == 200)
+			{
+				return true;
+			}
+			else
+			{
+				string msg = string.Join("\n", result.Data.Select(a => $"{a.shopName},{a.message}"));
+				throw new Exception(msg);
+			}
+		}
+
+		/// <summary>
+		/// 拉取指定商铺列表时间范围内的数据
+		/// </summary>
+		/// <param name="shopIds">店铺ID列表</param>
+		/// <param name="startTime">开始时间</param>
+		/// <param name="endTime">结束时间</param>
+		/// <returns>服务器异步任务ID；为 0 表示服务器已直接完成</returns>
+		/// <exception cref="Exception"></exception>
+		public async Task<bool> PullOrderByShopIdsAndTimeRange(long[] shopIds, DateTime startTime, DateTime endTime)
+		{
+			TimeSpan time = endTime - startTime;
+			if (time.TotalDays > 7) throw new Exception("时间范围最大7天");
+			string data = JsonConvert.SerializeObject(new
+			{
+				platformCode = "WEISHOP",
+				shopIds = string.Join(",", shopIds),
+				startTime = startTime.ToString("yyyy-MM-dd HH:mm:ss"),
+				endTime = endTime.ToString("yyyy-MM-dd HH:mm:ss"),
+				clientUserName = BaseClass.UserName,
+				remark=$"同步 {startTime.ToString("yyyy-MM-dd")}/{endTime.ToString("dd")}"
+			});
+			var result = await PostAndGetTaskIdAsync("/prod-api/api/oms-api/client/sync/pull_order", data);
+
+			if (result.Code == 200)
+			{
+				return true;
+			}
+			else
+			{
+				string msg = string.Join("\n", result.Data.Select(a => $"{a.shopName},{a.message}"));
+				throw new Exception(msg);
+			}
+		}
+
+		/// <summary>
+		/// 拉取指定店铺的售后订单
+		/// </summary>
+		/// <param name="shopIds">店铺ID列表</param>
+		/// <returns>服务器异步任务ID；为 0 表示服务器已直接完成</returns>
+		/// <exception cref="Exception"></exception>
+		public async Task<bool> PullRefundOrder(long[] shopIds, DateTime startTime, DateTime endTime)
+		{
+			TimeSpan time = endTime - startTime;
+			if (time.TotalDays > 7) throw new Exception("时间范围最大7天");
+			string data = JsonConvert.SerializeObject(new
+			{
+				platformCode = "WEISHOP",
+				shopIdList = shopIds,
+				startTime = startTime.ToString("yyyy-MM-dd HH:mm:ss"),
+				endTime = endTime.ToString("yyyy-MM-dd HH:mm:ss"),
+				clientUserName = BaseClass.UserName,
+				remark = $"同步售后订单"
+			});
+			var result = await PostAndGetTaskIdAsync("/prod-api/api/oms-api/client/sync/oms/pull_refund_order", data);
+
+			if (result.Code == 200)
+			{
+				return true;
+			}
+			else
+			{
+				string msg = string.Join("\n", result.Data.Select(a => $"{a.shopName},{a.message}"));
+				throw new Exception(msg);
+			}
+		}
+
+		/// <summary>
+		/// 拉取指定商铺的售后订单
+		/// </summary>
+		/// <param name="shopId">店铺ID</param>
+		/// <param name="afterSaleOrderIds">售后订单号列表</param>
+		/// <returns>服务器异步任务ID；为 0 表示服务器已直接完成</returns>
+		/// <exception cref="Exception"></exception>
+		public async Task<bool> PullAfterSaleOrders(long shopId, string[] afterSaleOrderIds)
+		{
+			string data = JsonConvert.SerializeObject(new
+			{
+				platformCode = "WEISHOP",
+				shopId = shopId,
+				afterSaleOrderIds = afterSaleOrderIds,
+				clientUserName = BaseClass.UserName,
+				remark = $"同步售后订单"
+			});
+			var result = await PostAndGetTaskIdAsync("/prod-api/api/oms-api/client/sync/oms/pull_list/batch", data);
+
+			if (result.Code == 200)
+			{
+				return true;
+			}
+			else
+			{
+				string msg = string.Join("\n", result.Data.Select(a => $"{a.shopName},{a.message}"));
+				throw new Exception(msg);
+			}
+		}
+
+		/// <summary>
+		/// 提交拉取请求并从返回结果中解析服务器异步任务ID。
+		/// 兼容 data 为纯数字、数字字符串或对象（含 taskId/task_id/id 字段）等返回格式；
+		/// 无法解析时返回 0（视为服务器直接完成）。
+		/// </summary>
+		private async Task<PullWXOrderResult> PostAndGetTaskIdAsync(string url, string data)
+		{
+			var result = await ERPHttp.e57PostResponseAsync<PullWXOrderResult>(url, data);
+			if (result.Code != 200) throw new Exception(result.Msg);
+			return result;
+		}
+	}
+}
diff --git a/Work/ERP.API/Orders/ShipGiftServiceApi.cs b/Work/ERP.API/Orders/ShipGiftServiceApi.cs
new file mode 100644
index 0000000..c10579e
--- /dev/null
+++ b/Work/ERP.API/Orders/ShipGiftServiceApi.cs
@@ -0,0 +1,39 @@
+using AllBase;
+using CefSharp.DevTools.FedCm;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Security.Policy;
+using System.Text;
+using System.Threading.Tasks;
+using Work.ERP.API.Orders;
+using WxOrder.Framework.Commons;
+
+namespace Work.ERP.API.Orders
+{
+	public class ShipGiftServiceApi
+	{
+		public async Task<bool> SendShipGift(string[] orderIds, int giftType, decimal amount, decimal oemGiftAmount)
+		{
+			string data = JsonConvert.SerializeObject(new
+			{
+				platformCode = "WEISHOP",
+				orderIds = orderIds,
+				userId = BaseClass.UserId,
+				userName = BaseClass.UserName,
+				giftOrderType = (int)giftType,
+				amount = (int)(amount * 100),
+				oemAmount = (int)(oemGiftAmount * 100)
+			});
+			Debug.WriteLine($"礼品单:{data}");
+			var result = await ERPHttp.e57PostResponseAsync<Result>("/prod-api/api/oms-api/gift/order/deliveryFor29Erp", data);
+			if (result.Code != 200)
+			{
+				throw new Exception(result.Msg);
+			}
+			return true;
+		}
+	}
+}
diff --git a/Work/ERP.API/TaskStatus.cs b/Work/ERP.API/TaskStatus.cs
new file mode 100644
index 0000000..73503ba
--- /dev/null
+++ b/Work/ERP.API/TaskStatus.cs
@@ -0,0 +1,26 @@
+using System.ComponentModel;
+
+namespace Work.ERP.API
+{
+	/// <summary>
+	/// 服务器异步任务状态（与任务状态表字段一致：1=执行中，2=已完成，3=已人为中断）
+	/// </summary>
+	public enum TaskStatus
+	{
+		/// <summary>
+		/// 执行中
+		/// </summary>
+		[Description("执行中")]
+		Executing = 1,
+		/// <summary>
+		/// 已完成
+		/// </summary>
+		[Description("已完成")]
+		Completed = 2,
+		/// <summary>
+		/// 已人为中断
+		/// </summary>
+		[Description("已人为中断")]
+		ManuallyInterrupted = 3
+	}
+}
diff --git a/Work/KJDServer.API/KJDServerHttp.cs b/Work/KJDServer.API/KJDServerHttp.cs
new file mode 100644
index 0000000..24080ce
--- /dev/null
+++ b/Work/KJDServer.API/KJDServerHttp.cs
@@ -0,0 +1,112 @@
+using AllBase;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.IO.Compression;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using WxOrder.Framework.Commons;
+
+namespace Work.KJDServer.API
+{
+	public class KJDServerHttp
+	{
+		public static async Task<string> PostAsync(string url, string data)
+		{
+			if (url.StartsWith("/"))
+				url = url.Substring(1);
+			url = BaseClass.LoginApiUrl + "/wxxd_" + url + "?obj=" + BaseClass.MainPath + "/wxxd_" + url;
+			string sign = UserLogin.GetSignaturex();
+			data = $"{sign}&{data}";
+			return await _postAsync(url, data);
+		}
+		public static async Task<T> PostAsync<T>(string url, string data) where T : Result, new()
+		{
+			try
+			{
+				string result = await PostAsync(url, data);
+				return JsonConvert.DeserializeObject<T>(result);
+			}
+			catch (JsonException)
+			{
+				return new T { Code = 0, Msg = "数据解析失败" };
+			}
+			catch (Exception ex)
+			{
+				return new T { Code = 0, Msg = ex.Message };
+			}
+		}
+
+
+		private static async Task<string> _postAsync(string url, string postData, int timeOut = -1)
+		{
+			HttpWebResponse response = null;
+			string result;
+			try
+			{
+				HttpWebRequest request;
+				request = (HttpWebRequest)WebRequest.Create(url);
+
+				request.KeepAlive = true;
+				request.ContentType = "application/x-www-form-urlencoded; charset=utf-8";
+				request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36";
+				request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate");
+				request.Headers.Set(HttpRequestHeader.AcceptLanguage, "zh-CN,zh;q=0.9");
+
+				request.Method = "POST";
+				request.ServicePoint.Expect100Continue = false;
+
+				string body = postData;
+				byte[] postBytes = System.Text.Encoding.UTF8.GetBytes(body);
+				request.ContentLength = postBytes.Length;
+				Stream stream = request.GetRequestStream();
+				stream.Write(postBytes, 0, postBytes.Length);
+				stream.Close();
+
+				response = (HttpWebResponse)await request.GetResponseAsync();
+			}
+			catch (WebException ex)
+			{
+				if (ex.Status == WebExceptionStatus.ProtocolError)
+				{
+					response = (HttpWebResponse)ex.Response;
+					result = ReadResponse(response);
+					return result;
+				}
+				else return ex.Message;
+			}
+			catch (Exception e)
+			{
+				if (response != null) response.Close();
+				return e.Message;
+			}
+			result = ReadResponse(response);
+			return result;
+
+		}
+
+		public static string ReadResponse(HttpWebResponse response, Encoding encoding = null)
+		{
+			using (Stream responseStream = response.GetResponseStream())
+			{
+				Stream streamToRead = responseStream;
+				if (response.ContentEncoding.ToLower().Contains("gzip"))
+				{
+					streamToRead = new GZipStream(streamToRead, CompressionMode.Decompress);
+				}
+				else if (response.ContentEncoding.ToLower().Contains("deflate"))
+				{
+					streamToRead = new DeflateStream(streamToRead, CompressionMode.Decompress);
+				}
+				if (encoding == null) encoding = Encoding.UTF8;
+				using (StreamReader streamReader = new StreamReader(streamToRead, encoding))
+				{
+					return streamReader.ReadToEnd();
+				}
+			}
+		}
+	}
+}
diff --git a/Work/KJDServer.API/Models/OrderTask.cs b/Work/KJDServer.API/Models/OrderTask.cs
new file mode 100644
index 0000000..3feda5f
--- /dev/null
+++ b/Work/KJDServer.API/Models/OrderTask.cs
@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Work.KJDServer.API.Models
+{
+	public class OrderTask
+	{
+		public int Id { get; set; }
+
+		public int TaskType { get; set; }
+
+		public string TaskDescribe { get; set; }
+
+		public string ShopId { get; set; }
+		public string ShopName { get; set; }
+
+		public string ObjectIds { get; set; }
+
+		public int SubTaskNum { get; set; }
+
+		public int SuccessTaskNum { get; set; }
+
+		public int FailTaskNum { get; set; }
+
+		public int Status { get; set; }
+
+		public string CreateBy { get; set; }
+
+		public string UpdateBy { get; set; }
+
+		public string Remark { get; set; }
+
+		public string TaskFailReason { get; set; }
+
+		public DateTime CreateTime { get; set; }
+
+		public DateTime UpdateTime { get; set; }
+	}
+
+}
\ No newline at end of file
diff --git a/Work/KJDServer.API/WXOrder/WxOrderServiceApi.cs b/Work/KJDServer.API/WXOrder/WxOrderServiceApi.cs
new file mode 100644
index 0000000..fb0689d
--- /dev/null
+++ b/Work/KJDServer.API/WXOrder/WxOrderServiceApi.cs
@@ -0,0 +1,30 @@
+using AllBase;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Work.KJDServer.API.Models;
+using WxOrder.Framework.Commons;
+
+namespace Work.KJDServer.API.WXOrder
+{
+	public class WxOrderServiceApi
+	{
+		public WxOrderServiceApi()
+		{
+
+		}
+
+		public async Task<List<OrderTask>> GetWxTaskStatus()
+		{
+			var ret = await KJDServerHttp.PostAsync<Result<List<OrderTask>>>("order/wx_get_task_status_list", "");
+			if (ret.Code == 200)
+			{
+				return ret.Data;
+			}
+			return null;
+		}
+	}
+}
diff --git a/Work/_29Tools/BLL/HttpResponseWXBLL.cs b/Work/_29Tools/BLL/HttpResponseWXBLL.cs
index be8b77f..8b127a1 100644
--- a/Work/_29Tools/BLL/HttpResponseWXBLL.cs
+++ b/Work/_29Tools/BLL/HttpResponseWXBLL.cs
@@ -659,7 +659,7 @@ namespace Work._29Tools.BLL
 			return result;
 		}
 
-		public static async Task<string> e57PostResponseAsync(string _url, string _data, string referer)
+		public static async Task<string> e57PostResponseAsync(string _url, string _data)
 		{
 			//await Task.Delay(2000);
 			//return await Task.FromResult("<AjaxResult><msg>SUCCESS</msg><code>200</code></AjaxResult>");
@@ -694,26 +694,11 @@ namespace Work._29Tools.BLL
 				}
 				else
 					request = (HttpWebRequest)WebRequest.Create(url);
-
 				request.KeepAlive = true;
-				//request.Headers.Set(HttpRequestHeader.CacheControl, "max-age=0");
-				//request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/137.0.0.0 Safari/537.36";
 				request.ContentType = "application/json";
-				//request.Accept = "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7"; //request.Accept = "*/*";
-				//request.Referer = referer;
-				//request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate");
-				//request.Headers.Set(HttpRequestHeader.AcceptLanguage, "zh-CN,zh;q=0.9");
-				request.Headers.Add("sec-ch-ua", @"""Not(A:Brand"";v=""8"", ""Chromium"";v=""144"", ""Google Chrome"";v=""144""");
-				request.Headers.Add("sec-ch-ua-mobile", @"?0");
-				request.Headers.Add("sec-ch-ua-platform", @"""Windows""");
-				request.Headers.Add("Upgrade-Insecure-Requests", @"1");
+
 				request.Headers.Add("Authorization", "Bearer " + sAuthorization);
-				request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/144.0.0.0 Safari/537.36";
-				request.Accept = "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7";
-				request.Headers.Add("Sec-Fetch-Site", @"none");
-				request.Headers.Add("Sec-Fetch-Mode", @"navigate");
-				request.Headers.Add("Sec-Fetch-User", @"?1");
-				request.Headers.Add("Sec-Fetch-Dest", @"document");
+				request.Accept = "application/json";
 				request.Headers.Set(HttpRequestHeader.Cookie, "Admin-Token=" + sAuthorization);
 				request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate");
 				request.Headers.Set(HttpRequestHeader.AcceptLanguage, "zh-CN,zh;q=0.9");
diff --git a/29WxOrderWpf/Common/Result.cs b/WxOrder.Framework/Commons/Result.cs
similarity index 91%
rename from 29WxOrderWpf/Common/Result.cs
rename to WxOrder.Framework/Commons/Result.cs
index 43f7e9e..6608d8a 100644
--- a/29WxOrderWpf/Common/Result.cs
+++ b/WxOrder.Framework/Commons/Result.cs
@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace _29WxOrderWpf.Common
+namespace WxOrder.Framework.Commons
 {
 	public class Result
 	{
diff --git a/WxOrder.Framework/WxOrder.Framework.csproj b/WxOrder.Framework/WxOrder.Framework.csproj
index 8dbcc0e..078c8ae 100644
--- a/WxOrder.Framework/WxOrder.Framework.csproj
+++ b/WxOrder.Framework/WxOrder.Framework.csproj
@@ -7,6 +7,14 @@
 	  <UseWPF>true</UseWPF>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="Resources\Fonts\iconfont.ttf" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Resource Include="Resources\Fonts\iconfont.ttf" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="WPFCommon" Version="1.1.0" />
   </ItemGroup>
diff --git a/test/WXOrder.Test/PullWXOrder.Test.cs b/test/WXOrder.Test/PullWXOrder.Test.cs
new file mode 100644
index 0000000..95f5c3e
--- /dev/null
+++ b/test/WXOrder.Test/PullWXOrder.Test.cs
@@ -0,0 +1,28 @@
+using AllBase;
+
+namespace WXOrder.Test;
+
+public class Tests
+{
+	[SetUp]
+	public void Setup()
+	{
+		var a = BaseClass.ServerUrl;
+		BaseClass.UserName = "18990991234";
+	}
+
+	[Test]
+	public async Task Test1()
+	{ 
+		var pp = new Work.ERP.API.PullWxOrder.PullWXOrderServiceApi();
+		await pp.PullOrderDetail(1960967267443621583, "3722940821913342976");
+		Assert.Pass();
+	}
+	[Test]
+	public async Task Test2()
+	{
+		var pp = new Work.ERP.API.PullWxOrder.PullWXOrderServiceApi();
+		await pp.PullOrderByShopIdsAndTimeRange([1960967267443621583, 1960967267443620449], DateTime.Now.AddDays(-1), DateTime.Now);
+		Assert.Pass();
+	}
+}
\ No newline at end of file
diff --git a/test/WXOrder.Test/WXOrder.Test.csproj b/test/WXOrder.Test/WXOrder.Test.csproj
new file mode 100644
index 0000000..cc9052d
--- /dev/null
+++ b/test/WXOrder.Test/WXOrder.Test.csproj
@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+	  <PlatformTarget>x64</PlatformTarget>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="3.9.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="System.Drawing.Common" Version="10.0.11" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\29WxOrderWpf\29WxOrderWpf.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="NUnit.Framework" />
+  </ItemGroup>
+
+</Project>