From e00209cb2449f9784edc225ca47f79162ea156fc Mon Sep 17 00:00:00 2001
From: wule <jtt_fan@qq.com>
Date: Fri, 24 Jul 2026 11:16:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=86=E7=B1=BB=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20=20=E5=BF=AB=E9=80=92=E9=87=91=E9=A2=9D=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86=E7=BB=9F=E8=AE=A1=EF=BC=8C=20=E5=BF=AB=E9=80=92?=
 =?UTF-8?q?=E5=9C=A8=E7=BA=BF=E5=85=85=E5=80=BC=20=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 29WxOrder.sln                                 |  23 +-
 29WxOrderWpf/29WxOrderWpf.csproj              |  15 +-
 29WxOrderWpf/29WxOrderWpf.csproj.user         |   2 +-
 .../BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs  |  18 +-
 .../Ctrls/OrderCtrls/OrderListCtrl.xaml       | 174 ++++--
 .../Ctrls/OrderCtrls/OrderListCtrl.xaml.cs    | 260 ++++++--
 .../OrderCtrls/OrderListRowHeaderCtrl.xaml    |  16 +-
 .../OrderCtrls/OrderListRowItemCtrl.xaml      |  72 +--
 .../OrderCtrls/OrderListRowItemCtrl.xaml.cs   |  68 +-
 29WxOrderWpf/MainWindow.xaml.cs               |   2 +-
 29WxOrderWpf/StartUp.cs                       |  16 +
 29WxOrderWpf/Styles/BaseButtonStyle.xaml      |  31 +
 .../Styles/UcWaterMarkTextBoxStyle.xaml       |   4 +-
 .../UserControls/UcWaterMarkTextBox.xaml      |  20 +
 .../UserControls/UcWaterMarkTextBox.xaml.cs   |  75 +++
 ...rMarkTextBox.cs => UcWaterMarkTextBox1.cs} |   6 +-
 29WxOrderWpf/gear.ico                         | Bin 0 -> 270398 bytes
 AllBase/29WxOrderAllBase.csproj               |   2 +
 AllBase/BaseClass.cs                          |   2 +-
 .../Model/DBModel/TransitWarehouseParam.cs    |  18 +-
 AllBase/Model/DBModel/oms_wei_order_info.cs   |  46 +-
 .../Model/DBModel/oms_wei_order_item_info.cs  | 520 +++++++++-------
 AllBase/Model/DBModel/user_payment_record.cs  | 154 +++++
 AllBase/Model/Result/PddBuyerOrderLiteInfo.cs |   5 +
 Work/29WxOrderWork.csproj                     |  10 +
 Work/29WxOrderWork.csproj.user                |   2 +-
 Work/BaseForms/BaseGeneralForm.cs             |   2 +-
 Work/Initialization.cs                        |   3 +
 Work/_29Tools/Forms/PddMobileBuyOrderForm.cs  |  58 +-
 .../Forms/PddMobileBuyOrderForm.designer.cs   |   1 +
 .../Forms/ShopForms/WXShopLoginForm.cs        |  35 ++
 .../WXGetBalanceQrCodeForm.Designer.cs        | 550 +++++++++++++++-
 .../Forms/UserForms/WXGetBalanceQrCodeForm.cs | 197 +++++-
 .../UserForms/WXGetBalanceQrCodeForm.resx     |  21 +
 .../UserForms/WXGetTopUpQrCode.Designer.cs    | 585 ++++++++++++++++++
 .../Forms/UserForms/WXGetTopUpQrCode.cs       |  88 +++
 .../Forms/UserForms/WXGetTopUpQrCode.resx     | 183 ++++++
 37 files changed, 2764 insertions(+), 520 deletions(-)
 create mode 100644 29WxOrderWpf/UserControls/UcWaterMarkTextBox.xaml
 create mode 100644 29WxOrderWpf/UserControls/UcWaterMarkTextBox.xaml.cs
 rename 29WxOrderWpf/UserControls/{UcWaterMarkTextBox.cs => UcWaterMarkTextBox1.cs} (85%)
 create mode 100644 29WxOrderWpf/gear.ico
 create mode 100644 AllBase/Model/DBModel/user_payment_record.cs
 create mode 100644 Work/_29Tools/Forms/UserForms/WXGetTopUpQrCode.Designer.cs
 create mode 100644 Work/_29Tools/Forms/UserForms/WXGetTopUpQrCode.cs
 create mode 100644 Work/_29Tools/Forms/UserForms/WXGetTopUpQrCode.resx

diff --git a/29WxOrder.sln b/29WxOrder.sln
index 2ffd4f3..f7b161d 100644
--- a/29WxOrder.sln
+++ b/29WxOrder.sln
@@ -1,14 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.14.36221.1 d17.14
+# Visual Studio Version 18
+VisualStudioVersion = 18.7.12002.237 oobstable
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "29WxOrderAllBase", "AllBase\29WxOrderAllBase.csproj", "{6461D807-B1C8-45F0-B388-E0CA1A418DE0}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "29供应链-微信小店拍单", "29供应链-微信小店拍单", "{1A7830FA-AC8F-40FB-A232-F0626812B8BE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "29WxOrder", "29WxOrder\29WxOrder.csproj", "{D51A1BB0-17BB-44C3-9129-1F3187E82729}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "29WxOrderWork", "Work\29WxOrderWork.csproj", "{1AD45D66-6872-4522-ACF0-04E2C0514048}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "29WxOrderWpf", "29WxOrderWpf\29WxOrderWpf.csproj", "{D7884375-E42F-4B89-AA3A-D8E75508D8C7}"
@@ -43,22 +41,6 @@ Global
 		{6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Release|x64.Build.0 = Release|x64
 		{6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Release|x86.ActiveCfg = Release|x86
 		{6461D807-B1C8-45F0-B388-E0CA1A418DE0}.Release|x86.Build.0 = Release|x86
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|x64.ActiveCfg = Debug|x64
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|x64.Build.0 = Debug|x64
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Debug|x86.Build.0 = Debug|Any CPU
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Release|x64.ActiveCfg = Release|x64
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Release|x64.Build.0 = Release|x64
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Release|x86.ActiveCfg = Release|x86
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729}.Release|x86.Build.0 = Release|x86
 		{1AD45D66-6872-4522-ACF0-04E2C0514048}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1AD45D66-6872-4522-ACF0-04E2C0514048}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1AD45D66-6872-4522-ACF0-04E2C0514048}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
@@ -97,7 +79,6 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{6461D807-B1C8-45F0-B388-E0CA1A418DE0} = {4A54DC2A-B47C-4ED1-A482-EE60161DB2C3}
-		{D51A1BB0-17BB-44C3-9129-1F3187E82729} = {1A7830FA-AC8F-40FB-A232-F0626812B8BE}
 		{1AD45D66-6872-4522-ACF0-04E2C0514048} = {4A54DC2A-B47C-4ED1-A482-EE60161DB2C3}
 		{D7884375-E42F-4B89-AA3A-D8E75508D8C7} = {1A7830FA-AC8F-40FB-A232-F0626812B8BE}
 	EndGlobalSection
diff --git a/29WxOrderWpf/29WxOrderWpf.csproj b/29WxOrderWpf/29WxOrderWpf.csproj
index 246def0..4694fc4 100644
--- a/29WxOrderWpf/29WxOrderWpf.csproj
+++ b/29WxOrderWpf/29WxOrderWpf.csproj
@@ -55,7 +55,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>29_common_icon.ico</ApplicationIcon>
+    <ApplicationIcon>gear.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -168,6 +168,9 @@
     <Compile Include="Ctrls\ShopCtrls\ShopListCtrl.xaml.cs">
       <DependentUpon>ShopListCtrl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UserControls\UcWaterMarkTextBox.xaml.cs">
+      <DependentUpon>UcWaterMarkTextBox.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Windows\LoginWindows\LoginWindow.xaml.cs">
       <DependentUpon>LoginWindow.xaml</DependentUpon>
     </Compile>
@@ -179,7 +182,7 @@
       <DependentUpon>Icons.xaml</DependentUpon>
     </Compile>
     <Compile Include="UserControls\UcImageButton.cs" />
-    <Compile Include="UserControls\UcWaterMarkTextBox.cs" />
+    <Compile Include="UserControls\UcWaterMarkTextBox1.cs" />
     <Compile Include="UserControls\UcWindowBoxes.xaml.cs">
       <DependentUpon>UcWindowBoxes.xaml</DependentUpon>
     </Compile>
@@ -219,6 +222,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="UserControls\UcWaterMarkTextBox.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Windows\LoginWindows\LoginWindow.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -386,7 +393,9 @@
   <ItemGroup>
     <Resource Include="29_common_icon.ico" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Resource Include="gear.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/29WxOrderWpf/29WxOrderWpf.csproj.user b/29WxOrderWpf/29WxOrderWpf.csproj.user
index e56288b..e905d8d 100644
--- a/29WxOrderWpf/29WxOrderWpf.csproj.user
+++ b/29WxOrderWpf/29WxOrderWpf.csproj.user
@@ -9,6 +9,6 @@
     <ErrorReportUrlHistory />
     <FallbackCulture>zh-CN</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
index 8311a37..aa33f75 100644
--- a/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/BuyerCtrls/PDDBuyerOrderReadCtrl.xaml.cs
@@ -590,6 +590,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
             }
             pdd_order.TransitCreateTime = wx_transit_order?.created_time ?? DateTime.MinValue;
             pdd_order.TransitPickupTime = wx_transit_order?.pickup_time ?? DateTime.MaxValue.AddMonths(-1);
+            pdd_order.TransitWarehouseRawMessage = wx_transit_order?.raw_message;
         }
 
 
@@ -748,6 +749,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
                         order.TransitCreateTime = o.TransitCreateTime;
                         order.TransitPickupTime = o.TransitPickupTime;
 
+                        order.TransitWarehouseRawMessage = o.TransitWarehouseRawMessage;
                         order.WxOrderCreateTime = o.WxOrderCreateTime;
                         order.ShopOrderIdStr = o.ShopOrderIdStr;
                         order.ShopOrderSkuIdStr = o.ShopOrderSkuIdStr;
@@ -800,7 +802,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
                     //SendOrderE57(order);
                     //if (order.sendStatus.ParseToString().Contains("售后"))
 
-                    if (order.order_sn == "260706-681553467002665")
+                    if (order.order_sn == "260711-223346705920980")
                     {
 
                     }
@@ -813,6 +815,14 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
                             var afterSaleRst = PddAutoAfterSale(order);
                         }
                     }
+                    if (order.TransitWarehouseRawMessage.ParseToString().Contains("超出派送范围"))
+                    {
+                        if (!",2,3,4,5,7,8,10,31,".Contains("," + (order.after_sales?.after_sales_status).ParseToString() + ","))
+                        {
+                            // 待发货直接售后，并通知中转仓接口修改退货状态
+                            var afterSaleRst = PddAutoAfterSale(order);
+                        }
+                    }
 
                     // 根据订单状态 取号/修改取号
                     SendTransitOrderE57(order);
@@ -1029,6 +1039,10 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
 
                 if (isUpdate)
                 {
+                    if (afterSale.ShopOrderIdStr == "3737682397646176256")
+                    {
+
+                    }
                     // 如果买手退款成功，仓库不是买手退款成功，则修改仓库售后字段为买手退款成功
                     if (afterSale.AfterSaleStatusStr.Contains("退款成功") || afterSale.AfterSaleStatusStr.Contains("交易已取消"))
                     {
@@ -1048,7 +1062,7 @@ namespace _29WxOrderWpf.Ctrls.BuyerCtrls
                         }
                     }
                     // 如果中转仓表买手售后状态不等于买手售后单售后，更新仓库买手售后状态
-                    else if (afterSale.TransitBuyerOrderRefundStatus != afterSale.AfterSaleStatusStr)
+                    else if (afterSale.TransitBuyerOrderRefundStatus != "买手退款成功" && afterSale.TransitBuyerOrderRefundStatus != afterSale.AfterSaleStatusStr)
                     { 
                         //if (!afterSale.AfterSaleStatusStr.Contains("关闭") && !afterSale.AfterSaleStatusStr.Contains("撤销") && !afterSale.AfterSaleStatusStr.Contains("失败"))
                         var orderTmp = new PddBuyerOrderLiteInfo() { ShopOrderIdStr = afterSale.ShopOrderIdStr, order_sn = afterSale.orderSn };
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
index 6f768f3..a3abb31 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
@@ -21,11 +21,11 @@
         </Grid.RowDefinitions>
         <Grid x:Name="gridSearch" Margin="8,0,8,0">
             <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"></ColumnDefinition>
-                <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="*"></ColumnDefinition>
-                <ColumnDefinition Width="Auto"></ColumnDefinition>
                 <ColumnDefinition Width="*"></ColumnDefinition>
+                <ColumnDefinition Width="*"></ColumnDefinition>
+                <ColumnDefinition Width="*"></ColumnDefinition>
+                <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
                 <ColumnDefinition Width="0.8*"></ColumnDefinition>
                 <ColumnDefinition Width="0.8*"></ColumnDefinition>
@@ -33,60 +33,62 @@
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
                 <ColumnDefinition Width="*"></ColumnDefinition>
-                <ColumnDefinition x:Name="grid12" Width="*"></ColumnDefinition>
-                <ColumnDefinition Width="Auto"></ColumnDefinition>
+                <ColumnDefinition Width="*"></ColumnDefinition>
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
             </Grid.ColumnDefinitions>
 
-            <usercontrols:UcWaterMarkTextBox x:Name="txtOrderId" WaterMark="" DataContext="{Binding ElementName=txtOrderId,Path=DataContext}" Grid.Column="1" Margin="0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center"
-                    Style="{StaticResource BaseRoundCornerTextBoxStyle}" Grid.ColumnSpan="1" />
-            <TextBlock Text="店铺单号" Grid.Column="1" Margin="4,0,4,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtOrderId,Path=Text,Converter={StaticResource NotHasTextVisibility}}" Grid.ColumnSpan="1"></TextBlock>
 
-            <usercontrols:UcWaterMarkTextBox x:Name="txtShopName" Grid.Column="2" Margin="8,0,20,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" 
-                                             VerticalContentAlignment="Center" Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
-            <TextBlock Text="全部店铺" Grid.Column="2" Margin="12,0,24,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" 
-                       Visibility="{Binding ElementName=txtShopName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
-            <Button Grid.Column="2" x:Name="btnMultiShopChoice" Style="{StaticResource BasePageButtonStyle}" HorizontalAlignment="Right" Margin="0" Content=" ... " Width="28" Height="28" Click="btnMultiShopChoice_Click"/>
+            <usercontrols:UcWaterMarkTextBox Grid.Column="0" x:Name="txtOrderId" Margin="0,0,8,0" Height="28" WaterMark="店铺单号" />
+            
+            <usercontrols:UcWaterMarkTextBox Grid.Column="1" x:Name="txtSearchAll" Margin="0,0,8,0" Height="28" WaterMark="买手/仓库/退货物流 采购/退款单号" TextChanged="txtSearchAll_TextChanged"/>
+            
 
-            <TextBox x:Name="txtGoodsName" Grid.Column="4" Margin="8,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center" 
-                     Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
-            <TextBlock Text="商品标题" Grid.Column="4" Margin="12,0,0,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtGoodsName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
+            <usercontrols:UcWaterMarkTextBox Grid.Column="2" x:Name="txtGoodsName" Margin="0,0,8,0" Height="28" WaterMark="商品标题" />
 
-            <ComboBox Grid.Column="5" x:Name="cmbUserNameMobile" Margin="12,0,4,0" VerticalContentAlignment="Center" Style="{StaticResource BaseComboBoxStyle}" Width="70" Height="28" Text="成交时间"/>
-            <Border Grid.Column="5" Margin="8,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="4,0,0,4"/>
+            <usercontrols:UcWaterMarkTextBox x:Name="txtShopName" Grid.Column="3" Margin="0,0,-6,0" Height="28" WaterMark="全部店铺" TextWrapping="NoWrap"/>
+            <Button Grid.Column="4" x:Name="btnMultiShopChoice" Style="{StaticResource BasePageButtonLeftSquareStyle}" HorizontalAlignment="Left" VerticalAlignment="Center"
+                    Margin="0,0,8,0" Content=" ... " Width="28" Height="28" Click="btnMultiShopChoice_Click"/>
+
+            <ComboBox Grid.Column="5" x:Name="cmbUserNameMobile" Margin="4,0,4,0" VerticalContentAlignment="Center" BorderBrush="Transparent" Style="{StaticResource RoundedComboBox}"
+                      Width="70" Height="28" Text="成交时间" SelectedIndex="0">
+                <ComboBoxItem>
+                    <TextBlock>成交时间</TextBlock>
+                </ComboBoxItem>
+            </ComboBox>
+            <Border Grid.Column="5" Margin="0,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="4,0,0,4"/>
             <Border Grid.Column="6" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="0,0,0,0" Margin="0,0,10,0"/>
-            <DatePicker x:Name="dateStart" Grid.Column="6" Margin="0,0,14,0" VerticalAlignment="Center" BorderThickness="0" />
+            <DatePicker Grid.Column="6" x:Name="dateStart" Margin="0,0,14,0" VerticalAlignment="Center" BorderThickness="0" />
 
             <Border Grid.Column="7" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="0,4,4,0" Margin="-10,0,0,0"/>
-            <DatePicker x:Name="dateEnd" Grid.Column="7"  Margin="10,0,4,0" VerticalAlignment="Center" BorderThickness="0" />
+            <DatePicker Grid.Column="7" x:Name="dateEnd" Margin="10,0,4,0" VerticalAlignment="Center" BorderThickness="0" />
             <CheckBox Grid.Column="7" x:Name="chkEndDate" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="-6,0"/>
 
-            <Button Grid.Column="8" x:Name="btnFilter" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,0,0" Content="过滤" MinWidth="48" Height="28" Click="btnFilter_Click" Padding="4"/>
-            <Button Grid.Column="9" x:Name="btnSearch" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,4,0" Content="读单" MinWidth="48" Height="28" Click="btnSearch_Click" Padding="4" IsEnabled="False"/>
-            
-            <WrapPanel Grid.Column="10" VerticalAlignment="Center">
+            <Button Grid.Column="8" x:Name="btnFilter" Style="{StaticResource BasePageButtonStyle}" Margin="8,0,0,0" Content="过滤" MinWidth="48" Height="28" Click="btnFilter_Click" Padding="4"/>
+            <Button Grid.Column="9" x:Name="btnSearch" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,4,0" Content="读单" MinWidth="78" Height="28" Click="btnSearch_Click" Padding="4" IsEnabled="False"/>
+
+            <WrapPanel Grid.Column="10" VerticalAlignment="Center" Width="92">
                 <Image x:Name="imgLoading" Grid.Column="10" Source="{StaticResource imgLoadingPic}" Width="20" Height="20" Margin="0" IsEnabled="False">
-                <Image.RenderTransform>
-                    <RotateTransform Angle="45" CenterX="10" CenterY="10"/>
-                </Image.RenderTransform>
-                <Image.Triggers>
-                    <EventTrigger RoutedEvent="Image.Loaded">
-                        <BeginStoryboard>
-                            <Storyboard>
-                                <DoubleAnimation Storyboard.TargetName="imgLoading" 
+                    <Image.RenderTransform>
+                        <RotateTransform Angle="45" CenterX="10" CenterY="10"/>
+                    </Image.RenderTransform>
+                    <Image.Triggers>
+                        <EventTrigger RoutedEvent="Image.Loaded">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <DoubleAnimation Storyboard.TargetName="imgLoading" 
                                                  Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" 
                                                  From="0"
                                                  To="360"
                                                  Duration="0:0:3" 
                                                  RepeatBehavior="Forever">
-                                </DoubleAnimation>
-                            </Storyboard>
-                        </BeginStoryboard>
-                    </EventTrigger>
-                </Image.Triggers>
-            </Image>
-            <CheckBox Content="自动读单" x:Name="chkAutoReadOrder" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
+                                    </DoubleAnimation>
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </EventTrigger>
+                    </Image.Triggers>
+                </Image>
+                <CheckBox Content="自动读单" x:Name="chkAutoReadOrder" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
                           Margin="2,0" VerticalAlignment="Center" Checked="chkAutoReadBuyerOrder_CheckedChanged" Unchecked="chkAutoReadBuyerOrder_CheckedChanged" IsChecked="true"/>
             </WrapPanel>
         </Grid>
@@ -143,7 +145,7 @@
                         </Setter>
                     </Style>
                 </TabControl.Resources>
-                <TabItem Header="待采购" BorderBrush="Transparent" Background="Transparent" MinWidth="100" SizeChanged="TabItem_SizeChanged">
+                <TabItem Header="待采购" BorderBrush="Transparent" Background="Transparent" MinWidth="60" SizeChanged="TabItem_SizeChanged">
                     <Border BorderBrush="#e0e0e0" BorderThickness="0,0,0,1" Margin="4,0,4,4">
                         <Grid>
                             <Grid.ColumnDefinitions>
@@ -158,29 +160,103 @@
                         </Grid>
                     </Border>
                 </TabItem >
-                <TabItem Header="待发货" MinWidth="100" SizeChanged="TabItem_SizeChanged"></TabItem>
-                <TabItem Header="待收货" MinWidth="100" BorderBrush="Transparent" Background="Transparent" SizeChanged="TabItem_SizeChanged"></TabItem>
-                <TabItem Header="退款单" MinWidth="100" Foreground="#FF9966" BorderBrush="Transparent" Background="Transparent" SizeChanged="TabItem_SizeChanged"></TabItem>
-                <TabItem Header="紧急单" MinWidth="100" Foreground="#FF6666" BorderBrush="Transparent" Background="#FF6666" SizeChanged="TabItem_SizeChanged">
+                <TabItem Header="待发货" MinWidth="60" SizeChanged="TabItem_SizeChanged"></TabItem>
+                <TabItem Header="待收货" MinWidth="60" BorderBrush="Transparent" Background="Transparent" SizeChanged="TabItem_SizeChanged">
                     <Border BorderBrush="#e0e0e0" BorderThickness="0,0,0,1" Margin="4,0,4,4">
                         <Grid>
                             <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
                                 <ColumnDefinition Width="auto"></ColumnDefinition>
                                 <ColumnDefinition Width="auto"></ColumnDefinition>
                                 <ColumnDefinition Width="*"></ColumnDefinition>
                             </Grid.ColumnDefinitions>
-                            <CheckBox Content="买手需手动退货" x:Name="chkWaitOperate" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
-                                      VerticalAlignment="Center" Margin="6,8" Click="chkWaitOperate_Click"/>
+                            <CheckBox Content="买手未发货" x:Name="chkWaitReceiveBuyerIsNotSend" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
+                                        VerticalAlignment="Center" Margin="6,8" Click="chkWaitReceiveBuyerStatus_Click"/>
+                            <CheckBox Content="买手已发货" x:Name="chkWaitReceiveBuyerIsSend" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
+                                        Grid.Column="1" VerticalAlignment="Center" Margin="6,8" Click="chkWaitReceiveBuyerStatus_Click"/>
+                            <CheckBox Content="货物已入库" x:Name="chkWaitReceiveBuyerIsInWarehouse" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
+                                        Grid.Column="2" VerticalAlignment="Center" Margin="6,8" Click="chkWaitReceiveBuyerStatus_Click"/>
+                            <Polyline Grid.Column="3" Width="10" Margin="5,0" StrokeThickness="2" Stroke="{StaticResource mainColorBrush}" Points="5,0 5,8 5,0" VerticalAlignment="Center"/>
+
+                            <CheckBox Content="中转未取号" x:Name="chkWaitReceiveWarehouseIsNotPickup" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
+                                        Grid.Column="4" VerticalAlignment="Center" Margin="6,8" Click="chkWaitReceiveWarehouseStatus_Click" Visibility="Collapsed"/>
+                            <CheckBox Content="中转已取号" x:Name="chkWaitReceiveWarehouseIsPickup" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
+                                        Grid.Column="5" VerticalAlignment="Center" Margin="6,8" Click="chkWaitReceiveWarehouseStatus_Click"/>
+                            <CheckBox Content="中转已出库" x:Name="chkWaitReceiveWarehouseIsSendOut" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
+                                        Grid.Column="6" VerticalAlignment="Center" Margin="6,8" Click="chkWaitReceiveWarehouseStatus_Click"/>
                         </Grid>
                     </Border>
                 </TabItem>
-                <TabItem Header="异常单" MinWidth="100" Foreground="#FFEE0099" BorderBrush="Transparent" Background="Transparent" SizeChanged="TabItem_SizeChanged"></TabItem>
-                <TabItem Header="全部订单" MinWidth="110" BorderBrush="Transparent" Background="Transparent" SizeChanged="TabItem_SizeChanged"></TabItem>
+                <TabItem Header="异常订单" MinWidth="60" Foreground="#FFEE0099" BorderBrush="Transparent" Background="Transparent" SizeChanged="TabItem_SizeChanged"></TabItem>
+                <TabItem Header="需处理售后订单" MinWidth="60" Foreground="#FF6666" BorderBrush="Transparent" Background="#FF6666" SizeChanged="TabItem_SizeChanged">
+                    <Border BorderBrush="#e0e0e0" BorderThickness="0,0,0,1" Margin="4,0,4,4">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="*"></ColumnDefinition>
+                            </Grid.ColumnDefinitions>
+                            <CheckBox Grid.Column="0" Content="买手待申请售后" x:Name="chkEmergencyBuyerWaitAfterSale" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyBuyerAfterSale_Click"/>
+                            <CheckBox Grid.Column="1" Content="买手待退货" x:Name="chkEmergencyBuyerWaitSendBack" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyBuyerAfterSale_Click"/>
+                            <CheckBox Grid.Column="2" Content="买手已寄出待商家退款" x:Name="chkEmergencyBuyerWaitSupplierRefund" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyBuyerAfterSale_Click"/>
+                            <CheckBox Grid.Column="3" Content="买手退款失败" x:Name="chkEmergencyBuyerRefundFail" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyBuyerAfterSale_Click"/>
+                            <Polyline Grid.Column="4" Width="10" Margin="5,0" StrokeThickness="2" Stroke="{StaticResource mainColorBrush}" Points="5,0 5,8 5,0" VerticalAlignment="Center"/>
+
+                            <CheckBox Grid.Column="5" Content="店铺客户有退货单号" x:Name="chkEmergencyShopCustomRefundHasWaybill" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyShopCustomRefundWaybill_Click"/>
+                            <CheckBox Grid.Column="6" Content="店铺客户无退货单号" x:Name="chkEmergencyShopCustomRefundNoWaybill" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyShopCustomRefundWaybill_Click"/>
+                            <Polyline Grid.Column="7" Width="10" Margin="5,0" StrokeThickness="2" Stroke="{StaticResource mainColorBrush}" Points="5,0 5,8 5,0" VerticalAlignment="Center"/>
+
+                            <CheckBox Grid.Column="8" Content="店铺退款完成" x:Name="chkEmergencyShopAfterSaleSuccess" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyShopAfterSale_Click"/>
+                            <CheckBox Grid.Column="9" Content="店铺退款中" x:Name="chkEmergencyShopInAfterSale" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkEmergencyShopAfterSale_Click"/>
+                        </Grid>
+                    </Border>
+                </TabItem>
+                <TabItem Header="售后完成订单" MinWidth="60" Foreground="#FF9966" BorderBrush="Transparent" Background="Transparent" SizeChanged="TabItem_SizeChanged">
+                    <Border BorderBrush="#e0e0e0" BorderThickness="0,0,0,1" Margin="4,0,4,4">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="auto"></ColumnDefinition>
+                                <ColumnDefinition Width="*"></ColumnDefinition>
+                            </Grid.ColumnDefinitions>
+                            <CheckBox Grid.Column="0" Content="未发货退货完成" x:Name="chkAftersaleIsNotSend" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkAftersaleSendStatus_Click"/>
+                            <CheckBox Grid.Column="1" Content="已发货退款完成" x:Name="chkAftersaleIsSend" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkAftersaleSendStatus_Click"/>
+                            <Polyline Grid.Column="2" Width="10" Margin="5,0" StrokeThickness="2" Stroke="{StaticResource mainColorBrush}" Points="5,0 5,8 5,0" VerticalAlignment="Center"/>
+
+                            <CheckBox Grid.Column="3" Content="买手号已拍单" x:Name="chkAftersaleBuyerIsBuy" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkAftersaleBuyerStatus_Click"/>
+                            <Polyline Grid.Column="4" Width="10" Margin="5,0" StrokeThickness="2" Stroke="{StaticResource mainColorBrush}" Points="5,0 5,8 5,0" VerticalAlignment="Center"/>
+                            
+                            <CheckBox Grid.Column="5" Content="中转仓未取号" x:Name="chkAftersaleWarehouseIsNotPickup" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkAftersaleWarehouseStatus_Click"/>
+                            <CheckBox Grid.Column="6" Content="中转仓已取号" x:Name="chkAftersaleWarehouseIsPickup" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" VerticalAlignment="Center" Margin="6,8" Click="chkAftersaleWarehouseStatus_Click"/>
+                        </Grid>
+                    </Border>
+                </TabItem>
+                <TabItem Header="全部订单" MinWidth="60" BorderBrush="Transparent" Background="Transparent" SizeChanged="TabItem_SizeChanged"></TabItem>
                 <!--<TabItem Header="发货异常">
                     <Grid Background="#FFE5E5E5"/>
                 </TabItem>-->
             </TabControl>
-            <WrapPanel x:Name="wpFilter"  Margin="720,6,0,0" VerticalAlignment="Top">
+            <WrapPanel x:Name="wpFilter"  Margin="630,6,0,0" VerticalAlignment="Top">
                 <CheckBox Content="过滤非中转仓订单" x:Name="chkOnlyWarehouseOrder" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
                           Margin="0,0,0,0" VerticalAlignment="Top" Checked="chkSubFilterSonditions_Checked" Unchecked="chkSubFilterSonditions_Checked" IsChecked="true"/>
                 <CheckBox Content="过滤多件商品订单" x:Name="chkNoMultiOrder" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
index 739b6f9..e50e3e3 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
@@ -39,6 +39,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
         public bool IsAutoReadOrder = true;
         public DateTime nextGetOrderTime = DateTime.MinValue;
 
+        public string strSearchAll = "";
+
         public OrderListCtrl()
         {
             InitializeComponent();
@@ -50,7 +52,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 
             lbxOrder.ItemsSource = GlobalConfig.lstFilterOrder;
 
-            dateStart.SelectedDate = DateTime.Now.Date.AddDays(-7);
+            dateStart.SelectedDate = DateTime.Now.Date.AddDays(-10);
             dateEnd.SelectedDate = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
 
             AutoGetOrder();
@@ -228,7 +230,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                 } 
                 catch { }
 
-
                 // 读取暂时记录的买手订单，后面想办法放到中转订单库里去
                 // 读取中转仓拍单订单
                 var url4 = BaseClass.Build29WxObjString("order/wx_get_buyer_order_list");
@@ -303,15 +304,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                     try
                     {
                         oms_wei_order_info order = null;
-
-                        Dispatcher.Invoke(new Action(() =>
-                        {
-                            order = JsonHelper.DeserializeJsonToObject<oms_wei_order_info>(JsonHelper.SerializeObject(jObj));
-                            if (order.order_id == "3737596572558051840")
-                            {
-
-                            }
-                        }));
+                        order = JsonHelper.DeserializeJsonToObject<oms_wei_order_info>(JsonHelper.SerializeObject(jObj));
 
                         //装载订单商品详情
                         order.orderItems = new ObservableCollection<oms_wei_order_item_info>();
@@ -354,14 +347,17 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                         // 读取订单后立即赋值，防止滚动时实时赋值造成卡顿
                         foreach (var orderItem in order.orderItems)
                         {
-                            orderItem.SetTransitOrder();
-                            orderItem.SetItemRefund();
+                            orderItem.Dispatcher = this.Dispatcher;
+                            orderItem.SetOrderItemTextProperty();
                         }
 
                         // 删除再添加，触发更新。 todo: 如果已存在相同订单，则直接修改更新
                         var orderExist = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
-                        if (orderExist != null)
+                        while (orderExist != null)
+                        {
                             GlobalConfig.lstOrder.Remove(orderExist);
+                            orderExist = GlobalConfig.lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
+                        }
 
                         var nextOrder = GlobalConfig.lstOrder.FirstOrDefault(o => o.create_time < order.create_time);
                         if (nextOrder != null)
@@ -413,37 +409,43 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             if (tabItem != null)
             {
                 var filteLstTmp = new ObservableCollection<oms_wei_order_info>(userOrderLst.Where(o => !GetOrderIsFilter(o, "待采购")));
-                tabItem.Header = "待采购(" + userOrderLst.Where(r => r.IsWaitBuy).Count() + "|" + filteLstTmp.Where(r => r.IsWaitBuy).Count() + ")";
+                //tabItem.Header = "待采购(" + userOrderLst.Where(r => r.IsWaitBuy).Count() + "|" + filteLstTmp.Where(r => r.IsWaitBuy).Count() + ")";
+                tabItem.Header = "待采购(" + userOrderLst.Where(r => r.IsWaitBuy).Count() + "|" + filteLstTmp.Count() + ")";
             }
             tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待发货"));
             if (tabItem != null)
             {
                 var filteLstTmp = new ObservableCollection<oms_wei_order_info>(userOrderLst.Where(o => !GetOrderIsFilter(o, "待发货")));
-                tabItem.Header = "待发货(" + userOrderLst.Where(r => r.IsWaitSend).Count() + "|" + filteLstTmp.Where(r => r.IsWaitSend).Count() + ")";
+                //tabItem.Header = "待发货(" + userOrderLst.Where(r => r.IsWaitSend).Count() + "|" + filteLstTmp.Where(r => r.IsWaitSend).Count() + ")";
+                tabItem.Header = "待发货(" + userOrderLst.Where(r => r.IsWaitSend).Count() + "|" + filteLstTmp.Count() + ")";
             }
             tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("待收货"));
             if (tabItem != null)
             {
                 var filteLstTmp = new ObservableCollection<oms_wei_order_info>(userOrderLst.Where(o => !GetOrderIsFilter(o, "待收货")));
-                tabItem.Header = "待收货(" + userOrderLst.Where(r => r.IsWaitReceive).Count() + "|" + filteLstTmp.Where(r => r.IsWaitReceive).Count() + ")";
+                //tabItem.Header = "待收货(" + userOrderLst.Where(r => r.IsWaitReceive).Count() + "|" + filteLstTmp.Where(r => r.IsWaitReceive).Count() + ")";
+                tabItem.Header = "待收货(" + userOrderLst.Where(r => r.IsWaitReceive).Count() + "|" + filteLstTmp.Count() + ")";
             }
-            tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("退款单"));
+            tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("售后完成订单"));
             if (tabItem != null)
             {
-                var filteLstTmp = new ObservableCollection<oms_wei_order_info>(userOrderLst.Where(o => !GetOrderIsFilter(o, "退款单")));
-                tabItem.Header = "退款单(" + userOrderLst.Where(r => r.IsRefund).Count() + "|" + filteLstTmp.Where(r => r.IsRefund).Count() + ")";
+                var filteLstTmp = new ObservableCollection<oms_wei_order_info>(userOrderLst.Where(o => !GetOrderIsFilter(o, "售后完成订单")));
+                //tabItem.Header = "售后完成订单(" + userOrderLst.Where(r => r.IsRefund).Count() + "|" + filteLstTmp.Where(r => r.IsRefund).Count() + ")";
+                tabItem.Header = "售后完成订单(" + userOrderLst.Where(r => r.IsRefund).Count() + "|" + filteLstTmp.Count() + ")";
             }
-            tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("紧急单"));
+            tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("需处理售后订单"));
             if (tabItem != null)
             {
-                var filteLstTmp = new ObservableCollection<oms_wei_order_info>(userOrderLst.Where(o => !GetOrderIsFilter(o, "紧急单")));
-                tabItem.Header = "紧急单(" + userOrderLst.Where(r => r.IsEmergency).Count() + "|" + filteLstTmp.Where(r => r.IsEmergency).Count() + ")";
+                var filteLstTmp = new ObservableCollection<oms_wei_order_info>(userOrderLst.Where(o => !GetOrderIsFilter(o, "需处理售后订单")));
+                //tabItem.Header = "需处理售后订单(" + userOrderLst.Where(r => r.IsEmergency).Count() + "|" + filteLstTmp.Where(r => r.IsEmergency).Count() + ")";
+                tabItem.Header = "需处理售后订单(" + userOrderLst.Where(r => r.IsEmergency).Count() + "|" + filteLstTmp.Count() + ")";
             }
-            tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("异常单"));
+            tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("异常订单"));
             if (tabItem != null)
             {
-                var filteLstTmp = new ObservableCollection<oms_wei_order_info>(userOrderLst.Where(o => !GetOrderIsFilter(o, "异常单")));
-                tabItem.Header = "异常单(" + userOrderLst.Where(r => r.isAbnormal).Count() + "|" + filteLstTmp.Where(r => r.isAbnormal).Count() + ")";
+                var filteLstTmp = new ObservableCollection<oms_wei_order_info>(userOrderLst.Where(o => !GetOrderIsFilter(o, "异常订单")));
+                //tabItem.Header = "异常订单(" + userOrderLst.Where(r => r.isAbnormal).Count() + "|" + filteLstTmp.Where(r => r.isAbnormal).Count() + ")";
+                tabItem.Header = "异常订单(" + userOrderLst.Where(r => r.isAbnormal).Count() + "|" + filteLstTmp.Count() + ")";
             }
             tabItem = tabItems.FirstOrDefault(t => t.Header.ParseToString().StartsWith("全部订单"));
             if (tabItem != null)
@@ -490,12 +492,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 
         public void FilterOneOrder(oms_wei_order_info order, bool updateTabCount = false)
         {
+            var orderExist = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.order_id == order.order_id);
+            while (orderExist != null)
+            {
+                GlobalConfig.lstFilterOrder.Remove(orderExist);
+                orderExist = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.order_id == order.order_id);
+            }
+
             if (!GetOrderIsFilter(order))
             {
-                var orderExist = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.order_id == order.order_id);
-                if (orderExist != null)
-                    GlobalConfig.lstFilterOrder.Remove(orderExist);
-
                 var nextOrder = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.create_time < order.create_time);
                 if (nextOrder != null)
                 {
@@ -524,6 +529,31 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             if (!GlobalConfig.ShopLoginList.Any(s => s.ErpShopId.ParseToLong() == order.shop_id))
                 return true;
 
+            if (!string.IsNullOrEmpty(strSearchAll))
+            {
+                bool isFilter = true;
+                // 买手物流
+                if (order.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.express_1_waybill.ParseToString().Contains(strSearchAll))))
+                    isFilter = false;
+                // 仓库物流
+                else if (order.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.express_2_waybill.ParseToString().Contains(strSearchAll))))
+                    isFilter = false;
+                // 退货物流
+                else if (order.refundItems.Any(ri => ri.return_waybill_id.ParseToString().Contains(strSearchAll)))
+                    isFilter = false;
+                // 退货单号
+                else if (order.refundItems.Any(ri => ri.after_sale_order_id.ParseToString().Contains(strSearchAll)))
+                    isFilter = false;
+                // 仓库采购单号
+                else if (order.orderItems.Any(oi => oi.ItemTransitOrders.Any(t => t.out_order_no.ParseToString().Contains(strSearchAll))))
+                    isFilter = false;
+                // 仓库退款单号
+                else if (order.orderItems.Any(oi => oi.ItemTransitOrderAfterSales.Any(t => t.refund_waybill.ParseToString().Contains(strSearchAll))))
+                    isFilter = false;
+                if (isFilter)
+                    return true;
+            }
+
             // 过滤店铺名称
             if (!string.IsNullOrEmpty(txtShopName.Text.Trim()) && !(";" + txtShopName.Text.Trim() + ";").Contains(";" + order.shop_name + ";"))
             {
@@ -549,6 +579,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             {
                 return true;
             }
+
+            // 过滤时间范围
             if (order.createDateTime < dateStart.SelectedDate.Value)
                 return true;
             if (chkEndDate.IsChecked == true && order.createDateTime > dateEnd.SelectedDate.Value)
@@ -577,24 +609,70 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             {
                 return true;
             }
-            if (filterHeadStr.StartsWith("待收货") && !order.IsWaitReceive)
+            if (filterHeadStr.StartsWith("待收货"))
+            {
+                if (!order.IsWaitReceive)
+                    return true;
+
+                if (chkWaitReceiveBuyerIsNotSend.IsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手未发货"))
+                    return true;
+                if (chkWaitReceiveBuyerIsSend.IsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "买手已发货"))
+                    return true;
+                if (chkWaitReceiveBuyerIsInWarehouse.IsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr != "已到中转仓"))
+                    return true;
+
+                if (chkWaitReceiveWarehouseIsNotPickup.IsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转待取号"))
+                    return true;
+                if (chkWaitReceiveWarehouseIsPickup.IsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转提前取号" && oi.WarehouseWaybillStatusStr != "中转已取号" && oi.WarehouseWaybillStatusStr != "中转已入库"))
+                    return true;
+                if (chkWaitReceiveWarehouseIsSendOut.IsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转已出库"))
+                    return true;
+            }
+            if (filterHeadStr.StartsWith("异常订单") && !order.isAbnormal)
             {
                 return true;
             }
-            if (filterHeadStr.StartsWith("退款单") && !order.IsRefund)
-            {
-                return true;
-            }
-            if (filterHeadStr.StartsWith("紧急单"))
+            if (filterHeadStr.StartsWith("需处理售后订单"))
             {
                 if (!order.IsEmergency)
                     return true;
-                if (chkWaitOperate.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后")))
+
+                if (chkEmergencyBuyerWaitAfterSale.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("需手动申请售后")))
+                    return true;
+                else if (chkEmergencyBuyerWaitSendBack.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("待用户发货")))
+                    return true;
+                else if (chkEmergencyBuyerWaitSupplierRefund.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("商家处理中")))
+                    return true;
+                else if (chkEmergencyBuyerRefundFail.IsChecked == true && order.orderItems.All(oi => !oi.TransitRefundStatusStr.Contains("退款失败")))
+                    return true;
+
+                if (chkEmergencyShopCustomRefundHasWaybill.IsChecked == true && order.orderItems.Any(oi => oi.ReturnWaybillIdStr.IsNullOrEmpty()))
+                    return true;
+                else if (chkEmergencyShopCustomRefundNoWaybill.IsChecked == true && order.orderItems.All(oi => !oi.ReturnWaybillIdStr.IsNullOrEmpty()))
+                    return true;
+
+                if (chkEmergencyShopAfterSaleSuccess.IsChecked == true && order.DeliveryDeadlineDtatusStr != "退款完成")
+                    return true;
+                else if (chkEmergencyShopInAfterSale.IsChecked == true && order.DeliveryDeadlineDtatusStr != "退款中")
                     return true;
             }
-            if (filterHeadStr.StartsWith("异常单") && !order.isAbnormal)
+            if (filterHeadStr.StartsWith("售后完成订单"))
             {
-                return true;
+                if (!order.IsRefund)
+                    return true;
+
+                if (chkAftersaleIsSend.IsChecked == true && !order.DeliveryDeadlineStr.Contains("已发货"))
+                    return true;
+                else if (chkAftersaleIsNotSend.IsChecked == true && !order.DeliveryDeadlineStr.Contains("未发货"))
+                    return true;
+
+                if (chkAftersaleBuyerIsBuy.IsChecked == true && order.orderItems.All(oi => oi.BuyerTransitWaybillStatusStr.IsNullOrEmpty()))
+                    return true;
+                if (chkAftersaleWarehouseIsNotPickup.IsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转待取号" && !oi.WarehouseWaybillStatusStr.Contains("取号异常")))
+                    return true;
+                if (chkAftersaleWarehouseIsPickup.IsChecked == true && order.orderItems.All(oi => oi.WarehouseWaybillStatusStr != "中转提前取号" && oi.WarehouseWaybillStatusStr != "中转已取号" && 
+                                                                                                     oi.WarehouseWaybillStatusStr != "中转已入库" && oi.WarehouseWaybillStatusStr != "中转已出库"))
+                    return true;
             }
 
             return false;
@@ -713,6 +791,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             chkSelectAll.Unchecked += ChkSelectAll_Unchecked;
         }
 
+        private void txtSearchAll_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            strSearchAll = txtSearchAll.Text.Trim();
+        }
+
         private void tabOrderType_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             GlobalConfig.OrderTabHeaderStr = ((tabOrderType.SelectedItem as TabItem)?.Header).ParseToString();
@@ -760,8 +843,105 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             FilterOrders();
         }
 
-        private void chkWaitOperate_Click(object sender, RoutedEventArgs e)
+        /// <summary>
+        /// 待处理订单买手售后状态过滤
+        /// </summary>
+        private void chkEmergencyBuyerAfterSale_Click(object sender, RoutedEventArgs e)
         {
+            if (sender is CheckBox chk)
+            {
+                var isCheck = !chk.IsChecked.ParseToBool();
+                chkEmergencyBuyerWaitAfterSale.IsChecked = chkEmergencyBuyerWaitSendBack.IsChecked = chkEmergencyBuyerWaitSupplierRefund.IsChecked = chkEmergencyBuyerRefundFail.IsChecked = false;
+                chk.IsChecked = !isCheck;
+            }
+            FilterOrders();
+        }
+        /// <summary>
+        /// 待处理订单店铺买家售后物流状态过滤
+        /// </summary>
+        private void chkEmergencyShopCustomRefundWaybill_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is CheckBox chk)
+            {
+                var isCheck = !chk.IsChecked.ParseToBool();
+                chkEmergencyShopCustomRefundHasWaybill.IsChecked = chkEmergencyShopCustomRefundNoWaybill.IsChecked = false;
+                chk.IsChecked = !isCheck;
+            }
+            FilterOrders();
+        }
+        /// <summary>
+        /// 待处理订单店铺售后状态过滤
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void chkEmergencyShopAfterSale_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is CheckBox chk)
+            {
+                var isCheck = !chk.IsChecked.ParseToBool();
+                chkEmergencyShopAfterSaleSuccess.IsChecked = chkEmergencyShopInAfterSale.IsChecked = false;
+                chk.IsChecked = !isCheck;
+            }
+            FilterOrders();
+        }
+
+        /// <summary>
+        /// 待收货 买手发货状态
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void chkWaitReceiveBuyerStatus_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is CheckBox chk)
+            {
+                var isCheck = !chk.IsChecked.ParseToBool();
+                chkWaitReceiveBuyerIsSend.IsChecked = chkWaitReceiveBuyerIsNotSend.IsChecked = chkWaitReceiveBuyerIsInWarehouse.IsChecked = false;
+                chk.IsChecked = !isCheck;
+            }
+            FilterOrders();
+        }
+
+        private void chkWaitReceiveWarehouseStatus_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is CheckBox chk)
+            {
+                var isCheck = !chk.IsChecked.ParseToBool();
+                chkWaitReceiveWarehouseIsNotPickup.IsChecked = chkWaitReceiveWarehouseIsPickup.IsChecked = chkWaitReceiveWarehouseIsSendOut.IsChecked = false;
+                chk.IsChecked = !isCheck;
+            }
+            FilterOrders();
+        }
+
+        private void chkAftersaleSendStatus_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is CheckBox chk)
+            {
+                var isCheck = !chk.IsChecked.ParseToBool();
+                chkAftersaleIsSend.IsChecked = chkAftersaleIsNotSend.IsChecked = false;
+                chk.IsChecked = !isCheck;
+            }
+            FilterOrders();
+        }
+
+        private void chkAftersaleBuyerStatus_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is CheckBox chk)
+            {
+                var isCheck = !chk.IsChecked.ParseToBool();
+                chkAftersaleBuyerIsBuy.IsChecked = false;
+                chk.IsChecked = !isCheck;
+            }
+            FilterOrders();
+        }
+
+        private void chkAftersaleWarehouseStatus_Click(object sender, RoutedEventArgs e)
+        {
+            if (sender is CheckBox chk)
+            {
+                var isCheck = !chk.IsChecked.ParseToBool();
+                chkAftersaleWarehouseIsPickup.IsChecked = chkAftersaleWarehouseIsNotPickup.IsChecked = false;
+                chk.IsChecked = !isCheck;
+            }
             FilterOrders();
         }
     }
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
index 453cd8d..591c21b 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
@@ -21,7 +21,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <TextBox Grid.Column="0" Margin="8,8,-4,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True" Text="店铺单号：" BorderThickness="0" />
-            <uc:UcWaterMarkTextBox Foreground="{StaticResource PageLinkBrush}" Cursor="Hand" WaterMark="订单号" x:Name="txtOrderId" Grid.Column="1" Margin="0,8,4,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True" Text="{Binding order_id}" BorderThickness="0" />
+            <uc:UcWaterMarkTextBox1 Foreground="{StaticResource PageLinkBrush}" Cursor="Hand" WaterMark="订单号" x:Name="txtOrderId" Grid.Column="1" Margin="0,8,4,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True" Text="{Binding order_id}" BorderThickness="0" />
             <Border Grid.Column="2" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand" 
                     Tag="{Binding order_id}" MouseLeftButtonDown="Path_MouseLeftButtonDown">
                 <Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" Tag="{Binding order_id}" MouseLeftButtonDown="Path_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
@@ -35,10 +35,10 @@
                     </Grid.ColumnDefinitions>
                     <Border x:Name="borderDeadlineHead" Background="#0397b5" CornerRadius="2,0,10,2">
                         <TextBox Grid.Column="0" Margin="2,0,2,1" Foreground="White" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" MinWidth="20"
-                                 Text="{Binding delivery_deadline_status_str}" BorderThickness="0" />
+                                 Text="{Binding DeliveryDeadlineDtatusStr}" BorderThickness="0" />
                     </Border>
                     <TextBox x:Name="txtDeadline" Grid.Column="1" Margin="2,0,2,1" Foreground="#0397b5" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" MinWidth="20" 
-                             Text="{Binding delivery_deadline_str}" BorderThickness="0" />
+                             Text="{Binding DeliveryDeadlineStr}" BorderThickness="0" />
                 </Grid>
             </Border>-->
             <Border x:Name="borderDeadline" Grid.Column="3" Margin="8,0,0,0" Background="{Binding StatusBoxBackColor}" BorderBrush="{Binding StatusBoxBorderColor}" BorderThickness="1" MinWidth="30" Height="24" CornerRadius="2">
@@ -49,20 +49,20 @@
                     </Grid.ColumnDefinitions>
                     <Border x:Name="borderDeadlineHead" Background="{Binding StatusBoxForeColor}" CornerRadius="2,0,10,2">
                         <TextBox Grid.Column="0" Margin="2,0,2,1" Foreground="White" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" MinWidth="20"
-                     Text="{Binding delivery_deadline_status_str}" BorderThickness="0" />
+                     Text="{Binding DeliveryDeadlineDtatusStr}" BorderThickness="0" />
                     </Border>
                     <TextBox x:Name="txtDeadline" Grid.Column="1" Margin="2,0,2,1" Foreground="{Binding StatusBoxForeColor}" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" MinWidth="20" 
-                 Text="{Binding delivery_deadline_str}" BorderThickness="0" />
+                 Text="{Binding DeliveryDeadlineStr}" BorderThickness="0" />
                 </Grid>
             </Border>
 
 
             <Image Margin="8,8,0,8" Grid.Column="4" Width="24" Height="24" Source="{StaticResource imgOrderWeishopIcon}"></Image>
-            <uc:UcWaterMarkTextBox WaterMark="店铺状态" x:Name="txtShopLoginStatus" Grid.Column="4" HorizontalAlignment="Right" Margin="0,12,-6,0" Padding="0" FontWeight="Bold"
+            <uc:UcWaterMarkTextBox1 WaterMark="店铺状态" x:Name="txtShopLoginStatus" Grid.Column="4" HorizontalAlignment="Right" Margin="0,12,-6,0" Padding="0" FontWeight="Bold"
                                    VerticalAlignment="Center" FontSize="7" Background="{StaticResource ListHeadBackColorBrush}" IsReadOnly="True"
                                    Text="{Binding order_item1.Shop.LoginStatusStr}" BorderThickness="0" 
                                    Foreground="{Binding  order_item1.Shop.LoginStatusStr, Converter={StaticResource statusToColorBrushConverter}}"/>
-            <uc:UcWaterMarkTextBox Foreground="{StaticResource PageLinkBrush}" Cursor="Hand" WaterMark="店铺名称" x:Name="txtShopName" Grid.Column="5" Margin="4,8,4,8" VerticalAlignment="Center" 
+            <uc:UcWaterMarkTextBox1 Foreground="{StaticResource PageLinkBrush}" Cursor="Hand" WaterMark="店铺名称" x:Name="txtShopName" Grid.Column="5" Margin="4,8,4,8" VerticalAlignment="Center" 
                                    FontSize="14" Background="Transparent" IsReadOnly="True" Text="{Binding shop_name}" BorderThickness="0" />
             
             
@@ -72,7 +72,7 @@
             </Border>
             
 
-            <uc:UcWaterMarkTextBox WaterMark="该订单共有 1 条不同商品记录" x:Name="txtCount" Grid.Column="8" Margin="8,8,0,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True" BorderThickness="0" />
+            <uc:UcWaterMarkTextBox1 WaterMark="该订单共有 1 条不同商品记录" x:Name="txtCount" Grid.Column="8" Margin="8,8,0,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True" BorderThickness="0" />
 
         </Grid>
     </Border>
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
index ab2dd63..30702b3 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
@@ -54,26 +54,26 @@
                     </Grid.RowDefinitions>
 
                     <!--<Image Grid.RowSpan="20" Grid.Column="0" Height="80" Width="80" Margin="0,0,8,0" Source="{DynamicResource imgErrPic}"></Image>-->
-                    <uc:UcWaterMarkTextBox WaterMark="商品名称" x:Name="txtGoodsName" Text="{Binding title}" Grid.Column="1" Grid.Row="1" Margin="0,2,4,2" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="商品名称" x:Name="txtGoodsName" Text="{Binding title}" Grid.Column="1" Grid.Row="1" Margin="0,2,4,2" 
                                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" FontWeight="Bold"/>
 
                     <TextBox Text="数量：" Grid.Column="1" Grid.Row="2" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                    <uc:UcWaterMarkTextBox WaterMark="SKU数量" Text="{Binding sku_cnt}" Grid.Column="1" Grid.Row="2" Margin="36,2,4,2" VerticalAlignment="Top" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="SKU数量" Text="{Binding sku_cnt}" Grid.Column="1" Grid.Row="2" Margin="36,2,4,2" VerticalAlignment="Top" 
                                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
 
                     <TextBox Text="规格：" Grid.Column="1" Grid.Row="3" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                    <uc:UcWaterMarkTextBox WaterMark="规格" Text="{Binding sku_attr_str}" Grid.Column="1" Grid.Row="3" Margin="36,2,4,2" VerticalAlignment="Top" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="规格" Text="{Binding sku_attr_str}" Grid.Column="1" Grid.Row="3" Margin="36,2,4,2" VerticalAlignment="Top" 
                                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
 
                     <TextBox Text="平台商品ID：" Grid.Column="1" Grid.Row="4" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                    <uc:UcWaterMarkTextBox WaterMark="平台商品ID" Text="{Binding product_id}" Grid.Column="1" Grid.Row="4" Margin="72,2,4,2" VerticalAlignment="Top" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="平台商品ID" Text="{Binding product_id}" Grid.Column="1" Grid.Row="4" Margin="72,2,4,2" VerticalAlignment="Top" 
                                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
 
                     <TextBox Text="系统商品ID：" Grid.Column="1" Grid.Row="5" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                    <uc:UcWaterMarkTextBox WaterMark="系统商品ID" Text="{Binding out_product_id}" Grid.Column="1" Grid.Row="5" Margin="72,2,4,2" VerticalAlignment="Top" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="系统商品ID" Text="{Binding out_product_id}" Grid.Column="1" Grid.Row="5" Margin="72,2,4,2" VerticalAlignment="Top" 
                                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
                     <TextBox Text="系统sku编码：" Grid.Column="1" Grid.Row="6" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                    <uc:UcWaterMarkTextBox WaterMark="系统sku编码" Text="{Binding out_sku_id}" Grid.Column="1" Grid.Row="6" Margin="78,2,4,2" VerticalAlignment="Top" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="系统sku编码" Text="{Binding out_sku_id}" Grid.Column="1" Grid.Row="6" Margin="78,2,4,2" VerticalAlignment="Top" 
                                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
                 </Grid>
             </Grid>
@@ -90,15 +90,15 @@
                     <RowDefinition Height="*"></RowDefinition>
                 </Grid.RowDefinitions>
                 <TextBox Text="成交时间：" Grid.Column="1" Grid.Row="1" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                <uc:UcWaterMarkTextBox WaterMark="成交时间" Text="{Binding ItemOrder.create_time_str}" Grid.Column="1" Grid.Row="1" Margin="60,2,4,2" VerticalAlignment="Top" 
+                <uc:UcWaterMarkTextBox1 WaterMark="成交时间" Text="{Binding ItemOrder.create_time_str}" Grid.Column="1" Grid.Row="1" Margin="60,2,4,2" VerticalAlignment="Top" 
                                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
                 <TextBox Text="发货时间：" Grid.Column="1" Grid.Row="2" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"
                                      Visibility="{Binding ItemOrder.ship_done_time_visibility}"/>
-                <uc:UcWaterMarkTextBox WaterMark="发货时间" Text="{Binding ItemOrder.ship_done_time_str}" Grid.Column="1" Grid.Row="2" Margin="60,2,4,2" VerticalAlignment="Top" 
+                <uc:UcWaterMarkTextBox1 WaterMark="发货时间" Text="{Binding ItemOrder.ship_done_time_str}" Grid.Column="1" Grid.Row="2" Margin="60,2,4,2" VerticalAlignment="Top" 
                                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Visibility="{Binding ItemOrder.ship_done_time_visibility}"/>
                 <TextBox Text="退款时间：" Grid.Column="1" Grid.Row="3" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"
                                      Visibility="{Binding RefundTimeVisibility}"/>
-                <uc:UcWaterMarkTextBox WaterMark="退款时间" Text="{Binding RefundTimeStr}" Grid.Column="1" Grid.Row="3" Margin="60,2,4,2" VerticalAlignment="Top" 
+                <uc:UcWaterMarkTextBox1 WaterMark="退款时间" Text="{Binding RefundTimeStr}" Grid.Column="1" Grid.Row="3" Margin="60,2,4,2" VerticalAlignment="Top" 
                                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Visibility="{Binding RefundTimeVisibility}"/>
             </Grid>
             <!--订单利润-->
@@ -116,33 +116,33 @@
                     <RowDefinition Height="*"></RowDefinition>
                 </Grid.RowDefinitions>
                 <TextBox Text="售价：" Grid.Column="1" Grid.Row="1" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                <uc:UcWaterMarkTextBox WaterMark="售价" Text="{Binding realPriceStr}" Grid.Column="1" Grid.Row="1" Margin="36,0,4,0" VerticalAlignment="Top" 
+                <uc:UcWaterMarkTextBox1 WaterMark="售价" Text="{Binding RealPriceStr}" Grid.Column="1" Grid.Row="1" Margin="36,0,4,0" VerticalAlignment="Top" 
                                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
                 <TextBox Text="平台优惠：" Grid.Column="1" Grid.Row="2" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                <uc:UcWaterMarkTextBox WaterMark="平台优惠" Text="{Binding cash_coupon_discounted_price_str}" Grid.Column="1" Grid.Row="2" Margin="60,0,4,0" VerticalAlignment="Top" 
+                <uc:UcWaterMarkTextBox1 WaterMark="平台优惠" Text="{Binding CashCouponDiscountedPriceStr}" Grid.Column="1" Grid.Row="2" Margin="60,0,4,0" VerticalAlignment="Top" 
                                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
                 <TextBox Text="进价：" Grid.Column="1" Grid.Row="3" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"
                                      Visibility="{Binding purchase_price_visibility}"/>
-                <uc:UcWaterMarkTextBox WaterMark="进价" Text="{Binding purchase_price_str}" Grid.Column="1" Grid.Row="3" Margin="36,0,4,0" VerticalAlignment="Top" 
+                <uc:UcWaterMarkTextBox1 WaterMark="进价" Text="{Binding purchase_price_str}" Grid.Column="1" Grid.Row="3" Margin="36,0,4,0" VerticalAlignment="Top" 
                                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Visibility="{Binding purchase_price_visibility}"/>
                 <TextBox Text="运费：" Grid.Column="1" Grid.Row="4" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"
                                      Visibility="{Binding freight_visibility}"/>
-                <uc:UcWaterMarkTextBox WaterMark="运费" Text="{Binding freight_str}" Grid.Column="1" Grid.Row="4" Margin="36,0,4,0" VerticalAlignment="Top" 
+                <uc:UcWaterMarkTextBox1 WaterMark="运费" Text="{Binding freight_str}" Grid.Column="1" Grid.Row="4" Margin="36,0,4,0" VerticalAlignment="Top" 
                                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Visibility="{Binding freight_visibility}"/>
                 <TextBox Text="平台服务费：" Grid.Column="1" Grid.Row="5" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                <uc:UcWaterMarkTextBox WaterMark="平台服务费" Text="{Binding predict_commission_fee_str}" Grid.Row="5" Margin="72,0,4,0" VerticalAlignment="Center" 
+                <uc:UcWaterMarkTextBox1 WaterMark="平台服务费" Text="{Binding predict_commission_fee_str}" Grid.Row="5" Margin="72,0,4,0" VerticalAlignment="Center" 
                                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
                 <TextBox Text="达人佣金：" Grid.Column="1" Grid.Row="6" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                <uc:UcWaterMarkTextBox WaterMark="达人佣金" Text="{Binding commission_amount_str}" Grid.Row="6" Margin="60,0,4,0" VerticalAlignment="Center" 
+                <uc:UcWaterMarkTextBox1 WaterMark="达人佣金" Text="{Binding commission_amount_str}" Grid.Row="6" Margin="60,0,4,0" VerticalAlignment="Center" 
                                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
                 <TextBox Text="外采金额：" Grid.Column="1" Grid.Row="7" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                <uc:UcWaterMarkTextBox WaterMark="外采金额" Text="{Binding out_amount_str}" Grid.Row="7" Margin="60,0,4,0" VerticalAlignment="Center" 
+                <uc:UcWaterMarkTextBox1 WaterMark="外采金额" Text="{Binding out_amount_str}" Grid.Row="7" Margin="60,0,4,0" VerticalAlignment="Center" 
                                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
                 <WrapPanel Grid.Column="1" Grid.Row="8" >
                     <!--<TextBox Text="预估" x:Name="txtProfitForecast" Grid.Column="1" Grid.Row="8" Margin="0,0,-4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" 
                              BorderThickness="0" Visibility="Collapsed"/>-->
                     <TextBox Text="利润：" Grid.Column="1" Grid.Row="8" Margin="0,0,-4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                    <uc:UcWaterMarkTextBox WaterMark="利润"  Text="{Binding ProfitCountStr}" Grid.Row="8" Margin="0,0,4,0" VerticalAlignment="Center" Foreground="{Binding ProfitStrColor}"
+                    <uc:UcWaterMarkTextBox1 WaterMark="利润"  Text="{Binding ProfitCountStr}" Grid.Row="8" Margin="0,0,4,0" VerticalAlignment="Center" Foreground="{Binding ProfitStrColor}"
                                            Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" FontWeight="Bold"/>
                 </WrapPanel>
             </Grid>
@@ -178,7 +178,7 @@
 
                 <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="5" Width="auto" HorizontalAlignment="Center">
                     <TextBox Text="收货地址：" Grid.Column="1" Grid.Row="5" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                    <uc:UcWaterMarkTextBox WaterMark="收货地址" Text="{Binding ItemOrder.address_str}" Grid.Column="1" Grid.Row="5" Margin="0,2,4,2" VerticalAlignment="Top" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="收货地址" Text="{Binding ItemOrder.address_str}" Grid.Column="1" Grid.Row="5" Margin="0,2,4,2" VerticalAlignment="Top" 
                                                        Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
                     <Button Grid.Column="10" x:Name="btnSeeAddressDetail" Background="Transparent" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
                                         Margin="4,0,0,0" Content="👁" Click="btnSeeAddressDetail_Click" Tag="{Binding order_id}"></Button>
@@ -187,7 +187,7 @@
                                         Margin="4,0,0,0" Content="仓库退货地址：点击复制" Click="btnGetRefundAddress_Click" Tag="{Binding order_id}"></Button>-->
                 <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="6" Width="auto" HorizontalAlignment="Center">
                     <TextBlock Text="退款单号：" VerticalAlignment="Center" Visibility="{Binding ElementName=txtRefundId,Path=Visibility}"/>
-                    <uc:UcWaterMarkTextBox WaterMark="退款单号" Text="{Binding ItemRefund.after_sale_order_id}" Grid.Column="1" Grid.Row="6" Margin="0,2,4,2" VerticalAlignment="Center" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="退款单号" Text="{Binding ItemRefund.after_sale_order_id}" Grid.Column="1" Grid.Row="6" Margin="0,2,4,2" VerticalAlignment="Center" 
                                        Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Foreground="{StaticResource PageLinkBrush}" Cursor="Hand" x:Name="txtRefundId"
                                        Visibility="{Binding Text,RelativeSource={RelativeSource Self},Converter={StaticResource HasTextVisibility}}" HorizontalAlignment="Center"/>
                     <Border Grid.Column="6" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand" 
@@ -252,14 +252,14 @@
                 <WrapPanel x:Name="wpBuyAccount" Orientation="Horizontal" Grid.Column="1" Grid.Row="3">
                     <TextBlock Text="采购账户：" IsHitTestVisible="False" Foreground="LightGray" VerticalAlignment="Center"
                                Visibility="{Binding ElementName=txtOutOrderBuyerStr,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
-                    <uc:UcWaterMarkTextBox WaterMark="采购账户：" Text="{Binding ItemTransitOrderWithVoid.OutOrderBuyerStr}" Grid.Column="1" Grid.Row="1" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="采购账户：" Text="{Binding ItemTransitOrderWithVoid.OutOrderBuyerStr}" Grid.Column="1" Grid.Row="1" 
                                            Padding="0" Margin="-2,2" VerticalAlignment="Top" x:Name="txtOutOrderBuyerStr" Background="Transparent" 
                                            IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Cursor="Hand" Foreground="#0099ff"/>
                 </WrapPanel>
                 <WrapPanel x:Name="wpBuyOrderId" Orientation="Horizontal" Grid.Column="1" Grid.Row="4">
                     <TextBlock Text="采购单号：" IsHitTestVisible="False" Foreground="LightGray" VerticalAlignment="Center"
                                Visibility="{Binding ElementName=txtOutOrderNumStr,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
-                    <uc:UcWaterMarkTextBox WaterMark="采购单号：" Text="{Binding ItemTransitOrderWithVoid.OutOrderNumStr}" Grid.Column="1" Grid.Row="1" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="采购单号：" Text="{Binding ItemTransitOrderWithVoid.OutOrderNumStr}" Grid.Column="1" Grid.Row="1" 
                                            Padding="0" Margin="-2,2" VerticalAlignment="Top" x:Name="txtOutOrderNumStr"  Background="Transparent" 
                                            IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Cursor="Hand" Foreground="#0099ff"/>
                     <Border Grid.Column="2" Margin="4,0,0,0" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand" Visibility="{Binding ElementName=txtOutOrderBuyerStr,Path=Text,Converter={StaticResource HasTextVisibility}}"
@@ -270,7 +270,7 @@
                 <WrapPanel x:Name="wpBuyTime" Orientation="Horizontal" Grid.Column="1" Grid.Row="5">
                     <TextBlock Text="采购时间：" IsHitTestVisible="False" Foreground="LightGray" VerticalAlignment="Center"
                                Visibility="{Binding ElementName=txtOutOrderTimeQualifiedStr,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
-                    <uc:UcWaterMarkTextBox WaterMark="采购时间：" Text="{Binding OutOrderTimeQualifiedStr}" Grid.Column="1" Grid.Row="1" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="采购时间：" Text="{Binding OutOrderTimeQualifiedStr}" Grid.Column="1" Grid.Row="1" 
                                            Padding="0" Margin="-2,2" VerticalAlignment="Top" x:Name="txtOutOrderTimeQualifiedStr"  Background="Transparent" 
                                            IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Foreground="{Binding OutOrderTimeQualifiedBrush}"/>
                     <!--<Border Grid.Column="2" Margin="4,0,0,0" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand" Visibility="{Binding ElementName=txtOutOrderTimeQualifiedStr,Path=Text,Converter={StaticResource HasTextVisibility}}"
@@ -282,39 +282,39 @@
                 <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="6" Visibility="{Binding TransitOrderWaybillToWareHouseStr, Converter={StaticResource HasTextVisibility}}">
                     <TextBlock Text="取号物流：" IsHitTestVisible="False" Foreground="LightGray" VerticalAlignment="Center"
                                Visibility="{Binding TransitOrderWaybillToWareHouseStr,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
-                    <uc:UcWaterMarkTextBox WaterMark="取号物流" Text="{Binding TransitOrderWaybillToWareHouseStr}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="取号物流" Text="{Binding TransitOrderWaybillToWareHouseStr}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
                            Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Foreground="{StaticResource PageOkBrush}"/>
                 </WrapPanel>
                 <!--<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="6" Visibility="{Binding TransitOrderWaybillFakeStr, Converter={StaticResource HasTextVisibility}}">-->
                 <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="7" Visibility="Collapsed">
                     <TextBlock Text="提前物流：" IsHitTestVisible="False" Foreground="LightGray" VerticalAlignment="Center"
                                Visibility="{Binding TransitOrderWaybillFakeStr,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
-                    <uc:UcWaterMarkTextBox WaterMark="提前物流" Text="{Binding  TransitOrderWaybillFakeStr}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="提前物流" Text="{Binding  TransitOrderWaybillFakeStr}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
                            Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Foreground="{StaticResource PageWarningBrush}"/>
                 </WrapPanel>
                 <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="8" Visibility="{Binding TransitOrderWaybillFromWareHouseStr, Converter={StaticResource HasTextVisibility}}">
                     <TextBlock Text="仓库物流：" IsHitTestVisible="False" Foreground="LightGray" VerticalAlignment="Center"
                                Visibility="{Binding TransitOrderWaybillFromWareHouseStr,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
-                    <uc:UcWaterMarkTextBox WaterMark="仓库物流" Text="{Binding TransitOrderWaybillFromWareHouseStr}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="仓库物流" Text="{Binding TransitOrderWaybillFromWareHouseStr}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
                            Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
                 </WrapPanel>
 
                 <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="9" Visibility="{Binding ItemOrder.out_express_no, Converter={StaticResource HasTextVisibility}}">
                     <TextBox Text="外采：" Grid.Column="1" Grid.Row="1" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                    <uc:UcWaterMarkTextBox WaterMark="外采" Text="{Binding  ItemOrder.out_express_company}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="外采" Text="{Binding  ItemOrder.out_express_company}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
                            Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
-                    <uc:UcWaterMarkTextBox WaterMark="-" Text="-" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="-" Text="-" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
                            Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
-                    <uc:UcWaterMarkTextBox WaterMark="外采" Text="{Binding  ItemOrder.out_express_no}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2,4,2" VerticalAlignment="Top" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="外采" Text="{Binding  ItemOrder.out_express_no}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2,4,2" VerticalAlignment="Top" 
                            Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
                 </WrapPanel>
-                <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="10" Visibility="{Binding ReturnWaybillId, Converter={StaticResource HasTextVisibility}}">
+                <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="10" Visibility="{Binding ReturnWaybillIdStr, Converter={StaticResource HasTextVisibility}}">
                     <TextBox Text="退货：" Grid.Column="1" Grid.Row="1" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                    <uc:UcWaterMarkTextBox WaterMark="退货" Text="{Binding ItemRefund.return_delivery_name}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="退货" Text="{Binding ItemRefund.return_delivery_name}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
                            Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
-                    <uc:UcWaterMarkTextBox WaterMark="-" Text="-" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="-" Text="-" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
                            Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
-                    <uc:UcWaterMarkTextBox WaterMark="退货" Text="{Binding ReturnWaybillId}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2,4,2" VerticalAlignment="Top" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="退货" Text="{Binding ReturnWaybillIdStr}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2,4,2" VerticalAlignment="Top" 
                            Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
                 </WrapPanel>
                 <!--
@@ -341,13 +341,13 @@
 
                 <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="1">
                     <TextBox Text="买家留言：" Grid.Column="1" Grid.Row="1" Margin="0,1,-8,1" VerticalAlignment="Top" Background="Transparent" BorderBrush="Transparent" IsReadOnly="True" BorderThickness="1"/>
-                    <uc:UcWaterMarkTextBox WaterMark="买家留言" Text="" Grid.Column="1" Grid.Row="1" Margin="0,1,0,1" VerticalAlignment="Top" 
+                    <uc:UcWaterMarkTextBox1 WaterMark="买家留言" Text="" Grid.Column="1" Grid.Row="1" Margin="0,1,0,1" VerticalAlignment="Top" 
                                        Background="Transparent" IsReadOnly="True" BorderThickness="1" TextWrapping="Wrap"/>
                 </WrapPanel>
 
                 <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="2">
                     <TextBox Text="店铺备注：" Grid.Column="1" Grid.Row="2" Margin="0,1,-8,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderBrush="Transparent" BorderThickness="1"/>
-                    <uc:UcWaterMarkTextBox x:Name="txtShopRemark" WaterMark="店铺备注" Text="{Binding ItemOrder.shop_remark}" Grid.Column="1" Grid.Row="2" Margin="0,1,0,1"
+                    <uc:UcWaterMarkTextBox1 x:Name="txtShopRemark" WaterMark="店铺备注" Text="{Binding ItemOrder.shop_remark}" Grid.Column="1" Grid.Row="2" Margin="0,1,0,1"
                                            VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="1" TextWrapping="Wrap"/>
                     <Button Grid.Column="1" Grid.Row="2" x:Name="btnEditShopRemark" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
                             Margin="2,0,0,0" Content="编辑" Click="btnEditShopRemark_Click"></Button>
@@ -356,7 +356,7 @@
                 </WrapPanel>
                 <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="3">
                     <TextBox Text="软件备注：" Grid.Column="1" Grid.Row="2" Margin="0,1,-8,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderBrush="Transparent" BorderThickness="1"/>
-                    <uc:UcWaterMarkTextBox x:Name="txtAppRemark" WaterMark="软件备注" Text="{Binding ItemOrder.soft_remark}" Grid.Column="1" Grid.Row="2" Margin="0,1,0,1"
+                    <uc:UcWaterMarkTextBox1 x:Name="txtAppRemark" WaterMark="软件备注" Text="{Binding ItemOrder.soft_remark}" Grid.Column="1" Grid.Row="2" Margin="0,1,0,1"
                                            VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="1" TextWrapping="Wrap"/>
                     <Button Grid.Column="1" Grid.Row="2" x:Name="btnEditAppRemark" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
                                             Margin="2,0,0,0" Content="编辑" Click="btnEditAppRemark_Click"></Button>
@@ -366,7 +366,7 @@
 
                 <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="4" Visibility="{Binding AddEditTransitWarehouseAfterSaleStr,Converter={StaticResource HasTextVisibility}}">
                     <TextBox Text="中转售后：" Grid.Column="1" Grid.Row="2" Margin="0,1,-8,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderBrush="Transparent" BorderThickness="1"/>
-                    <uc:UcWaterMarkTextBox x:Name="txtTransitWarehouseAfterSale" WaterMark="订单售后" Text="{Binding ItemOrder.soft_remark}" Grid.Column="1" Grid.Row="2" Margin="0,1,0,1"
+                    <uc:UcWaterMarkTextBox1 x:Name="txtTransitWarehouseAfterSale" WaterMark="订单售后" Text="{Binding ItemOrder.soft_remark}" Grid.Column="1" Grid.Row="2" Margin="0,1,0,1"
                                            VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="1" TextWrapping="Wrap"/>
                     <Button Grid.Column="1" Grid.Row="2" x:Name="btnAddEditTransitWarehouseAfterSale" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
                                             Margin="2,0,0,0" Content="{Binding AddEditTransitWarehouseAfterSaleStr}" Click="btnAddEditTransitWarehouseAfterSale_Click"></Button>
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
index fe99b9b..d2feae7 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
@@ -209,13 +209,16 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                 BaseMsgWindow.ShowError("请选择买手号");
                 return;
             }
-
             if (/*orderItem.sku_cnt > 1 ||*/ orderItem.ItemOrder.orderItems.Count > 1)
             {
                 //BaseMsgWindow.ShowError("多子单或多件商品订单中转仓暂不支持");
                 BaseMsgWindow.ShowError("多子单订单中转仓暂不支持");
                 return;
             }
+            if (GlobalConfig.lstOrder.Any(o => o.orderItems.Any(oi => oi.ItemTransitOrder?.order_no == orderItem.order_id && oi.ItemTransitOrder?.order_sku_id == orderItem.sku_id)))
+            {
+                BaseMsgWindow.ShowError("已存在中转拍单信息，请核对后再拍单");
+            }
 
             btnBuyOrder.Cursor = Cursors.Wait;
             btnBuyOrder.IsEnabled = false;
@@ -455,7 +458,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                 {
                     btnBuyOrder.Cursor = Cursors.Hand;
 
-                    PddMobileBuyOrderForm buyOrderForm = new PddMobileBuyOrderForm(MainWindow.Instance.orderListCtrl.FilterOneOrder, orderItem, GlobalConfig.CurrentPddBuyer, orderItem.BuyMap);
+                    PddMobileBuyOrderForm buyOrderForm = new PddMobileBuyOrderForm(MainWindow.Instance.orderListCtrl.FilterOneOrder, StartUp.UpdateBalance, 
+                        orderItem, GlobalConfig.CurrentPddBuyer, orderItem.BuyMap);
 
                     // 未关联拍单的跳到所有订单页面
                     buyOrderForm.InitUrl = "https://mobile.yangkeduo.com/orders.html"; //"?type=0&comment_tab=1&combine_orders=1&main_orders=1&refer_page_name=personal&refer_page_id=10001_1782219035613_a9ulipk4k3&refer_page_sn=10001";
@@ -511,6 +515,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                     // 缩略图在有的电脑上无法显示
                     //BitmapImage bImg = ImageUrlToBitmapImageConverter.LoadImageFromUrl(order_item.thumb_img + "?imageView2/1/w/100/format/webp|imageMogr2/auto-orient=");
                     BitmapImage bImg = ImageUrlToBitmapImageConverter.LoadImageFromUrl(order_item.thumb_img);
+                    Thread.Sleep(Randomx.GetId(1000));
                     Dispatcher.Invoke(new Action(() =>
                     {
                         imgOrderItem.Source = bImg;
@@ -527,9 +532,15 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                     btnVoidTransitOrder.Visibility = Visibility.Collapsed;
                 }
 
-                if (order_item.ItemOrder.isAbnormal && order_item.BuyerTransitWaybillStatusStr != "已到中转仓" && btnVoidTransitOrder.Visibility == Visibility.Collapsed)
+                // 异常重拍
+                if (order_item.ItemOrder.isAbnormal && order_item.BuyerTransitWaybillStatusStr != "已到中转仓"  && btnVoidTransitOrder.Visibility == Visibility.Collapsed)
                 {
-                    btnAbnormalOrderRebuy.Visibility = Visibility.Visible;
+                    // 取号异常/失败的异常单不能重拍
+                    if (((order_item.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("取号异常") || (order_item.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("无法调用")) &&
+                       order_item.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1)
+                        btnAbnormalOrderRebuy.Visibility = Visibility.Collapsed;
+                    else
+                        btnAbnormalOrderRebuy.Visibility = Visibility.Visible;
                 }
                 else
                 {
@@ -595,7 +606,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                 return;
             }
 
-            PddMobileBuyOrderForm buyOrderForm = new PddMobileBuyOrderForm(MainWindow.Instance.orderListCtrl.FilterOneOrder, orderItem, GlobalConfig.CurrentPddBuyer, orderItem.BuyMap);
+            PddMobileBuyOrderForm buyOrderForm = new PddMobileBuyOrderForm(MainWindow.Instance.orderListCtrl.FilterOneOrder, StartUp.UpdateBalance, 
+                orderItem, GlobalConfig.CurrentPddBuyer, orderItem.BuyMap);
 
             //所有订单页面
             buyOrderForm.InitUrl = url;
@@ -686,27 +698,26 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                     MainWindow.Instance.orderListCtrl.GetOrder(orderId);
 
                 var newOrder = GlobalConfig.lstOrder.FirstOrDefault(or => or.order_id == orderId);
-                if (newOrder.orderItems.Count == 1)
+                if (newOrder?.orderItems.Count == 1)
                     orderItem = newOrder?.orderItems?.FirstOrDefault();
                 else
                     orderItem = newOrder?.orderItems?.FirstOrDefault(oi => oi.sku_id == skuId);
-                if (orderItem == null)
-                {
-                    if (!isSilent)
-                        BaseMsgWindow.ShowError("订单查询失败，请重试");
-                    return;
-                }
-
-                if (orderItem.ItemTransitOrder == null)
-                {
-                    if (!isSilent)
-                        BaseMsgWindow.ShowError("要作废的中转订单不存在，请确认后重试");
-                    return;
-                }
             });
+            if (orderItem == null)
+            {
+                if (!isSilent)
+                    BaseMsgWindow.ShowError("订单查询失败，请重试");
+                return;
+            }
+            if (orderItem.ItemTransitOrder == null)
+            {
+                if (!isSilent)
+                    BaseMsgWindow.ShowError("要作废的中转订单不存在，请确认后重试");
+                return;
+            }
 
             bool noBuyer = false;
-            var buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_name == orderItem.ItemTransitOrder.buyer_account);
+            var buyer = GlobalConfig.PDDBuyerLoginList.FirstOrDefault(b => b.buyer_name == orderItem?.ItemTransitOrder?.buyer_account);
             if (buyer == null)
             {
                 if (!isSilent)
@@ -768,10 +779,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             if (discardRst.Contains("<code>0</code>") || discardRst.Contains("<code>200</code>"))
             {
                 //MainWindow.Instance.orderListCtrl.GetOrder(orderId);
-                #region 更新订单
+                #region 立即更新订单
                 orderItem.ItemTransitOrder.order_void_status = 1;
-                orderItem.SetTransitOrder();
-                orderItem.SetItemRefund();
+                orderItem.SetOrderItemTextProperty();
                 #endregion
 
                 #region 重新过滤订单
@@ -781,17 +791,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                 #endregion
 
                 #region 更新拍单余额
-                var url3 = BaseClass.Build29WxObjString("user/get_all_user");
-                var data3 = UserLogin.GetSignaturex();
-                data3 += "&search_user_name=" + BaseClass.UserName;
-                var html = GetHtml.PostUtf8(url3, data3);
-                if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
-                    html = GetHtml.PostUtf8(url3, data3);
-                if (html.Contains("\"code\":200"))
-                {
-                    BaseClass.Balance = BaseRegex.GetDecimalJson(ref html, "balance");
-                    MainWindow.Instance.Balance = BaseClass.Balance.ToString("0.00");
-                }
+                StartUp.UpdateBalance();
                 #endregion
             }
             else
diff --git a/29WxOrderWpf/MainWindow.xaml.cs b/29WxOrderWpf/MainWindow.xaml.cs
index 4945784..81c9fde 100644
--- a/29WxOrderWpf/MainWindow.xaml.cs
+++ b/29WxOrderWpf/MainWindow.xaml.cs
@@ -428,7 +428,7 @@ namespace _29WxOrderWpf
 
         private void lblBalance_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
         {
-            WXGetBalanceQrCodeForm balanceQrCodeForm = new WXGetBalanceQrCodeForm();
+            WXGetBalanceQrCodeForm balanceQrCodeForm = new WXGetBalanceQrCodeForm(StartUp.UpdateBalance);
             balanceQrCodeForm.ShowDialog();
         }
 
diff --git a/29WxOrderWpf/StartUp.cs b/29WxOrderWpf/StartUp.cs
index 073872b..df03ce8 100644
--- a/29WxOrderWpf/StartUp.cs
+++ b/29WxOrderWpf/StartUp.cs
@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Work;
 
 namespace _29WxOrderWpf
 {
@@ -24,5 +25,20 @@ namespace _29WxOrderWpf
         {
             ConfigHelper.SaveConfig("buy_config_260708", GlobalConfig.BuyConfig);
         }
+
+        public static void UpdateBalance()
+        {
+            var url3 = BaseClass.Build29WxObjString("user/get_all_user");
+            var data3 = UserLogin.GetSignaturex();
+            data3 += "&search_user_name=" + BaseClass.UserName;
+            var html = GetHtml.PostUtf8(url3, data3);
+            if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                html = GetHtml.PostUtf8(url3, data3);
+            if (html.Contains("\"code\":200"))
+            {
+                BaseClass.Balance = BaseRegex.GetDecimalJson(ref html, "balance");
+                MainWindow.Instance.Balance = BaseClass.Balance.ToString("0.00");
+            }
+        }
     }
 }
diff --git a/29WxOrderWpf/Styles/BaseButtonStyle.xaml b/29WxOrderWpf/Styles/BaseButtonStyle.xaml
index bae53ad..0479f2d 100644
--- a/29WxOrderWpf/Styles/BaseButtonStyle.xaml
+++ b/29WxOrderWpf/Styles/BaseButtonStyle.xaml
@@ -129,6 +129,37 @@
             </Setter.Value>
         </Setter>
     </Style>
+    <Style x:Key="BasePageButtonLeftSquareStyle" TargetType="Button">
+        <Setter Property="Foreground" Value="{DynamicResource pageColorLightBrush}"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Button">
+                    <Border x:Name="buttonBorder" Background="{DynamicResource pageColorBrush}" Cursor="Hand"
+                    BorderBrush="{DynamicResource pageColorDarkBrush}" CornerRadius="0 4 4 0"
+                    BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
+                        <ContentPresenter Content="{TemplateBinding Content}"
+                                  ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                                  HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                        </ContentPresenter>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource pageColorDarkBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource pageColorDarkBrush}"/>
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.5" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
     <Style x:Key="BasePageButtonLightStyle" TargetType="Button">
         <Setter Property="Foreground" Value="{DynamicResource pageColorBrush}"/>
         <Setter Property="BorderBrush" Value="{DynamicResource pageColorBrush}"/>
diff --git a/29WxOrderWpf/Styles/UcWaterMarkTextBoxStyle.xaml b/29WxOrderWpf/Styles/UcWaterMarkTextBoxStyle.xaml
index 744a88f..9e77cda 100644
--- a/29WxOrderWpf/Styles/UcWaterMarkTextBoxStyle.xaml
+++ b/29WxOrderWpf/Styles/UcWaterMarkTextBoxStyle.xaml
@@ -2,7 +2,7 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:_29WxOrderWpf.UserControls">
     
-    <Style TargetType="{x:Type local:UcWaterMarkTextBox}">
+    <Style TargetType="{x:Type local:UcWaterMarkTextBox1}">
         <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderBrush" Value="Transparent"/>
         <Setter Property="BorderThickness" Value="1"/>
@@ -10,7 +10,7 @@
         <Setter Property="Text" Value=""/>
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:UcWaterMarkTextBox}">
+                <ControlTemplate TargetType="{x:Type local:UcWaterMarkTextBox1}">
                     <Border x:Name="border" CornerRadius="4" BorderBrush="{TemplateBinding BorderBrush}" 
                             BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
                         <Grid>
diff --git a/29WxOrderWpf/UserControls/UcWaterMarkTextBox.xaml b/29WxOrderWpf/UserControls/UcWaterMarkTextBox.xaml
new file mode 100644
index 0000000..1b13b26
--- /dev/null
+++ b/29WxOrderWpf/UserControls/UcWaterMarkTextBox.xaml
@@ -0,0 +1,20 @@
+<UserControl x:Class="_29WxOrderWpf.UserControls.UcWaterMarkTextBox"
+             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.UserControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="28" d:DesignWidth="100">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <local:WaterMarkVisibilityConverter x:Key="WaterMarkVisibility"/>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Grid>
+        <TextBox x:Name="txt" Text="{Binding Text, Mode=TwoWay}" Style="{StaticResource BaseRoundCornerTextBoxStyle}" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1"
+                 HorizontalAlignment="Stretch" VerticalAlignment="Stretch" VerticalContentAlignment="Center" TextWrapping="{Binding TextWrapping}" TextChanged="txt_TextChanged"/>
+        <TextBlock x:Name="tbWaterMark" Text="{Binding WaterMark}" Margin="4,0,4,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="DarkGray" 
+                   Visibility="{Binding ElementName=txt,Path=Text,Converter={StaticResource WaterMarkVisibility}}"></TextBlock>
+    </Grid>
+</UserControl>
diff --git a/29WxOrderWpf/UserControls/UcWaterMarkTextBox.xaml.cs b/29WxOrderWpf/UserControls/UcWaterMarkTextBox.xaml.cs
new file mode 100644
index 0000000..9ea503b
--- /dev/null
+++ b/29WxOrderWpf/UserControls/UcWaterMarkTextBox.xaml.cs
@@ -0,0 +1,75 @@
+using NaiBa.Util.Extension;
+using System;
+using System.Collections.Generic;
+using System.Drawing.Drawing2D;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using static System.Net.Mime.MediaTypeNames;
+
+namespace _29WxOrderWpf.UserControls
+{
+    /// <summary>
+    /// UcWaterMarkTextBox.xaml 的交互逻辑
+    /// </summary>
+    public partial class UcWaterMarkTextBox : UserControl
+    {
+        public event Action<object, TextChangedEventArgs> TextChanged;
+
+        public UcWaterMarkTextBox()
+        {
+            InitializeComponent();
+            DataContext = this;
+            //this.txt.TextChanged
+        }
+
+        public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(UcWaterMarkTextBox), null);
+        public string Text
+        {
+            get { return (string)GetValue(TextProperty) == null ? "" : (string)GetValue(TextProperty); }
+            set { SetValue(TextProperty, value); }
+        }
+
+        public static readonly DependencyProperty WaterMarkProperty = DependencyProperty.Register("WaterMark", typeof(string), typeof(UcWaterMarkTextBox), null);
+        public string WaterMark
+        {
+            get { return (string)GetValue(WaterMarkProperty) == null ? "" : (string)GetValue(WaterMarkProperty); }
+            set { SetValue(WaterMarkProperty, value); }
+        }
+
+        public static readonly DependencyProperty TextWrappingProperty = DependencyProperty.Register("TextWrapping", typeof(TextWrapping), typeof(UcWaterMarkTextBox), null);
+        public TextWrapping TextWrapping
+        {
+            get { return (TextWrapping)GetValue(TextWrappingProperty); }
+            set { SetValue(TextWrappingProperty, value); }
+        }
+
+        private void txt_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            this.Text = txt.Text;
+            TextChanged?.Invoke(this, e);
+        }
+    }
+
+    public class WaterMarkVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value.ParseToString().IsNullOrEmpty() ? Visibility.Visible : Visibility.Collapsed;
+        }
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException(); // 单向绑定可不实现
+        }
+    }
+}
diff --git a/29WxOrderWpf/UserControls/UcWaterMarkTextBox.cs b/29WxOrderWpf/UserControls/UcWaterMarkTextBox1.cs
similarity index 85%
rename from 29WxOrderWpf/UserControls/UcWaterMarkTextBox.cs
rename to 29WxOrderWpf/UserControls/UcWaterMarkTextBox1.cs
index 129cd11..81b543b 100644
--- a/29WxOrderWpf/UserControls/UcWaterMarkTextBox.cs
+++ b/29WxOrderWpf/UserControls/UcWaterMarkTextBox1.cs
@@ -8,14 +8,14 @@ using System.Windows.Controls;
 
 namespace _29WxOrderWpf.UserControls
 {
-    public class UcWaterMarkTextBox : TextBox
+    public class UcWaterMarkTextBox1 : TextBox
     {
-        public UcWaterMarkTextBox()
+        public UcWaterMarkTextBox1()
         {
         }
 
         public static readonly DependencyProperty WaterMarkProperty = DependencyProperty.Register(
-            "WaterMark", typeof(string), typeof(UcWaterMarkTextBox), null);
+            "WaterMark", typeof(string), typeof(UcWaterMarkTextBox1), null);
         public string WaterMark
         {
             get { return (string)GetValue(WaterMarkProperty); }
diff --git a/29WxOrderWpf/gear.ico b/29WxOrderWpf/gear.ico
new file mode 100644
index 0000000000000000000000000000000000000000..2223b1f10e818169c8ee1578984c0b79481f5021
GIT binary patch
literal 270398
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
V$swuRC^F-(uZH9+`W#My{|Co}TM+;N

literal 0
HcmV?d00001

diff --git a/AllBase/29WxOrderAllBase.csproj b/AllBase/29WxOrderAllBase.csproj
index 8de58fa..c029b57 100644
--- a/AllBase/29WxOrderAllBase.csproj
+++ b/AllBase/29WxOrderAllBase.csproj
@@ -151,6 +151,7 @@
     <Reference Include="System.Web.Services" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AdslHelper.cs" />
@@ -172,6 +173,7 @@
     <Compile Include="Model\DBModel\oms_wei_external_procurement_log_info.cs" />
     <Compile Include="Model\DBModel\order_pdd_buyer_order.cs" />
     <Compile Include="Model\DBModel\TransitWarehouseParam.cs" />
+    <Compile Include="Model\DBModel\user_payment_record.cs" />
     <Compile Include="Model\DBModel\WaybillHelper.cs" />
     <Compile Include="Model\Division\Division.cs" />
     <Compile Include="Model\Result\PddBuyerAfterSaleLiteInfo.cs" />
diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index b79d53a..bb8b59a 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -32,7 +32,7 @@ namespace AllBase
         /// 版本ID
         /// </summary>
 
-        public static int VersionCount = 171;
+        public static int VersionCount = 183;
 
         public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
         public static string DebugUrl { get; set; } = "http://localhost:9000";
diff --git a/AllBase/Model/DBModel/TransitWarehouseParam.cs b/AllBase/Model/DBModel/TransitWarehouseParam.cs
index 1f14618..53434de 100644
--- a/AllBase/Model/DBModel/TransitWarehouseParam.cs
+++ b/AllBase/Model/DBModel/TransitWarehouseParam.cs
@@ -40,15 +40,15 @@ namespace AllBase.Model.DBModel
     public class TransitWarehouseData
     {
         public static string TransitWarehouseDataStr = @"
-XDYYWC     ;义乌仓   ;小田     ;19058117371 ;浙江省金华市义乌市北苑街道西站大道妈妈商贸6号库3楼中库走到底鸿鹄云仓（康诚楼上） ;31 ;386 ;3409 ;浙江省 ;金华市
-XDYJJC     ;晋江仓   ;安群     ;19905951984 ;福建省泉州市南安市霞美镇温山村431号鸿鹄大厦 ;4 ;58 ;569 ;福建省 ;泉州市
+XDYYWC     ;义乌仓   ;小田     ;19058117371 ;浙江省金华市义乌市北苑街道西站大道妈妈商贸18号库39号楼誉达 ;31 ;386 ;3409 ;浙江省 ;金华市
 XDYBJC     ;北京仓   ;胡萍     ;18565773752 ;北京市顺义区光明街道滨河小区七区1号楼 ;2 ;52 ;511 ;北京市 ;北京市
-XDYCDC     ;成都仓   ;谢春虹   ;15828201479 ;四川省资阳市乐至县仙鹤大道桑都街15-19号仓库（不要放驿站，送到仓库） ;26 ;340 ;2898 ;四川省 ;资阳市
 XDYGZC     ;广州仓   ;何外华   ;13826339849 ;广州市从化区太平镇高埔细埔街99号东门4栋3楼 ;6 ;76 ;692 ;广东省 ;广州市
-XDYWHC     ;武汉2仓  ;杨先生   ;13044121071 ;湖北省武汉市汉阳区洲头街道汉新大道2号鲲鹏公司 ;13 ;180 ;1548 ;湖北省 ;武汉市
+XDYWHC     ;武汉2仓  ;杨先生   ;13044121071 ;湖北省武汉市汉阳区洲头街道汉新大道2号3栋17楼 ;13 ;180 ;1548 ;湖北省 ;武汉市
 XDYSHANDC  ;山东2仓  ;鸿鹄小申 ;13044121239 ;山东省临沂市费县南外环东转盘往东200米顺通快递有限公司（仓库二楼） ;22 ;292 ;2415 ;山东省 ;临沂市
 XDYSHC     ;上海新仓 ;纪先生   ;13044121150 ;上海市上海市普陀区真如镇街道真北路2653弄G区 ;25 ;321 ;2709 ;上海市 ;上海市
-XDYSZC     ;深圳仓   ;峰峰     ;15343351331 ;广东省东莞市东莞市凤岗镇 浸校塘东良巷兔喜生活（云仓）;6 ;79 ;732 ;广东省 ;东莞市";
+XDYSZC     ;深圳仓   ;峰峰     ;15343351331 ;广东省东莞市凤岗镇浸校塘东良巷逸乐轩E栋5号楼 ;6 ;79 ;732 ;广东省 ;东莞市";
+        //XDYJJC     ;晋江仓   ;安群     ;19905951984 ;福建省泉州市南安市霞美镇温山村431号鸿鹄大厦 ;4 ;58 ;569 ;福建省 ;泉州市
+        //XDYCDC     ;成都仓   ;谢春虹   ;15828201479 ;四川省资阳市乐至县仙鹤大道桑都街15-19号仓库（不要放驿站，送到仓库） ;26 ;340 ;2898 ;四川省 ;资阳市
         //XDYCHONGQC ;重庆2仓  ;翁桂柱   ;18923911055 ;重庆市九龙坡区中梁山街道云飞九龙香山(二纵线东50米)重庆九龙坡区渝州公司 ;32 ;394 ;3339
         //XDYHEBC    ;哈尔滨仓 ;韩健     ;13044121250 ;黑龙江省哈尔滨市双城区新兴镇钱江路南侧韵达快递分拨中心发出库房84号装车口旁边电梯 ;12 ;167 ;1426
         //XDYXA      ;西安仓   ;方先生   ;15813526665 ;陕西省西安市雁塔区田马路厨具市场内韵达超市（田马路店）;24 ;311 ;2599
@@ -57,6 +57,14 @@ XDYSZC     ;深圳仓   ;峰峰     ;15343351331 ;广东省东莞市东莞市凤
         //XDYSSC     ;河北仓   ;田女士   ;13382898026 ;河北省衡水市安平县兴安大道灿达创业基地韵达库房A-1 ;10 ;143 ;1180
         //XDYZZC     ;郑州仓   ;朱红艳   ;13044121247 ;河南省郑州市经济开发区祥云办公处润之新物流园韵达速递 ;11 ;149 ;1259
 
+        // 广州仓 广州市从化区太平镇高埔细埔街99号东门***栋***楼
+        // 深圳仓 广东省东莞市凤岗镇浸校塘东良巷逸乐轩E栋***楼
+        // 武汉2仓 湖北省武汉市汉阳区洲头街道汉新大道2号***栋 * **楼
+        // 义乌仓 浙江省金华市义乌市北苑街道西站大道妈妈商贸*号库 * **楼誉达
+        // 义乌（7-999）*号库
+        //XDYYWC     ;义乌仓   ;小田     ;19058117371 ;浙江省金华市义乌市北苑街道西站大道妈妈商贸6号库3楼中库走到底鸿鹄云仓（康诚楼上） ;31 ;386 ;3409 ;浙江省 ;金华市
+        //XDYSZC     ;深圳仓   ;峰峰     ;15343351331 ;广东省东莞市东莞市凤岗镇 浸校塘东良巷兔喜生活（云仓）;6 ;79 ;732 ;广东省 ;东莞市";
+
         static List<TransitWarehouseParam> transitWarehouseList = null;
 
         public static List<TransitWarehouseParam> TransitWarehouseList
diff --git a/AllBase/Model/DBModel/oms_wei_order_info.cs b/AllBase/Model/DBModel/oms_wei_order_info.cs
index 7c5ca15..c60f5c9 100644
--- a/AllBase/Model/DBModel/oms_wei_order_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_info.cs
@@ -49,7 +49,7 @@ namespace AllBase.Model.DBModel
                 if (!string.IsNullOrEmpty(out_order_no))
                 {
                     var oi = orderItems.FirstOrDefault(o => o.ItemTransitOrders.Any(t => t.out_order_no == out_order_no && t.order_void_status == 1));
-                    if (oi == null)
+                    if (oi == null && out_after_sale_status != "退款成功")
                         return false;
                 }
                 return true;
@@ -76,7 +76,7 @@ namespace AllBase.Model.DBModel
                 if (!string.IsNullOrEmpty(out_order_no))
                 {
                     var oi = orderItems.FirstOrDefault(o => o.ItemTransitOrders.Any(t => t.out_order_no == out_order_no && t.order_void_status == 1));
-                    if (oi != null)
+                    if (oi != null || out_after_sale_status == "退款成功")
                         return false;
                 }
                 return true;
@@ -88,15 +88,16 @@ namespace AllBase.Model.DBModel
         /// </summary>
         public bool IsWaitReceive
         {
-            get { return status == 30 || status == 100 || gift_order_status == 1 || gift_order_status == 2; }
+            get { return (status == 30 || status == 100 || gift_order_status == 1 || gift_order_status == 2) && orderItems?.Any(oi => oi.refund_status > 1) != true; }
             set { }
         }
         /// <summary>
-        /// 售后订单（含售后关闭）
+        /// 售后订单（不含售后关闭）
         /// </summary>
         public bool IsRefund
         {
-            get { return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD"); }
+            //get { return refundItems?.Count > 0 && refundItems.Any(r => r.status != "USER_CANCELD"); }
+            get { return orderItems.Any(oi => oi.refund_status > 1) && !IsEmergency; }
             set { }
         }
         public bool IsRefundWithCancel
@@ -111,11 +112,11 @@ namespace AllBase.Model.DBModel
         {
             get
             {
-                if (orderItems.Any(oi => oi.id == 3737775520624572928))
+                if (this.order_id == "3737682397646176256")
                 {
 
                 }
-                if (orderItems.Any(oi => oi.refund_status > 0 && oi.ItemTransitOrders.Count > 0 &&
+                if (orderItems.Any(oi => oi.refund_status == 2 || oi.refund_status == 3 || oi.ItemTransitOrders.Count > 0 &&
                                          oi.ItemTransitOrders.Any(t => !string.IsNullOrEmpty(t.refund_status) &&
                                                                        !t.refund_status.Contains("退款成功") &&
                                                                        !t.refund_status.Contains("关闭") &&
@@ -123,9 +124,6 @@ namespace AllBase.Model.DBModel
                 {
                     return true;
                 }
-                else if (orderItems.Any(oi => (oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("取号异常") && 
-                                               oi.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1))
-                    return true;
                 return false;
             }
             set { }
@@ -145,6 +143,13 @@ namespace AllBase.Model.DBModel
                 // 订单无售后或者售后关闭，有未作废的仓库单且仓库单买手信息为退款成功
                 if (orderItems.Any(oi => oi.refund_status <= 1 && oi.ItemTransitOrder != null && oi.ItemTransitOrder.refund_status == "买手退款成功"))
                     return true;
+
+                // 取号异常或无法调用发货也放在异常单
+                // 订单不满足鸿浩仓库发货条件，无法调用鸿浩仓库接口发货
+                else if (orderItems.Any(oi => ((oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("取号异常") ||
+                                               (oi.ItemTransitOrderWithVoid?.raw_message).ParseToString().Contains("无法调用")) &&
+                                               oi.ItemTransitOrderWithVoid?.transfer_warehouse_status != 1))
+                    return true;
                 return false;
             }
             set { }
@@ -208,7 +213,7 @@ namespace AllBase.Model.DBModel
         /// <summary>
         /// 订单总状态文本
         /// </summary>
-        public string delivery_deadline_status_str
+        public string DeliveryDeadlineDtatusStr
         {
             get
             {
@@ -217,7 +222,8 @@ namespace AllBase.Model.DBModel
                 else if (this.refundItems.Any(r => r.RefundStatusStr == "退款完成" || r.RefundStatusStr == "退货退款完成"))
                     return "退款完成";
                 // 用户取消申请
-                else if (GlobalConfig.OrderTabHeaderStr.StartsWith("退款单") && this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
+                else if ((GlobalConfig.OrderTabHeaderStr.StartsWith("售后完成订单") || GlobalConfig.OrderTabHeaderStr.StartsWith("需处理售后订单")) && 
+                          this.refundItems.Any(r => !r.RefundStatusStr.IsNullOrEmpty()))
                     return this.refundItems.FirstOrDefault(r => !r.RefundStatusStr.IsNullOrEmpty()).RefundStatusStr;
                 if (this.status == 20 || this.status == 21)
                 {
@@ -225,13 +231,13 @@ namespace AllBase.Model.DBModel
                 }
                 return "剩余";
             }
-            set { /*delivery_deadline_status_str = value;*/ }
+            set { }
         }
 
         /// <summary>
         /// 延迟发货时间(微信小店：商品发货时效，超时此时间未发货即为发货超时)文本
         /// </summary>
-        public string delivery_deadline_str
+        public string DeliveryDeadlineStr
         {
             get
             {
@@ -258,9 +264,9 @@ namespace AllBase.Model.DBModel
         {
             get
             {
-                if (delivery_deadline_status_str == "退款中" || delivery_deadline_str == "已超时")
+                if (DeliveryDeadlineDtatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
                     return new SolidColorBrush(Color.FromRgb(250, 71, 51)); // #fa4733
-                else if (delivery_deadline_status_str == "退款完成" || delivery_deadline_str == "已发货")
+                else if (DeliveryDeadlineDtatusStr == "退款完成" || DeliveryDeadlineStr == "已发货")
                     return new SolidColorBrush(Color.FromRgb(103, 194, 58)); // #67c23a
                 else
                     return new SolidColorBrush(Color.FromRgb(3, 151, 181)); // #0397b5
@@ -271,9 +277,9 @@ namespace AllBase.Model.DBModel
         {
             get
             {
-                if (delivery_deadline_status_str == "退款中" || delivery_deadline_str == "已超时")
+                if (DeliveryDeadlineDtatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
                     return new SolidColorBrush(Color.FromArgb(26, 250, 71, 51)); // #fa4733 0.2
-                else if (delivery_deadline_status_str == "退款完成" || delivery_deadline_str == "已发货")
+                else if (DeliveryDeadlineDtatusStr == "退款完成" || DeliveryDeadlineStr == "已发货")
                     return new SolidColorBrush(Color.FromArgb(26, 103, 194, 58)); // #67c23a 0.2
                 else
                     return new SolidColorBrush(Color.FromArgb(26, 3, 151, 181)); // #0397b5 0.2
@@ -284,9 +290,9 @@ namespace AllBase.Model.DBModel
         {
             get
             {
-                if (delivery_deadline_status_str == "退款中" || delivery_deadline_str == "已超时")
+                if (DeliveryDeadlineDtatusStr == "退款中" || DeliveryDeadlineStr == "已超时")
                     return new SolidColorBrush(Color.FromArgb(50, 250, 71, 51)); // #fa4733 0.2
-                else if (delivery_deadline_status_str == "退款完成" || delivery_deadline_str == "已发货")
+                else if (DeliveryDeadlineDtatusStr == "退款完成" || DeliveryDeadlineStr == "已发货")
                     return new SolidColorBrush(Color.FromArgb(50, 103, 194, 58)); // #67c23a 0.2
                 else
                     return new SolidColorBrush(Color.FromArgb(50, 3, 151, 181)); // #0397b5 0.2
diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
index 0d68dfe..3aa2e6c 100644
--- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
@@ -9,121 +9,31 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Forms;
 using System.Windows.Media;
+using System.Windows.Threading;
 
 namespace AllBase.Model.DBModel
 {
     public class oms_wei_order_item_info : PropertyNotifyObject
     {
+        /// <summary>
+        /// 颜色等图形元素需要在主线程操作
+        /// </summary>
+        public Dispatcher Dispatcher { get; set; }
+        /// <summary>
+        /// 订单对应店铺
+        /// </summary>
         public ShopLoginInfo Shop
         {
             get { return this.GetValue(x => x.Shop); }
             set { this.SetValue(x => x.Shop, value); }
         }
 
-        public oms_wei_order_info ItemOrder
-        {
-            get { return this.GetValue(x => x.ItemOrder); }
-            set { this.SetValue(x => x.ItemOrder, value); }
-        }
-
-        public oms_wei_refund_info ItemRefund
-        {
-            get { return this.GetValue(x => x.ItemRefund); }
-            set { this.SetValue(x => x.ItemRefund, value); }
-        }
-        public void SetItemRefund()
-        {
-            if (ItemOrder?.refundItems?.Count == 1)
-                ItemRefund = ItemOrder?.refundItems?.FirstOrDefault();
-            else
-                ItemRefund = ItemOrder?.refundItems?.FirstOrDefault(r => r.sku_id == this.sku_id);
-
-            if (ItemRefund?.status != "MERCHANT_REFUND_SUCCESS" && ItemRefund?.status != "MERCHANT_RETURN_SUCCESS")
-                this.RefundResultStr = "";
-            else
-                this.RefundResultStr = "商品退款数量：" + ItemRefund.count + "，订单状态：" + ItemOrder.orderStatusStr;
-            this.ReturnWaybillId = ItemRefund?.return_waybill_id;
-            this.RefundTimeStr = BaseClass.StampToDateTime((ItemRefund?.create_time).ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss");
-            this.RefundTimeVisibility = ItemRefund?.create_time > 0 ? Visibility.Visible : Visibility.Collapsed;
-        }
-
-        public List<oms_wei_external_procurement_log_info> ItemTransitOrders { get; set; } = new List<oms_wei_external_procurement_log_info>();
-        /// <summary>
-        /// 当前仓库订单（不可以是作废单）
-        /// </summary>
-        public oms_wei_external_procurement_log_info ItemTransitOrder
-        {
-            get { return this.GetValue(x => x.ItemTransitOrder); }
-            set { this.SetValue(x => x.ItemTransitOrder, value); }
-        }
-        /// <summary>
-        /// 当前仓库订单（可以是作废单）
-        /// </summary>
-        public oms_wei_external_procurement_log_info ItemTransitOrderWithVoid
-        {
-            get { return this.GetValue(x => x.ItemTransitOrderWithVoid); }
-            set { this.SetValue(x => x.ItemTransitOrderWithVoid, value); }
-        }
-
-        public List<oms_wei_external_procurement_after_sale_info> ItemTransitOrderAfterSales { get; set; } = new List<oms_wei_external_procurement_after_sale_info>();
-        public oms_wei_external_procurement_after_sale_info ItemTransitOrderAfterSale
-        {
-            get { return this.GetValue(x => x.ItemTransitOrderAfterSale); }
-            set { this.SetValue(x => x.ItemTransitOrderAfterSale, value); }
-        }
-
-        public List<order_pdd_buyer_order> PddBuyerOrders { get; set; } = new List<order_pdd_buyer_order>();
-        public order_pdd_buyer_order PddBuyerOrder
-        {
-            get { return this.GetValue(x => x.PddBuyerOrder); }
-            set { this.SetValue(x => x.PddBuyerOrder, value); }
-        }
-        public void SetTransitOrder()
-        {
-            this.ItemTransitOrder = ItemTransitOrders.FirstOrDefault(t => t.order_void_status != 1);
-            this.ItemTransitOrderWithVoid = ItemTransitOrders.FirstOrDefault();
-            this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
-            this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales.FirstOrDefault();
-
-            // 直接取号和更正取号显示的买手到仓库物流
-            if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)
-                this.TransitOrderWaybillToWareHouseStr = null;
-            else
-                this.TransitOrderWaybillToWareHouseStr = "买手物流：" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
-
-            // 提前取号物流
-            if (ItemTransitOrder?.pre_allocated_order_no != 2)
-                this.TransitOrderWaybillFakeStr = null;
-            else
-                this.TransitOrderWaybillFakeStr = "取号物流：" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
-
-            // 仓库下游物流
-            if (ItemTransitOrder == null || ItemTransitOrder.express_2_company.IsNullOrEmpty() || ItemTransitOrder.express_2_waybill.IsNullOrEmpty())
-                TransitOrderWaybillFromWareHouseStr = null;
-            else
-                TransitOrderWaybillFromWareHouseStr = "仓库物流：" + ItemTransitOrder.express_2_company + "-" + ItemTransitOrder.express_2_waybill;
-
-
-            if (this.order_id == "3737713100455836416")
-            {
-
-            }
-            // 仓库物流售后按钮上的文字，仓库作废单不存在仓库物流，所以此处必须是有效的仓库单（含作废失败）
-            if (this.ItemTransitOrder == null || !this.ItemOrder.IsRefundWithCancel)
-                AddEditTransitWarehouseAfterSaleStr = "";
-            else
-                AddEditTransitWarehouseAfterSaleStr = this.ItemTransitOrderAfterSale == null ? "添加" : "查看";
-        }
-
-        public string AddEditTransitWarehouseAfterSaleStr
-        {
-            get { return this.GetValue(x => x.AddEditTransitWarehouseAfterSaleStr); }
-            set { this.SetValue(x => x.AddEditTransitWarehouseAfterSaleStr, value); }
-        }
-
+        #region 订单采购参数
         /// <summary>
         /// 采购关联
         /// </summary>
@@ -132,7 +42,6 @@ namespace AllBase.Model.DBModel
             get { return this.GetValue(x => x.BuyMap); }
             set { this.SetValue(x => x.BuyMap, value); }
         }
-
         /// <summary>
         /// 采购按钮文字
         /// </summary>
@@ -157,14 +66,151 @@ namespace AllBase.Model.DBModel
             get { return this.GetValue(x => x.BuyGoodsBtnBackColor); }
             set { this.SetValue(x => x.BuyGoodsBtnBackColor, value); }
         }
+        /// <summary>
+        /// 采购按钮是否可用
+        /// </summary>
         public bool IsBuyGoodsBtnEnabled
         {
             get { return this.GetValue(x => x.IsBuyGoodsBtnEnabled); }
             set { this.SetValue(x => x.IsBuyGoodsBtnEnabled, value); }
         }
+        #endregion
 
+        public oms_wei_order_info ItemOrder
+        {
+            get { return this.GetValue(x => x.ItemOrder); }
+            set { this.SetValue(x => x.ItemOrder, value); }
+        }
+
+        #region 订单售后状态参数
+        public oms_wei_refund_info ItemRefund
+        {
+            get { return this.GetValue(x => x.ItemRefund); }
+            set { this.SetValue(x => x.ItemRefund, value); }
+        }
+        public void SetItemRefund()
+        {
+            if (ItemOrder?.refundItems?.Count == 1)
+                ItemRefund = ItemOrder?.refundItems?.FirstOrDefault();
+            else
+                ItemRefund = ItemOrder?.refundItems?.FirstOrDefault(r => r.sku_id == this.sku_id);
+
+            if (ItemRefund?.status != "MERCHANT_REFUND_SUCCESS" && ItemRefund?.status != "MERCHANT_RETURN_SUCCESS")
+                this.RefundResultStr = "";
+            else
+                this.RefundResultStr = "商品退款数量：" + ItemRefund.count + "，订单状态：" + ItemOrder.orderStatusStr;
+            this.ReturnWaybillIdStr = ItemRefund?.return_waybill_id;
+            this.RefundTimeStr = BaseClass.StampToDateTime((ItemRefund?.create_time).ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss");
+            this.RefundTimeVisibility = ItemRefund?.create_time > 0 ? Visibility.Visible : Visibility.Collapsed;
+        }
         /// <summary>
-        /// 拍单物流
+        /// 退款状态文本
+        /// </summary>
+        public string RefundResultStr
+        {
+            get { return this.GetValue(x => x.RefundResultStr); }
+            set { this.SetValue(x => x.RefundResultStr, value); }
+        }
+        /// <summary>
+        /// 微信小店用户退款快递单号
+        /// </summary>
+        public string ReturnWaybillIdStr
+        {
+            get { return this.GetValue(x => x.ReturnWaybillIdStr); }
+            set { this.SetValue(x => x.ReturnWaybillIdStr, value); }
+        }
+        /// <summary>
+        /// 订单退款时间
+        /// </summary>
+        public string RefundTimeStr
+        {
+            get { return this.GetValue(x => x.RefundTimeStr); }
+            set { this.SetValue(x => x.RefundTimeStr, value); }
+        }
+        /// <summary>
+        /// 订单退款时间可见
+        /// </summary>
+        public Visibility RefundTimeVisibility
+        {
+            get { return this.GetValue(x => x.RefundTimeVisibility); }
+            set { this.SetValue(x => x.RefundTimeVisibility, value); }
+        }
+        #endregion
+
+        #region 中转仓及中转拍单相关参数
+        /// <summary>
+        /// 中转订单列表
+        /// </summary>
+        public List<oms_wei_external_procurement_log_info> ItemTransitOrders { get; set; } = new List<oms_wei_external_procurement_log_info>();
+        /// <summary>
+        /// 当前仓库订单（不可以是作废单）
+        /// </summary>
+        public oms_wei_external_procurement_log_info ItemTransitOrder
+        {
+            get { return this.GetValue(x => x.ItemTransitOrder); }
+            set { this.SetValue(x => x.ItemTransitOrder, value); }
+        }
+        /// <summary>
+        /// 当前仓库订单（可以是作废单）
+        /// </summary>
+        public oms_wei_external_procurement_log_info ItemTransitOrderWithVoid
+        {
+            get { return this.GetValue(x => x.ItemTransitOrderWithVoid); }
+            set { this.SetValue(x => x.ItemTransitOrderWithVoid, value); }
+        }
+        public List<oms_wei_external_procurement_after_sale_info> ItemTransitOrderAfterSales { get; set; } = new List<oms_wei_external_procurement_after_sale_info>();
+        public oms_wei_external_procurement_after_sale_info ItemTransitOrderAfterSale
+        {
+            get { return this.GetValue(x => x.ItemTransitOrderAfterSale); }
+            set { this.SetValue(x => x.ItemTransitOrderAfterSale, value); }
+        }
+        public List<order_pdd_buyer_order> PddBuyerOrders { get; set; } = new List<order_pdd_buyer_order>();
+        public order_pdd_buyer_order PddBuyerOrder
+        {
+            get { return this.GetValue(x => x.PddBuyerOrder); }
+            set { this.SetValue(x => x.PddBuyerOrder, value); }
+        }
+        public void SetTransitOrder()
+        {
+            this.ItemTransitOrder = ItemTransitOrders?.FirstOrDefault(t => t.order_void_status != 1);
+            this.ItemTransitOrderWithVoid = ItemTransitOrders?.FirstOrDefault();
+            this.PddBuyerOrder = PddBuyerOrders?.FirstOrDefault();
+            this.ItemTransitOrderAfterSale = ItemTransitOrderAfterSales?.FirstOrDefault();
+
+            // 直接取号和更正取号显示的买手到仓库物流
+            if (ItemTransitOrder?.pre_allocated_order_no != 1 && ItemTransitOrder?.pre_allocated_order_no != 3)
+                this.TransitOrderWaybillToWareHouseStr = null;
+            else
+                this.TransitOrderWaybillToWareHouseStr = "买手物流：" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
+
+            // 提前取号物流
+            if (ItemTransitOrder?.pre_allocated_order_no != 2)
+                this.TransitOrderWaybillFakeStr = null;
+            else
+                this.TransitOrderWaybillFakeStr = "取号物流：" + ItemTransitOrder.express_1_company + "-" + ItemTransitOrder.express_1_waybill;
+
+            // 仓库下游物流
+            if (ItemTransitOrder == null || ItemTransitOrder.express_2_company.IsNullOrEmpty() || ItemTransitOrder.express_2_waybill.IsNullOrEmpty())
+                TransitOrderWaybillFromWareHouseStr = null;
+            else
+                TransitOrderWaybillFromWareHouseStr = "仓库物流：" + ItemTransitOrder.express_2_company + "-" + ItemTransitOrder.express_2_waybill;
+
+            // 仓库物流售后按钮上的文字，仓库作废单不存在仓库物流，所以此处必须是有效的仓库单（含作废失败）
+            if (this.ItemTransitOrder == null || !this.ItemOrder.IsRefundWithCancel)
+                AddEditTransitWarehouseAfterSaleStr = "";
+            else
+                AddEditTransitWarehouseAfterSaleStr = this.ItemTransitOrderAfterSale == null ? "添加" : "查看";
+        }
+        /// <summary>
+        /// 仓库退货编辑按钮文本参数
+        /// </summary>
+        public string AddEditTransitWarehouseAfterSaleStr
+        {
+            get { return this.GetValue(x => x.AddEditTransitWarehouseAfterSaleStr); }
+            set { this.SetValue(x => x.AddEditTransitWarehouseAfterSaleStr, value); }
+        }
+        /// <summary>
+        /// 拍单物流编号
         /// </summary>
         public string TransitOrderWaybillToWareHouseStr
         {
@@ -172,7 +218,7 @@ namespace AllBase.Model.DBModel
             set { this.SetValue(x => x.TransitOrderWaybillToWareHouseStr, value); }
         }
         /// <summary>
-        /// 提前取号物流
+        /// 提前取号物流编号（虚拟）
         /// </summary>
         public string TransitOrderWaybillFakeStr
         {
@@ -180,114 +226,138 @@ namespace AllBase.Model.DBModel
             set { this.SetValue(x => x.TransitOrderWaybillFakeStr, value); }
         }
         /// <summary>
-        /// 仓库物流
+        /// 仓库物流编号
         /// </summary>
         public string TransitOrderWaybillFromWareHouseStr
         {
             get { return this.GetValue(x => x.TransitOrderWaybillFromWareHouseStr); }
             set { this.SetValue(x => x.TransitOrderWaybillFromWareHouseStr, value); }
         }
+        #endregion
+
+        #region 买手物流参数
         public string BuyerTransitWaybillStatusStr
         {
-            get
+            get { return this.GetValue(x => x.BuyerTransitWaybillStatusStr); }
+            set { this.SetValue(x => x.BuyerTransitWaybillStatusStr, value); }
+        }
+        public void SetBuyerTransitWaybillStatusStr()
+        {
+            BuyerTransitWaybillStatusStr = "";
+
+            string refund_status = (ItemTransitOrderWithVoid?.refund_status).ParseToString();
+
+            //if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("退款成功"))
+            //{
+            //    BuyerTransitWaybillStatusStr = "买手已退款"; return;
+            //}
+            //else if (refund_status.Contains("退款成功"))
+            //{
+            //    BuyerTransitWaybillStatusStr = "买手已退款"; return;
+            //}
+            // 已到中转仓的或者中转仓已正式发出的，买手（仓上游）状态显示为已到中转仓
+            if (ItemTransitOrderWithVoid?.warehouse_status == 1 || ItemTransitOrderWithVoid?.warehouse_status == 2)
             {
-                if (PddBuyerOrder?.wx_order_id == "3737803757296943104")
-                {
-                }
-
-                string refund_status = (ItemTransitOrderWithVoid?.refund_status).ParseToString();
+                BuyerTransitWaybillStatusStr = "已到中转仓";
+            }
+            // 拼多多买手状态为已签收的，为已到中转仓
+            else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("已签收"))
+            {
+                BuyerTransitWaybillStatusStr = "已到中转仓";
+            }
+            // 售后待用户退回商品的，至少为买手已发货
+            else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("待用户退回商品"))
+            {
+                BuyerTransitWaybillStatusStr = "买手已发货";
+            }
+            // 待收货的，至少为买手已发货
+            else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("待收货"))
+            {
+                BuyerTransitWaybillStatusStr = "买手已发货";
+            }
+            // 有退款还没完成的，至少为买手已发货（未发货一般秒退）
+            else if (!refund_status.Contains("退款成功") && refund_status.Length > 0)
+            {
+                BuyerTransitWaybillStatusStr = "买手已发货";
+            }
+            // 正式取号或者取号更正的，可认定买手已发货
+            else if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)
+            {
+                BuyerTransitWaybillStatusStr = "买手已发货";
+            }
+            else if (ItemTransitOrderWithVoid != null)
+            {
+                BuyerTransitWaybillStatusStr = "买手未发货";
+            }
 
-                //if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("退款成功"))
-                //{
-                //    return "买手已退款";
-                //}
-                //else if (refund_status.Contains("退款成功"))
-                //{
-                //    return "买手已退款";
-                //}
-
-                // 已到中转仓的或者中转仓已正式发出的，买手（仓上游）状态显示为已到中转仓
-                if (ItemTransitOrderWithVoid?.warehouse_status == 1 || ItemTransitOrderWithVoid?.warehouse_status == 2)
-                {
-                    return "已到中转仓";
-                }
-                // 拼多多买手状态为已签收的，为已到中转仓
-                else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("已签收"))
-                {
-                    return "已到中转仓";
-                }
-                // 售后待用户退回商品的，至少为买手已发货
-                else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("待用户退回商品"))
-                {
-                    return "买手已发货";
-                }
-                else if ((PddBuyerOrder?.order_status_prompt).ParseToString().Contains("待收货"))
-                {
-                    return "买手已发货";
-                }
-                // 有退款还没完成的，至少为买手已发货
-                if (!refund_status.Contains("退款成功") && refund_status.Length > 0)
+            // 文本确定后设置颜色
+            if (Dispatcher != null)
+            {
+                Dispatcher.Invoke(new Action(() =>
                 {
-                    return "买手已发货";
-                }
-                // 正式取号或者取号更正的，可认定买手已发货
-                if (ItemTransitOrderWithVoid?.pre_allocated_order_no == 1 || ItemTransitOrderWithVoid?.pre_allocated_order_no == 3)
-                    return "买手已发货";
-                if (ItemTransitOrderWithVoid != null)
-                    return "买手未发货";
-                return "";
+                    SetBuyerTransitWaybillStatusStrColor();
+                    SetBuyerTransitWaybillStatusBorderColor();
+                    SetBuyerTransitWaybillStatusBackColor();
+                }));
             }
-            set { }
         }
         public SolidColorBrush BuyerTransitWaybillStatusStrColor
         {
-            get
-            {
-                if (BuyerTransitWaybillStatusStr.StartsWith("买手已退款"))
-                    return new SolidColorBrush(Color.FromRgb(152, 96, 143));
-                if (BuyerTransitWaybillStatusStr.StartsWith("已到中转仓"))
-                    return new SolidColorBrush(Color.FromRgb(19, 206, 102));
-                if (BuyerTransitWaybillStatusStr.StartsWith("买手已发货"))
-                    return new SolidColorBrush(Color.FromRgb(255, 186, 0));
-                if (BuyerTransitWaybillStatusStr.StartsWith("买手未发货"))
-                    return new SolidColorBrush(Color.FromRgb(255, 73, 73));
-                return new SolidColorBrush(Color.FromRgb(255, 73, 73));
-            }
-            set { }
+            get { return this.GetValue(x => x.BuyerTransitWaybillStatusStrColor); }
+            set { this.SetValue(x => x.BuyerTransitWaybillStatusStrColor, value); }
+        }
+        public void SetBuyerTransitWaybillStatusStrColor()
+        {
+            if (BuyerTransitWaybillStatusStr.StartsWith("买手已退款"))
+                BuyerTransitWaybillStatusStrColor = new SolidColorBrush(Color.FromRgb(152, 96, 143));
+            else if(BuyerTransitWaybillStatusStr.StartsWith("已到中转仓"))
+                BuyerTransitWaybillStatusStrColor = new SolidColorBrush(Color.FromRgb(19, 206, 102));
+            else if(BuyerTransitWaybillStatusStr.StartsWith("买手已发货"))
+                BuyerTransitWaybillStatusStrColor = new SolidColorBrush(Color.FromRgb(255, 186, 0));
+            else if(BuyerTransitWaybillStatusStr.StartsWith("买手未发货"))
+                BuyerTransitWaybillStatusStrColor = new SolidColorBrush(Color.FromRgb(255, 73, 73));
+            else
+                BuyerTransitWaybillStatusStrColor = new SolidColorBrush(Color.FromRgb(255, 73, 73));
         }
         public SolidColorBrush BuyerTransitWaybillStatusBorderColor
         {
-            get
-            {
-                if (BuyerTransitWaybillStatusStr.StartsWith("买手已退款"))
-                    return new SolidColorBrush(Color.FromArgb(75, 152, 96, 143));
-                if (BuyerTransitWaybillStatusStr.StartsWith("已到中转仓"))
-                    return new SolidColorBrush(Color.FromRgb(208, 245, 224));
-                if (BuyerTransitWaybillStatusStr.StartsWith("买手已发货"))
-                    return new SolidColorBrush(Color.FromRgb(255, 241, 204));
-                if (BuyerTransitWaybillStatusStr.StartsWith("买手未发货"))
-                    return new SolidColorBrush(Color.FromRgb(255, 219, 219));
-                return new SolidColorBrush(Color.FromRgb(255, 219, 219));
-            }
-            set { }
+            get { return this.GetValue(x => x.BuyerTransitWaybillStatusBorderColor); }
+            set { this.SetValue(x => x.BuyerTransitWaybillStatusBorderColor, value); }
+        }
+        public void SetBuyerTransitWaybillStatusBorderColor()
+        {
+            if (BuyerTransitWaybillStatusStr.StartsWith("买手已退款"))
+                BuyerTransitWaybillStatusBorderColor = new SolidColorBrush(Color.FromArgb(75, 152, 96, 143));
+            else if(BuyerTransitWaybillStatusStr.StartsWith("已到中转仓"))
+                BuyerTransitWaybillStatusBorderColor = new SolidColorBrush(Color.FromRgb(208, 245, 224));
+            else if(BuyerTransitWaybillStatusStr.StartsWith("买手已发货"))
+                BuyerTransitWaybillStatusBorderColor = new SolidColorBrush(Color.FromRgb(255, 241, 204));
+            else if(BuyerTransitWaybillStatusStr.StartsWith("买手未发货"))
+                BuyerTransitWaybillStatusBorderColor = new SolidColorBrush(Color.FromRgb(255, 219, 219));
+            else
+                BuyerTransitWaybillStatusBorderColor = new SolidColorBrush(Color.FromRgb(255, 219, 219));
         }
         public SolidColorBrush BuyerTransitWaybillStatusBackColor
         {
-            get
-            {
-                if (BuyerTransitWaybillStatusStr.StartsWith("买手已退款"))
-                    return new SolidColorBrush(Color.FromArgb(35, 152, 96, 143));
-                if (BuyerTransitWaybillStatusStr.StartsWith("已到中转仓"))
-                    return new SolidColorBrush(Color.FromRgb(231, 250, 240));
-                if (BuyerTransitWaybillStatusStr.StartsWith("买手已发货"))
-                    return new SolidColorBrush(Color.FromRgb(255, 248, 230));
-                if (BuyerTransitWaybillStatusStr.StartsWith("买手未发货"))
-                    return new SolidColorBrush(Color.FromRgb(255, 237, 237));
-                return new SolidColorBrush(Color.FromRgb(255, 237, 237));
-            }
-            set { }
+            get { return this.GetValue(x => x.BuyerTransitWaybillStatusBackColor); }
+            set { this.SetValue(x => x.BuyerTransitWaybillStatusBackColor, value); }
         }
+        public void SetBuyerTransitWaybillStatusBackColor()
+        {
+            if (BuyerTransitWaybillStatusStr.StartsWith("买手已退款"))
+                BuyerTransitWaybillStatusBackColor = new SolidColorBrush(Color.FromArgb(35, 152, 96, 143));
+            else if (BuyerTransitWaybillStatusStr.StartsWith("已到中转仓"))
+                BuyerTransitWaybillStatusBackColor = new SolidColorBrush(Color.FromRgb(231, 250, 240));
+            else if (BuyerTransitWaybillStatusStr.StartsWith("买手已发货"))
+                BuyerTransitWaybillStatusBackColor = new SolidColorBrush(Color.FromRgb(255, 248, 230));
+            else if (BuyerTransitWaybillStatusStr.StartsWith("买手未发货"))
+                BuyerTransitWaybillStatusBackColor = new SolidColorBrush(Color.FromRgb(255, 237, 237));
+            else
+                BuyerTransitWaybillStatusBackColor = new SolidColorBrush(Color.FromRgb(255, 237, 237));
+        }
+        #endregion
 
+        #region 仓库物流参数
         public string WarehouseWaybillStatusStr
         {
             get
@@ -295,7 +365,10 @@ namespace AllBase.Model.DBModel
                 if (ItemTransitOrderWithVoid == null)
                     return "";
 
-                if (ItemTransitOrderWithVoid.raw_message.ParseToString().Contains("取号异常") && ItemTransitOrderWithVoid.transfer_warehouse_status != 1)
+                // 订单不满足鸿浩仓库发货条件，无法调用鸿浩仓库接口发货
+                if ((ItemTransitOrderWithVoid.raw_message.ParseToString().Contains("取号异常") || 
+                     ItemTransitOrderWithVoid.raw_message.ParseToString().Contains("无法调用")) &&
+                     ItemTransitOrderWithVoid.transfer_warehouse_status != 1)
                 {
                     if (ItemTransitOrderWithVoid.raw_message.Contains("超出派送范围"))
                         return "取号异常-超出派送范围";
@@ -379,6 +452,9 @@ namespace AllBase.Model.DBModel
             }
             set { }
         }
+        #endregion
+
+
         /// <summary>
         /// 中转仓表买手售后字段文字显示
         /// </summary>
@@ -386,8 +462,16 @@ namespace AllBase.Model.DBModel
         {
             get
             {
+                if (order_id == "3737688046871408640")
+                {
+
+                }
+
                 if (!string.IsNullOrEmpty(ItemTransitOrderWithVoid?.refund_status))
                 {
+                    // 店铺售后又取消的，如果是买手还没申请售后，不显示需手动申请售后文字
+                    //if (ItemTransitOrderWithVoid.refund_status.Contains("需手动申请售后") && this.refund_status <= 1)
+                    //    return "";
                     if (!ItemTransitOrderWithVoid.refund_status.Contains("需手动申请售后"))
                         return "已申请售后 " + ItemTransitOrderWithVoid.refund_status.Replace("申请收到，", "");
                     return ItemTransitOrderWithVoid.refund_status;
@@ -412,6 +496,9 @@ namespace AllBase.Model.DBModel
             }
             set { }
         }
+        /// <summary>
+        /// 中转仓作废参数
+        /// </summary>
         public string TransitRefundVoidStatusStr
         {
             get
@@ -424,8 +511,6 @@ namespace AllBase.Model.DBModel
             }
             set { }
         }
-
-
         // 仓库采购时间是否达标字段
         public string OutOrderTimeQualifiedStr
         {
@@ -445,7 +530,7 @@ namespace AllBase.Model.DBModel
             set { }
         }
         /// <summary>
-        /// 仓库采购时间是否达标字段
+        /// 仓库采购时间是否达标字段颜色
         /// </summary>
         public SolidColorBrush OutOrderTimeQualifiedBrush
         {
@@ -455,7 +540,9 @@ namespace AllBase.Model.DBModel
             }
         }
 
-
+        /// <summary>
+        /// 微信订单状态参数
+        /// </summary>
         public string OrderItemStatusStr
         {
             get
@@ -478,6 +565,9 @@ namespace AllBase.Model.DBModel
             }
             set { }
         }
+        /// <summary>
+        /// 微信订单状态颜色
+        /// </summary>
         public SolidColorBrush OrderItemStatusStrColor
         {
             get
@@ -521,42 +611,11 @@ namespace AllBase.Model.DBModel
             set { }
         }
 
-        /// <summary>
-        /// 退款状态文本
-        /// </summary>
-        public string RefundResultStr
-        {
-            get { return this.GetValue(x => x.RefundResultStr); }
-            set { this.SetValue(x => x.RefundResultStr, value); }
-        }
-
-        public string ReturnWaybillId
-        {
-            get { return this.GetValue(x => x.ReturnWaybillId); }
-            set { this.SetValue(x => x.ReturnWaybillId, value); }
-        }
-
-        /// <summary>
-        /// 订单退款时间
-        /// </summary>
-        public string RefundTimeStr
-        {
-            get { return this.GetValue(x => x.RefundTimeStr); }
-            set { this.SetValue(x => x.RefundTimeStr, value); }
-        }
-        /// <summary>
-        /// 订单退款时间可见
-        /// </summary>
-        public Visibility RefundTimeVisibility
-        {
-            get { return this.GetValue(x => x.RefundTimeVisibility); }
-            set { this.SetValue(x => x.RefundTimeVisibility, value); }
-        }
 
         /// <summary>
         /// 订单中所有商品加起来的总售价文本
         /// </summary>
-        public string realPriceStr
+        public string RealPriceStr
         {
             //get { return "￥" + (order_items.Sum(oi => oi.real_price) * 0.01m).ParseToDecimal().ToString("0.00"); }
             get { return "￥" + (real_price * 0.01m).ParseToDecimal().ToString("0.00"); }
@@ -566,7 +625,7 @@ namespace AllBase.Model.DBModel
         /// <summary>
         /// 订单内商品维度平台券优惠金额(利润需要计算这个金额在内)文本
         /// </summary>
-        public string cash_coupon_discounted_price_str
+        public string CashCouponDiscountedPriceStr
         {
             //get { return "￥" + (order_items.Sum(oi => oi.cash_coupon_discounted_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
             get { return "￥" + (cash_coupon_discounted_price.ParseToInt() * 0.01m).ParseToDecimal().ToString("0.00"); }
@@ -854,6 +913,13 @@ namespace AllBase.Model.DBModel
         /// </summary>
         public int? refund_status { get; set; }
 
+        public void SetOrderItemTextProperty()
+        {
+            this.SetTransitOrder();
+            this.SetItemRefund();
+            this.SetBuyerTransitWaybillStatusStr();
+        }
+
         public void UpdateOrderItemBuyButton()
         {
             var order_item = this;
diff --git a/AllBase/Model/DBModel/user_payment_record.cs b/AllBase/Model/DBModel/user_payment_record.cs
new file mode 100644
index 0000000..75a6965
--- /dev/null
+++ b/AllBase/Model/DBModel/user_payment_record.cs
@@ -0,0 +1,154 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AllBase.Model.DBModel
+{
+    public class user_payment_record
+    {
+        public long id { get; set; }
+        /// <summary>
+        /// 变动类型，1：充值，2：采购花费，3：产品退款到账，4：运费退款到账，5：采购收款，6：产品退款扣除，7：运费退款扣除，16:礼物单话费，20:中转运费，23:作废运费返还
+        /// </summary>
+        public int? type { get; set; }
+        /// <summary>
+        /// 充值或花费的金额(元)
+        /// </summary>
+        public decimal amount { get; set; }
+        /// <summary>
+        /// 充值或花费后的当前账户余额(元)
+        /// </summary>
+        public decimal balance { get; set; }
+        /// <summary>
+        /// 账户名
+        /// </summary>
+        public string user_name { get; set; }
+        /// <summary>
+        /// 平台编码
+        /// </summary>
+        public string platform_code { get; set; }
+        /// <summary>
+        /// 订单id
+        /// </summary>
+        public string order_id { get; set; }
+        /// <summary>
+        /// 售后单id
+        /// </summary>
+        public long? after_sale_id { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string create_by { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime create_time { get; set; }
+        /// <summary>
+        /// 修改人
+        /// </summary>
+        public string update_by { get; set; }
+        /// <summary>
+        /// 修改时间
+        /// </summary>
+        public DateTime update_time { get; set; }
+        /// <summary>
+        /// 是否已删除
+        /// </summary>
+        public int? is_deleted { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string remark { get; set; }
+        /// <summary>
+        /// 扣款的对方账户名称
+        /// </summary>
+        public string counterparty_account_name { get; set; }
+    }
+
+    public enum EnumOrderPaymentType
+    {
+        充值 = 1,
+        //采购花费 = 2,
+        //产品退款到账 = 3,
+        //运费退款到账 = 4,
+        //采购收款 = 5,
+        //产品退款扣除 = 6,
+        //运费退款扣除 = 7,
+        礼物单支出 = 16,
+        中转仓扣费支出 = 20,
+        中转仓作废收入 = 23,
+        中转仓超重支出 = 24,
+        支付宝在线充值 = 30,
+    }
+
+    /*
+       // 充值
+       RECHARGE(1, "充值"),
+
+       // 采购产品花费
+       PURCHASE_PRODUCT(2, "采购产品花费"),
+
+       // 产品退款到账
+       PRODUCT_REFUND_REVICED(3, "产品退款到账"),
+       //运费退款
+       FREIGHT_REFUND_REVICED(4, "运费退款到账"),
+       //采购产品收款
+       PURCHASE_PRODUCT_RECEIVE(5, "采购产品收款"),
+       //产品退款扣除
+       PRODUCT_REFUND(6, "产品退款扣除"),
+       //运费退款扣除
+       FREIGHT_REFUND(7, "运费退款扣除"),
+       //采购运费花费
+       PURCHASE_FREIGHT(8, "采购运费花费"),
+       //采购运费收款
+       PURCHASE_FREIGHT_RECEIVE(9, "采购运费收款"),
+       //手动补偿扣款
+       MANUAL_COMPENSATION(10, "手动补偿扣款"),
+       //手动补偿收款
+       MANUAL_COMPENSATION_RECEIVE(11, "手动补偿收款"),
+
+       //店铺订购抽成入账  代理
+       SHOP_ORDER_COMMISSION_ENTRY(12, "店铺订购抽成入账"),
+       // 货款充值抽成入账
+       RECHARGE_COMMISSION_ENTRY(13, "货款充值抽成入账"),
+       //代理提现
+       AGENT_WITHDRAWAL_ENTRY(14, "代理提现"),
+       DEDUCT_RECHARGE_COMMISSION(15, "减去货款充值抽成"),
+       //礼物单花费
+       GIFT_ORDER_DEDUCTION(16, "礼物单花费"),
+       //礼物单收取
+       GIFT_ORDER_COLLECTION(17, "礼物单收取"),
+
+       //外采礼物单花费
+       EXTERNAL_GIFT_ORDER_DEDUCTION(18, "外采礼物单花费"),
+       //外采礼物单收取
+       EXTERNAL_GIFT_ORDER_COLLECTION(19, "外采礼物单收取"),
+
+       // 中转费用花费（扣款/支出）
+       TRANSIT_WAREHOUSE_FEE_DEDUCTION(20, "中转仓花费"),
+       // 中转费用收取（入账/收费）
+       TRANSIT_WAREHOUSE_FEE_COLLECTION(21, "中转仓收取"),
+
+       // 中转费用退款扣款（退回时从供应商扣款）
+       TRANSIT_WAREHOUSE_FEE_REFUND_DEDUCTION(22, "中转仓退款扣款"),
+       // 中转费用退款收取（退回时给用户回款）
+       TRANSIT_WAREHOUSE_FEE_REFUND_COLLECTION(23, "中转仓退款收取"),
+
+       // 中转仓快递超重收款（入账/收费）
+       TRANSIT_WAREHOUSE_OVERWEIGHT_COLLECTION(25, "中转仓快递超重收款"),
+       TRANSIT_WAREHOUSE_OVERWEIGHT_DEDUCTION(24, "中转仓快递超重花费"),
+
+       // 退货包裹发货花费
+       RETURN_PACKAGE_SHIPPING_DEDUCTION(26, "退货包裹发货花费"),
+       // 退货包裹发货收款
+       RETURN_PACKAGE_SHIPPING_COLLECTION(27, "退货包裹发货收款"),
+       // 退货包裹超重花费（新增）
+       RETURN_PACKAGE_OVERWEIGHT_DEDUCTION(28, "退货包裹超重花费"),
+       // 退货包裹超重收款（新增）
+       RETURN_PACKAGE_OVERWEIGHT_COLLECTION(29, "退货包裹超重收款"),
+       //支付宝充值
+       ALI_PAY_RECHARGE(30, "支付宝在线充值");
+   */
+}
diff --git a/AllBase/Model/Result/PddBuyerOrderLiteInfo.cs b/AllBase/Model/Result/PddBuyerOrderLiteInfo.cs
index 18e8714..587504c 100644
--- a/AllBase/Model/Result/PddBuyerOrderLiteInfo.cs
+++ b/AllBase/Model/Result/PddBuyerOrderLiteInfo.cs
@@ -192,6 +192,11 @@ namespace AllBase.Model.Result
             get { return this.GetValue(x => x.PreAllocatedOrderNoStr); }
             set { this.SetValue(x => x.PreAllocatedOrderNoStr, value); }
         }
+        public string TransitWarehouseRawMessage
+        {
+            get { return this.GetValue(x => x.TransitWarehouseRawMessage); }
+            set { this.SetValue(x => x.TransitWarehouseRawMessage, value); }
+        }
         /// <summary>
         /// 处理中,  "已取号(更正)",  已取号， 提前取号， 取号失败
         /// </summary>
diff --git a/Work/29WxOrderWork.csproj b/Work/29WxOrderWork.csproj
index 68eda3e..36efe79 100644
--- a/Work/29WxOrderWork.csproj
+++ b/Work/29WxOrderWork.csproj
@@ -268,6 +268,7 @@
     <Compile Include="_29Tools\BLL\HttpResponseYkdBLL.cs" />
     <Compile Include="_29Tools\BLL\ShopBLL.cs" />
     <Compile Include="_29Tools\BLL\WxOrderSupplierBLL.cs" />
+    <Compile Include="_29Tools\CefTools\LocalCEFBrowser.cs" />
     <Compile Include="_29Tools\CefTools\LocalCookieVisitor.cs" />
     <Compile Include="_29Tools\CefTools\LocalRequestHandler.cs" />
     <Compile Include="_29Tools\CefTools\LocalResourceRequestHandler.cs" />
@@ -303,6 +304,12 @@
     <Compile Include="_29Tools\Forms\UserForms\WXGetBalanceQrCodeForm.Designer.cs">
       <DependentUpon>WXGetBalanceQrCodeForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="_29Tools\Forms\UserForms\WXGetTopUpQrCode.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="_29Tools\Forms\UserForms\WXGetTopUpQrCode.Designer.cs">
+      <DependentUpon>WXGetTopUpQrCode.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\AllBase\29WxOrderAllBase.csproj">
@@ -383,6 +390,9 @@
     <EmbeddedResource Include="_29Tools\Forms\UserForms\WXGetBalanceQrCodeForm.resx">
       <DependentUpon>WXGetBalanceQrCodeForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="_29Tools\Forms\UserForms\WXGetTopUpQrCode.resx">
+      <DependentUpon>WXGetTopUpQrCode.cs</DependentUpon>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Work/29WxOrderWork.csproj.user b/Work/29WxOrderWork.csproj.user
index a607660..0b24643 100644
--- a/Work/29WxOrderWork.csproj.user
+++ b/Work/29WxOrderWork.csproj.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/Work/BaseForms/BaseGeneralForm.cs b/Work/BaseForms/BaseGeneralForm.cs
index 2a63833..03c9c59 100644
--- a/Work/BaseForms/BaseGeneralForm.cs
+++ b/Work/BaseForms/BaseGeneralForm.cs
@@ -97,7 +97,7 @@ namespace Work.BaseForms
         {
             if (visible)
             {
-                this.Padding = new Padding(1);
+                this.Padding = new Padding(2);
                 this.pnlTitle.Visible = true;
             }
             else
diff --git a/Work/Initialization.cs b/Work/Initialization.cs
index 5ffc7db..4d782fb 100644
--- a/Work/Initialization.cs
+++ b/Work/Initialization.cs
@@ -27,6 +27,9 @@ namespace Work
         public static string ConfigFilePach = Application.StartupPath + "\\Config.xml";
         public void Get()
         {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+
             string s = FileBase.ReadAllText("config.ini");
             if (!string.IsNullOrEmpty(s) && s.Contains(","))
             {
diff --git a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
index 6019cf9..3aeb9fb 100644
--- a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
+++ b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
@@ -62,11 +62,12 @@ namespace TemuKJD.ToolForms
         private WXBuyMapInfo buyMap = null;
         // 订单仓库
         private TransitWarehouseParam transitWarehouse = null;
-        // (拍单后)回调函数
+        // (拍单后)回调函数，过滤订单
         private Action<oms_wei_order_info, bool> filterOrderAction = null;
+        // (拍单后)回调函数，更新拍单余额
+        private Action updateBalanceAction = null;
 
-
-        public PddMobileBuyOrderForm(Action<oms_wei_order_info, bool> filterOrder, oms_wei_order_item_info orderItemInfo, BuyerLoginInfo buyerInfo, WXBuyMapInfo buy_map = null)
+        public PddMobileBuyOrderForm(Action<oms_wei_order_info, bool> filterOrder, Action updateBalance, oms_wei_order_item_info orderItemInfo, BuyerLoginInfo buyerInfo, WXBuyMapInfo buy_map = null)
         {
             InitializeComponent();
 
@@ -75,6 +76,7 @@ namespace TemuKJD.ToolForms
             this.buyMap = buy_map;
 
             filterOrderAction = filterOrder;
+            updateBalanceAction = updateBalance;
         }
 
         private void PddBuyOrderForm_Load(object sender, EventArgs e)
@@ -648,7 +650,7 @@ namespace TemuKJD.ToolForms
             jsStr1 = @"(function() { var elements = document.getElementsByTagName('div');
                                for (i = elements.length - 1; i >= 0; i--){
                                    var element = elements[i];
-                                   if (element.innerHTML.indexOf('" + txtBuyTransitWarehouse.Text.Trim() + @"') >= 0) {
+                                   if (element.innerHTML.indexOf('" + txtBuyTransitWarehouse.Text.Trim() + @"') >= 0 && element.innerHTML.indexOf('" + txtSourceCode.Text.Trim() + @"') >= 0) {
                                        element.click();
                                        return 'success';
                                    }
@@ -819,7 +821,6 @@ namespace TemuKJD.ToolForms
 
                                         if (filterOrderAction != null)
                                         {
-                                            GlobalConfig.lstFilterOrder.Remove(order);
                                             filterOrderAction(order, false);
                                         }
                                     }
@@ -940,14 +941,8 @@ namespace TemuKJD.ToolForms
                     return;
                 }
 
-                url = BaseClass.Build29WxObjString("user/get_all_user");
-                var data = UserLogin.GetSignaturex();
-                data += "&search_user_name=" + BaseClass.UserName;
-                var html = GetHtml.PostUtf8(url, data);
-                if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
-                    html = GetHtml.PostUtf8(url, data);
-                if (html.Contains("\"code\":200"))
-                    BaseClass.Balance = BaseRegex.GetDecimalJson(ref html, "balance");
+                if (updateBalanceAction != null)
+                    updateBalanceAction();
 
                 orderItem.ItemTransitOrders.Insert(0, new oms_wei_external_procurement_log_info()
                 {
@@ -959,14 +954,12 @@ namespace TemuKJD.ToolForms
                     out_order_no = txtBuyOrderId.Text.Trim(),
                     purchaser_note = body["purchaserNote"].ParseToString(),
                 });
-
-                orderItem.SetTransitOrder();
+                orderItem.SetOrderItemTextProperty();
                 // 利润计算重置为最小值，控件Resource更新时将计算利润
                 orderItem.ProfitCount = decimal.MinValue;
-                var order = orderItem.ItemOrder;
-                if (filterOrderAction != null)
+                var order = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.order_id == orderItem.order_id);
+                if (filterOrderAction != null && order != null)
                 {
-                    GlobalConfig.lstFilterOrder.Remove(order);
                     filterOrderAction(order, true);
                 }
 
@@ -1030,27 +1023,28 @@ namespace TemuKJD.ToolForms
                 if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
                 {
                     var msg = BaseRegex.GetStringJsonByRegs(ref html, html, "msg");
-                    BaseMsgForm.ShowError("异常单重拍保存失败");
+                    BaseMsgForm.ShowError("异常订单重拍保存失败");
                     btnManualUpdateBuyOrder.Enabled = true;
                     return;
                 }
 
-                orderItem.ItemTransitOrder.buyer_account = buyer.buyer_nick;
-                orderItem.ItemTransitOrder.id = 0;
-                orderItem.ItemTransitOrder.order_no = orderItem.order_id;
-                orderItem.ItemTransitOrder.order_sku_id = orderItem.sku_id;
-                orderItem.ItemTransitOrder.out_amount = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt();
-                orderItem.ItemTransitOrder.out_order_no = txtBuyOrderId.Text.Trim();
-                orderItem.ItemTransitOrder.purchaser_note = BaseClass.UserName + "-" + BaseClass.NickName;
-                orderItem.ItemTransitOrder.refund_status = "";
-
-                orderItem.SetTransitOrder();
+                if (orderItem.ItemTransitOrder != null)
+                {
+                    orderItem.ItemTransitOrder.buyer_account = buyer.buyer_nick;
+                    orderItem.ItemTransitOrder.id = 0;
+                    orderItem.ItemTransitOrder.order_no = orderItem.order_id;
+                    orderItem.ItemTransitOrder.order_sku_id = orderItem.sku_id;
+                    orderItem.ItemTransitOrder.out_amount = (txtBuyPrice.Text.ParseToDecimal() * 100).ParseToInt();
+                    orderItem.ItemTransitOrder.out_order_no = txtBuyOrderId.Text.Trim();
+                    orderItem.ItemTransitOrder.purchaser_note = BaseClass.UserName + "-" + BaseClass.NickName;
+                    orderItem.ItemTransitOrder.refund_status = "";
+                }
+                orderItem.SetOrderItemTextProperty();
                 // 利润计算重置为最小值，控件Resource更新时将计算利润
                 orderItem.ProfitCount = decimal.MinValue;
-                var order = orderItem.ItemOrder;
-                if (filterOrderAction != null)
+                var order = GlobalConfig.lstFilterOrder.FirstOrDefault(o => o.order_id == orderItem.order_id);
+                if (filterOrderAction != null && order != null)
                 {
-                    GlobalConfig.lstFilterOrder.Remove(order);
                     filterOrderAction(order, true);
                 }
             }
diff --git a/Work/_29Tools/Forms/PddMobileBuyOrderForm.designer.cs b/Work/_29Tools/Forms/PddMobileBuyOrderForm.designer.cs
index 0e564ac..b5ea5ea 100644
--- a/Work/_29Tools/Forms/PddMobileBuyOrderForm.designer.cs
+++ b/Work/_29Tools/Forms/PddMobileBuyOrderForm.designer.cs
@@ -865,6 +865,7 @@
             this.txtSourceCode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
             this.txtSourceCode.Location = new System.Drawing.Point(310, 139);
             this.txtSourceCode.Name = "txtSourceCode";
+            this.txtSourceCode.ReadOnly = true;
             this.txtSourceCode.Size = new System.Drawing.Size(152, 23);
             this.txtSourceCode.TabIndex = 885;
             // 
diff --git a/Work/_29Tools/Forms/ShopForms/WXShopLoginForm.cs b/Work/_29Tools/Forms/ShopForms/WXShopLoginForm.cs
index 5e4ccbb..dca3de1 100644
--- a/Work/_29Tools/Forms/ShopForms/WXShopLoginForm.cs
+++ b/Work/_29Tools/Forms/ShopForms/WXShopLoginForm.cs
@@ -45,6 +45,7 @@ namespace Work._29Tools.Forms.ShopForms
         public bool isMultiLogin = false;
         public string MultiLoginCookieName = "";
         public string InitUrl = "";
+        public string InitHtml = "";
         private string shopCookieHead = "qq.com";
         private string shopLoginUrl = "https://store.weixin.qq.com/shop?redirect_url=%2Fhome";
         private string shopMainUrl = "https://store.weixin.qq.com/shop/home";
@@ -81,6 +82,25 @@ namespace Work._29Tools.Forms.ShopForms
                 });
             }
 
+            if (string.IsNullOrEmpty(InitUrl) && !string.IsNullOrEmpty(InitHtml))
+            {
+                btnLoginAgain.Visible = false;
+                panel1.Visible = false;
+
+
+                cefWebBrowser = new ChromiumWebBrowser(new CefSharp.Web.HtmlString(InitHtml, false, "UTF-8"));
+                LocalResourceRequestHandler resourceRequestHandler = new LocalResourceRequestHandler();
+                resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete;
+                cefWebBrowser.RequestHandler = new CustomRequestHandler(resourceRequestHandler); 
+                var lifeSapnHandler = new LocalLifeSpanHandler(PopWindowType.SelfWindow);
+                cefWebBrowser.LifeSpanHandler = lifeSapnHandler;
+                cefWebBrowser.KeyboardHandler = new KeyboardHandler();
+                cefWebBrowser.Dock = DockStyle.Fill;
+                splitContainer1.Panel1.Controls.Add(cefWebBrowser);
+                cefWebBrowser.BringToFront();
+                return;
+            }
+
             if (!isMultiLogin)
                 AutoLogin();
 
@@ -484,6 +504,21 @@ namespace Work._29Tools.Forms.ShopForms
         
         private void RequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData, IRequest request)
         {
+            if (responseData.Contains("交易付款成功，正在跳转至商户页面"))
+            {
+                Invoke(new Action(() =>
+                {
+                    try
+                    {
+                        this.Close();
+                    }
+                    catch
+                    {
+
+                    }
+                }));
+            }
+
             if (url == "https://store.weixin.qq.com/shop/home" && this.openType == EnumOpenType.login)
             {
                 Task.Run(() =>
diff --git a/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.Designer.cs b/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.Designer.cs
index b21a4ab..7e9d92e 100644
--- a/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.Designer.cs
+++ b/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.Designer.cs
@@ -29,40 +29,93 @@ namespace Work._29Tools.Forms.UserForms
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             this.label1 = new System.Windows.Forms.Label();
-            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.pbQrcode = new System.Windows.Forms.PictureBox();
             this.btnRefresh = new DevComponents.DotNetBar.PanelEx();
             this.pbLoading = new System.Windows.Forms.PictureBox();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.numTopUpAmount = new System.Windows.Forms.NumericUpDown();
+            this.btnBalanceTopUp = new DevComponents.DotNetBar.PanelEx();
+            this.splitContainer2 = new System.Windows.Forms.SplitContainer();
+            this.ucGroupBoxEx1 = new Work.UserComponents.UcGroupBoxEx(this.components);
+            this.label7 = new System.Windows.Forms.Label();
+            this.txtOutOrderId = new System.Windows.Forms.TextBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.txtShopOrderNo = new System.Windows.Forms.TextBox();
+            this.btnSearch = new DevComponents.DotNetBar.PanelEx();
+            this.dtpTimeEnd = new System.Windows.Forms.DateTimePicker();
+            this.dtpTimeBegin = new System.Windows.Forms.DateTimePicker();
+            this.label5 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.cmbType = new System.Windows.Forms.ComboBox();
+            this.splitContainer3 = new System.Windows.Forms.SplitContainer();
+            this.pictureBox2 = new System.Windows.Forms.PictureBox();
+            this.dgvPayment = new Work.UserComponents.DataGridViewEx();
+            this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.colType = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colOrderId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colAmount = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colBalance = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colCreateTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colRemark = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.statusBarUserControl1 = new Work.UserControls.StatusBarUserControl();
+            this.ucSplitPage1 = new Work.UserControls.UcSplitPage();
             ((System.ComponentModel.ISupportInitialize)(this.pbCloseBase)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbQrcode)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.numTopUpAmount)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
+            this.splitContainer2.Panel1.SuspendLayout();
+            this.splitContainer2.Panel2.SuspendLayout();
+            this.splitContainer2.SuspendLayout();
+            this.ucGroupBoxEx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
+            this.splitContainer3.Panel1.SuspendLayout();
+            this.splitContainer3.Panel2.SuspendLayout();
+            this.splitContainer3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvPayment)).BeginInit();
             this.SuspendLayout();
             // 
             // pbCloseBase
             // 
             this.pbCloseBase.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.pbCloseBase.Location = new System.Drawing.Point(412, 0);
+            this.pbCloseBase.Location = new System.Drawing.Point(1189, 0);
             // 
             // label1
             // 
             this.label1.Font = new System.Drawing.Font("微软雅黑", 11F);
             this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
-            this.label1.Location = new System.Drawing.Point(29, 409);
+            this.label1.Location = new System.Drawing.Point(21, 20);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(384, 44);
+            this.label1.Size = new System.Drawing.Size(214, 64);
             this.label1.TabIndex = 1;
-            this.label1.Text = "支付宝扫码充值，备注软件登录账户。如忘记备注，请联系购买方充值。";
+            this.label1.Text = "在下方输入要充值的金额，点击充值按钮自助充值。";
             // 
-            // pictureBox1
+            // pbQrcode
             // 
-            this.pictureBox1.Location = new System.Drawing.Point(29, 19);
-            this.pictureBox1.Name = "pictureBox1";
-            this.pictureBox1.Size = new System.Drawing.Size(384, 384);
-            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
-            this.pictureBox1.TabIndex = 3;
-            this.pictureBox1.TabStop = false;
+            this.pbQrcode.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pbQrcode.Location = new System.Drawing.Point(21, 174);
+            this.pbQrcode.Name = "pbQrcode";
+            this.pbQrcode.Padding = new System.Windows.Forms.Padding(0, 0, 10, 14);
+            this.pbQrcode.Size = new System.Drawing.Size(200, 200);
+            this.pbQrcode.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            this.pbQrcode.TabIndex = 3;
+            this.pbQrcode.TabStop = false;
+            this.pbQrcode.Visible = false;
             // 
             // btnRefresh
             // 
@@ -70,7 +123,7 @@ namespace Work._29Tools.Forms.UserForms
             this.btnRefresh.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnRefresh.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnRefresh.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnRefresh.Location = new System.Drawing.Point(329, 450);
+            this.btnRefresh.Location = new System.Drawing.Point(136, 385);
             this.btnRefresh.Name = "btnRefresh";
             this.btnRefresh.Size = new System.Drawing.Size(84, 23);
             this.btnRefresh.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -86,12 +139,13 @@ namespace Work._29Tools.Forms.UserForms
             this.btnRefresh.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
             this.btnRefresh.TabIndex = 1135;
             this.btnRefresh.Text = "刷新";
+            this.btnRefresh.Visible = false;
             this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click);
             // 
             // pbLoading
             // 
             this.pbLoading.Image = global::Work.Properties.Resources.loading_blue;
-            this.pbLoading.Location = new System.Drawing.Point(196, 186);
+            this.pbLoading.Location = new System.Drawing.Point(96, 249);
             this.pbLoading.Name = "pbLoading";
             this.pbLoading.Size = new System.Drawing.Size(50, 50);
             this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -102,42 +156,484 @@ namespace Work._29Tools.Forms.UserForms
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.btnRefresh);
-            this.panel1.Controls.Add(this.pbLoading);
-            this.panel1.Controls.Add(this.label1);
-            this.panel1.Controls.Add(this.pictureBox1);
+            this.panel1.Controls.Add(this.splitContainer1);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.panel1.Location = new System.Drawing.Point(1, 33);
+            this.panel1.Location = new System.Drawing.Point(2, 34);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(444, 488);
+            this.panel1.Size = new System.Drawing.Size(1221, 529);
             this.panel1.TabIndex = 1140;
             // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.label3);
+            this.splitContainer1.Panel1.Controls.Add(this.pbLoading);
+            this.splitContainer1.Panel1.Controls.Add(this.label2);
+            this.splitContainer1.Panel1.Controls.Add(this.numTopUpAmount);
+            this.splitContainer1.Panel1.Controls.Add(this.btnRefresh);
+            this.splitContainer1.Panel1.Controls.Add(this.btnBalanceTopUp);
+            this.splitContainer1.Panel1.Controls.Add(this.label1);
+            this.splitContainer1.Panel1.Controls.Add(this.pbQrcode);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
+            this.splitContainer1.Size = new System.Drawing.Size(1221, 529);
+            this.splitContainer1.SplitterDistance = 253;
+            this.splitContainer1.TabIndex = 1139;
+            // 
+            // label3
+            // 
+            this.label3.Font = new System.Drawing.Font("微软雅黑", 11F);
+            this.label3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
+            this.label3.Location = new System.Drawing.Point(21, 421);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(214, 64);
+            this.label3.TabIndex = 1148;
+            this.label3.Text = "支付宝扫码充值，备注软件登录账户。如忘记备注，请联系购买方充值。";
+            this.label3.Visible = false;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(21, 88);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(80, 17);
+            this.label2.TabIndex = 1144;
+            this.label2.Text = "余额充值金额";
+            // 
+            // numTopUpAmount
+            // 
+            this.numTopUpAmount.DecimalPlaces = 2;
+            this.numTopUpAmount.Location = new System.Drawing.Point(107, 85);
+            this.numTopUpAmount.Maximum = new decimal(new int[] {
+            1000000,
+            0,
+            0,
+            0});
+            this.numTopUpAmount.Minimum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            this.numTopUpAmount.Name = "numTopUpAmount";
+            this.numTopUpAmount.Size = new System.Drawing.Size(67, 23);
+            this.numTopUpAmount.TabIndex = 1143;
+            this.numTopUpAmount.Value = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
+            // 
+            // btnBalanceTopUp
+            // 
+            this.btnBalanceTopUp.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnBalanceTopUp.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnBalanceTopUp.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnBalanceTopUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnBalanceTopUp.Location = new System.Drawing.Point(180, 85);
+            this.btnBalanceTopUp.Name = "btnBalanceTopUp";
+            this.btnBalanceTopUp.Size = new System.Drawing.Size(41, 23);
+            this.btnBalanceTopUp.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnBalanceTopUp.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnBalanceTopUp.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnBalanceTopUp.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnBalanceTopUp.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnBalanceTopUp.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnBalanceTopUp.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnBalanceTopUp.Style.GradientAngle = 90;
+            this.btnBalanceTopUp.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnBalanceTopUp.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnBalanceTopUp.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnBalanceTopUp.TabIndex = 1142;
+            this.btnBalanceTopUp.Text = "充值";
+            this.btnBalanceTopUp.Click += new System.EventHandler(this.btnBalanceTopUp_Click);
+            // 
+            // splitContainer2
+            // 
+            this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer2.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer2.Name = "splitContainer2";
+            this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer2.Panel1
+            // 
+            this.splitContainer2.Panel1.Controls.Add(this.ucGroupBoxEx1);
+            // 
+            // splitContainer2.Panel2
+            // 
+            this.splitContainer2.Panel2.Controls.Add(this.splitContainer3);
+            this.splitContainer2.Size = new System.Drawing.Size(964, 529);
+            this.splitContainer2.SplitterDistance = 86;
+            this.splitContainer2.TabIndex = 1163;
+            // 
+            // ucGroupBoxEx1
+            // 
+            this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.ucGroupBoxEx1.BorderStyle = Work.UserComponents.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
+            this.ucGroupBoxEx1.Controls.Add(this.label7);
+            this.ucGroupBoxEx1.Controls.Add(this.txtOutOrderId);
+            this.ucGroupBoxEx1.Controls.Add(this.label6);
+            this.ucGroupBoxEx1.Controls.Add(this.txtShopOrderNo);
+            this.ucGroupBoxEx1.Controls.Add(this.btnSearch);
+            this.ucGroupBoxEx1.Controls.Add(this.dtpTimeEnd);
+            this.ucGroupBoxEx1.Controls.Add(this.dtpTimeBegin);
+            this.ucGroupBoxEx1.Controls.Add(this.label5);
+            this.ucGroupBoxEx1.Controls.Add(this.label4);
+            this.ucGroupBoxEx1.Controls.Add(this.cmbType);
+            this.ucGroupBoxEx1.Location = new System.Drawing.Point(-2, 2);
+            this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
+            this.ucGroupBoxEx1.Size = new System.Drawing.Size(966, 84);
+            this.ucGroupBoxEx1.TabIndex = 0;
+            this.ucGroupBoxEx1.TabStop = false;
+            this.ucGroupBoxEx1.Text = "查询条件";
+            this.ucGroupBoxEx1.Enter += new System.EventHandler(this.ucGroupBoxEx1_Enter);
+            // 
+            // label7
+            // 
+            this.label7.AutoSize = true;
+            this.label7.Location = new System.Drawing.Point(169, 37);
+            this.label7.Name = "label7";
+            this.label7.Size = new System.Drawing.Size(56, 17);
+            this.label7.TabIndex = 1160;
+            this.label7.Text = "买手单号";
+            // 
+            // txtOutOrderId
+            // 
+            this.txtOutOrderId.Location = new System.Drawing.Point(225, 34);
+            this.txtOutOrderId.Name = "txtOutOrderId";
+            this.txtOutOrderId.Size = new System.Drawing.Size(154, 23);
+            this.txtOutOrderId.TabIndex = 1159;
+            // 
+            // label6
+            // 
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(385, 37);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(56, 17);
+            this.label6.TabIndex = 1158;
+            this.label6.Text = "店铺单号";
+            // 
+            // txtShopOrderNo
+            // 
+            this.txtShopOrderNo.Location = new System.Drawing.Point(441, 34);
+            this.txtShopOrderNo.Name = "txtShopOrderNo";
+            this.txtShopOrderNo.Size = new System.Drawing.Size(154, 23);
+            this.txtShopOrderNo.TabIndex = 1157;
+            // 
+            // btnSearch
+            // 
+            this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSearch.Location = new System.Drawing.Point(888, 34);
+            this.btnSearch.Name = "btnSearch";
+            this.btnSearch.Size = new System.Drawing.Size(62, 23);
+            this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnSearch.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnSearch.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnSearch.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnSearch.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnSearch.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnSearch.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnSearch.Style.GradientAngle = 90;
+            this.btnSearch.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnSearch.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnSearch.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnSearch.TabIndex = 1153;
+            this.btnSearch.Text = "查询";
+            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+            // 
+            // dtpTimeEnd
+            // 
+            this.dtpTimeEnd.Location = new System.Drawing.Point(772, 34);
+            this.dtpTimeEnd.Name = "dtpTimeEnd";
+            this.dtpTimeEnd.Size = new System.Drawing.Size(111, 23);
+            this.dtpTimeEnd.TabIndex = 1149;
+            // 
+            // dtpTimeBegin
+            // 
+            this.dtpTimeBegin.Location = new System.Drawing.Point(656, 34);
+            this.dtpTimeBegin.Name = "dtpTimeBegin";
+            this.dtpTimeBegin.Size = new System.Drawing.Size(111, 23);
+            this.dtpTimeBegin.TabIndex = 1148;
+            // 
+            // label5
+            // 
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(600, 37);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(56, 17);
+            this.label5.TabIndex = 1147;
+            this.label5.Text = "起止时间";
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(10, 37);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(32, 17);
+            this.label4.TabIndex = 1145;
+            this.label4.Text = "类型";
+            // 
+            // cmbType
+            // 
+            this.cmbType.FormattingEnabled = true;
+            this.cmbType.Items.AddRange(new object[] {
+            "",
+            "充值",
+            "管理员充值",
+            "支付宝充值",
+            "拍单扣除/作废返还",
+            "超重扣费"});
+            this.cmbType.Location = new System.Drawing.Point(42, 33);
+            this.cmbType.Name = "cmbType";
+            this.cmbType.Size = new System.Drawing.Size(121, 25);
+            this.cmbType.TabIndex = 0;
+            // 
+            // splitContainer3
+            // 
+            this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
+            this.splitContainer3.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer3.Name = "splitContainer3";
+            this.splitContainer3.Orientation = System.Windows.Forms.Orientation.Horizontal;
+            // 
+            // splitContainer3.Panel1
+            // 
+            this.splitContainer3.Panel1.Controls.Add(this.pictureBox2);
+            this.splitContainer3.Panel1.Controls.Add(this.dgvPayment);
+            this.splitContainer3.Panel1.Controls.Add(this.textBox1);
+            this.splitContainer3.Panel1.Padding = new System.Windows.Forms.Padding(0, 2, 2, 2);
+            // 
+            // splitContainer3.Panel2
+            // 
+            this.splitContainer3.Panel2.Controls.Add(this.statusBarUserControl1);
+            this.splitContainer3.Panel2.Controls.Add(this.ucSplitPage1);
+            this.splitContainer3.Size = new System.Drawing.Size(964, 439);
+            this.splitContainer3.SplitterDistance = 410;
+            this.splitContainer3.TabIndex = 1163;
+            // 
+            // pictureBox2
+            // 
+            this.pictureBox2.Image = global::Work.Properties.Resources.loading_blue;
+            this.pictureBox2.Location = new System.Drawing.Point(458, 181);
+            this.pictureBox2.Name = "pictureBox2";
+            this.pictureBox2.Size = new System.Drawing.Size(50, 50);
+            this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pictureBox2.TabIndex = 1163;
+            this.pictureBox2.TabStop = false;
+            this.pictureBox2.Visible = false;
+            // 
+            // dgvPayment
+            // 
+            this.dgvPayment.AllowUserToAddRows = false;
+            this.dgvPayment.AllowUserToDeleteRows = false;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvPayment.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvPayment.AutoRowNumber = true;
+            this.dgvPayment.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+            this.dgvPayment.BackgroundColor = System.Drawing.Color.White;
+            this.dgvPayment.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvPayment.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvPayment.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dgvPayment.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.colCheck,
+            this.colType,
+            this.colOrderId,
+            this.colAmount,
+            this.colBalance,
+            this.colCreateTime,
+            this.colRemark});
+            this.dgvPayment.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvPayment.Location = new System.Drawing.Point(0, 2);
+            this.dgvPayment.MultiSelectCheckBox = true;
+            this.dgvPayment.Name = "dgvPayment";
+            this.dgvPayment.ReadOnly = true;
+            this.dgvPayment.RowTemplate.Height = 23;
+            this.dgvPayment.Size = new System.Drawing.Size(962, 406);
+            this.dgvPayment.TabIndex = 1162;
+            this.dgvPayment.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPayment_CellContentClick);
+            // 
+            // colCheck
+            // 
+            this.colCheck.FillWeight = 20F;
+            this.colCheck.HeaderText = "选择";
+            this.colCheck.Name = "colCheck";
+            this.colCheck.ReadOnly = true;
+            this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            // 
+            // colType
+            // 
+            this.colType.HeaderText = "类型";
+            this.colType.Name = "colType";
+            this.colType.ReadOnly = true;
+            // 
+            // colOrderId
+            // 
+            this.colOrderId.FillWeight = 120F;
+            this.colOrderId.HeaderText = "订单ID";
+            this.colOrderId.Name = "colOrderId";
+            this.colOrderId.ReadOnly = true;
+            // 
+            // colAmount
+            // 
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colAmount.DefaultCellStyle = dataGridViewCellStyle3;
+            this.colAmount.FillWeight = 60F;
+            this.colAmount.HeaderText = "金额";
+            this.colAmount.Name = "colAmount";
+            this.colAmount.ReadOnly = true;
+            // 
+            // colBalance
+            // 
+            this.colBalance.FillWeight = 60F;
+            this.colBalance.HeaderText = "余额";
+            this.colBalance.Name = "colBalance";
+            this.colBalance.ReadOnly = true;
+            // 
+            // colCreateTime
+            // 
+            this.colCreateTime.HeaderText = "创建时间";
+            this.colCreateTime.Name = "colCreateTime";
+            this.colCreateTime.ReadOnly = true;
+            // 
+            // colRemark
+            // 
+            this.colRemark.FillWeight = 120F;
+            this.colRemark.HeaderText = "备注";
+            this.colRemark.Name = "colRemark";
+            this.colRemark.ReadOnly = true;
+            this.colRemark.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colRemark.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(75, 74);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(100, 23);
+            this.textBox1.TabIndex = 1;
+            // 
+            // statusBarUserControl1
+            // 
+            this.statusBarUserControl1.Dock = System.Windows.Forms.DockStyle.Left;
+            this.statusBarUserControl1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.statusBarUserControl1.Location = new System.Drawing.Point(0, 0);
+            this.statusBarUserControl1.Margin = new System.Windows.Forms.Padding(0);
+            this.statusBarUserControl1.Name = "statusBarUserControl1";
+            this.statusBarUserControl1.Size = new System.Drawing.Size(585, 25);
+            this.statusBarUserControl1.TabIndex = 1164;
+            // 
+            // ucSplitPage1
+            // 
+            this.ucSplitPage1.CurrentPage = 1;
+            this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
+            this.ucSplitPage1.IsShowPageSize = true;
+            this.ucSplitPage1.Location = new System.Drawing.Point(550, 0);
+            this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
+            this.ucSplitPage1.Name = "ucSplitPage1";
+            this.ucSplitPage1.PageSize = 50;
+            this.ucSplitPage1.Size = new System.Drawing.Size(414, 25);
+            this.ucSplitPage1.TabIndex = 1163;
+            this.ucSplitPage1.TotalPage = 1;
+            this.ucSplitPage1.PageChange += new System.Action<object>(this.ucSplitPage1_PageChange);
+            this.ucSplitPage1.Load += new System.EventHandler(this.ucSplitPage1_Load);
+            // 
             // WXGetBalanceQrCodeForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(152)))), ((int)(((byte)(99)))), ((int)(((byte)(143)))));
-            this.ClientSize = new System.Drawing.Size(446, 522);
+            this.ClientSize = new System.Drawing.Size(1225, 565);
             this.Controls.Add(this.panel1);
             this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.KeyPreview = true;
             this.Name = "WXGetBalanceQrCodeForm";
-            this.Padding = new System.Windows.Forms.Padding(1);
-            this.Text = "二维码充值";
-            this.TitleText = "二维码充值";
+            this.Padding = new System.Windows.Forms.Padding(2);
+            this.Text = "二维码余额充值";
+            this.TitleText = "二维码余额充值";
             this.Load += new System.EventHandler(this.WXGetTopUpQrCode_Load);
             this.Controls.SetChildIndex(this.panel1, 0);
             ((System.ComponentModel.ISupportInitialize)(this.pbCloseBase)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbQrcode)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
             this.panel1.ResumeLayout(false);
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel1.PerformLayout();
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.numTopUpAmount)).EndInit();
+            this.splitContainer2.Panel1.ResumeLayout(false);
+            this.splitContainer2.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
+            this.splitContainer2.ResumeLayout(false);
+            this.ucGroupBoxEx1.ResumeLayout(false);
+            this.ucGroupBoxEx1.PerformLayout();
+            this.splitContainer3.Panel1.ResumeLayout(false);
+            this.splitContainer3.Panel1.PerformLayout();
+            this.splitContainer3.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
+            this.splitContainer3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvPayment)).EndInit();
             this.ResumeLayout(false);
 
         }
 
         #endregion
         private System.Windows.Forms.Label label1;
-        private System.Windows.Forms.PictureBox pictureBox1;
+        private System.Windows.Forms.PictureBox pbQrcode;
         private DevComponents.DotNetBar.PanelEx btnRefresh;
         private System.Windows.Forms.PictureBox pbLoading;
         private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.NumericUpDown numTopUpAmount;
+        private DevComponents.DotNetBar.PanelEx btnBalanceTopUp;
+        private UserComponents.DataGridViewEx dgvPayment;
+        private System.Windows.Forms.SplitContainer splitContainer2;
+        private System.Windows.Forms.SplitContainer splitContainer3;
+        private UserControls.UcSplitPage ucSplitPage1;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.PictureBox pictureBox2;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colType;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colOrderId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colAmount;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colBalance;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colCreateTime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colRemark;
+        private UserComponents.UcGroupBoxEx ucGroupBoxEx1;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.ComboBox cmbType;
+        private System.Windows.Forms.DateTimePicker dtpTimeEnd;
+        private System.Windows.Forms.DateTimePicker dtpTimeBegin;
+        private DevComponents.DotNetBar.PanelEx btnSearch;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.TextBox txtShopOrderNo;
+        private System.Windows.Forms.Label label7;
+        private System.Windows.Forms.TextBox txtOutOrderId;
+        private UserControls.StatusBarUserControl statusBarUserControl1;
     }
 }
\ No newline at end of file
diff --git a/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.cs b/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.cs
index 255855e..4652f03 100644
--- a/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.cs
+++ b/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.cs
@@ -1,27 +1,47 @@
 using AllBase;
+using AllBase.Model.DBModel;
+using CefSharp;
+using CefSharp.WinForms;
+using DevComponents.WinForms.Drawing;
+using NaiBa.CefHelper;
+using NaiBa.Util.Extension;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
+using System.Diagnostics;
 using System.Drawing;
+using System.Drawing.Printing;
+using System.IO;
 using System.Linq;
+using System.Security.Cryptography.X509Certificates;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using Work;
+using Work._29Tools.BLL;
+using Work._29Tools.Forms.ShopForms;
 using Work.BaseForms;
+using Work.Extension;
 
 namespace Work._29Tools.Forms.UserForms
 {
     public partial class WXGetBalanceQrCodeForm : BaseForms.BaseGeneralForm
     {
-        public WXGetBalanceQrCodeForm()
+        // (拍单后)回调函数，更新拍单余额
+        private Action updateBalanceAction = null;
+
+        public WXGetBalanceQrCodeForm(Action updateBalance = null)
         {
             InitializeComponent();
+            updateBalanceAction = updateBalance;
         }
 
         public void refreshQrcode()
         {
+            return;
             Invoke(new Action(() =>
             {
                 pbLoading.Visible = true;
@@ -43,9 +63,9 @@ namespace Work._29Tools.Forms.UserForms
                     pbLoading.Visible = false;
                     var base64Str = BaseRegex.GetStringJson(ref html, "qrcode_base64");
                     if (!string.IsNullOrEmpty(base64Str))
-                        pictureBox1.Image = Base64ChangeImgUrl.Base64ToImage(base64Str);
+                        pbQrcode.Image = Base64ChangeImgUrl.Base64ToImage(base64Str);
                     else
-                        pictureBox1.Image = Properties.Resources.errpic;
+                        pbQrcode.Image = Properties.Resources.errpic;
                 }));
             }
         }
@@ -55,10 +75,175 @@ namespace Work._29Tools.Forms.UserForms
             Task.Run(() => { refreshQrcode(); });
         }
 
-        private void WXGetTopUpQrCode_Load(object sender, EventArgs e)
+        private async void WXGetTopUpQrCode_Load(object sender, EventArgs e)
         {
-            Task.Run(() => { refreshQrcode(); });
+#if DEBUG
+            if (File.Exists(System.Environment.CurrentDirectory + "\\choice.debug.tools"))
+            {
+                this.numTopUpAmount.Minimum = 0.01m;
+                this.numTopUpAmount.Value = 0.01m;
+            }
+#endif
+
+                this.dgvPayment.AddSelectorColumn("colCheck");
+            this.dtpTimeBegin.Value = DateTime.Now.Date.AddMonths(-3);
+            this.dtpTimeEnd.Value = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+
+
+            ucSplitPage1.cmbPageSize.Items.Remove("5000");
+            ucSplitPage1.cmbPageSize.Items.Remove("2000");
+            ucSplitPage1.cmbPageSize.Items.Remove("1000");
+
+            pictureBox2.Visible = true;
+            await Task.Run(() => { refreshQrcode(); });
+            await Task.Run(() => { GetBalanceList(); });
+            pictureBox2.Visible = false;
+        }
+
+        private void btnBalanceTopUp_Click(object sender, EventArgs e)
+        {
+            string url2 = "https://po.e57.cn/prod-api/api/oms-api/alipay/pay";
+            var data = new JObject();
+            data["userId"] = BaseClass.UserId;
+            data["userName"] = BaseClass.UserName;
+            data["nickName"] = BaseClass.NickName;
+            data["totalAmount"] = numTopUpAmount.Value; 
+            data["type"] = 1; // type：1：快递余额，2：账户积分
+            var dataStr2 = JsonHelper.SerializeObject(data);
+            var html2 = HttpResponseWXBLL.e57PostResponse(url2, dataStr2, "");
+            //<AjaxResult><msg>支付订单创建成功</msg><code>200</code><data>&lt;form name="punchout_form" method="post" action="https://openapi.alipay.com/gateway.do?charset=UTF-8&amp;method=alipay.trade.page.pay&amp;sign=Z7%2Bv3UQL3B9Q9nH1iNGimA9FL9XPcG9A2oyjTpLbyExJbw52tHEX1LXifNrdJLtBdSjAQaFNyc3qzKUn3J6algYUlcy9e5DMKIG1NPQGSn3FFoSiKM%2FfSKlx8Jbj3zC2JFQAvUoFVUnk89pen078rh2IL2XKNaD300VDq28WiAAE3fX%2FHdd5Tu%2F3yun4tD90KOXzVQ2PFrcQqwefo2Bm%2BQVFCGXM5zxzE%2FvfkHnCwGwlH%2FfLrdsKrQc3s%2B1Gt1NHlS3iyKEP%2F4F7dKB9Iq0GIsyPJu9RINv9XRlk404S60gDRHBHs3avWdMwjMRkoxIdoe%2BPrXX0zxYEEN9hAX5C%2Fw%3D%3D&amp;return_url=https%3A%2F%2Fpo.e57.cn&amp;notify_url=https%3A%2F%2Fpo.e57.cn%2Fprod-api%2Fapi%2Foms-api%2Falipay%2Fnotify&amp;version=1.0&amp;app_id=2021006172644180&amp;sign_type=RSA2&amp;timestamp=2026-07-20+11%3A59%3A55&amp;alipay_sdk=alipay-sdk-java-4.40.909.ALL&amp;format=JSON">
+            //&lt;input type="hidden" name="biz_content" value="{&amp;quot;out_trade_no&amp;quot;:&amp;quot;8f6ece19baf14f7ca8b0b5d8d0c03b57&amp;quot;,&amp;quot;total_amount&amp;quot;:&amp;quot;0.01&amp;quot;,&amp;quot;subject&amp;quot;:&amp;quot;店统领余额充值&amp;quot;,&amp;quot;body&amp;quot;:&amp;quot;店统领余额充值&amp;quot;,&amp;quot;product_code&amp;quot;:&amp;quot;FAST_INSTANT_TRADE_PAY&amp;quot;,&amp;quot;timeout_express&amp;quot;:&amp;quot;15m&amp;quot;}">
+            //&lt;input type="submit" value="立即支付" style="display:none" >
+            //&lt;/form>
+            //&lt;script>document.forms[0].submit();&lt;/script></data></AjaxResult>
+            if (html2.Contains("<code>200</code>") || html2.Contains("<code>0</code>"))
+            {
+                var rstData = BaseRegex.GetStringXml(ref html2, "data").ParseToString();
+                rstData = HttpUtility.HtmlDecode(rstData);
+                //rstData = HttpUtility.HtmlDecode(rstData);
+
+                WXShopLoginForm loginForm = new WXShopLoginForm(new AllBase.Model.DBModel.ShopLoginInfo());
+                loginForm.InitUrl = "";
+                loginForm.InitHtml = rstData;
+                loginForm.openType = EnumOpenType.manage;
+                loginForm.ShowDialog();
+                if (updateBalanceAction != null)
+                {
+                    updateBalanceAction();
+                }
+            }
+        }
+
+
+        public async void GetBalanceList()
+        {
+            int pageCount = 1;
+            int pageSize = 50;
+            Invoke(new Action(() =>
+            {
+                this.dgvPayment.Rows.Clear();
+            }));
+            var url3 = BaseClass.Build29WxObjString("user/get_user_balance");
+            var data3 = UserLogin.GetSignaturex();
+            Invoke(new Action(() =>
+            {
+                data3 += "&user_name_in=" + BaseClass.UserName;
+                data3 += "&create_time_begin=" + dtpTimeBegin.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                data3 += "&create_time_end=" + dtpTimeEnd.Value.ToString("yyyy-MM-dd HH:mm:ss");
+                if (cmbType.Text == "充值")
+                    data3 += "&type_in=1,30";
+                if (cmbType.Text == "管理员充值")
+                    data3 += "&type_in=1";
+                if (cmbType.Text == "支付宝充值")
+                    data3 += "&type_in=30";
+                if (cmbType.Text == "拍单扣除/作废返还")
+                    data3 += "&type_in=20,23";
+                if (cmbType.Text == "超重扣费")
+                    data3 += "&type_in=24";
+                if (!string.IsNullOrEmpty(txtOutOrderId.Text.Trim()))
+                    data3 += "&order_id_in=" + txtOutOrderId.Text.Trim();
+                if (!string.IsNullOrEmpty(txtShopOrderNo.Text.Trim()))
+                    data3 += "&remark_fulltext=" + txtShopOrderNo.Text.Trim();
+                data3 += "&page=" + ucSplitPage1.CurrentPage;
+                data3 += "&page_size=" + ucSplitPage1.PageSize;
+                pageSize = ucSplitPage1.PageSize;
+            }));
+            var html3 = GetHtml.PostUtf8(url3, data3);
+            if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
+                html3 = GetHtml.PostUtf8(url3, data3);
+            if (string.IsNullOrEmpty(html3) || !html3.Contains("\"code\":200"))
+            {
+                BaseMsgForm.ShowError("查询失败：" + BaseRegex.GetStringJsonByRegs(ref html3, html3, "msg"));
+                return;
+            }
+            List<user_payment_record> paymentList = new List<user_payment_record>();
+            paymentList = JsonHelper.DeserializeJsonToList<user_payment_record>(JsonHelper.JObjectParse(html3)["data"].ParseToString());
+            foreach(var payment in paymentList)
+            {
+                Invoke(new Action(() =>
+                {
+                    var rowIndex = this.dgvPayment.Rows.Add(
+                        false,
+                        ((EnumOrderPaymentType)payment.type.ParseToInt()).ParseToString(),
+                        payment.order_id,
+                        payment.amount,
+                        payment.balance,
+                        payment.create_time.ToString("yyyy-MM-dd HH:mm:ss"),
+                        payment.remark
+                    );
+                    this.dgvPayment.Rows[rowIndex].Height = 60;
+                }));
+            }
+            int count = BaseRegex.GetIntJson(ref html3, "count");
+            pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
+            pageCount = Math.Max(pageCount, 1);
+            ucSplitPage1.TotalPage = pageCount;
+#if DEBUG
+            Invoke(new Action(() => { statusBarUserControl1.lblTaskStatus.Text = BaseRegex.GetDecimalJson(ref html3, "seconds") + "秒"; }));
+#endif
+        }
+
+        private async void btnSearch_Click(object sender, EventArgs e)
+        {
+            if(this.ucSplitPage1.CurrentPage!=1)
+                { this.ucSplitPage1.CurrentPage = 1; }
+
+            pictureBox2.Visible = true;
+            await Task.Run(() => { GetBalanceList(); });
+            pictureBox2.Visible = false;
+        }
+
+        private void ucSplitPage1_Load(object sender, EventArgs e)
+        {
+
+        }
+
+        private async void ucSplitPage1_PageChange(object obj)
+        {
+            pictureBox2.Visible = true;
+            await Task.Run(() => { GetBalanceList(); });
+            pictureBox2.Visible = false;
+        }
+
+        private void ucGroupBoxEx1_Enter(object sender, EventArgs e)
+        { 
+        }
+
+        private void dgvPayment_CellContentClick(object sender, DataGridViewCellEventArgs e)
+        {
+            if (e.ColumnIndex < 0 || e.RowIndex < 0)
+                return;
+            var row = dgvPayment.Rows[e.RowIndex];
+            string headerText = dgvPayment.Columns[e.ColumnIndex].HeaderText;
+            string columnName = dgvPayment.Columns[e.ColumnIndex].Name;
+            switch (headerText)
+            {
+                case "":
+                    dgvPayment.Rows[e.RowIndex].Cells["colCheck"].Value = !(bool)dgvPayment.Rows[e.RowIndex].Cells["colCheck"].Value;
+                    break;
+                default:
+                    break;
+            }
         }
     }
-
 }
diff --git a/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.resx b/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.resx
index 8b2ff64..0570d79 100644
--- a/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.resx
+++ b/Work/_29Tools/Forms/UserForms/WXGetBalanceQrCodeForm.resx
@@ -117,4 +117,25 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="colCheck.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colOrderId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colAmount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colBalance.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colCreateTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colRemark.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>
\ No newline at end of file
diff --git a/Work/_29Tools/Forms/UserForms/WXGetTopUpQrCode.Designer.cs b/Work/_29Tools/Forms/UserForms/WXGetTopUpQrCode.Designer.cs
new file mode 100644
index 0000000..e5e3122
--- /dev/null
+++ b/Work/_29Tools/Forms/UserForms/WXGetTopUpQrCode.Designer.cs
@@ -0,0 +1,585 @@
+
+using Work.UserComponents;
+
+namespace TemuKJD.WXForms.ShopForms
+{
+    partial class WXGetTopUpQrCode
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            this.label1 = new System.Windows.Forms.Label();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.btnRefresh = new DevComponents.DotNetBar.PanelEx();
+            this.pbLoading = new System.Windows.Forms.PictureBox();
+            this.numAddTopUp = new System.Windows.Forms.NumericUpDown();
+            this.label8 = new System.Windows.Forms.Label();
+            this.btnAddPoints = new DevComponents.DotNetBar.PanelEx();
+            this.btnAddBalance = new DevComponents.DotNetBar.PanelEx();
+            this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
+            this.label2 = new System.Windows.Forms.Label();
+            this.dgvSelectProduct = new DataGridViewEx();
+            this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colSupplierName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colLogin = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colInShop = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colSpuId = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colSkcId = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colProductSkcPic = new System.Windows.Forms.DataGridViewImageColumn();
+            this.colSkuFakeImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colSkuFakeImg = new System.Windows.Forms.DataGridViewImageColumn();
+            this.colProductName = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colProductCat = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colExtCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colDraftId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colUserNotes = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.ColDelete = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colAddTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numAddTopUp)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 11F);
+            this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0)))));
+            this.label1.Location = new System.Drawing.Point(18, 274);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(228, 72);
+            this.label1.TabIndex = 1;
+            this.label1.Text = "支付宝扫码充值，备注软件登录账户。如忘记备注，请联系购买方充值。";
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.pictureBox1.Location = new System.Drawing.Point(21, 22);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(212, 212);
+            this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            this.pictureBox1.TabIndex = 3;
+            this.pictureBox1.TabStop = false;
+            // 
+            // btnRefresh
+            // 
+            this.btnRefresh.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnRefresh.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnRefresh.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnRefresh.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnRefresh.Location = new System.Drawing.Point(149, 349);
+            this.btnRefresh.Name = "btnRefresh";
+            this.btnRefresh.Size = new System.Drawing.Size(84, 23);
+            this.btnRefresh.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnRefresh.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnRefresh.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnRefresh.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnRefresh.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnRefresh.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnRefresh.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnRefresh.Style.GradientAngle = 90;
+            this.btnRefresh.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnRefresh.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnRefresh.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnRefresh.TabIndex = 1135;
+            this.btnRefresh.Text = "刷新";
+            this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click);
+            // 
+            // pbLoading
+            // 
+            this.pbLoading.Image = global::Work.Properties.Resources.loading_blue;
+            this.pbLoading.Location = new System.Drawing.Point(102, 103);
+            this.pbLoading.Name = "pbLoading";
+            this.pbLoading.Size = new System.Drawing.Size(50, 50);
+            this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.pbLoading.TabIndex = 1136;
+            this.pbLoading.TabStop = false;
+            this.pbLoading.Visible = false;
+            // 
+            // numAddTopUp
+            // 
+            this.numAddTopUp.DecimalPlaces = 2;
+            this.numAddTopUp.Location = new System.Drawing.Point(107, 409);
+            this.numAddTopUp.Maximum = new decimal(new int[] {
+            100000,
+            0,
+            0,
+            0});
+            this.numAddTopUp.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            131072});
+            this.numAddTopUp.Name = "numAddTopUp";
+            this.numAddTopUp.Size = new System.Drawing.Size(66, 23);
+            this.numAddTopUp.TabIndex = 1140;
+            this.numAddTopUp.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            131072});
+            this.numAddTopUp.Visible = false;
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(24, 412);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(92, 17);
+            this.label8.TabIndex = 1141;
+            this.label8.Text = "积分充值金额：";
+            this.label8.Visible = false;
+            // 
+            // btnAddPoints
+            // 
+            this.btnAddPoints.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnAddPoints.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnAddPoints.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnAddPoints.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnAddPoints.Location = new System.Drawing.Point(177, 409);
+            this.btnAddPoints.Name = "btnAddPoints";
+            this.btnAddPoints.Size = new System.Drawing.Size(56, 23);
+            this.btnAddPoints.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnAddPoints.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnAddPoints.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnAddPoints.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnAddPoints.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnAddPoints.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnAddPoints.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnAddPoints.Style.GradientAngle = 90;
+            this.btnAddPoints.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnAddPoints.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnAddPoints.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnAddPoints.TabIndex = 1145;
+            this.btnAddPoints.Text = "充值";
+            this.btnAddPoints.Visible = false;
+            this.btnAddPoints.Click += new System.EventHandler(this.btnAddPoints_Click);
+            // 
+            // btnAddBalance
+            // 
+            this.btnAddBalance.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnAddBalance.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnAddBalance.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnAddBalance.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnAddBalance.Location = new System.Drawing.Point(177, 443);
+            this.btnAddBalance.Name = "btnAddBalance";
+            this.btnAddBalance.Size = new System.Drawing.Size(56, 23);
+            this.btnAddBalance.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnAddBalance.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnAddBalance.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnAddBalance.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnAddBalance.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnAddBalance.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnAddBalance.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnAddBalance.Style.GradientAngle = 90;
+            this.btnAddBalance.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnAddBalance.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnAddBalance.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnAddBalance.TabIndex = 1151;
+            this.btnAddBalance.Text = "充值";
+            this.btnAddBalance.Visible = false;
+            this.btnAddBalance.Click += new System.EventHandler(this.btnAddBalance_Click);
+            // 
+            // numericUpDown1
+            // 
+            this.numericUpDown1.DecimalPlaces = 2;
+            this.numericUpDown1.Location = new System.Drawing.Point(107, 443);
+            this.numericUpDown1.Maximum = new decimal(new int[] {
+            100000,
+            0,
+            0,
+            0});
+            this.numericUpDown1.Minimum = new decimal(new int[] {
+            1,
+            0,
+            0,
+            131072});
+            this.numericUpDown1.Name = "numericUpDown1";
+            this.numericUpDown1.Size = new System.Drawing.Size(66, 23);
+            this.numericUpDown1.TabIndex = 1149;
+            this.numericUpDown1.Value = new decimal(new int[] {
+            1,
+            0,
+            0,
+            131072});
+            this.numericUpDown1.Visible = false;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(24, 446);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(92, 17);
+            this.label2.TabIndex = 1150;
+            this.label2.Text = "余额充值金额：";
+            this.label2.Visible = false;
+            // 
+            // dgvSelectProduct
+            // 
+            this.dgvSelectProduct.AllowUserToAddRows = false;
+            this.dgvSelectProduct.AllowUserToDeleteRows = false;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dgvSelectProduct.AutoRowNumber = true;
+            this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
+            this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.colCheck,
+            this.colSelectId,
+            this.colSupplierId,
+            this.colSupplierName,
+            this.colLogin,
+            this.colInShop,
+            this.colSpuId,
+            this.colSkcId,
+            this.colImgUrl,
+            this.colProductSkcPic,
+            this.colSkuFakeImgUrl,
+            this.colSkuFakeImg,
+            this.colProductName,
+            this.colProductCat,
+            this.colExtCode,
+            this.colMsg,
+            this.colDraftId,
+            this.colNotes,
+            this.colUserNotes,
+            this.ColDelete,
+            this.colAddTime,
+            this.colOpResult});
+            this.dgvSelectProduct.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dgvSelectProduct.Location = new System.Drawing.Point(3, 3);
+            this.dgvSelectProduct.MultiSelectCheckBox = true;
+            this.dgvSelectProduct.Name = "dgvSelectProduct";
+            this.dgvSelectProduct.ReadOnly = true;
+            this.dgvSelectProduct.RowTemplate.Height = 23;
+            this.dgvSelectProduct.Size = new System.Drawing.Size(1017, 516);
+            this.dgvSelectProduct.TabIndex = 1161;
+            this.dgvSelectProduct.Visible = false;
+            // 
+            // colCheck
+            // 
+            this.colCheck.Frozen = true;
+            this.colCheck.HeaderText = "选择";
+            this.colCheck.Name = "colCheck";
+            this.colCheck.ReadOnly = true;
+            this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colCheck.Width = 30;
+            // 
+            // colSelectId
+            // 
+            this.colSelectId.HeaderText = "认领Id";
+            this.colSelectId.Name = "colSelectId";
+            this.colSelectId.ReadOnly = true;
+            this.colSelectId.Visible = false;
+            // 
+            // colSupplierId
+            // 
+            this.colSupplierId.Frozen = true;
+            this.colSupplierId.HeaderText = "店铺Id";
+            this.colSupplierId.Name = "colSupplierId";
+            this.colSupplierId.ReadOnly = true;
+            this.colSupplierId.Visible = false;
+            // 
+            // colSupplierName
+            // 
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle3;
+            this.colSupplierName.Frozen = true;
+            this.colSupplierName.HeaderText = "店铺名称";
+            this.colSupplierName.Name = "colSupplierName";
+            this.colSupplierName.ReadOnly = true;
+            this.colSupplierName.Width = 90;
+            // 
+            // colLogin
+            // 
+            this.colLogin.HeaderText = "登录";
+            this.colLogin.Name = "colLogin";
+            this.colLogin.ReadOnly = true;
+            this.colLogin.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colLogin.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colLogin.Width = 40;
+            // 
+            // colInShop
+            // 
+            this.colInShop.HeaderText = "进店";
+            this.colInShop.Name = "colInShop";
+            this.colInShop.ReadOnly = true;
+            this.colInShop.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colInShop.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colInShop.Width = 40;
+            // 
+            // colSpuId
+            // 
+            this.colSpuId.HeaderText = "源商品ID";
+            this.colSpuId.Name = "colSpuId";
+            this.colSpuId.ReadOnly = true;
+            this.colSpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colSpuId.Width = 120;
+            // 
+            // colSkcId
+            // 
+            this.colSkcId.FillWeight = 150F;
+            this.colSkcId.HeaderText = "商品SKC";
+            this.colSkcId.Name = "colSkcId";
+            this.colSkcId.ReadOnly = true;
+            this.colSkcId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSkcId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colSkcId.Visible = false;
+            this.colSkcId.Width = 80;
+            // 
+            // colImgUrl
+            // 
+            this.colImgUrl.HeaderText = "图片地址";
+            this.colImgUrl.Name = "colImgUrl";
+            this.colImgUrl.ReadOnly = true;
+            this.colImgUrl.Visible = false;
+            // 
+            // colProductSkcPic
+            // 
+            this.colProductSkcPic.HeaderText = "图片";
+            this.colProductSkcPic.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom;
+            this.colProductSkcPic.Name = "colProductSkcPic";
+            this.colProductSkcPic.ReadOnly = true;
+            this.colProductSkcPic.Width = 60;
+            // 
+            // colSkuFakeImgUrl
+            // 
+            this.colSkuFakeImgUrl.HeaderText = "SKU替换图地址";
+            this.colSkuFakeImgUrl.Name = "colSkuFakeImgUrl";
+            this.colSkuFakeImgUrl.ReadOnly = true;
+            this.colSkuFakeImgUrl.Visible = false;
+            // 
+            // colSkuFakeImg
+            // 
+            this.colSkuFakeImg.HeaderText = "SKU替换图";
+            this.colSkuFakeImg.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom;
+            this.colSkuFakeImg.Name = "colSkuFakeImg";
+            this.colSkuFakeImg.ReadOnly = true;
+            this.colSkuFakeImg.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSkuFakeImg.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colSkuFakeImg.Visible = false;
+            this.colSkuFakeImg.Width = 60;
+            // 
+            // colProductName
+            // 
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colProductName.DefaultCellStyle = dataGridViewCellStyle4;
+            this.colProductName.HeaderText = "商品标题";
+            this.colProductName.Name = "colProductName";
+            this.colProductName.ReadOnly = true;
+            this.colProductName.Width = 150;
+            // 
+            // colProductCat
+            // 
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colProductCat.DefaultCellStyle = dataGridViewCellStyle5;
+            this.colProductCat.HeaderText = "商品类目";
+            this.colProductCat.Name = "colProductCat";
+            this.colProductCat.ReadOnly = true;
+            this.colProductCat.Width = 80;
+            // 
+            // colExtCode
+            // 
+            this.colExtCode.HeaderText = "商品货号";
+            this.colExtCode.Name = "colExtCode";
+            this.colExtCode.ReadOnly = true;
+            this.colExtCode.Width = 120;
+            // 
+            // colMsg
+            // 
+            this.colMsg.HeaderText = "状态";
+            this.colMsg.Name = "colMsg";
+            this.colMsg.ReadOnly = true;
+            this.colMsg.Width = 75;
+            // 
+            // colDraftId
+            // 
+            this.colDraftId.HeaderText = "上传商品Id";
+            this.colDraftId.Name = "colDraftId";
+            this.colDraftId.ReadOnly = true;
+            this.colDraftId.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colDraftId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
+            this.colDraftId.Width = 130;
+            // 
+            // colNotes
+            // 
+            this.colNotes.HeaderText = "上传备注";
+            this.colNotes.Name = "colNotes";
+            this.colNotes.ReadOnly = true;
+            this.colNotes.Visible = false;
+            // 
+            // colUserNotes
+            // 
+            this.colUserNotes.HeaderText = "重上/已买";
+            this.colUserNotes.Name = "colUserNotes";
+            this.colUserNotes.ReadOnly = true;
+            this.colUserNotes.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colUserNotes.Visible = false;
+            this.colUserNotes.Width = 75;
+            // 
+            // ColDelete
+            // 
+            this.ColDelete.HeaderText = "删除";
+            this.ColDelete.Name = "ColDelete";
+            this.ColDelete.ReadOnly = true;
+            this.ColDelete.Visible = false;
+            this.ColDelete.Width = 75;
+            // 
+            // colAddTime
+            // 
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colAddTime.DefaultCellStyle = dataGridViewCellStyle6;
+            this.colAddTime.HeaderText = "上传时间";
+            this.colAddTime.Name = "colAddTime";
+            this.colAddTime.ReadOnly = true;
+            this.colAddTime.Width = 66;
+            // 
+            // colOpResult
+            // 
+            this.colOpResult.HeaderText = "操作结果";
+            this.colOpResult.Name = "colOpResult";
+            this.colOpResult.ReadOnly = true;
+            this.colOpResult.Width = 280;
+            // 
+            // splitContainer1
+            // 
+            this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1;
+            this.splitContainer1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.pictureBox1);
+            this.splitContainer1.Panel1.Controls.Add(this.label1);
+            this.splitContainer1.Panel1.Controls.Add(this.btnAddBalance);
+            this.splitContainer1.Panel1.Controls.Add(this.btnAddPoints);
+            this.splitContainer1.Panel1.Controls.Add(this.numericUpDown1);
+            this.splitContainer1.Panel1.Controls.Add(this.label2);
+            this.splitContainer1.Panel1.Controls.Add(this.btnRefresh);
+            this.splitContainer1.Panel1.Controls.Add(this.numAddTopUp);
+            this.splitContainer1.Panel1.Controls.Add(this.pbLoading);
+            this.splitContainer1.Panel1.Controls.Add(this.label8);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.dgvSelectProduct);
+            this.splitContainer1.Panel2.Padding = new System.Windows.Forms.Padding(3);
+            this.splitContainer1.Size = new System.Drawing.Size(1288, 522);
+            this.splitContainer1.SplitterDistance = 261;
+            this.splitContainer1.TabIndex = 1162;
+            // 
+            // WXGetTopUpQrCode
+            // 
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
+            this.BackColor = System.Drawing.Color.White;
+            this.ClientSize = new System.Drawing.Size(1288, 522);
+            this.Controls.Add(this.splitContainer1);
+            this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.KeyPreview = true;
+            this.Name = "WXGetTopUpQrCode";
+            this.Text = "二维码充值用户积分";
+            this.Load += new System.EventHandler(this.WXGetTopUpQrCode_Load);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numAddTopUp)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).EndInit();
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel1.PerformLayout();
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.PictureBox pictureBox1;
+        private DevComponents.DotNetBar.PanelEx btnRefresh;
+        private System.Windows.Forms.PictureBox pbLoading;
+        private System.Windows.Forms.NumericUpDown numAddTopUp;
+        private System.Windows.Forms.Label label8;
+        private DevComponents.DotNetBar.PanelEx btnAddPoints;
+        private DevComponents.DotNetBar.PanelEx btnAddBalance;
+        private System.Windows.Forms.NumericUpDown numericUpDown1;
+        private System.Windows.Forms.Label label2;
+        private DataGridViewEx dgvSelectProduct;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn colCheck;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colSelectId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colSupplierName;
+        private System.Windows.Forms.DataGridViewLinkColumn colLogin;
+        private System.Windows.Forms.DataGridViewLinkColumn colInShop;
+        private System.Windows.Forms.DataGridViewLinkColumn colSpuId;
+        private System.Windows.Forms.DataGridViewLinkColumn colSkcId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colImgUrl;
+        private System.Windows.Forms.DataGridViewImageColumn colProductSkcPic;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colSkuFakeImgUrl;
+        private System.Windows.Forms.DataGridViewImageColumn colSkuFakeImg;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colProductName;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colProductCat;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colExtCode;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colMsg;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colDraftId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colNotes;
+        private System.Windows.Forms.DataGridViewLinkColumn colUserNotes;
+        private System.Windows.Forms.DataGridViewLinkColumn ColDelete;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult;
+        private System.Windows.Forms.SplitContainer splitContainer1;
+    }
+}
\ No newline at end of file
diff --git a/Work/_29Tools/Forms/UserForms/WXGetTopUpQrCode.cs b/Work/_29Tools/Forms/UserForms/WXGetTopUpQrCode.cs
new file mode 100644
index 0000000..0446941
--- /dev/null
+++ b/Work/_29Tools/Forms/UserForms/WXGetTopUpQrCode.cs
@@ -0,0 +1,88 @@
+using AllBase;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Diagnostics;
+using System.Drawing;
+using System.Linq;
+using System.Security.Policy;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Work;
+using Work.BaseForms;
+using Work.Properties;
+
+namespace TemuKJD.WXForms.ShopForms
+{
+    public partial class WXGetTopUpQrCode : Form
+    {
+        public WXGetTopUpQrCode()
+        {
+            InitializeComponent();
+        }
+
+        public void refreshQrcode()
+        {
+            Invoke(new Action(() =>
+            {
+                pbLoading.Visible = true;
+            }));
+
+            var url = BaseClass.Build29WxObjString("user/get_top_up_qrcode");
+            var data = UserLogin.GetSignaturex();
+
+            var html = GetHtml.PostUtf8(url, data);
+            if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+            {
+                var msg = BaseRegex.GetStringJson(ref html, "msg");
+                BaseMsgForm.ShowError(msg);
+            }
+            else
+            {
+                Invoke(new Action(() =>
+                {
+                    pbLoading.Visible = false;
+                    var base64Str = BaseRegex.GetStringJson(ref html, "qrcode_base64");
+                    if (!string.IsNullOrEmpty(base64Str))
+                        pictureBox1.Image = Base64ChangeImgUrl.Base64ToImage(base64Str);
+                    else
+                        pictureBox1.Image = Resources.errpic;
+                }));
+            }
+        }
+
+        private void btnRefresh_Click(object sender, EventArgs e)
+        {
+            Task.Run(() => { refreshQrcode(); });
+        }
+
+        private void WXGetTopUpQrCode_Load(object sender, EventArgs e)
+        {
+            Task.Run(() => { refreshQrcode(); });
+        }
+
+        private void btnAddPoints_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                Process.Start(new ProcessStartInfo("https://excashier.alipay.com/standard/auth.htm?payOrderId=5afc56d40af64001ad2a486cce1ca579.25") { UseShellExecute = true });
+            }
+            catch (Exception ex)
+            {
+                // 处理可能出现的异常，例如找不到浏览器等
+                MessageBox.Show("无法打开浏览器: " + ex.Message);
+            }
+        }
+
+        private void btnAddBalance_Click(object sender, EventArgs e)
+        {
+            //ShopLoginForm loginForm = new ShopLoginForm(new AllBase.Model.Result.ShopLoginInfo());
+            //loginForm.InitUrl = "https://excashier.alipay.com/standard/auth.htm?payOrderId=5afc56d40af64001ad2a486cce1ca579.25";
+            //loginForm.openType = KJDForms.ShopForms.EnumOpenType.manage;
+            //loginForm.ShowDialog();
+        }
+    }
+
+}
diff --git a/Work/_29Tools/Forms/UserForms/WXGetTopUpQrCode.resx b/Work/_29Tools/Forms/UserForms/WXGetTopUpQrCode.resx
new file mode 100644
index 0000000..e4ad395
--- /dev/null
+++ b/Work/_29Tools/Forms/UserForms/WXGetTopUpQrCode.resx
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="colCheck.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSelectId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSupplierId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSupplierName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colLogin.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colInShop.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSpuId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colImgUrl.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colProductSkcPic.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSkuFakeImgUrl.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colSkuFakeImg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colProductName.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colProductCat.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colExtCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colMsg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colDraftId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colUserNotes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="ColDelete.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colAddTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colOpResult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>
\ No newline at end of file