diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs
index 8ebc280e..e658f3fc 100644
--- a/BBWY.Client/App.xaml.cs
+++ b/BBWY.Client/App.xaml.cs
@@ -27,24 +27,24 @@ namespace BBWY.Client
         {
             var gl = new GlobalContext();
             string userToken = string.Empty;
-#if DEBUG
+//#if DEBUG
             userToken = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySWQiOiIxNDA1MTUxNjE5NTk0NTg4MTYwIiwidGVhbUlkIjoiMTQzOTg5OTEyMzk1NTI3MzcyOCIsImV4cCI6MTY3MTkwMTU1NH0.UaUubqP442qxVc6ppQt7FO0jcFs3w6KR6q1OeBuL1i8";  //齐越小一
-#else
-            var uid = e.Args.Count() > 0 ? e.Args.LastOrDefault(args => args.StartsWith("uid:")) : string.Empty;
-            if (string.IsNullOrEmpty(uid))
-            {
-                MessageBox.Show("缺少启动参数", "提示");
-                Environment.Exit(0);
-            }
-            var tokenResult = ReadMMF(uid);
-            if (tokenResult.isOk)
-                userToken = tokenResult.content;
-            else
-            {
-                MessageBox.Show($"读取内存数据失败\r\n{tokenResult.content}", "提示");
-                Environment.Exit(0);
-            }
-#endif
+//#else
+//            var uid = e.Args.Count() > 0 ? e.Args.LastOrDefault(args => args.StartsWith("uid:")) : string.Empty;
+//            if (string.IsNullOrEmpty(uid))
+//            {
+//                MessageBox.Show("缺少启动参数", "提示");
+//                Environment.Exit(0);
+//            }
+//            var tokenResult = ReadMMF(uid);
+//            if (tokenResult.isOk)
+//                userToken = tokenResult.content;
+//            else
+//            {
+//                MessageBox.Show($"读取内存数据失败\r\n{tokenResult.content}", "提示");
+//                Environment.Exit(0);
+//            }
+//#endif
             gl.UserToken = userToken;
 
             #region 注册全局异常
diff --git a/BBWY.Client/Resources/Themes/Generic.xaml b/BBWY.Client/Resources/Themes/Generic.xaml
index 31f30da1..7853ca8f 100644
--- a/BBWY.Client/Resources/Themes/Generic.xaml
+++ b/BBWY.Client/Resources/Themes/Generic.xaml
@@ -279,4 +279,78 @@
         <Setter Property="HorizontalAlignment" Value="Center"/>
         <Setter Property="VerticalAlignment" Value="Center"/>
     </Style>
+
+    <Style TargetType="DataGrid">
+        <Setter Property="AutoGenerateColumns" Value="False"/>
+        <Setter Property="IsReadOnly" Value="True"/>
+        <Setter Property="RowHeaderWidth" Value="0"/>
+        <Setter Property="ColumnHeaderHeight" Value="30"/>
+        <Setter Property="RowHeight" Value="30"/>
+        <Setter Property="CanUserAddRows" Value="False"/>
+        <Setter Property="CanUserDeleteRows" Value="False"/>
+        <Setter Property="CanUserResizeRows" Value="False"/>
+        <Setter Property="CanUserSortColumns" Value="False"/>
+        <Setter Property="BorderBrush" Value="#E3F3FF"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="HorizontalGridLinesBrush" Value="{StaticResource Border.Brush}"/>
+        <Setter Property="VerticalGridLinesBrush" Value="{StaticResource Border.Brush}"/>
+    </Style>
+
+    <Style TargetType="DataGridRow">
+        <Setter Property="Background" Value="Transparent"/>
+        <Style.Triggers>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter Property="Background" Value="{StaticResource Item.Selected}"/>
+                <Setter Property="Foreground" Value="{StaticResource Text.Color}"/>
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{StaticResource Item.MouseOver}"/>
+                <Setter Property="Foreground" Value="{StaticResource Text.Color}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    
+    <Style TargetType="DataGridCell">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Margin" Value="0"/>
+        <Setter Property="Padding" Value="0"/>
+        <Style.Triggers>
+            <Trigger Property="IsSelected" Value="True">
+                <Setter Property="Background" Value="{StaticResource Item.Selected}"/>
+                <Setter Property="Foreground" Value="{StaticResource Text.Color}"/>
+                <Setter Property="BorderThickness" Value="0"/>
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="{StaticResource Item.MouseOver}"/>
+                <Setter Property="Foreground" Value="{StaticResource Text.Color}"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="ColumnHeaderStyle_Center" TargetType="DataGridColumnHeader">
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="BorderThickness" Value="0,0,1,0"/>
+        <Setter Property="BorderBrush" Value="{StaticResource Border.Brush}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="DataGridColumnHeader">
+                    <Border x:Name="BackgroundBorder"
+                             BorderThickness="{TemplateBinding BorderThickness}"
+                             BorderBrush="{TemplateBinding BorderBrush}"
+                             Background="{TemplateBinding Background}"
+                             Width="{TemplateBinding Width}">
+                        <Grid >
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <ContentPresenter  Margin="0" VerticalAlignment="Center" HorizontalAlignment="Center"/>
+                            <Path x:Name="SortArrow" Visibility="Collapsed" Data="M0,0 L1,0 0.5,1 z" Stretch="Fill"  Grid.Column="2" Width="8" Height="6" Fill="White" Margin="0,0,50,0" 
+                            VerticalAlignment="Center" RenderTransformOrigin="1,1" />
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/BBWY.Client/ViewModels/BaseVM.cs b/BBWY.Client/ViewModels/BaseVM.cs
index e6479fa3..13d7ef43 100644
--- a/BBWY.Client/ViewModels/BaseVM.cs
+++ b/BBWY.Client/ViewModels/BaseVM.cs
@@ -10,15 +10,23 @@ namespace BBWY.Client.ViewModels
 
         public ICommand LoadCommand { get; set; }
 
+        public ICommand UnloadCommand { get; set; }
+
         public BaseVM()
         {
             VMId = Guid.NewGuid();
             LoadCommand = new RelayCommand(Load);
+            UnloadCommand = new RelayCommand(Unload);
         }
 
         protected virtual void Load()
         {
 
         }
+
+        protected virtual void Unload()
+        { 
+            
+        }
     }
 }
diff --git a/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs b/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs
index ea0fa04c..eca4a4e5 100644
--- a/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs
@@ -41,5 +41,11 @@ namespace BBWY.Client.ViewModels
                 });
             });
         }
+
+        protected override void Unload()
+        {
+            this.SkuId = string.Empty;
+            PurchaseSchemeList.Clear();
+        }
     }
 }
diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index 5c13d193..dd8c6f24 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -21,6 +21,7 @@ namespace BBWY.Client.ViewModels
     {
         private OrderService orderService;
         private StatisticsService statisticsService;
+        private ChoosePurchaseSchemeViewModel choosePurchaseSchemeViewModel;
 
         private bool isLoading;
 
@@ -91,12 +92,13 @@ namespace BBWY.Client.ViewModels
 
         public ICommand OutStockCommand { get; set; }
 
-        public OrderListViewModel(OrderService orderService, StatisticsService statisticsService, GlobalContext globalContext)
+        public OrderListViewModel(OrderService orderService, StatisticsService statisticsService, GlobalContext globalContext, ChoosePurchaseSchemeViewModel choosePurchaseSchemeViewModel)
         {
             random = new Random();
             this.globalContext = globalContext;
             this.orderService = orderService;
             this.statisticsService = statisticsService;
+            this.choosePurchaseSchemeViewModel = choosePurchaseSchemeViewModel;
             OrderList = new ObservableCollection<Order>();
             EndDate = DateTime.Now;
             StartDate = DateTime.Now.Date.AddDays(-29);
@@ -260,7 +262,9 @@ namespace BBWY.Client.ViewModels
                 }
                 else if (chooseDFType.DFType == DFType.在线采购)
                 {
-
+                    choosePurchaseSchemeViewModel.SkuId = order.ItemList[0].Id;
+                    var choosePurchaseScheme = new ChoosePurchaseScheme();
+                    choosePurchaseScheme.ShowDialog();
                 }
             }
         }
diff --git a/BBWY.Client/Views/Order/ChoosePurchaseScheme.xaml b/BBWY.Client/Views/Order/ChoosePurchaseScheme.xaml
index 65d29531..2190bb72 100644
--- a/BBWY.Client/Views/Order/ChoosePurchaseScheme.xaml
+++ b/BBWY.Client/Views/Order/ChoosePurchaseScheme.xaml
@@ -1,16 +1,25 @@
 <c:BWindow x:Class="BBWY.Client.Views.Order.ChoosePurchaseScheme"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:BBWY.Client.Views.Order"
-        xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
-        mc:Ignorable="d"
-        Title="ChoosePurchaseScheme" Height="200" Width="800"
-        Style="{StaticResource bwstyle}"
-        MinButtonVisibility="Collapsed"
-        MaxButtonVisibility="Collapsed"
+           xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+           xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+           xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+           xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+           xmlns:local="clr-namespace:BBWY.Client.Views.Order"
+           xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
+           xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+           mc:Ignorable="d"
+           Title="ChoosePurchaseScheme" Height="200" Width="600"
+           Style="{StaticResource bwstyle}"
+           MinButtonVisibility="Collapsed"
+           MaxButtonVisibility="Collapsed"
            DataContext="{Binding ChoosePurchaseScheme,Source={StaticResource Locator}}">
+    <b:Interaction.Triggers>
+        <b:EventTrigger EventName="Loaded">
+            <b:InvokeCommandAction Command="{Binding LoadCommand}"/>
+        </b:EventTrigger>
+        <b:EventTrigger EventName="Unloaded">
+            <b:InvokeCommandAction Command="{Binding UnloadCommand}"/>
+        </b:EventTrigger>
+    </b:Interaction.Triggers>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="30"/>
@@ -24,9 +33,30 @@
         <DataGrid Grid.Row="1"
                   ItemsSource="{Binding PurchaseSchemeList}">
             <DataGrid.Columns>
-                <DataGridTextColumn Binding="{Binding PurchaserName}"/>
-                <DataGridTextColumn Binding="{Binding PurchaserLocation}"/>
-                <DataGridTextColumn Binding="{Binding PurchaserLocation}"/>
+                <DataGridTextColumn Binding="{Binding PurchaserName}" Header="采购商" Width="1*"
+                                    HeaderStyle="{StaticResource ColumnHeaderStyle_Center}"
+                                    ElementStyle="{StaticResource middleTextBlock}"/>
+                <DataGridTextColumn Binding="{Binding PurchaserLocation}" Header="发货地" Width="120" HeaderStyle="{StaticResource ColumnHeaderStyle_Center}"
+                                    ElementStyle="{StaticResource middleTextBlock}"/>
+                <DataGridTemplateColumn Header="操作" Width="120" HeaderStyle="{StaticResource ColumnHeaderStyle_Center}">
+                    <DataGridTemplateColumn.CellTemplate>
+                        <DataTemplate>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <c:BButton Content="下单" HorizontalAlignment="Stretch"
+                                           Background="#1CC2A2"/>
+                                <c:BButton Content="编辑" Grid.Column="1" HorizontalAlignment="Stretch"
+                                           Background="#02A7F0"/>
+                                <c:BButton Content="删除" Grid.Column="2" HorizontalAlignment="Stretch"
+                                           Background="#EC808D"/>
+                            </Grid>
+                        </DataTemplate>
+                    </DataGridTemplateColumn.CellTemplate>
+                </DataGridTemplateColumn>
             </DataGrid.Columns>
         </DataGrid>
     </Grid>