diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
index 70b13f0..42ef422 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
@@ -939,6 +939,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			}
 		}
 
+		public void FilterOneOrder(string orderId, bool updateTabCount = false)
+		{
+			var orderExist = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.order_id == orderId);
+			FilterOneOrder(orderExist, updateTabCount);
+		}
+
 		public void FilterOneOrder(oms_wei_order_info order, bool updateTabCount = false)
 		{
 			var orderExist = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.order_id == order.order_id);
diff --git a/29WxOrderWpf/Ctrls/ShopCtrls/ShopListCtrl.xaml b/29WxOrderWpf/Ctrls/ShopCtrls/ShopListCtrl.xaml
index 8714b49..99153e3 100644
--- a/29WxOrderWpf/Ctrls/ShopCtrls/ShopListCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/ShopCtrls/ShopListCtrl.xaml
@@ -1,90 +1,199 @@
-<UserControl x:Class="_29WxOrderWpf.Ctrls.ShopCtrls.ShopListCtrl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.ShopCtrls"
-             mc:Ignorable="d"
-             d:DesignHeight="450" d:DesignWidth="800" x:Name="shopListCtrl" Loaded="shopListCtrl_Loaded">
+<UserControl
+    x:Class="_29WxOrderWpf.Ctrls.ShopCtrls.ShopListCtrl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.ShopCtrls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    x:Name="shopListCtrl"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    Loaded="shopListCtrl_Loaded"
+    mc:Ignorable="d">
     <Grid Background="{StaticResource ListCtrlBackColorBrush}">
         <Grid.RowDefinitions>
-            <RowDefinition Height="40"></RowDefinition>
-            <RowDefinition Height="40"></RowDefinition>
-            <RowDefinition Height="*"></RowDefinition>
-            <RowDefinition Height="40"></RowDefinition>
+            <RowDefinition Height="40" />
+            <RowDefinition Height="40" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="40" />
         </Grid.RowDefinitions>
 
         <Grid x:Name="gridSearch">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"></ColumnDefinition>
-                <ColumnDefinition Width="*"></ColumnDefinition>
-                <ColumnDefinition Width="Auto"></ColumnDefinition>
-                <ColumnDefinition Width="*"></ColumnDefinition>
-                <ColumnDefinition Width="Auto"></ColumnDefinition>
-                <ColumnDefinition Width="*"></ColumnDefinition>
-                <ColumnDefinition Width="Auto"></ColumnDefinition>
-                <ColumnDefinition Width="Auto"></ColumnDefinition>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
-            <TextBlock Text="店名" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="0" Margin="6,0,0,0"/>
-            <Border Grid.Column="1" Margin="4" BorderBrush="{StaticResource mainColorBrush}" BorderThickness="1" CornerRadius="4" Height="26">
-                <TextBox x:Name="txtShopName" Margin="3,0" VerticalContentAlignment="Center" Style="{StaticResource BaseTextBoxStyle}"/>
+            <TextBlock
+                Grid.Column="0"
+                Margin="6,0,0,0"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Text="店名" />
+            <Border
+                Grid.Column="1"
+                Height="26"
+                Margin="4"
+                BorderBrush="{StaticResource mainColorBrush}"
+                BorderThickness="1"
+                CornerRadius="4">
+                <TextBox
+                    x:Name="txtShopName"
+                    Margin="3,0"
+                    VerticalContentAlignment="Center"
+                    Style="{StaticResource BaseTextBoxStyle}" />
             </Border>
-            <TextBlock Text="分组" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="2"/>
-            <Border Grid.Column="3" Margin="4" BorderBrush="{StaticResource mainColorBrush}" BorderThickness="1" CornerRadius="4" Height="26">
-                <ComboBox x:Name="cmbGroup" Margin="3,0" VerticalContentAlignment="Center" Style="{StaticResource BaseComboBoxStyle}" SelectionChanged="cmbGroup_SelectionChanged"/>
+            <TextBlock
+                Grid.Column="2"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Text="分组" />
+            <Border
+                Grid.Column="3"
+                Height="26"
+                Margin="4"
+                BorderBrush="{StaticResource mainColorBrush}"
+                BorderThickness="1"
+                CornerRadius="4">
+                <ComboBox
+                    x:Name="cmbGroup"
+                    Margin="3,0"
+                    VerticalContentAlignment="Center"
+                    SelectionChanged="cmbGroup_SelectionChanged"
+                    Style="{StaticResource BaseComboBoxStyle}" />
             </Border>
-            <TextBlock Text="备注" VerticalAlignment="Center" HorizontalAlignment="Center" Grid.Column="4"/>
-            <Border Grid.Column="5" Margin="4" BorderBrush="{StaticResource mainColorBrush}" BorderThickness="1" CornerRadius="4" Height="26">
-                <ComboBox x:Name="cmbNotes" Margin="3,0" VerticalContentAlignment="Center" Style="{StaticResource BaseComboBoxStyle}" SelectionChanged="cmbNotes_SelectionChanged"/>
+            <TextBlock
+                Grid.Column="4"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Text="备注" />
+            <Border
+                Grid.Column="5"
+                Height="26"
+                Margin="4"
+                BorderBrush="{StaticResource mainColorBrush}"
+                BorderThickness="1"
+                CornerRadius="4">
+                <ComboBox
+                    x:Name="cmbNotes"
+                    Margin="3,0"
+                    VerticalContentAlignment="Center"
+                    SelectionChanged="cmbNotes_SelectionChanged"
+                    Style="{StaticResource BaseComboBoxStyle}" />
             </Border>
-            <Button Grid.Column="6" x:Name="btnSearch" Style="{StaticResource BasePageButtonStyle}" Grid.Row="4" Content=" 搜索 " Height="26" Click="btnSearch_Click"></Button>
-            <Button Grid.Column="7" x:Name="btnRestore" Style="{StaticResource BasePageButtonLightStyle}" Grid.Row="4" Content=" 还原 " Height="26" Click="btnRestore_Click" Margin="4,0,6,0"></Button>
+            <Button
+                x:Name="btnSearch"
+                Grid.Row="4"
+                Grid.Column="6"
+                Height="26"
+                Click="btnSearch_Click"
+                Content=" 搜索 "
+                Style="{StaticResource BasePageButtonStyle}" />
+            <Button
+                x:Name="btnRestore"
+                Grid.Row="4"
+                Grid.Column="7"
+                Height="26"
+                Margin="4,0,6,0"
+                Click="btnRestore_Click"
+                Content=" 还原 "
+                Style="{StaticResource BasePageButtonLightStyle}" />
         </Grid>
-        <Grid x:Name="lstTitle" Grid.Row="1" Margin="4,0" Background="{StaticResource ListHeadBackColorBrush}">
-            <Border BorderThickness="0,0,1,0" BorderBrush="{StaticResource ListHeadBorderColorBrush}">
-                <DataGrid Margin="0,0,18,0" x:Name="dgShopHeader" Grid.ColumnSpan="100" AutoGenerateColumns="False" CanUserReorderColumns="False"
-                      ColumnHeaderHeight="{Binding ElementName=lstTitle, Path=ActualHeight}" BorderThickness="0" 
-                      ColumnDisplayIndexChanged="dgShopHeader_ColumnDisplayIndexChanged"
-                      LayoutUpdated="dgShopHeader_LayoutUpdated">
+        <Grid
+            x:Name="lstTitle"
+            Grid.Row="1"
+            Margin="4,0"
+            Background="{StaticResource ListHeadBackColorBrush}">
+            <Border BorderBrush="{StaticResource ListHeadBorderColorBrush}" BorderThickness="0,0,1,0">
+                <DataGrid
+                    x:Name="dgShopHeader"
+                    Grid.ColumnSpan="100"
+                    Margin="0,0,18,0"
+                    AutoGenerateColumns="False"
+                    BorderThickness="0"
+                    CanUserReorderColumns="False"
+                    ColumnDisplayIndexChanged="dgShopHeader_ColumnDisplayIndexChanged"
+                    ColumnHeaderHeight="{Binding ElementName=lstTitle, Path=ActualHeight}"
+                    LayoutUpdated="dgShopHeader_LayoutUpdated">
                     <DataGrid.Columns>
-                        <DataGridTemplateColumn x:Name="colSelectAll" Header="选择" Width="50" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}">
+                        <DataGridTemplateColumn
+                            x:Name="colSelectAll"
+                            Width="50"
+                            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" IsChecked="False" Checked="ChkSelectAll_Checked" Unchecked="ChkSelectAll_Unchecked" Loaded="ChkSelectAll_Loaded" IsThreeState="True"/>
-                                        <Border BorderThickness="1" Background="Transparent" BorderBrush="{StaticResource mainColorBrush}" Width="14" Height="14"
-                                            HorizontalAlignment="Center" VerticalAlignment="Center" IsHitTestVisible="False">
-                                        </Border>
+                                        <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"/>
+                                    <CheckBox HorizontalAlignment="Center" VerticalAlignment="Center" />
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
-                        <DataGridTextColumn Width="100*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="AppId"/>
-                        <DataGridTextColumn Width="100*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="店铺名称"/>
-                        <DataGridTextColumn Width="100*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="分组"/>
-                        <DataGridTextColumn Width="82*" HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" Header="    备注"/>
+                        <DataGridTextColumn
+                            Width="100*"
+                            Header="AppId"
+                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+                        <DataGridTextColumn
+                            Width="100*"
+                            Header="店铺名称"
+                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+                        <DataGridTextColumn
+                            Width="100*"
+                            Header="分组"
+                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+                        <DataGridTextColumn
+                            Width="82*"
+                            Header="    备注"
+                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
                     </DataGrid.Columns>
                 </DataGrid>
             </Border>
         </Grid>
         <!--<ListBox Grid.Row="2" x:Name="lbxShop" ItemsSource="{Binding GlobalConfig.ShopLoginList}" BorderThickness="0" Margin="4,0,4,4">-->
-        <ListBox Grid.Row="2" x:Name="lbxShop" BorderThickness="0" Margin="4,0,4,4" SelectionMode="Extended">
-                <!--使用自定义属性模板去除ListBox高亮显示框-->
+        <ListBox
+            x:Name="lbxShop"
+            Grid.Row="2"
+            Margin="4,0,4,4"
+            BorderThickness="0"
+            SelectionMode="Extended">
+            <!--  使用自定义属性模板去除ListBox高亮显示框  -->
             <ListBox.ItemContainerStyle>
                 <Style TargetType="ListBoxItem">
                     <Setter Property="Template">
                         <Setter.Value>
                             <ControlTemplate TargetType="ListBoxItem">
-                                <ContentPresenter Content="{TemplateBinding Content}"
-                                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
-                                                  ContentTemplate="{TemplateBinding ContentTemplate}" />
+                                <ContentPresenter
+                                    Content="{TemplateBinding Content}"
+                                    ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                    ContentTemplate="{TemplateBinding ContentTemplate}" />
                             </ControlTemplate>
                         </Setter.Value>
                     </Setter>
@@ -93,14 +202,20 @@
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <!--<local:ShopListRowCtrl></local:ShopListRowCtrl>-->
-                    <Border Margin="0,0,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" BorderThickness="0, 0, 0, 1" MinHeight="50"
-                            BorderBrush="{StaticResource ListRowBorderColorBrush}" CornerRadius="0">
+                    <Border
+                        MinHeight="50"
+                        Margin="0,0,0,0"
+                        HorizontalAlignment="Stretch"
+                        VerticalAlignment="Stretch"
+                        BorderBrush="{StaticResource ListRowBorderColorBrush}"
+                        BorderThickness="0,0,0,1"
+                        CornerRadius="0">
                         <Border.Style>
-                            <!-- 鼠标进入或悬停Border时切换颜色（悬停时Border的填充控件必须有填充Border，所在层级不限，仅填充透明Grid则触发器无效） -->
+                            <!--  鼠标进入或悬停Border时切换颜色（悬停时Border的填充控件必须有填充Border，所在层级不限，仅填充透明Grid则触发器无效）  -->
                             <Style TargetType="Border">
                                 <Style.Triggers>
                                     <Trigger Property="IsMouseOver" Value="True">
-                                        <Setter Property="Background" Value="{StaticResource ListRowHoverBackColorBrush}"/>
+                                        <Setter Property="Background" Value="{StaticResource ListRowHoverBackColorBrush}" />
                                     </Trigger>
                                 </Style.Triggers>
                             </Style>
@@ -109,17 +224,60 @@
                         <Grid x:Name="gridListItem">
                             <Grid.ColumnDefinitions>
                                 <!--<ColumnDefinition Width="{Binding colShopIdWidth,RelativeSource={RelativeSource AncestorType={x:Type local:ShopListCtrl}}}" ></ColumnDefinition>-->
-                                <ColumnDefinition x:Name="colCheck" Width="100*"></ColumnDefinition>
-                                <ColumnDefinition x:Name="colShopId" Width="100*"></ColumnDefinition>
-                                <ColumnDefinition x:Name="colShopName" Width="100*"></ColumnDefinition>
-                                <ColumnDefinition x:Name="colGroupName" Width="100*"></ColumnDefinition>
-                                <ColumnDefinition x:Name="colNotes" Width="100*"></ColumnDefinition>
+                                <ColumnDefinition x:Name="colCheck" Width="100*" />
+                                <ColumnDefinition x:Name="colShopId" Width="100*" />
+                                <ColumnDefinition x:Name="colShopName" Width="100*" />
+                                <ColumnDefinition x:Name="colGroupName" Width="100*" />
+                                <ColumnDefinition x:Name="colNotes" Width="100*" />
                             </Grid.ColumnDefinitions>
-                            <CheckBox Grid.Column="0" Background="Transparent" HorizontalAlignment="Center" VerticalAlignment="Center" Tag="{Binding ShopId}" IsChecked="{Binding IsSelect, Mode=TwoWay}" Click="CheckBox_Click"/>
-                            <TextBox Grid.Column="1" Background="Transparent" TextWrapping="Wrap" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" BorderThickness="0" Tag="{Binding ShopId}" Text="{Binding ShopId}" />
-                            <TextBox Grid.Column="2" Background="Transparent" TextWrapping="Wrap" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" BorderThickness="0" Tag="{Binding ShopId}" Text="{Binding ShopAccount}" />
-                            <TextBox Grid.Column="3" Background="Transparent" TextWrapping="Wrap" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" BorderThickness="0" Tag="{Binding ShopId}" Text="{Binding GroupName}" />
-                            <TextBox Grid.Column="4" Background="Transparent" TextWrapping="Wrap" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" IsReadOnly="True" BorderThickness="0" Tag="{Binding ShopId}" Text="{Binding Notes}" />
+                            <CheckBox
+                                Grid.Column="0"
+                                HorizontalAlignment="Center"
+                                VerticalAlignment="Center"
+                                Background="Transparent"
+                                Click="CheckBox_Click"
+                                IsChecked="{Binding IsSelect, Mode=TwoWay}"
+                                Tag="{Binding ShopId}" />
+                            <TextBox
+                                Grid.Column="1"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="Center"
+                                Background="Transparent"
+                                BorderThickness="0"
+                                IsReadOnly="True"
+                                Tag="{Binding ShopId}"
+                                Text="{Binding ShopId}"
+                                TextWrapping="Wrap" />
+                            <TextBox
+                                Grid.Column="2"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="Center"
+                                Background="Transparent"
+                                BorderThickness="0"
+                                IsReadOnly="True"
+                                Tag="{Binding ShopId}"
+                                Text="{Binding ShopAccount}"
+                                TextWrapping="Wrap" />
+                            <TextBox
+                                Grid.Column="3"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="Center"
+                                Background="Transparent"
+                                BorderThickness="0"
+                                IsReadOnly="True"
+                                Tag="{Binding ShopId}"
+                                Text="{Binding GroupName}"
+                                TextWrapping="Wrap" />
+                            <TextBox
+                                Grid.Column="4"
+                                HorizontalContentAlignment="Center"
+                                VerticalContentAlignment="Center"
+                                Background="Transparent"
+                                BorderThickness="0"
+                                IsReadOnly="True"
+                                Tag="{Binding ShopId}"
+                                Text="{Binding Notes}"
+                                TextWrapping="Wrap" />
                         </Grid>
                     </Border>
                 </DataTemplate>
@@ -128,19 +286,42 @@
 
         <Grid x:Name="gridRefreshOrSelect" Grid.Row="3">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"></ColumnDefinition>
-                <ColumnDefinition Width="Auto"></ColumnDefinition>
-                <ColumnDefinition Width="Auto"></ColumnDefinition>
-                <ColumnDefinition Width="*"></ColumnDefinition>
-                <ColumnDefinition Width="Auto"></ColumnDefinition>
-                <ColumnDefinition Width="*"></ColumnDefinition>
-                <ColumnDefinition Width="Auto"></ColumnDefinition>
-                <ColumnDefinition Width="Auto"></ColumnDefinition>
+                <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 Grid.Column="0" x:Name="btnRefreshShop" Style="{StaticResource BasePageButtonStyle}" Grid.Row="4" Content=" 刷新店铺 " Height="26" Margin="6,0,0,0" Click="btnRefreshShop_Click"></Button>
+            <Button
+                x:Name="btnRefreshShop"
+                Grid.Row="4"
+                Grid.Column="0"
+                Height="26"
+                Margin="6,0,0,0"
+                Click="btnRefreshShop_Click"
+                Content=" 刷新店铺 "
+                Style="{StaticResource BasePageButtonStyle}" />
 
-            <Button Grid.Column="6" x:Name="btnApplySelectShop" Style="{StaticResource BasePageButtonStyle}" Grid.Row="4" Content=" 确定 " Height="26" Click="btnApplySelectShop_Click"></Button>
-            <Button Grid.Column="7" x:Name="btnCancelSelectShop" Style="{StaticResource BasePageButtonLightStyle}" Grid.Row="4" Content=" 取消 " Height="26" Margin="4,0,6,0" Click="btnCancelSelectShop_Click"></Button>
+            <Button
+                x:Name="btnApplySelectShop"
+                Grid.Row="4"
+                Grid.Column="6"
+                Height="26"
+                Click="btnApplySelectShop_Click"
+                Content=" 确定 "
+                Style="{StaticResource BasePageButtonStyle}" />
+            <Button
+                x:Name="btnCancelSelectShop"
+                Grid.Row="4"
+                Grid.Column="7"
+                Height="26"
+                Margin="4,0,6,0"
+                Click="btnCancelSelectShop_Click"
+                Content=" 取消 "
+                Style="{StaticResource BasePageButtonLightStyle}" />
         </Grid>
     </Grid>
 </UserControl>
diff --git a/29WxOrderWpf/MainWindow.xaml.cs b/29WxOrderWpf/MainWindow.xaml.cs
index d2e4542..cc3a82f 100644
--- a/29WxOrderWpf/MainWindow.xaml.cs
+++ b/29WxOrderWpf/MainWindow.xaml.cs
@@ -231,7 +231,6 @@ namespace _29WxOrderWpf
                 return;
 
             var tList = new List<Task>();
-            var cList = new List<int>();
             List<ShopLoginInfo> list = new List<ShopLoginInfo>();
             Dispatcher.Invoke(new Action(() =>
             {
@@ -272,12 +271,6 @@ namespace _29WxOrderWpf
                         list.Remove(shopExist); 
 						shopExist = list.LastOrDefault(l => l.ShopId == shop.ShopId);
 					}
-                    // 更新店铺 // 代发管理中更新
-                    //foreach (var order in GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == shop.ErpShopId).ToList())
-                    //{
-                    //    foreach (var orderItem in order.orderItems)
-                    //        orderItem.Shop = shop;
-                    //}
                     list.Add(shop);
 
                     if (!GlobalConfig.ShopLoginList.Any(s => s.ShopId == shop.ShopId && !shop.is_point_shop_expire))
@@ -286,55 +279,54 @@ namespace _29WxOrderWpf
                         {
                             GlobalConfig.ShopLoginList.Add(shop);
                         }));
-                       
-                        var t = Task.Run(() =>
-                        {
-                            while (cList.Count > 20)
+
+						Task.Run(() =>
+						{
+							while (tList.Count > 20)
 							{
 								tList.RemoveAll(ta => ta.IsFaulted || ta.IsCompleted || ta.IsCanceled);
 								Thread.Sleep(100);
 							}
-                            cList.Add(1);
-                            try
-                            {
-                                if (shop.LoginStatus == "登录成功")
-                                {
-									shop.Is29Supplier = false;
-									for (int i = 0; i < 100; i++)
+							tList.Add(Task.Run(() =>
+							{
+								try
+								{
+									if (shop.LoginStatus == "登录成功")
 									{
-										var is29SupplierRst = WxOrderSupplierBLL.GetWxSupplierListV2(shop);
-										if (!is29SupplierRst.Contains("\"code\":0"))
-											is29SupplierRst = WxOrderSupplierBLL.GetWxSupplierListV2(shop);
-										if (is29SupplierRst.Contains("\"code\":0") && is29SupplierRst.Contains("\"name\":\"29供货商\""))
+										shop.Is29Supplier = false;
+										for (int i = 0; i < 100; i++)
 										{
-											shop.Is29Supplier = true;
-											break;
+											var is29SupplierRst = WxOrderSupplierBLL.GetWxSupplierListV2(shop);
+											if (!is29SupplierRst.Contains("\"code\":0"))
+												is29SupplierRst = WxOrderSupplierBLL.GetWxSupplierListV2(shop);
+											if (is29SupplierRst.Contains("\"code\":0") && is29SupplierRst.Contains("\"name\":\"29供货商\""))
+											{
+												shop.Is29Supplier = true;
+												break;
+											}
+											else if (!is29SupplierRst.Contains("\"code\":0"))
+											{
+												ShopBLL.CheckShopLogin(shop);
+											}
+											int totalCount = BaseRegex.GetIntJson(ref is29SupplierRst, "totalCount");
+											if (i * 20 >= totalCount)
+												break;
 										}
-										else if (!is29SupplierRst.Contains("\"code\":0"))
-										{
-											ShopBLL.CheckShopLogin(shop);
-										}
-										int totalCount = BaseRegex.GetIntJson(ref is29SupplierRst, "totalCount");
-										if (i * 20 >= totalCount)
-											break;
-									}
 
-									foreach (var order in GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == shop.ErpShopId).ToList())
-                                    {
-                                        // 更新代发管理情况
-                                        foreach (var orderItem in order.orderItems)
-                                            Dispatcher.Invoke(new Action(() => { orderItem.UpdateOrderItemBuyButton(); }));
-                                    }
-                                }
-                            }
-                            catch
-                            {
-                            }
-                            //if (cList.Count > 0)
-                            //    cList.RemoveAt(0);
-                        });
-                        tList.Add(t);
-                    }
+										foreach (var order in GlobalConfig.lstFilterOrder.Where(o => o.shop_id.ParseToString() == shop.ErpShopId).ToList())
+										{
+											// 更新代发管理情况
+											foreach (var orderItem in order.orderItems)
+												Dispatcher.Invoke(new Action(() => { orderItem.UpdateOrderItemBuyButton(); }));
+										}
+									}
+								}
+								catch
+								{
+								}
+							}));
+						});
+					}
                 }
             }
             Dispatcher.Invoke(new Action(() =>
diff --git a/29WxOrderWpf/Windows/OrderWindows/TransitReturnOrderWindow.xaml.cs b/29WxOrderWpf/Windows/OrderWindows/TransitReturnOrderWindow.xaml.cs
index 3993dff..54754bf 100644
--- a/29WxOrderWpf/Windows/OrderWindows/TransitReturnOrderWindow.xaml.cs
+++ b/29WxOrderWpf/Windows/OrderWindows/TransitReturnOrderWindow.xaml.cs
@@ -164,7 +164,7 @@ namespace _29WxOrderWpf.Windows.OrderWindows
             {
                 //<AjaxResult><msg>创建退货包裹成功</msg><code>0</code></AjaxResult>
                 MainWindow.Instance.orderListCtrl.GetOrder(OrderItem.order_id);
-                MainWindow.Instance.orderListCtrl.FilterOrders();
+                MainWindow.Instance.orderListCtrl.FilterOneOrder(OrderItem.order_id, true);
                 BaseMsgWindow.ShowInfo("添加退货包裹成功", "", this);
                 this.Close();
             }
diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index f4e9f4b..7fbe8c4 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -36,7 +36,7 @@ namespace AllBase
 		/// 版本ID
 		/// </summary>
 
-        public static int VersionCount = 233;
+        public static int VersionCount = 237;
 
 		public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
 		public static string DebugUrl { get; set; } = "http://localhost:9000";