diff --git a/BBWY.Client/ViewModels/MainViewModel.cs b/BBWY.Client/ViewModels/MainViewModel.cs
index 94b96c6f..b24cd428 100644
--- a/BBWY.Client/ViewModels/MainViewModel.cs
+++ b/BBWY.Client/ViewModels/MainViewModel.cs
@@ -120,7 +120,7 @@ namespace BBWY.Client.ViewModels
                     Name = "订单管理",
                     ChildList = new List<MenuModel>()
                     {
-                        new MenuModel(){ Name="刷单组",Url="/Views/Order/SDOrderList.xaml" }
+                        new MenuModel(){ Name="刷单组",Url="/Views/Order/SDGroup.xaml" }
                     }
                 }));
                 return;
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index 01f16809..e1d71119 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -19,7 +19,7 @@ using System.Windows.Input;
 
 namespace BBWY.Client.ViewModels
 {
-    public class OrderListViewModel : BaseVM, IDenpendency
+    public partial class OrderListViewModel : BaseVM, IDenpendency
     {
         private OrderService orderService;
         private StatisticsService statisticsService;
@@ -162,6 +162,7 @@ namespace BBWY.Client.ViewModels
                 queryShopId = globalContext.User.Shop.ShopId;
             }
 
+            SDGroupInit();
             random = new Random();
             this.globalContext = globalContext;
             this.orderService = orderService;
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel_SDGroup.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel_SDGroup.cs
new file mode 100644
index 00000000..6c753537
--- /dev/null
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel_SDGroup.cs
@@ -0,0 +1,25 @@
+using GalaSoft.MvvmLight.Command;
+using System.Windows.Input;
+
+namespace BBWY.Client.ViewModels
+{
+    public partial class OrderListViewModel
+    {
+        private int sdGroupButtonIndex;
+
+        public int SDGroupButtonIndex { get => sdGroupButtonIndex; set { Set(ref sdGroupButtonIndex, value); }}
+
+        public ICommand SetSDButtinIndexCommand { get; set; }
+
+
+        private void SDGroupInit()
+        {
+            SetSDButtinIndexCommand = new RelayCommand<int>(SetSDButtinIndex);
+        }
+
+        private void SetSDButtinIndex(int index)
+        {
+            SDGroupButtonIndex = index;
+        }
+    }
+}
diff --git a/BBWY.Client/Views/Order/OrderList.xaml b/BBWY.Client/Views/Order/OrderList.xaml
index 9ea4174a..0e66d8b0 100644
--- a/BBWY.Client/Views/Order/OrderList.xaml
+++ b/BBWY.Client/Views/Order/OrderList.xaml
@@ -288,7 +288,8 @@
                 </StackPanel>
             </Border>
 
-            <local:OrderListControl x:Name="listbox_order" Grid.Row="6" Grid.RowSpan="2"/>
+            <local:OrderListControl x:Name="listbox_order" Grid.Row="6" Grid.RowSpan="2"
+                                     Visibility="{Binding IncludeAfterOrder,Converter={StaticResource objConverter},ConverterParameter=true:Collapsed:Visible}"/>
             <!--<Border Grid.Row="6" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1,1,1,0"
                     Background="#F2F2F2"
                     Visibility="{Binding Visibility,ElementName=listbox_order}">
diff --git a/BBWY.Client/Views/Order/SDGroup.xaml b/BBWY.Client/Views/Order/SDGroup.xaml
index b99621f6..a34da986 100644
--- a/BBWY.Client/Views/Order/SDGroup.xaml
+++ b/BBWY.Client/Views/Order/SDGroup.xaml
@@ -4,12 +4,21 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:BBWY.Client.Views.Order"
+      xmlns:cmodel="clr-namespace:BBWY.Client.Models"
+      xmlns:sys="clr-namespace:System;assembly=mscorlib"
       xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
       Title="SDGroup"
       DataContext="{Binding OrderList,Source={StaticResource Locator}}">
-
+    <Page.Resources>
+        <sys:Int32 x:Key="d0">0</sys:Int32>
+        <sys:Int32 x:Key="d1">1</sys:Int32>
+        <sys:Int32 x:Key="d3">2</sys:Int32>
+        <sys:Int32 x:Key="d7">6</sys:Int32>
+        <sys:Int32 x:Key="d15">14</sys:Int32>
+        <sys:Int32 x:Key="d30">29</sys:Int32>
+    </Page.Resources>
     <Grid>
         <c:RoundWaitProgress Play="{Binding IsLoading}" Panel.ZIndex="999"/>
         <Grid Margin="5,0">
@@ -22,6 +31,85 @@
                 <RowDefinition/>
                 <RowDefinition Height="30"/>
             </Grid.RowDefinitions>
+
+            <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
+                <c:BButton Content="拉取订单" Width="100" 
+                           Background="{Binding SDGroupButtonIndex,Converter={StaticResource objConverter},ConverterParameter=0:#8080FF:#F2F2F2}"
+                           Foreground="{Binding SDGroupButtonIndex,Converter={StaticResource objConverter},ConverterParameter=0:White:#4A4A4A}"
+                           Command="{Binding SetSDButtinIndexCommand}" CommandParameter="{StaticResource d0}"/>
+
+                <c:BButton Content="我的订单" Width="100" 
+                           Background="{Binding SDGroupButtonIndex,Converter={StaticResource objConverter},ConverterParameter=1:#8080FF:#F2F2F2}"
+                           Foreground="{Binding SDGroupButtonIndex,Converter={StaticResource objConverter},ConverterParameter=1:White:#4A4A4A}"
+                           Command="{Binding SetSDButtinIndexCommand}" CommandParameter="{StaticResource d1}"/>
+            </StackPanel>
+
+            <Grid Grid.Row="2" Background="{StaticResource Border.Background}">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="0.5*"/>
+                    <RowDefinition Height="5"/>
+                    <RowDefinition Height="0.5*"/>
+                </Grid.RowDefinitions>
+                <StackPanel Orientation="Horizontal" Margin="0,5,0,0">
+                    <StackPanel.Resources>
+                        <Style TargetType="DatePickerTextBox">
+                            <Setter Property="IsReadOnly" Value="True"/>
+                        </Style>
+                    </StackPanel.Resources>
+                    <TextBlock Text="下单时间" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <DatePicker SelectedDate="{Binding StartDate}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
+                    <DatePicker SelectedDate="{Binding EndDate}" Width="133.5" Height="30" VerticalContentAlignment="Center" FocusVisualStyle="{x:Null}" Margin="5,0,0,0"/>
+                    <TextBlock Text="订单号" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchOrderId}" WaterRemark="精确匹配"/>
+                    <TextBlock Text="SPU" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="精确匹配" Text="{Binding SearchProductId}"/>
+                    <TextBlock Text="SKU" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchSku}" WaterRemark="精确匹配"/>
+                    <!--<TextBlock Text="下单账号" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" WaterRemark="暂不支持" IsEnabled="False"
+                                DisableBgColor="{StaticResource TextBox.Disable.BgColor}"/>-->
+                    <c:BButton Content="搜索" Width="50" Margin="5,0,0,0" Command="{Binding SearchOrderCommand}"/>
+                </StackPanel>
+                <StackPanel Orientation="Horizontal" Grid.Row="2" Margin="0,0,0,5">
+                    <c:BButton Content="今天" Width="50" Height="25" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d0}"/>
+                    <c:BButton Content="昨天" Width="50" Height="25" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d1}"/>
+                    <c:BButton Content="近3天" Width="50" Height="25" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d3}"/>
+                    <c:BButton Content="近7天" Width="50" Height="24" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d7}"/>
+                    <c:BButton Content="近15天" Width="50" Height="25" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d15}"/>
+                    <c:BButton Content="近30天" Width="50" Height="25" Margin="5,0,0,0"
+                               Command="{Binding SetSearchDateCommand}"
+                               CommandParameter="{StaticResource d30}"/>
+                    <TextBlock Text="下单账号" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" DisableBgColor="{StaticResource TextBox.Disable.BgColor}" IsEnabled="False" WaterRemark="精确匹配"/>
+                    <TextBlock Text="货号" VerticalAlignment="Center" Margin="5,0,0,0" />
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchProductNo}" WaterRemark="精确匹配"/>
+                    <TextBlock Text="客户姓名" VerticalAlignment="Center" Margin="5,0,0,0"/>
+                    <c:BTextBox Width="150" Margin="5,0,0,0" Text="{Binding SearchContactName}" WaterRemark="精确匹配"/>
+
+                    <c:BButton Content="同步" Width="50" Margin="5,0,0,0" Command="{Binding SyncOrderCommand}" ToolTipService.InitialShowDelay="0" ToolTipService.ShowDuration="10000"
+                               Visibility="Collapsed">
+                        <c:BButton.ToolTip>
+                            <StackPanel>
+                                <TextBlock Text="1.使用筛选条件中的开始时间和结束时间进行同步"/>
+                                <TextBlock Text="2.从开始时间起每次同步3小时时长的订单直到到达结束时间"/>
+                                <TextBlock Text="3.已存在未结束的同步任务将不会重复执行"/>
+                            </StackPanel>
+                        </c:BButton.ToolTip>
+                    </c:BButton>
+                    <c:BButton Content="导出" Command="{Binding ExportCommand}" Width="50" Margin="5,0,0,0"
+                               Visibility="{Binding Visibility,ElementName=listbox_order}"/>
+                </StackPanel>
+            </Grid>
         </Grid>
     </Grid>
 </Page>