From 7ef75f813411227b2e52f4cbc75fd627cff2be83 Mon Sep 17 00:00:00 2001
From: wule <jtt_fan@qq.com>
Date: Fri, 14 Aug 2026 22:12:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BB=A3=E5=8F=91=E5=90=8E?=
 =?UTF-8?q?=E5=86=8D=E5=8F=91=E9=80=81=E7=A4=BC=E7=89=A9=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MoreThanZeroVisibilityConverter.cs        |   24 +
 .../Ctrls/OrderCtrls/OrderListCtrl.xaml       | 2300 +++++++++--------
 .../Ctrls/OrderCtrls/OrderListCtrl.xaml.cs    |   55 +-
 .../Ctrls/OrderCtrls/OrderListRowCtrl.xaml    |   15 -
 .../OrderCtrls/OrderListRowHeaderCtrl.xaml    |    4 +-
 .../OrderCtrls/OrderListRowItemCtrl.xaml      | 2130 +++++++++++----
 .../OrderCtrls/OrderListRowItemCtrl.xaml.cs   |   20 +-
 .../Ctrls/ShopCtrls/ShopListCtrl.xaml.cs      |    3 +-
 29WxOrderWpf/Services/ShipGiftService.cs      |    4 +-
 .../Styles/StaticColorBrushDictionary.xaml    |   42 +-
 AllBase/BaseClass.cs                          |    4 +-
 AllBase/Model/DBModel/oms_wei_order_info.cs   |   29 +-
 Work/UserLogin.cs                             |    1 +
 Work/_29Tools/BLL/HttpResponseWXBLL.cs        |    6 +-
 Work/_29Tools/BLL/WxApiBLL.cs                 |   35 +-
 Work/_29Tools/Forms/PddMobileBuyOrderForm.cs  |   18 +-
 .../Forms/PddMobileBuyOrderForm.designer.cs   |   56 +-
 17 files changed, 3028 insertions(+), 1718 deletions(-)
 create mode 100644 29WxOrderWpf/Converters/MoreThanZeroVisibilityConverter.cs

diff --git a/29WxOrderWpf/Converters/MoreThanZeroVisibilityConverter.cs b/29WxOrderWpf/Converters/MoreThanZeroVisibilityConverter.cs
new file mode 100644
index 0000000..603d163
--- /dev/null
+++ b/29WxOrderWpf/Converters/MoreThanZeroVisibilityConverter.cs
@@ -0,0 +1,24 @@
+using NaiBa.Util.Extension;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace _29WxOrderWpf.Converters
+{
+	public class MoreThanZeroVisibilityConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			return value.ParseToInt() > 0 ? Visibility.Visible : Visibility.Collapsed;
+		}
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException(); // 单向绑定可不实现
+		}
+	}
+}
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
index aec7499..f6c080a 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
@@ -1,1177 +1,1191 @@
 <UserControl
-	x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListCtrl"
-	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:c="clr-namespace:_29WxOrderWpf.Common"
-	xmlns:converters="clr-namespace:_29WxOrderWpf.Converters"
-	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
-	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	xmlns:usercontrols="clr-namespace:_29WxOrderWpf.UserControls"
-	xmlns:utils="clr-namespace:_29WxOrderWpf.Utils"
-	d:DesignHeight="450"
-	d:DesignWidth="1560"
-	Loaded="Window_Loaded"
-	mc:Ignorable="d">
+    x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListCtrl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:c="clr-namespace:_29WxOrderWpf.Common"
+    xmlns:converters="clr-namespace:_29WxOrderWpf.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:usercontrols="clr-namespace:_29WxOrderWpf.UserControls"
+    xmlns:utils="clr-namespace:_29WxOrderWpf.Utils"
+    d:DesignHeight="450"
+    d:DesignWidth="1560"
+    Loaded="Window_Loaded"
+    mc:Ignorable="d">
 
 
-	<Grid x:Name="gridOrderListCtrl" Background="{StaticResource ListCtrlBackColorBrush}">
-		<Grid.RowDefinitions>
-			<RowDefinition Height="45" />
-			<RowDefinition Height="auto" />
-			<RowDefinition Height="auto" />
-			<RowDefinition Height="40" />
-			<RowDefinition Height="*" />
-			<RowDefinition Height="18" />
-		</Grid.RowDefinitions>
-		<Grid x:Name="gridSearch" Margin="8,0,8,0">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="*" />
-				<ColumnDefinition Width="1.2*" />
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="*" />
-				<ColumnDefinition Width="*" />
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="0.85*" />
-				<ColumnDefinition Width="0.85*" />
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="*" />
-				<ColumnDefinition Width="1.4*" />
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="Auto" />
-				<ColumnDefinition Width="Auto" />
-			</Grid.ColumnDefinitions>
+    <Grid x:Name="gridOrderListCtrl" Background="{StaticResource ListCtrlBackColorBrush}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="45" />
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="40" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="18" />
+        </Grid.RowDefinitions>
+        <Grid x:Name="gridSearch" Margin="8,0,8,-2">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="1.2*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="0.85*" />
+                <ColumnDefinition Width="0.85*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="1.4*" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
 
 
-			<usercontrols:UcWaterMarkTextBox
-				x:Name="txtOrderId"
-				Grid.Column="0"
-				Height="28"
-				Margin="0,0,8,0"
-				WaterMark="店铺单号" />
+            <usercontrols:UcWaterMarkTextBox
+                x:Name="txtOrderId"
+                Grid.Column="0"
+                Height="28"
+                Margin="0,0,8,0"
+                WaterMark="店铺单号" />
 
-			<usercontrols:UcWaterMarkTextBox
-				x:Name="txtSearchAll"
-				Grid.Column="1"
-				Height="28"
-				Margin="0,0,8,0"
-				TextChanged="txtSearchAll_TextChanged"
-				WaterMark="买手/仓库/退货物流 采购/退款单号" />
+            <usercontrols:UcWaterMarkTextBox
+                x:Name="txtSearchAll"
+                Grid.Column="1"
+                Height="28"
+                Margin="0,0,8,0"
+                TextChanged="txtSearchAll_TextChanged"
+                WaterMark="买手/仓库/退货物流 采购/退款单号" />
 
-			<!--  选择标题筛选类型  -->
-			<Border
-				Grid.Column="2"
-				Height="28"
-				Margin="0,0,0,0"
-				VerticalAlignment="Center"
-				BorderBrush="{StaticResource pageColorBrush}"
-				BorderThickness="1,1,1,1"
-				CornerRadius="4,0,0,4" />
-			<ComboBox
-				x:Name="cmbFilterGoodsNameType"
-				Grid.Column="2"
-				Width="70"
-				Height="28"
-				Margin="4,0,4,0"
-				VerticalContentAlignment="Center"
-				BorderBrush="Transparent"
-				SelectedIndex="0"
-				SelectionChanged="cmbFilterGoodsNameType_SelectionChanged"
-				Style="{StaticResource RoundedComboBox}"
-				Text="标题包含">
-				<ComboBoxItem>
-					<TextBlock>标题包含</TextBlock>
-				</ComboBoxItem>
-				<ComboBoxItem>
-					<TextBlock>标题不含</TextBlock>
-				</ComboBoxItem>
-			</ComboBox>
-			<Border
-				Grid.Column="3"
-				Height="28"
-				Margin="0,0,8,0"
-				VerticalAlignment="Center"
-				BorderBrush="{StaticResource pageColorBrush}"
-				BorderThickness="0,1,1,1"
-				CornerRadius="0,4,4,0" />
-			<usercontrols:UcWaterMarkTextBox
-				x:Name="txtFilterGoodsName"
-				Grid.Column="3"
-				Height="28"
-				Margin="0,0,8,0"
-				TextBorderThickness="0"
-				TextChanged="txtGoodsNameFilter_TextChanged"
-				WaterMark="商品标题" />
+            <!--  选择标题筛选类型  -->
+            <Border
+                Grid.Column="2"
+                Height="28"
+                Margin="0,0,0,0"
+                VerticalAlignment="Center"
+                BorderBrush="{StaticResource pageColorBrush}"
+                BorderThickness="1,1,1,1"
+                CornerRadius="4,0,0,4" />
+            <ComboBox
+                x:Name="cmbFilterGoodsNameType"
+                Grid.Column="2"
+                Width="70"
+                Height="28"
+                Margin="4,0,4,0"
+                VerticalContentAlignment="Center"
+                BorderBrush="Transparent"
+                SelectedIndex="0"
+                SelectionChanged="cmbFilterGoodsNameType_SelectionChanged"
+                Style="{StaticResource RoundedComboBox}"
+                Text="标题包含">
+                <ComboBoxItem>
+                    <TextBlock>标题包含</TextBlock>
+                </ComboBoxItem>
+                <ComboBoxItem>
+                    <TextBlock>标题不含</TextBlock>
+                </ComboBoxItem>
+            </ComboBox>
+            <Border
+                Grid.Column="3"
+                Height="28"
+                Margin="0,0,8,0"
+                VerticalAlignment="Center"
+                BorderBrush="{StaticResource pageColorBrush}"
+                BorderThickness="0,1,1,1"
+                CornerRadius="0,4,4,0" />
+            <usercontrols:UcWaterMarkTextBox
+                x:Name="txtFilterGoodsName"
+                Grid.Column="3"
+                Height="28"
+                Margin="0,0,8,0"
+                TextBorderThickness="0"
+                TextChanged="txtGoodsNameFilter_TextChanged"
+                WaterMark="商品标题" />
 
-			<usercontrols:UcWaterMarkTextBox
-				x:Name="txtShopName"
-				Grid.Column="4"
-				Height="28"
-				Margin="0,0,-6,0"
-				TextWrapping="NoWrap"
-				WaterMark="全部店铺" />
-			<Button
-				x:Name="btnMultiShopChoice"
-				Grid.Column="5"
-				Width="28"
-				Height="28"
-				Margin="0,0,8,0"
-				HorizontalAlignment="Left"
-				VerticalAlignment="Center"
-				Click="btnMultiShopChoice_Click"
-				Content=" ... "
-				Style="{StaticResource BasePageButtonLeftSquareStyle}" />
+            <usercontrols:UcWaterMarkTextBox
+                x:Name="txtShopName"
+                Grid.Column="4"
+                Height="28"
+                Margin="0,0,-6,0"
+                TextWrapping="NoWrap"
+                WaterMark="全部店铺" />
+            <Button
+                x:Name="btnMultiShopChoice"
+                Grid.Column="5"
+                Width="28"
+                Height="28"
+                Margin="0,0,8,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                Click="btnMultiShopChoice_Click"
+                Content=" ... "
+                Style="{StaticResource BasePageButtonLeftSquareStyle}" />
 
-			<!--  选择时间  -->
-			<Border
-				Grid.Column="6"
-				Height="28"
-				Margin="0,0,0,0"
-				VerticalAlignment="Center"
-				BorderBrush="{StaticResource pageColorBrush}"
-				BorderThickness="1,1,1,1"
-				CornerRadius="4,0,0,4" />
-			<ComboBox
-				x:Name="cmbTimeType"
-				Grid.Column="6"
-				Width="70"
-				Height="28"
-				Margin="4,0,4,0"
-				VerticalContentAlignment="Center"
-				BorderBrush="Transparent"
-				SelectedIndex="0"
-				Style="{StaticResource RoundedComboBox}"
-				Text="更新时间">
-				<ComboBoxItem>
-					<TextBlock>更新时间</TextBlock>
-				</ComboBoxItem>
-				<ComboBoxItem>
-					<TextBlock>成交时间</TextBlock>
-				</ComboBoxItem>
-			</ComboBox>
+            <!--  选择时间  -->
+            <Border
+                Grid.Column="6"
+                Height="28"
+                Margin="0,0,0,0"
+                VerticalAlignment="Center"
+                BorderBrush="{StaticResource pageColorBrush}"
+                BorderThickness="1,1,1,1"
+                CornerRadius="4,0,0,4" />
+            <ComboBox
+                x:Name="cmbTimeType"
+                Grid.Column="6"
+                Width="70"
+                Height="28"
+                Margin="4,0,4,0"
+                VerticalContentAlignment="Center"
+                BorderBrush="Transparent"
+                SelectedIndex="0"
+                Style="{StaticResource RoundedComboBox}"
+                Text="更新时间">
+                <ComboBoxItem>
+                    <TextBlock>更新时间</TextBlock>
+                </ComboBoxItem>
+                <ComboBoxItem>
+                    <TextBlock>成交时间</TextBlock>
+                </ComboBoxItem>
+            </ComboBox>
 
-			<!--  开始时间  -->
-			<Border
-				Grid.Column="7"
-				Height="28"
-				Margin="0,0,10,0"
-				VerticalAlignment="Center"
-				BorderBrush="{StaticResource pageColorBrush}"
-				BorderThickness="0,1,1,1"
-				CornerRadius="0,0,0,0" />
-			<DatePicker
-				x:Name="dateStart"
-				Grid.Column="7"
-				Margin="0,0,14,0"
-				VerticalAlignment="Center"
-				BorderThickness="0" />
+            <!--  开始时间  -->
+            <Border
+                Grid.Column="7"
+                Height="28"
+                Margin="0,0,10,0"
+                VerticalAlignment="Center"
+                BorderBrush="{StaticResource pageColorBrush}"
+                BorderThickness="0,1,1,1"
+                CornerRadius="0,0,0,0" />
+            <DatePicker
+                x:Name="dateStart"
+                Grid.Column="7"
+                Margin="0,0,14,0"
+                VerticalAlignment="Center"
+                BorderThickness="0" />
 
-			<!--  结束时间  -->
-			<Border
-				Grid.Column="8"
-				Height="28"
-				Margin="-10,0,0,0"
-				VerticalAlignment="Center"
-				BorderBrush="{StaticResource pageColorBrush}"
-				BorderThickness="0,1,1,1"
-				CornerRadius="0,4,4,0" />
-			<DatePicker
-				x:Name="dateEnd"
-				Grid.Column="8"
-				Margin="10,0,4,0"
-				VerticalAlignment="Center"
-				BorderThickness="0" />
-			<CheckBox
-				x:Name="chkEndDate"
-				Grid.Column="8"
-				Margin="-6,0"
-				HorizontalAlignment="Left"
-				VerticalAlignment="Center"
-				BorderBrush="{StaticResource mainColorBrush}"
-				FontSize="12" />
+            <!--  结束时间  -->
+            <Border
+                Grid.Column="8"
+                Height="28"
+                Margin="-10,0,0,0"
+                VerticalAlignment="Center"
+                BorderBrush="{StaticResource pageColorBrush}"
+                BorderThickness="0,1,1,1"
+                CornerRadius="0,4,4,0" />
+            <DatePicker
+                x:Name="dateEnd"
+                Grid.Column="8"
+                Margin="10,0,4,0"
+                VerticalAlignment="Center"
+                BorderThickness="0" />
+            <CheckBox
+                x:Name="chkEndDate"
+                Grid.Column="8"
+                Margin="-6,0"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Center"
+                BorderBrush="{StaticResource mainColorBrush}"
+                FontSize="12" />
 
-			<Button
-				x:Name="btnFilter"
-				Grid.Column="9"
-				Height="28"
-				MinWidth="48"
-				Margin="8,0,0,0"
-				Padding="4"
-				Click="btnFilter_Click"
-				Content="过滤"
-				Style="{StaticResource BasePageButtonStyle}" />
-			<Button
-				x:Name="btnSearch"
-				Grid.Column="10"
-				Height="28"
-				MinWidth="78"
-				Margin="4,0,4,0"
-				Padding="4"
-				Click="btnSearch_Click"
-				Content="读单"
-				IsEnabled="False"
-				Style="{StaticResource BasePageButtonStyle}" />
+            <Button
+                x:Name="btnFilter"
+                Grid.Column="9"
+                Height="28"
+                MinWidth="48"
+                Margin="8,0,0,0"
+                Padding="4"
+                Click="btnFilter_Click"
+                Content="过滤"
+                Style="{StaticResource BasePageButtonStyle}" />
+            <Button
+                x:Name="btnSearch"
+                Grid.Column="10"
+                Height="28"
+                MinWidth="78"
+                Margin="4,0,4,0"
+                Padding="4"
+                Click="btnSearch_Click"
+                Content="读单"
+                IsEnabled="False"
+                Style="{StaticResource BasePageButtonStyle}" />
 
-			<WrapPanel
-				Grid.Column="11"
-				Width="192"
-				VerticalAlignment="Center">
-				<Image
-					x:Name="imgLoading"
-					Grid.Column="10"
-					Width="20"
-					Height="20"
-					Margin="0"
-					IsEnabled="False"
-					Source="{StaticResource imgLoadingPic}">
-					<Image.RenderTransform>
-						<RotateTransform Angle="45" CenterX="10" CenterY="10" />
-					</Image.RenderTransform>
-					<Image.Triggers>
-						<EventTrigger RoutedEvent="Image.Loaded">
-							<BeginStoryboard>
-								<Storyboard>
-									<DoubleAnimation
-										RepeatBehavior="Forever"
-										Storyboard.TargetName="imgLoading"
-										Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
-										From="0"
-										To="360"
-										Duration="0:0:3" />
-								</Storyboard>
-							</BeginStoryboard>
-						</EventTrigger>
-					</Image.Triggers>
-				</Image>
-				<CheckBox
-					x:Name="chkAutoReadOrder"
-					Margin="2,0"
-					HorizontalAlignment="Left"
-					VerticalAlignment="Center"
-					BorderBrush="{StaticResource mainColorBrush}"
-					Checked="chkAutoReadBuyerOrder_CheckedChanged"
-					Content="自动读单"
-					FontSize="12"
-					IsChecked="true"
-					Unchecked="chkAutoReadBuyerOrder_CheckedChanged" />
+            <WrapPanel
+                Grid.Column="11"
+                Width="192"
+                VerticalAlignment="Center">
+                <Image
+                    x:Name="imgLoading"
+                    Grid.Column="10"
+                    Width="20"
+                    Height="20"
+                    Margin="0"
+                    IsEnabled="False"
+                    Source="{StaticResource imgLoadingPic}">
+                    <Image.RenderTransform>
+                        <RotateTransform Angle="45" CenterX="10" CenterY="10" />
+                    </Image.RenderTransform>
+                    <Image.Triggers>
+                        <EventTrigger RoutedEvent="Image.Loaded">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <DoubleAnimation
+                                        RepeatBehavior="Forever"
+                                        Storyboard.TargetName="imgLoading"
+                                        Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)"
+                                        From="0"
+                                        To="360"
+                                        Duration="0:0:3" />
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </EventTrigger>
+                    </Image.Triggers>
+                </Image>
+                <CheckBox
+                    x:Name="chkAutoReadOrder"
+                    Margin="2,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    BorderBrush="{StaticResource mainColorBrush}"
+                    Checked="chkAutoReadBuyerOrder_CheckedChanged"
+                    Content="自动读单"
+                    FontSize="12"
+                    IsChecked="true"
+                    Unchecked="chkAutoReadBuyerOrder_CheckedChanged" />
 
-				<CheckBox
-					x:Name="chkHideGreenFlag"
-					Grid.Column="12"
-					Margin="2,0"
-					HorizontalAlignment="Left"
-					VerticalAlignment="Center"
-					BorderBrush="{StaticResource mainColorBrush}"
-					Click="chkHideGreenFlag_Click"
-					Content="隐藏标记订单"
-					FontSize="12"
-					IsChecked="true" />
-			</WrapPanel>
+                <CheckBox
+                    x:Name="chkHideGreenFlag"
+                    Grid.Column="12"
+                    Margin="2,0"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    BorderBrush="{StaticResource mainColorBrush}"
+                    Click="chkHideGreenFlag_Click"
+                    Content="隐藏标记订单"
+                    FontSize="12"
+                    IsChecked="true" />
+            </WrapPanel>
 
 
-			<Button
-				Grid.Column="13"
-				Width="60"
-				Height="28"
-				Padding="4"
-				HorizontalAlignment="Center"
-				Click="btn_ShowShopRevenueStatisticsView"
-				Content="利润统计"
-				Style="{StaticResource BasePageButtonStyle}" />
-		</Grid>
+            <Button
+                Grid.Column="13"
+                Width="60"
+                Height="28"
+                Padding="4"
+                HorizontalAlignment="Center"
+                Click="btn_ShowShopRevenueStatisticsView"
+                Content="利润统计"
+                Style="{StaticResource BasePageButtonStyle}" />
+        </Grid>
 
-		<Border Grid.Row="1" x:Name="filterConfig" Margin="8,0" >
-			<WrapPanel
-	x:Name="wpFilter"
+        <Border
+            x:Name="filterConfig"
+            Grid.Row="1"
+            Margin="8,0">
+            <WrapPanel x:Name="wpFilter" VerticalAlignment="Top">
+                <CheckBox
+                    x:Name="chkOnlyWarehouseOrder"
+                    Margin="0,2,3,2"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    VerticalContentAlignment="Center"
+                    BorderBrush="{StaticResource mainColorBrush}"
+                    Checked="chkSubFilterSonditions_Checked"
+                    Content="过滤非本系统订单"
+                    FontSize="12"
+                    IsChecked="true"
+                    Unchecked="chkSubFilterSonditions_Checked" />
+                <CheckBox
+                    x:Name="chkNoMultiOrder"
+                    Margin="0,2,0,2"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    VerticalContentAlignment="Center"
+                    BorderBrush="{StaticResource mainColorBrush}"
+                    Checked="chkSubFilterSonditions_Checked"
+                    Content="过滤多商品订单"
+                    FontSize="12"
+                    IsChecked="true"
+                    Unchecked="chkSubFilterSonditions_Checked" />
+                <Polyline
+                    Grid.Column="5"
+                    Width="10"
+                    Margin="2,0"
+                    VerticalAlignment="Center"
+                    Points="5,0 5,4 5,0"
+                    Stroke="{StaticResource mainColorBrush}"
+                    StrokeThickness="2" />
+                <CheckBox
+                    x:Name="chkTransitOrder"
+                    Margin="0,2,3,2"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    VerticalContentAlignment="Center"
+                    BorderBrush="{StaticResource mainColorBrush}"
+                    Checked="chkSubFilterSonditions_Checked"
+                    Content="云仓"
+                    FontSize="12"
+                    IsChecked="true"
+                    Unchecked="chkSubFilterSonditions_Checked" />
+                <CheckBox
+                    x:Name="chkDirectOrder"
+                    Margin="0,2,3,2"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    VerticalContentAlignment="Center"
+                    BorderBrush="{StaticResource mainColorBrush}"
+                    Checked="chkSubFilterSonditions_Checked"
+                    Content="直发"
+                    FontSize="12"
+                    IsChecked="true"
+                    Unchecked="chkSubFilterSonditions_Checked" />
+                <CheckBox
+                    x:Name="chkTransitChangeDirectOrder"
+                    Margin="0,2,0,2"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    VerticalContentAlignment="Center"
+                    BorderBrush="{StaticResource mainColorBrush}"
+                    Checked="chkSubFilterSonditions_Checked"
+                    Content="云改直"
+                    FontSize="12"
+                    IsChecked="true"
+                    Unchecked="chkSubFilterSonditions_Checked" />
+                <Polyline
+                    Grid.Column="5"
+                    Width="10"
+                    Margin="2,0"
+                    VerticalAlignment="Center"
+                    Points="5,0 5,4 5,0"
+                    Stroke="{StaticResource mainColorBrush}"
+                    StrokeThickness="2" />
+                <CheckBox
+                    x:Name="chkFilterRemark"
+                    Margin="0,2,3,2"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center"
+                    VerticalContentAlignment="Center"
+                    BorderBrush="{StaticResource mainColorBrush}"
+                    Checked="chkSubFilterSonditions_Checked"
+                    Content="过滤备注"
+                    FontSize="12"
+                    IsChecked="False"
+                    Unchecked="chkSubFilterSonditions_Checked" />
+                <WrapPanel>
+                    <Border
+                        Height="22"
+                        Margin="0,2,0,2"
+                        VerticalAlignment="Center"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="1,1,1,1"
+                        CornerRadius="4,0,0,4">
+                        <ComboBox
+                            x:Name="cmbFilterRemark"
+                            Width="94"
+                            Height="20"
+                            Margin="4,0,4,0"
+                            VerticalContentAlignment="Center"
+                            BorderBrush="Transparent"
+                            SelectedIndex="0"
+                            Style="{StaticResource RoundedComboBox}"
+                            Text="成交时间">
+                            <ComboBoxItem>
+                                <TextBlock Margin="0,-2">店铺备注包含</TextBlock>
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Margin="0,-2">软件备注包含</TextBlock>
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Margin="0,-2">店铺备注不含</TextBlock>
+                            </ComboBoxItem>
+                            <ComboBoxItem>
+                                <TextBlock Margin="0,-2">软件备注不含</TextBlock>
+                            </ComboBoxItem>
+                        </ComboBox>
+                    </Border>
+                    <Border
+                        Grid.Column="7"
+                        Height="22"
+                        Margin="-2,0,0,0"
+                        VerticalAlignment="Center"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="0,1,1,1"
+                        CornerRadius="0,4,4,0">
+                        <TextBox
+                            x:Name="txtFilterRemark"
+                            Width="100"
+                            Margin="3,1"
+                            VerticalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            BorderBrush="Transparent"
+                            BorderThickness="0"
+                            TextChanged="txtFilterRemark_TextChanged"
+                            ToolTip="{Binding Text, RelativeSource={RelativeSource Self}}" />
+                    </Border>
+                    <Button
+                        Grid.Column="4"
+                        Width="22"
+                        Height="22"
+                        Margin="-4,2,0,2"
+                        HorizontalAlignment="Right"
+                        VerticalAlignment="Center"
+                        Click="btnMultiRemark_Click"
+                        Content=" ... "
+                        Style="{StaticResource BasePageButtonLeftSquareStyle}" />
+                </WrapPanel>
 
-	VerticalAlignment="Top">
-				<CheckBox
-		x:Name="chkOnlyWarehouseOrder"
-		Margin="0,2,3,2"
-		HorizontalAlignment="Left"
-		VerticalAlignment="Center"
-		VerticalContentAlignment="Center"
-		BorderBrush="{StaticResource mainColorBrush}"
-		Checked="chkSubFilterSonditions_Checked"
-		Content="过滤非本系统订单"
-		FontSize="12"
-		IsChecked="true"
-		Unchecked="chkSubFilterSonditions_Checked" />
-				<CheckBox
-		x:Name="chkNoMultiOrder"
-		Margin="0,2,0,2"
-		HorizontalAlignment="Left"
-		VerticalAlignment="Center"
-		VerticalContentAlignment="Center"
-		BorderBrush="{StaticResource mainColorBrush}"
-		Checked="chkSubFilterSonditions_Checked"
-		Content="过滤多商品订单"
-		FontSize="12"
-		IsChecked="true"
-		Unchecked="chkSubFilterSonditions_Checked" />
-				<Polyline
-		Grid.Column="5"
-		Width="10"
-		Margin="2,0"
-		VerticalAlignment="Center"
-		Points="5,0 5,4 5,0"
-		Stroke="{StaticResource mainColorBrush}"
-		StrokeThickness="2" />
-				<CheckBox
-		x:Name="chkTransitOrder"
-		Margin="0,2,3,2"
-		HorizontalAlignment="Left"
-		VerticalAlignment="Center"
-		VerticalContentAlignment="Center"
-		BorderBrush="{StaticResource mainColorBrush}"
-		Checked="chkSubFilterSonditions_Checked"
-		Content="云仓"
-		FontSize="12"
-		IsChecked="true"
-		Unchecked="chkSubFilterSonditions_Checked" />
-				<CheckBox
-		x:Name="chkDirectOrder"
-		Margin="0,2,3,2"
-		HorizontalAlignment="Left"
-		VerticalAlignment="Center"
-		VerticalContentAlignment="Center"
-		BorderBrush="{StaticResource mainColorBrush}"
-		Checked="chkSubFilterSonditions_Checked"
-		Content="直发"
-		FontSize="12"
-		IsChecked="true"
-		Unchecked="chkSubFilterSonditions_Checked" />
-				<CheckBox
-		x:Name="chkTransitChangeDirectOrder"
-		Margin="0,2,0,2"
-		HorizontalAlignment="Left"
-		VerticalAlignment="Center"
-		VerticalContentAlignment="Center"
-		BorderBrush="{StaticResource mainColorBrush}"
-		Checked="chkSubFilterSonditions_Checked"
-		Content="云改直"
-		FontSize="12"
-		IsChecked="true"
-		Unchecked="chkSubFilterSonditions_Checked" />
-				<Polyline
-		Grid.Column="5"
-		Width="10"
-		Margin="2,0"
-		VerticalAlignment="Center"
-		Points="5,0 5,4 5,0"
-		Stroke="{StaticResource mainColorBrush}"
-		StrokeThickness="2" />
-				<CheckBox
-		x:Name="chkFilterRemark"
-		Margin="0,2,3,2"
-		HorizontalAlignment="Left"
-		VerticalAlignment="Center"
-		VerticalContentAlignment="Center"
-		BorderBrush="{StaticResource mainColorBrush}"
-		Checked="chkSubFilterSonditions_Checked"
-		Content="过滤备注"
-		FontSize="12"
-		IsChecked="False"
-		Unchecked="chkSubFilterSonditions_Checked" />
-				<WrapPanel>
-					<Border
-			Height="22"
-			Margin="0,2,0,2"
-			VerticalAlignment="Center"
-			BorderBrush="{StaticResource pageColorBrush}"
-			BorderThickness="1,1,1,1"
-			CornerRadius="4,0,0,4">
-						<ComboBox
-				x:Name="cmbFilterRemark"
-				Width="94"
-				Height="20"
-				Margin="4,0,4,0"
-				VerticalContentAlignment="Center"
-				BorderBrush="Transparent"
-				SelectedIndex="0"
-				Style="{StaticResource RoundedComboBox}"
-				Text="成交时间">
-							<ComboBoxItem>
-								<TextBlock Margin="0,-2">店铺备注包含</TextBlock>
-							</ComboBoxItem>
-							<ComboBoxItem>
-								<TextBlock Margin="0,-2">软件备注包含</TextBlock>
-							</ComboBoxItem>
-							<ComboBoxItem>
-								<TextBlock Margin="0,-2">店铺备注不含</TextBlock>
-							</ComboBoxItem>
-							<ComboBoxItem>
-								<TextBlock Margin="0,-2">软件备注不含</TextBlock>
-							</ComboBoxItem>
-						</ComboBox>
-					</Border>
-					<Border
-			Grid.Column="7"
-			Height="22"
-			Margin="-2,0,0,0"
-			VerticalAlignment="Center"
-			BorderBrush="{StaticResource pageColorBrush}"
-			BorderThickness="0,1,1,1"
-			CornerRadius="0,4,4,0">
-						<TextBox
-				x:Name="txtFilterRemark"
-				Width="100"
-				Margin="3,1"
-				VerticalAlignment="Center"
-				VerticalContentAlignment="Center"
-				BorderBrush="Transparent"
-				BorderThickness="0"
-				TextChanged="txtFilterRemark_TextChanged"
-				ToolTip="{Binding Text, RelativeSource={RelativeSource Self}}" />
-					</Border>
-					<Button
-			Grid.Column="4"
-			Width="22"
-			Height="22"
-			Margin="-4,2,0,2"
-			HorizontalAlignment="Right"
-			VerticalAlignment="Center"
-			Click="btnMultiRemark_Click"
-			Content=" ... "
-			Style="{StaticResource BasePageButtonLeftSquareStyle}" />
-				</WrapPanel>
-
-				<WrapPanel Margin="8,0,4,0">
-					<TextBlock Text="礼品选择：" FontSize="12" VerticalAlignment="Center"></TextBlock>
-					<ComboBox x:Name="cb_gift" SelectedIndex="0"  Height="22" FontSize="12" Width="100" SelectionChanged="ComboBox_SelectionChanged">
-						<ComboBoxItem Content="1.55"></ComboBoxItem>
-						<ComboBoxItem Content="1.6"></ComboBoxItem>
-					</ComboBox>
-				</WrapPanel>
-			</WrapPanel>
-		</Border>
-		<Grid
-			x:Name="gridListHeader"
-			Grid.Row="2"
-			Margin="8,2,8,0">
-			<TabControl
-				x:Name="tabOrderType"
-				VerticalAlignment="Stretch"
-				FontSize="16"
-				SelectionChanged="tabOrderType_SelectionChanged">
-				<TabControl.Resources>
-					<Style TargetType="{x:Type TabControl}">
-						<Setter Property="Template">
-							<Setter.Value>
-								<ControlTemplate TargetType="{x:Type TabControl}">
-									<Grid>
-										<Grid.RowDefinitions>
-											<RowDefinition Height="Auto" />
-											<RowDefinition Height="*" />
-										</Grid.RowDefinitions>
-										<Border
-											Grid.Row="1"
-											MinHeight="4"
-											Background="#f8f8f9"
-											BorderBrush="#e0e0e0"
-											BorderThickness="1,1,1,0"
-											CornerRadius="0,4,0,0">
-											<ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" />
-										</Border>
-										<Border
-											Margin="0,0,0,0"
-											HorizontalAlignment="Left"
-											Background="#e8e8e9"
-											BorderBrush="#e1e1e1"
-											BorderThickness="1,1,1,0"
-											CornerRadius="4,4,0,0"
-											Cursor="Hand">
-											<TabPanel
-												x:Name="HeaderPanel"
-												Background="Transparent"
-												IsItemsHost="True" />
-										</Border>
-									</Grid>
-								</ControlTemplate>
-							</Setter.Value>
-						</Setter>
-					</Style>
-					<Style TargetType="TabItem">
-						<Setter Property="Template">
-							<Setter.Value>
-								<ControlTemplate TargetType="TabItem">
-									<Border
-										Name="Border"
-										Margin="-1,-2,-1,0"
-										BorderThickness="1,1,1,0"
-										CornerRadius="4,4,0,0">
-										<ContentPresenter
-											x:Name="ContentSite"
-											Margin="10,5"
-											HorizontalAlignment="Center"
-											VerticalAlignment="Center"
-											ContentSource="Header" />
-									</Border>
-									<ControlTemplate.Triggers>
-										<Trigger Property="IsSelected" Value="True">
-											<Setter TargetName="Border" Property="Background" Value="#f8f8f9" />
-											<Setter TargetName="Border" Property="BorderBrush" Value="#e0e0e0" />
-											<Setter TargetName="Border" Property="Margin" Value="-1,-3,-1,-1" />
-											<Setter Property="Foreground" Value="{StaticResource pageColorBrush}" />
-											<Setter Property="Panel.ZIndex" Value="100" />
-										</Trigger>
-										<Trigger Property="IsSelected" Value="False">
-											<Setter TargetName="Border" Property="Background" Value="Transparent" />
-											<Setter Property="Foreground" Value="#999999" />
-										</Trigger>
-									</ControlTemplate.Triggers>
-								</ControlTemplate>
-							</Setter.Value>
-						</Setter>
-					</Style>
-				</TabControl.Resources>
-				<TabItem
-					MinWidth="60"
-					Background="Transparent"
-					BorderBrush="Transparent"
-					Header="待采购"
-					SizeChanged="TabItem_SizeChanged">
-					<Border
-						Padding="0,10"
-						BorderBrush="#e0e0e0"
-						BorderThickness="0,0,0,1">
-						<WrapPanel>
-							<CheckBox
-								x:Name="chkMapProdOnly"
-								Margin="8,0,4,0"
-								HorizontalAlignment="Left"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkMapProdOnly_Click"
-								Content="已关联拍单"
-								FontSize="12" />
-							<CheckBox
-								x:Name="chkNoMapProdOnly"
-								Margin="8,0,4,0"
-								HorizontalAlignment="Left"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkNoMapProdOnly_Click"
-								Content="未关联拍单"
-								FontSize="12" />
+                <WrapPanel Margin="18,0,4,0" VerticalAlignment="Center">
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        FontSize="12"
+                        Text="礼品选择：" />
+                    <ComboBox
+                        x:Name="cb_gift"
+                        Width="100"
+                        Height="22"
+                        FontSize="12"
+                        SelectedIndex="0"
+                        SelectionChanged="ComboBox_SelectionChanged"
+                        Style="{StaticResource RoundedComboBox}">
+                        <ComboBoxItem Content="1.55" />
+                        <ComboBoxItem Content="1.6" />
+                    </ComboBox>
+                </WrapPanel>
+            </WrapPanel>
+        </Border>
+        <Grid
+            x:Name="gridListHeader"
+            Grid.Row="2"
+            Margin="8,2,8,0">
+            <TabControl
+                x:Name="tabOrderType"
+                VerticalAlignment="Stretch"
+                FontSize="16"
+                SelectionChanged="tabOrderType_SelectionChanged">
+                <TabControl.Resources>
+                    <Style TargetType="{x:Type TabControl}">
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="{x:Type TabControl}">
+                                    <Grid>
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="*" />
+                                        </Grid.RowDefinitions>
+                                        <Border
+                                            Grid.Row="1"
+                                            MinHeight="4"
+                                            Background="#f8f8f9"
+                                            BorderBrush="#e0e0e0"
+                                            BorderThickness="1,1,1,0"
+                                            CornerRadius="0,4,0,0">
+                                            <ContentPresenter x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" />
+                                        </Border>
+                                        <Border
+                                            Margin="0,0,0,0"
+                                            HorizontalAlignment="Left"
+                                            Background="#e8e8e9"
+                                            BorderBrush="#e1e1e1"
+                                            BorderThickness="1,1,1,0"
+                                            CornerRadius="4,4,0,0"
+                                            Cursor="Hand">
+                                            <TabPanel
+                                                x:Name="HeaderPanel"
+                                                Background="Transparent"
+                                                IsItemsHost="True" />
+                                        </Border>
+                                    </Grid>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                    <Style TargetType="TabItem">
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="TabItem">
+                                    <Border
+                                        Name="Border"
+                                        Margin="-1,-2,-1,0"
+                                        BorderThickness="1,1,1,0"
+                                        CornerRadius="4,4,0,0">
+                                        <ContentPresenter
+                                            x:Name="ContentSite"
+                                            Margin="10,5"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            ContentSource="Header" />
+                                    </Border>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="IsSelected" Value="True">
+                                            <Setter TargetName="Border" Property="Background" Value="#f8f8f9" />
+                                            <Setter TargetName="Border" Property="BorderBrush" Value="#e0e0e0" />
+                                            <Setter TargetName="Border" Property="Margin" Value="-1,-3,-1,-1" />
+                                            <Setter Property="Foreground" Value="{StaticResource pageColorBrush}" />
+                                            <Setter Property="Panel.ZIndex" Value="100" />
+                                        </Trigger>
+                                        <Trigger Property="IsSelected" Value="False">
+                                            <Setter TargetName="Border" Property="Background" Value="Transparent" />
+                                            <Setter Property="Foreground" Value="#999999" />
+                                        </Trigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                </TabControl.Resources>
+                <TabItem
+                    MinWidth="60"
+                    Background="Transparent"
+                    BorderBrush="Transparent"
+                    Header="待采购"
+                    SizeChanged="TabItem_SizeChanged">
+                    <Border
+                        Padding="0,10"
+                        BorderBrush="#e0e0e0"
+                        BorderThickness="0,0,0,1">
+                        <WrapPanel>
+                            <CheckBox
+                                x:Name="chkMapProdOnly"
+                                Margin="8,0,4,0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkMapProdOnly_Click"
+                                Content="已关联拍单"
+                                FontSize="12" />
+                            <CheckBox
+                                x:Name="chkNoMapProdOnly"
+                                Margin="8,0,4,0"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkNoMapProdOnly_Click"
+                                Content="未关联拍单"
+                                FontSize="12" />
 
 
-							<Button Width="Auto" Content="批量礼品单"
-									Height="22" FontSize="12"
-									MinWidth="48"
-									Margin="8,0,4,0" Command="{Binding MultipleShipGiftCommand}"
-									Padding="4"
-									Style="{StaticResource BasePageButtonStyle}"></Button>
-						</WrapPanel>
-					</Border>
-				</TabItem>
-				<TabItem
-					MinWidth="60"
-					Header="待发货"
-					SizeChanged="TabItem_SizeChanged" />
-				<TabItem
-					MinWidth="60"
-					Background="Transparent"
-					BorderBrush="Transparent"
-					Header="待收货"
-					SizeChanged="TabItem_SizeChanged">
-					<Border
-						Margin="4,0,4,4"
-						BorderBrush="#e0e0e0"
-						BorderThickness="0,0,0,1">
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="*" />
-							</Grid.ColumnDefinitions>
-							<CheckBox
-								x:Name="chkWaitReceiveBuyerIsNotSend"
-								Margin="6,8"
-								HorizontalAlignment="Left"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkWaitReceiveBuyerStatus_Click"
-								Content="买手未发货"
-								FontSize="12" />
-							<CheckBox
-								x:Name="chkWaitReceiveBuyerIsSend"
-								Grid.Column="1"
-								Margin="6,8"
-								HorizontalAlignment="Left"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkWaitReceiveBuyerStatus_Click"
-								Content="买手已发货"
-								FontSize="12" />
-							<CheckBox
-								x:Name="chkWaitReceiveBuyerIsInWarehouse"
-								Grid.Column="2"
-								Margin="6,8"
-								HorizontalAlignment="Left"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkWaitReceiveBuyerStatus_Click"
-								Content="货物已入库"
-								FontSize="12" />
-							<Polyline
-								Grid.Column="3"
-								Width="10"
-								Margin="5,0"
-								VerticalAlignment="Center"
-								Points="5,0 5,8 5,0"
-								Stroke="{StaticResource mainColorBrush}"
-								StrokeThickness="2" />
+                            <Button
+                                Width="Auto"
+                                Height="22"
+                                MinWidth="48"
+                                Margin="8,0,4,0"
+                                Padding="4,0"
+                                Command="{Binding MultipleShipGiftCommand}"
+                                Content="批量礼品单"
+                                FontSize="12"
+                                Style="{StaticResource BasePageButtonStyle}" />
+                        </WrapPanel>
+                    </Border>
+                </TabItem>
+                <TabItem
+                    MinWidth="60"
+                    Header="待发货"
+                    SizeChanged="TabItem_SizeChanged" />
+                <TabItem
+                    MinWidth="60"
+                    Background="Transparent"
+                    BorderBrush="Transparent"
+                    Header="待收货"
+                    SizeChanged="TabItem_SizeChanged">
+                    <Border
+                        Margin="4,0,4,4"
+                        BorderBrush="#e0e0e0"
+                        BorderThickness="0,0,0,1">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <CheckBox
+                                x:Name="chkWaitReceiveBuyerIsNotSend"
+                                Margin="6,8"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkWaitReceiveBuyerStatus_Click"
+                                Content="买手未发货"
+                                FontSize="12" />
+                            <CheckBox
+                                x:Name="chkWaitReceiveBuyerIsSend"
+                                Grid.Column="1"
+                                Margin="6,8"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkWaitReceiveBuyerStatus_Click"
+                                Content="买手已发货"
+                                FontSize="12" />
+                            <CheckBox
+                                x:Name="chkWaitReceiveBuyerIsInWarehouse"
+                                Grid.Column="2"
+                                Margin="6,8"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkWaitReceiveBuyerStatus_Click"
+                                Content="货物已入库"
+                                FontSize="12" />
+                            <Polyline
+                                Grid.Column="3"
+                                Width="10"
+                                Margin="5,0"
+                                VerticalAlignment="Center"
+                                Points="5,0 5,8 5,0"
+                                Stroke="{StaticResource mainColorBrush}"
+                                StrokeThickness="2" />
 
-							<CheckBox
-								x:Name="chkWaitReceiveWarehouseIsNotPickup"
-								Grid.Column="4"
-								Margin="6,8"
-								HorizontalAlignment="Left"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkWaitReceiveWarehouseStatus_Click"
-								Content="中转未取号"
-								FontSize="12"
-								Visibility="Collapsed" />
-							<CheckBox
-								x:Name="chkWaitReceiveWarehouseIsPickup"
-								Grid.Column="5"
-								Margin="6,8"
-								HorizontalAlignment="Left"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkWaitReceiveWarehouseStatus_Click"
-								Content="中转已取号"
-								FontSize="12" />
-							<CheckBox
-								x:Name="chkWaitReceiveWarehouseIsSendOut"
-								Grid.Column="6"
-								Margin="6,8"
-								HorizontalAlignment="Left"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkWaitReceiveWarehouseStatus_Click"
-								Content="中转已出库"
-								FontSize="12" />
-						</Grid>
-					</Border>
-				</TabItem>
-				<TabItem
-					MinWidth="60"
-					Background="Transparent"
-					BorderBrush="Transparent"
-					Foreground="#FFEE0099"
-					Header="异常单"
-					SizeChanged="TabItem_SizeChanged" />
-				<TabItem
-					MinWidth="60"
-					Background="#FF6666"
-					BorderBrush="Transparent"
-					Foreground="#FF6666"
-					Header="需处理售后单"
-					SizeChanged="TabItem_SizeChanged">
-					<Border
-						Margin="4,0,4,4"
-						BorderBrush="#e0e0e0"
-						BorderThickness="0,0,0,1">
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="*" />
-							</Grid.ColumnDefinitions>
-							<CheckBox
-								x:Name="chkEmergencyBuyerWaitAfterSale"
-								Grid.Column="0"
-								Margin="6,8"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkEmergencyBuyerAfterSale_Click"
-								Content="买手待申请售后"
-								FontSize="12" />
-							<Button
-								x:Name="btnBatchRefund"
-								Grid.Column="1"
-								Height="20"
-								MinWidth="48"
-								Margin="0,0,0,0"
-								Padding="4,0"
-								Click="btnBatchRefund_Click"
-								Content="批量申请买手售后"
-								FontSize="12"
-								Style="{StaticResource BasePageButtonStyle}" />
+                            <CheckBox
+                                x:Name="chkWaitReceiveWarehouseIsNotPickup"
+                                Grid.Column="4"
+                                Margin="6,8"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkWaitReceiveWarehouseStatus_Click"
+                                Content="中转未取号"
+                                FontSize="12"
+                                Visibility="Collapsed" />
+                            <CheckBox
+                                x:Name="chkWaitReceiveWarehouseIsPickup"
+                                Grid.Column="5"
+                                Margin="6,8"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkWaitReceiveWarehouseStatus_Click"
+                                Content="中转已取号"
+                                FontSize="12" />
+                            <CheckBox
+                                x:Name="chkWaitReceiveWarehouseIsSendOut"
+                                Grid.Column="6"
+                                Margin="6,8"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkWaitReceiveWarehouseStatus_Click"
+                                Content="中转已出库"
+                                FontSize="12" />
+                        </Grid>
+                    </Border>
+                </TabItem>
+                <TabItem
+                    MinWidth="60"
+                    Background="Transparent"
+                    BorderBrush="Transparent"
+                    Foreground="#FFEE0099"
+                    Header="异常单"
+                    SizeChanged="TabItem_SizeChanged" />
+                <TabItem
+                    MinWidth="60"
+                    Background="#FF6666"
+                    BorderBrush="Transparent"
+                    Foreground="#FF6666"
+                    Header="需处理售后单"
+                    SizeChanged="TabItem_SizeChanged">
+                    <Border
+                        Margin="4,0,4,4"
+                        BorderBrush="#e0e0e0"
+                        BorderThickness="0,0,0,1">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <CheckBox
+                                x:Name="chkEmergencyBuyerWaitAfterSale"
+                                Grid.Column="0"
+                                Margin="6,8"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkEmergencyBuyerAfterSale_Click"
+                                Content="买手待申请售后"
+                                FontSize="12" />
+                            <Button
+                                x:Name="btnBatchRefund"
+                                Grid.Column="1"
+                                Height="20"
+                                MinWidth="48"
+                                Margin="0,0,0,0"
+                                Padding="4,0"
+                                Click="btnBatchRefund_Click"
+                                Content="批量申请买手售后"
+                                FontSize="12"
+                                Style="{StaticResource BasePageButtonStyle}" />
 
-							<CheckBox
-								x:Name="chkEmergencyBuyerWaitSendBack"
-								Grid.Column="2"
-								Margin="6,8"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkEmergencyBuyerAfterSale_Click"
-								Content="买手待退货"
-								FontSize="12" />
-							<CheckBox
-								x:Name="chkEmergencyBuyerWaitSupplierRefund"
-								Grid.Column="3"
-								Margin="6,8"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkEmergencyBuyerAfterSale_Click"
-								Content="买手已寄出待商家退款"
-								FontSize="12" />
-							<CheckBox
-								x:Name="chkEmergencyBuyerRefundFail"
-								Grid.Column="4"
-								Margin="6,8"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkEmergencyBuyerAfterSale_Click"
-								Content="买手退款失败"
-								FontSize="12" />
-							<Polyline
-								Grid.Column="5"
-								Width="10"
-								Margin="5,0"
-								VerticalAlignment="Center"
-								Points="5,0 5,8 5,0"
-								Stroke="{StaticResource mainColorBrush}"
-								StrokeThickness="2" />
+                            <CheckBox
+                                x:Name="chkEmergencyBuyerWaitSendBack"
+                                Grid.Column="2"
+                                Margin="6,8"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkEmergencyBuyerAfterSale_Click"
+                                Content="买手待退货"
+                                FontSize="12" />
+                            <CheckBox
+                                x:Name="chkEmergencyBuyerWaitSupplierRefund"
+                                Grid.Column="3"
+                                Margin="6,8"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkEmergencyBuyerAfterSale_Click"
+                                Content="买手已寄出待商家退款"
+                                FontSize="12" />
+                            <CheckBox
+                                x:Name="chkEmergencyBuyerRefundFail"
+                                Grid.Column="4"
+                                Margin="6,8"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkEmergencyBuyerAfterSale_Click"
+                                Content="买手退款失败"
+                                FontSize="12" />
+                            <Polyline
+                                Grid.Column="5"
+                                Width="10"
+                                Margin="5,0"
+                                VerticalAlignment="Center"
+                                Points="5,0 5,8 5,0"
+                                Stroke="{StaticResource mainColorBrush}"
+                                StrokeThickness="2" />
 
-							<CheckBox
-								x:Name="chkEmergencyShopCustomRefundHasWaybill"
-								Grid.Column="6"
-								Margin="6,8"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkEmergencyShopCustomRefundWaybill_Click"
-								Content="店铺客户有退货单号"
-								FontSize="12" />
-							<CheckBox
-								x:Name="chkEmergencyShopCustomRefundNoWaybill"
-								Grid.Column="7"
-								Margin="6,8"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkEmergencyShopCustomRefundWaybill_Click"
-								Content="店铺客户无退货单号"
-								FontSize="12" />
-							<Polyline
-								Grid.Column="8"
-								Width="10"
-								Margin="5,0"
-								VerticalAlignment="Center"
-								Points="5,0 5,8 5,0"
-								Stroke="{StaticResource mainColorBrush}"
-								StrokeThickness="2" />
+                            <CheckBox
+                                x:Name="chkEmergencyShopCustomRefundHasWaybill"
+                                Grid.Column="6"
+                                Margin="6,8"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkEmergencyShopCustomRefundWaybill_Click"
+                                Content="店铺客户有退货单号"
+                                FontSize="12" />
+                            <CheckBox
+                                x:Name="chkEmergencyShopCustomRefundNoWaybill"
+                                Grid.Column="7"
+                                Margin="6,8"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkEmergencyShopCustomRefundWaybill_Click"
+                                Content="店铺客户无退货单号"
+                                FontSize="12" />
+                            <Polyline
+                                Grid.Column="8"
+                                Width="10"
+                                Margin="5,0"
+                                VerticalAlignment="Center"
+                                Points="5,0 5,8 5,0"
+                                Stroke="{StaticResource mainColorBrush}"
+                                StrokeThickness="2" />
 
-							<CheckBox
-								x:Name="chkEmergencyShopAfterSaleSuccess"
-								Grid.Column="9"
-								Margin="6,8"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkEmergencyShopAfterSale_Click"
-								Content="店铺退款完成"
-								FontSize="12" />
-							<CheckBox
-								x:Name="chkEmergencyShopInAfterSale"
-								Grid.Column="10"
-								Margin="6,8"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkEmergencyShopAfterSale_Click"
-								Content="店铺退款中"
-								FontSize="12" />
+                            <CheckBox
+                                x:Name="chkEmergencyShopAfterSaleSuccess"
+                                Grid.Column="9"
+                                Margin="6,8"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkEmergencyShopAfterSale_Click"
+                                Content="店铺退款完成"
+                                FontSize="12" />
+                            <CheckBox
+                                x:Name="chkEmergencyShopInAfterSale"
+                                Grid.Column="10"
+                                Margin="6,8"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkEmergencyShopAfterSale_Click"
+                                Content="店铺退款中"
+                                FontSize="12" />
 
-							<Polyline
-								Grid.Column="11"
-								Width="10"
-								Margin="5,0"
-								VerticalAlignment="Center"
-								Points="5,0 5,8 5,0"
-								Stroke="{StaticResource mainColorBrush}"
-								StrokeThickness="2" />
+                            <Polyline
+                                Grid.Column="11"
+                                Width="10"
+                                Margin="5,0"
+                                VerticalAlignment="Center"
+                                Points="5,0 5,8 5,0"
+                                Stroke="{StaticResource mainColorBrush}"
+                                StrokeThickness="2" />
 
-							<CheckBox
-								x:Name="chkEmergencyReturn"
-								Grid.Column="12"
-								Margin="6,8"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkEmergencyReturnOrRefund_Click"
-								Content="退货退款"
-								FontSize="12" />
-							<CheckBox
-								x:Name="chkEmergencyRefund"
-								Grid.Column="13"
-								Margin="6,8"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkEmergencyReturnOrRefund_Click"
-								Content="仅退款"
-								FontSize="12" />
-						</Grid>
-					</Border>
-				</TabItem>
-				<TabItem
-					MinWidth="60"
-					Background="Transparent"
-					BorderBrush="Transparent"
-					Foreground="#FF9966"
-					Header="售后完成单"
-					SizeChanged="TabItem_SizeChanged">
-					<Border
-						Margin="4,0,4,4"
-						BorderBrush="#e0e0e0"
-						BorderThickness="0,0,0,1">
-						<Grid>
-							<Grid.ColumnDefinitions>
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="auto" />
-								<ColumnDefinition Width="*" />
-							</Grid.ColumnDefinitions>
-							<CheckBox
-								x:Name="chkAftersaleIsNotSend"
-								Grid.Column="0"
-								Margin="6,8"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkAftersaleSendStatus_Click"
-								Content="未发货退货完成"
-								FontSize="12" />
-							<CheckBox
-								x:Name="chkAftersaleIsSend"
-								Grid.Column="1"
-								Margin="6,8"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkAftersaleSendStatus_Click"
-								Content="已发货退款完成"
-								FontSize="12" />
-							<Polyline
-								Grid.Column="2"
-								Width="10"
-								Margin="5,0"
-								VerticalAlignment="Center"
-								Points="5,0 5,8 5,0"
-								Stroke="{StaticResource mainColorBrush}"
-								StrokeThickness="2" />
+                            <CheckBox
+                                x:Name="chkEmergencyReturn"
+                                Grid.Column="12"
+                                Margin="6,8"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkEmergencyReturnOrRefund_Click"
+                                Content="退货退款"
+                                FontSize="12" />
+                            <CheckBox
+                                x:Name="chkEmergencyRefund"
+                                Grid.Column="13"
+                                Margin="6,8"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkEmergencyReturnOrRefund_Click"
+                                Content="仅退款"
+                                FontSize="12" />
+                        </Grid>
+                    </Border>
+                </TabItem>
+                <TabItem
+                    MinWidth="60"
+                    Background="Transparent"
+                    BorderBrush="Transparent"
+                    Foreground="#FF9966"
+                    Header="售后完成单"
+                    SizeChanged="TabItem_SizeChanged">
+                    <Border
+                        Margin="4,0,4,4"
+                        BorderBrush="#e0e0e0"
+                        BorderThickness="0,0,0,1">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <CheckBox
+                                x:Name="chkAftersaleIsNotSend"
+                                Grid.Column="0"
+                                Margin="6,8"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkAftersaleSendStatus_Click"
+                                Content="未发货退货完成"
+                                FontSize="12" />
+                            <CheckBox
+                                x:Name="chkAftersaleIsSend"
+                                Grid.Column="1"
+                                Margin="6,8"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkAftersaleSendStatus_Click"
+                                Content="已发货退款完成"
+                                FontSize="12" />
+                            <Polyline
+                                Grid.Column="2"
+                                Width="10"
+                                Margin="5,0"
+                                VerticalAlignment="Center"
+                                Points="5,0 5,8 5,0"
+                                Stroke="{StaticResource mainColorBrush}"
+                                StrokeThickness="2" />
 
-							<CheckBox
-								x:Name="chkAftersaleBuyerIsBuy"
-								Grid.Column="3"
-								Margin="6,8"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkAftersaleBuyerStatus_Click"
-								Content="买手号已拍单"
-								FontSize="12" />
-							<Polyline
-								Grid.Column="4"
-								Width="10"
-								Margin="5,0"
-								VerticalAlignment="Center"
-								Points="5,0 5,8 5,0"
-								Stroke="{StaticResource mainColorBrush}"
-								StrokeThickness="2" />
+                            <CheckBox
+                                x:Name="chkAftersaleBuyerIsBuy"
+                                Grid.Column="3"
+                                Margin="6,8"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkAftersaleBuyerStatus_Click"
+                                Content="买手号已拍单"
+                                FontSize="12" />
+                            <Polyline
+                                Grid.Column="4"
+                                Width="10"
+                                Margin="5,0"
+                                VerticalAlignment="Center"
+                                Points="5,0 5,8 5,0"
+                                Stroke="{StaticResource mainColorBrush}"
+                                StrokeThickness="2" />
 
-							<CheckBox
-								x:Name="chkAftersaleWarehouseIsNotPickup"
-								Grid.Column="5"
-								Margin="6,8"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkAftersaleWarehouseStatus_Click"
-								Content="中转仓未取号"
-								FontSize="12" />
-							<CheckBox
-								x:Name="chkAftersaleWarehouseIsPickup"
-								Grid.Column="6"
-								Margin="6,8"
-								VerticalAlignment="Center"
-								BorderBrush="{StaticResource mainColorBrush}"
-								Click="chkAftersaleWarehouseStatus_Click"
-								Content="中转仓已取号"
-								FontSize="12" />
-						</Grid>
-					</Border>
-				</TabItem>
-				<TabItem
-					MinWidth="60"
-					Background="Transparent"
-					BorderBrush="Transparent"
-					Header="全部订单"
-					SizeChanged="TabItem_SizeChanged" />
-				<!--<TabItem Header="发货异常">
+                            <CheckBox
+                                x:Name="chkAftersaleWarehouseIsNotPickup"
+                                Grid.Column="5"
+                                Margin="6,8"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkAftersaleWarehouseStatus_Click"
+                                Content="中转仓未取号"
+                                FontSize="12" />
+                            <CheckBox
+                                x:Name="chkAftersaleWarehouseIsPickup"
+                                Grid.Column="6"
+                                Margin="6,8"
+                                VerticalAlignment="Center"
+                                BorderBrush="{StaticResource mainColorBrush}"
+                                Click="chkAftersaleWarehouseStatus_Click"
+                                Content="中转仓已取号"
+                                FontSize="12" />
+                        </Grid>
+                    </Border>
+                </TabItem>
+                <TabItem
+                    MinWidth="60"
+                    Background="Transparent"
+                    BorderBrush="Transparent"
+                    Header="全部订单"
+                    SizeChanged="TabItem_SizeChanged" />
+                <!--<TabItem Header="发货异常">
                     <Grid Background="#FFE5E5E5"/>
                 </TabItem>-->
-			</TabControl>
-			<TextBlock
-				Width="180"
-				Margin="10,-5,0,-5"
-				HorizontalAlignment="Right"
-				VerticalAlignment="Top"
-				FontSize="12"
-				Foreground="{StaticResource PageWarningBrushCC}"
-				Text="注：需中转仓订单，店铺后台勿自行发货，发货后中转仓将无法打单"
-				TextWrapping="Wrap" />
-		</Grid>
-		<Grid
-			x:Name="lstTitle"
-			Grid.Row="3"
-			Margin="8,0,8,0"
-			Background="{StaticResource ListHeadBackColorBrush}">
-			<Border BorderBrush="{StaticResource ListHeadBorderColorBrush}" BorderThickness="0,0,1,0">
-				<DataGrid
-					x:Name="dgOrderHeader"
-					Grid.ColumnSpan="100"
-					Margin="0,0,28,0"
-					AutoGenerateColumns="False"
-					BorderThickness="0"
-					CanUserReorderColumns="False"
-					ColumnDisplayIndexChanged="dgOrderHeader_ColumnDisplayIndexChanged"
-					ColumnHeaderHeight="{Binding ElementName=lstTitle, Path=ActualHeight}"
-					LayoutUpdated="dgOrderHeader_LayoutUpdated">
-					<DataGrid.Columns>
-						<DataGridTextColumn
-							Width="38"
-							Header="序号"
-							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
-						<DataGridTemplateColumn
-							x:Name="colSelectAll"
-							Width="26"
-							Header="选择"
-							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}">
-							<DataGridTemplateColumn.HeaderTemplate>
-								<DataTemplate>
-									<Grid Width="14" Height="14">
-										<!--<CheckBox x:Name="headerCheckBox" BorderThickness="0" IsChecked="{Binding DataContext.AreAllSelected, RelativeSource={RelativeSource AncestorType=DataGrid},  UpdateSourceTrigger=PropertyChanged}" Checked="HeaderCheckBox_Checked" Unchecked="HeaderCheckBox_Unchecked"/>-->
-										<CheckBox
-											x:Name="chkSelectAll"
-											BorderThickness="0"
-											Checked="ChkSelectAll_Checked"
-											IsChecked="False"
-											IsThreeState="True"
-											Loaded="ChkSelectAll_Loaded"
-											Unchecked="ChkSelectAll_Unchecked" />
-										<Border
-											Width="14"
-											Height="14"
-											HorizontalAlignment="Center"
-											VerticalAlignment="Center"
-											Background="Transparent"
-											BorderBrush="{StaticResource mainColorBrush}"
-											BorderThickness="1"
-											IsHitTestVisible="False" />
-									</Grid>
-								</DataTemplate>
-							</DataGridTemplateColumn.HeaderTemplate>
-							<DataGridTemplateColumn.CellTemplate>
-								<DataTemplate>
-									<!--<CheckBox IsChecked="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
-									<CheckBox HorizontalAlignment="Center" VerticalAlignment="Center" />
-								</DataTemplate>
-							</DataGridTemplateColumn.CellTemplate>
-						</DataGridTemplateColumn>
-						<DataGridTextColumn
-							Width="185*"
-							Header="店铺单号"
-							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
-						<DataGridTextColumn
-							Width="90*"
-							Header="交易时间"
-							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
-						<DataGridTextColumn
-							Width="65*"
-							Header="利润"
-							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
-						<DataGridTextColumn
-							Width="170*"
-							Header="状态/地址"
-							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
-						<DataGridTextColumn
-							Width="140*"
-							Header="单号"
-							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
-						<DataGridTextColumn
-							Width="130*"
-							Header="备注"
-							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
-						<DataGridTextColumn
-							Width="72*"
-							Header="    操作"
-							HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
-					</DataGrid.Columns>
-				</DataGrid>
-			</Border>
-		</Grid>
+            </TabControl>
+            <TextBlock
+                Width="180"
+                Margin="10,-5,0,-5"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Top"
+                FontSize="12"
+                Foreground="{StaticResource PageWarningBrushCC}"
+                Text="注：需中转仓订单，店铺后台勿自行发货，发货后中转仓将无法打单"
+                TextWrapping="Wrap" />
+        </Grid>
+        <Grid
+            x:Name="lstTitle"
+            Grid.Row="3"
+            Margin="8,0,8,0"
+            Background="{StaticResource ListHeadBackColorBrush}">
+            <Border BorderBrush="{StaticResource ListHeadBorderColorBrush}" BorderThickness="0,0,1,0">
+                <DataGrid
+                    x:Name="dgOrderHeader"
+                    Grid.ColumnSpan="100"
+                    Margin="0,0,28,0"
+                    AutoGenerateColumns="False"
+                    BorderThickness="0"
+                    CanUserReorderColumns="False"
+                    ColumnDisplayIndexChanged="dgOrderHeader_ColumnDisplayIndexChanged"
+                    ColumnHeaderHeight="{Binding ElementName=lstTitle, Path=ActualHeight}"
+                    LayoutUpdated="dgOrderHeader_LayoutUpdated">
+                    <DataGrid.Columns>
+                        <DataGridTextColumn
+                            Width="38"
+                            Header="序号"
+                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+                        <DataGridTemplateColumn
+                            x:Name="colSelectAll"
+                            Width="26"
+                            Header="选择"
+                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}">
+                            <DataGridTemplateColumn.HeaderTemplate>
+                                <DataTemplate>
+                                    <Grid Width="14" Height="14">
+                                        <!--<CheckBox x:Name="headerCheckBox" BorderThickness="0" IsChecked="{Binding DataContext.AreAllSelected, RelativeSource={RelativeSource AncestorType=DataGrid},  UpdateSourceTrigger=PropertyChanged}" Checked="HeaderCheckBox_Checked" Unchecked="HeaderCheckBox_Unchecked"/>-->
+                                        <CheckBox
+                                            x:Name="chkSelectAll"
+                                            BorderThickness="0"
+                                            Checked="ChkSelectAll_Checked"
+                                            IsChecked="False"
+                                            IsThreeState="True"
+                                            Loaded="ChkSelectAll_Loaded"
+                                            Unchecked="ChkSelectAll_Unchecked" />
+                                        <Border
+                                            Width="14"
+                                            Height="14"
+                                            HorizontalAlignment="Center"
+                                            VerticalAlignment="Center"
+                                            Background="Transparent"
+                                            BorderBrush="{StaticResource mainColorBrush}"
+                                            BorderThickness="1"
+                                            IsHitTestVisible="False" />
+                                    </Grid>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.HeaderTemplate>
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <!--<CheckBox IsChecked="{Binding IsSelected, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
+                                    <CheckBox HorizontalAlignment="Center" VerticalAlignment="Center" />
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+                        </DataGridTemplateColumn>
+                        <DataGridTextColumn
+                            Width="185*"
+                            Header="店铺单号"
+                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+                        <DataGridTextColumn
+                            Width="90*"
+                            Header="交易时间"
+                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+                        <DataGridTextColumn
+                            Width="65*"
+                            Header="利润"
+                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+                        <DataGridTextColumn
+                            Width="170*"
+                            Header="状态/地址"
+                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+                        <DataGridTextColumn
+                            Width="140*"
+                            Header="单号"
+                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+                        <DataGridTextColumn
+                            Width="130*"
+                            Header="备注"
+                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+                        <DataGridTextColumn
+                            Width="72*"
+                            Header="    操作"
+                            HeaderStyle="{StaticResource BaseDataGridColumnHeaderStyle}" />
+                    </DataGrid.Columns>
+                </DataGrid>
+            </Border>
+        </Grid>
 
-		<!--  ItemsSource="{Binding lstFilterOrder}"  -->
-		<ListBox
-			x:Name="lbxOrder"
-			Grid.Row="4"
-			Margin="7,0,7,0"
-			HorizontalContentAlignment="Stretch"
-			BorderThickness="0"
-			ScrollViewer.CanContentScroll="True"
-			VirtualizingPanel.ScrollUnit="Pixel">
-			<!--  使用自定义属性模板去除ListBox高亮显示框  -->
-			<ListBox.ItemContainerStyle>
-				<Style TargetType="ListBoxItem">
-					<Setter Property="Template">
-						<Setter.Value>
-							<ControlTemplate TargetType="ListBoxItem">
-								<ContentPresenter
-									Content="{TemplateBinding Content}"
-									ContentStringFormat="{TemplateBinding ContentStringFormat}"
-									ContentTemplate="{TemplateBinding ContentTemplate}" />
-							</ControlTemplate>
-						</Setter.Value>
-					</Setter>
-				</Style>
-			</ListBox.ItemContainerStyle>
-			<ListBox.ItemTemplate>
-				<DataTemplate>
-					<!--  此处绑定将数据源传递给子自定义控件OrderListRowCtrl  -->
-					<local:OrderListRowCtrl
-						VerticalAlignment="Center"
-						VerticalContentAlignment="Center"
-						DataContext="{Binding}" />
-				</DataTemplate>
-			</ListBox.ItemTemplate>
-		</ListBox>
+        <!--  ItemsSource="{Binding lstFilterOrder}"  -->
+        <ListBox
+            x:Name="lbxOrder"
+            Grid.Row="4"
+            Margin="7,0,7,0"
+            HorizontalContentAlignment="Stretch"
+            BorderThickness="0"
+            ScrollViewer.CanContentScroll="True"
+            VirtualizingPanel.ScrollUnit="Pixel">
+            <!--  使用自定义属性模板去除ListBox高亮显示框  -->
+            <ListBox.ItemContainerStyle>
+                <Style TargetType="ListBoxItem">
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="ListBoxItem">
+                                <ContentPresenter
+                                    Content="{TemplateBinding Content}"
+                                    ContentStringFormat="{TemplateBinding ContentStringFormat}"
+                                    ContentTemplate="{TemplateBinding ContentTemplate}" />
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </ListBox.ItemContainerStyle>
+            <ListBox.ItemTemplate>
+                <DataTemplate>
+                    <!--  此处绑定将数据源传递给子自定义控件OrderListRowCtrl  -->
+                    <local:OrderListRowCtrl
+                        VerticalAlignment="Center"
+                        VerticalContentAlignment="Center"
+                        DataContext="{Binding}" />
+                </DataTemplate>
+            </ListBox.ItemTemplate>
+        </ListBox>
 
-		<Grid
-			x:Name="gridFooter"
-			Grid.Row="5"
-			Background="{StaticResource pageColorBrush}">
-			<ProgressBar 
-			VerticalAlignment="Stretch"
-			Background="Transparent"
-			BorderThickness="0"
-			Foreground="#FFA680"
-			d:IsIndeterminate="False"
-			d:Maximum="100"
-			d:Value="10"
-			Maximum="{Binding ProgressMaximum}"
-			Value="{Binding ProgressValue}" />
-			<Grid>
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="Auto" />
-					<ColumnDefinition Width="100*" />
-				</Grid.ColumnDefinitions>
+        <Grid
+            x:Name="gridFooter"
+            Grid.Row="5"
+            Background="{StaticResource pageColorBrush}">
+            <ProgressBar
+                VerticalAlignment="Stretch"
+                d:IsIndeterminate="False"
+                d:Maximum="100"
+                d:Value="10"
+                Background="Transparent"
+                BorderThickness="0"
+                Foreground="#FFA680"
+                Maximum="{Binding ProgressMaximum}"
+                Value="{Binding ProgressValue}" />
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="100*" />
+                </Grid.ColumnDefinitions>
 
-				<TextBox
-					Grid.Row="2"
-					Grid.Column="1"
-					Margin="10,2,0,0" 
-					VerticalAlignment="Center"
-					Background="Transparent"
-					BorderThickness="0"
-					Foreground="White"
-					IsReadOnly="True"
-					d:Text="共计：{}"
-					Text="{Binding BottomMsg}" />
-			</Grid>
-		</Grid>
-		<Border
-			x:Name="borderFilterRemarkSelect"
-			Grid.RowSpan="10"
-			MinWidth="200"
-			MinHeight="200"
-			MaxWidth="400"
-			MaxHeight="400"
-			Margin="30,180,0,0"
-			HorizontalAlignment="Left"
-			VerticalAlignment="Top"
-			Background="White"
-			BorderBrush="{StaticResource pageColorBrush}"
-			BorderThickness="1,1,1,1"
-			CornerRadius="4">
-			<Grid>
-				<Grid.RowDefinitions>
-					<RowDefinition />
-					<RowDefinition Height="40" />
-				</Grid.RowDefinitions>
-				<ScrollViewer Padding="2" VerticalScrollBarVisibility="Auto">
-					<WrapPanel x:Name="wpFilterRemarkSelect" />
-				</ScrollViewer>
-				<Grid Grid.Row="2">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="*" />
-						<ColumnDefinition Width="Auto" />
-						<ColumnDefinition Width="Auto" />
-					</Grid.ColumnDefinitions>
-					<Button
-						x:Name="btnFilterRemarkSelectAll"
-						Grid.Row="4"
-						Grid.Column="0"
-						Height="22"
-						Margin="6,0,4,0"
-						Click="btnFilterRemarkSelectAll_Click"
-						Content=" 全选 "
-						Style="{StaticResource BasePageButtonStyle}" />
-					<Button
-						x:Name="btnFilterRemarkUnSelectAll"
-						Grid.Row="4"
-						Grid.Column="1"
-						Height="22"
-						Click="btnFilterRemarkUnSelectAll_Click"
-						Content=" 全空 "
-						Style="{StaticResource BasePageButtonStyle}" />
-					<Button
-						x:Name="btnApplyFilterRemark"
-						Grid.Row="4"
-						Grid.Column="6"
-						Height="22"
-						Click="btnApplyFilterRemark_Click"
-						Content=" 确定 "
-						Style="{StaticResource BasePageButtonStyle}" />
-					<Button
-						x:Name="btnCancelFilterRemark"
-						Grid.Row="4"
-						Grid.Column="7"
-						Height="22"
-						Margin="4,0,6,0"
-						Click="btnCancelFilterRemark_Click"
-						Content=" 取消 "
-						Style="{StaticResource BasePageButtonLightStyle}" />
-				</Grid>
-			</Grid>
-		</Border>
-	</Grid>
+                <TextBox
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Margin="4,0,0,0"
+                    VerticalAlignment="Center"
+                    d:Text="共计：{}"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    Foreground="White"
+                    IsReadOnly="True"
+                    Text="{Binding BottomMsg}" />
+            </Grid>
+        </Grid>
+        <Border
+            x:Name="borderFilterRemarkSelect"
+            Grid.RowSpan="10"
+            MinWidth="200"
+            MinHeight="200"
+            MaxWidth="400"
+            MaxHeight="400"
+            Margin="30,180,0,0"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top"
+            Background="White"
+            BorderBrush="{StaticResource pageColorBrush}"
+            BorderThickness="1,1,1,1"
+            CornerRadius="4">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition Height="40" />
+                </Grid.RowDefinitions>
+                <ScrollViewer Padding="2" VerticalScrollBarVisibility="Auto">
+                    <WrapPanel x:Name="wpFilterRemarkSelect" />
+                </ScrollViewer>
+                <Grid Grid.Row="2">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Button
+                        x:Name="btnFilterRemarkSelectAll"
+                        Grid.Row="4"
+                        Grid.Column="0"
+                        Height="22"
+                        Margin="6,0,4,0"
+                        Click="btnFilterRemarkSelectAll_Click"
+                        Content=" 全选 "
+                        Style="{StaticResource BasePageButtonStyle}" />
+                    <Button
+                        x:Name="btnFilterRemarkUnSelectAll"
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Height="22"
+                        Click="btnFilterRemarkUnSelectAll_Click"
+                        Content=" 全空 "
+                        Style="{StaticResource BasePageButtonStyle}" />
+                    <Button
+                        x:Name="btnApplyFilterRemark"
+                        Grid.Row="4"
+                        Grid.Column="6"
+                        Height="22"
+                        Click="btnApplyFilterRemark_Click"
+                        Content=" 确定 "
+                        Style="{StaticResource BasePageButtonStyle}" />
+                    <Button
+                        x:Name="btnCancelFilterRemark"
+                        Grid.Row="4"
+                        Grid.Column="7"
+                        Height="22"
+                        Margin="4,0,6,0"
+                        Click="btnCancelFilterRemark_Click"
+                        Content=" 取消 "
+                        Style="{StaticResource BasePageButtonLightStyle}" />
+                </Grid>
+            </Grid>
+        </Border>
+    </Grid>
 </UserControl>
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
index f04fba9..477d5e9 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
@@ -84,21 +84,21 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			AutoGetOrder();
 		}
 
-		public void GetOrderTest()
-		{
-			for (int i = 0; i < 10000; i++)
-			{
-				//lstOrder.Add(new oms_wei_order_info() { id = 1, IsSelect = false, order_id = ("3737033423685556736".ParseToLong() + Randomx.GetId(0,100)).ParseToString(), shop_name = "媛卡曦工厂优选" });
-				GlobalConfig.lstOrder.Add(new oms_wei_order_info() { id = 1, IsSelect = false, order_id = Randomx.GetId(1000, 10000).ParseToString(), shop_name = "媛卡曦工厂优选" });
-			}
-			//GlobalConfig.lstOrder.SortDesc(o => o.order_id.ParseToLong());
-		}
+		//public void GetOrderTest()
+		//{
+		//	for (int i = 0; i < 10000; i++)
+		//	{
+		//		//lstOrder.Add(new oms_wei_order_info() { id = 1, IsSelect = false, order_id = ("3737033423685556736".ParseToLong() + Randomx.GetId(0,100)).ParseToString(), shop_name = "媛卡曦工厂优选" });
+		//		GlobalConfig.lstOrder.Add(new oms_wei_order_info() { id = 1, IsSelect = false, order_id = Randomx.GetId(1000, 10000).ParseToString(), shop_name = "媛卡曦工厂优选" });
+		//	}
+		//	//GlobalConfig.lstOrder.SortDesc(o => o.order_id.ParseToLong());
+		//}
 
 		public void AutoGetOrder()
 		{
 			Task.Run(() =>
 			{
-				Thread.Sleep(5000);
+				//Thread.Sleep(5000);
 				while (true)
 				{
 					if (!IsAutoReadOrder)
@@ -136,6 +136,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 		/// <param name="filterGetCondition">按过滤条件读取读取服务端订单</param>
 		public void GetOrder(string orderIds = "", bool filterGetCondition = false)
 		{
+			while (!MainWindow.Instance.hasReadShop)
+			{
+				Thread.Sleep(100);
+			}
+
 			BottomMsg = "开始读取订单...";
 			StartProgress();
 			Dispatcher.Invoke(new Action(() =>
@@ -934,6 +939,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			if (order == null)
 				return true;
 
+			if (order.order_id == "3738456804637165312")
+			{
+
+			}
+
 			// 过滤id
 			if (!string.IsNullOrEmpty(txtOrderId.Text.Trim()))
 			{
@@ -1190,11 +1200,6 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			});
 			Task.Run(() =>
 			{
-				while (!MainWindow.Instance.hasReadShop)
-				{
-					Thread.Sleep(100);
-				}
-
 				GetOrder();
 				nextGetOrderTime = DateTime.Now.AddMinutes(25);
 			});
@@ -1881,19 +1886,27 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 				}
 				else
 				{
-					giftType = GiftType._155;
+					giftType = GiftType._160;
 				}
 				int index = 1;
 				int sucessCount = 0;
 				int errorCount = 0;
 				foreach (oms_wei_order_info item in list)
 				{
-					var ret = await _shipGiftService.Send(item.order_id, giftType);
-					if (ret)
+					var rst = await WxApiBLL.WxSearchAndDropshipCancel(item.Shop, item);
+					if (rst == "success")
 					{
-						sucessCount++;
-						item.gift_order_status = 1;
-						this.FilterOneOrder(item, true);
+						var ret = await _shipGiftService.Send(item.order_id, giftType);
+						if (ret)
+						{
+							sucessCount++;
+							item.gift_order_status = 1;
+							this.FilterOneOrder(item, true);
+						}
+						else
+						{
+							errorCount++;
+						}
 					}
 					else
 					{
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml
index 6b66489..584a8b9 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml
@@ -35,21 +35,6 @@
                         <RowDefinition Height="auto"></RowDefinition>
                         <RowDefinition Height="6"></RowDefinition>
                     </Grid.RowDefinitions>
-                    <!--<Border Visibility="{Binding order_item1_visibility}" Grid.Row="1">
-                        <local:OrderListRowItemCtrl x:Name="item1" Grid.Row="1" DataContext="{Binding order_item1}" VerticalAlignment="Center" VerticalContentAlignment="Center"></local:OrderListRowItemCtrl>
-                    </Border>
-                    <Border Visibility="{Binding order_item2_visibility}" Grid.Row="2">
-                        <local:OrderListRowItemCtrl x:Name="item2" Grid.Row="2" DataContext="{Binding order_item2}" VerticalAlignment="Center" VerticalContentAlignment="Center"></local:OrderListRowItemCtrl>
-                    </Border>
-                    <Border Visibility="{Binding order_item3_visibility}" Grid.Row="3">
-                        <local:OrderListRowItemCtrl x:Name="item3" Grid.Row="3" DataContext="{Binding order_item3}" VerticalAlignment="Center" VerticalContentAlignment="Center"></local:OrderListRowItemCtrl>
-                    </Border>
-                    <Border Visibility="{Binding order_item4_visibility}" Grid.Row="4">
-                        <local:OrderListRowItemCtrl x:Name="item4" Grid.Row="4" DataContext="{Binding order_item4}" VerticalAlignment="Center" VerticalContentAlignment="Center"></local:OrderListRowItemCtrl>
-                    </Border>
-                    <Border Visibility="{Binding order_item5_visibility}" Grid.Row="5">
-                        <local:OrderListRowItemCtrl x:Name="item5" Grid.Row="5" DataContext="{Binding order_item5}" VerticalAlignment="Center" VerticalContentAlignment="Center"></local:OrderListRowItemCtrl>
-                    </Border>-->
                 </Grid>
             </Border>
         </Grid>
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
index c6220e6..b5107c2 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
@@ -66,8 +66,8 @@
             <Image Grid.Column="5" Margin="8,8,0,8" Width="24" Height="24" Source="{StaticResource imgOrderWeishopIcon}"></Image>
             <uc:UcWaterMarkTextBox1 WaterMark="店铺状态" x:Name="txtShopLoginStatus" Grid.Column="5" 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}}"/>
+                                   Text="{Binding Shop.LoginStatusStr}" BorderThickness="0" 
+                                   Foreground="{Binding Shop.LoginStatusStr, Converter={StaticResource statusToColorBrushConverter}}"/>
             <uc:UcWaterMarkTextBox1 Grid.Column="6" Foreground="{StaticResource PageLinkBrush}" Cursor="Hand" WaterMark="店铺名称" x:Name="txtShopName" Margin="4,8,4,8" VerticalAlignment="Center" 
                                    FontSize="14" Background="Transparent" IsReadOnly="True" Text="{Binding shop_name}" BorderThickness="0" />
             
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
index a871b75..383e895 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
@@ -1,507 +1,1721 @@
-<UserControl x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListRowItemCtrl"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
-			 xmlns:conv="clr-namespace:_29WxOrderWpf.Converters"
-             xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
-             mc:Ignorable="d" DataContextChanged="UserControl_DataContextChanged"
-			 d:Background="White"
-             d:DesignHeight="220" d:DesignWidth="1200">
-	<UserControl.Resources>
-		<conv:InverseVisibleToVisibilityConverter x:Key="InverseVisibleToVisibilityConverter"/>
-		<conv:VisibleToVisibilityConverter x:Key="VisibleToVisibilityConverter"/>
-	</UserControl.Resources>
+<UserControl
+    x:Class="_29WxOrderWpf.Ctrls.OrderCtrls.OrderListRowItemCtrl"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:_29WxOrderWpf.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:uc="clr-namespace:_29WxOrderWpf.UserControls"
+    d:Background="White"
+    d:DesignHeight="220"
+    d:DesignWidth="1300"
+    DataContextChanged="UserControl_DataContextChanged"
+    mc:Ignorable="d">
+    <UserControl.Resources>
+        <conv:InverseVisibleToVisibilityConverter x:Key="InverseVisibleToVisibilityConverter" />
+        <conv:VisibleToVisibilityConverter x:Key="VisibleToVisibilityConverter" />
+        <conv:MoreThanZeroVisibilityConverter x:Key="MoreThanZeroVisibilityConverter" />
+    </UserControl.Resources>
 
-	<Grid>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="2"></RowDefinition>
-			<RowDefinition Height="*"></RowDefinition>
-			<RowDefinition Height="2"></RowDefinition>
-		</Grid.RowDefinitions>
-		<Grid x:Name="gridListItem" Grid.Row="1" VerticalAlignment="Center">
-			<Grid.ColumnDefinitions>
-				<ColumnDefinition Width="36"></ColumnDefinition>
-				<ColumnDefinition Width="28"></ColumnDefinition>
-				<ColumnDefinition Width="200*"></ColumnDefinition>
-				<ColumnDefinition Width="95*"></ColumnDefinition>
-				<ColumnDefinition Width="75*"></ColumnDefinition>
-				<ColumnDefinition Width="170*"></ColumnDefinition>
-				<ColumnDefinition Width="120*"></ColumnDefinition>
-				<ColumnDefinition Width="120*"></ColumnDefinition>
-				<ColumnDefinition Width="72*"></ColumnDefinition>
-			</Grid.ColumnDefinitions>
-			<TextBlock Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Converter={StaticResource listBoxIndexConverter}}"
-                       HorizontalAlignment="Center" VerticalAlignment="Center"></TextBlock>
-			<CheckBox Grid.Column="1" Background="Transparent" HorizontalAlignment="Center" VerticalAlignment="Center" Tag="{Binding order_id}" IsChecked="{Binding ItemOrder.IsSelect, Mode=TwoWay}" Click="CheckBox_Click" Margin="0,0,0,0"/>
-			<!--订单商品信息-->
-			<Grid Grid.Column="2" Background="Transparent" VerticalAlignment="Center">
-				<Grid.ColumnDefinitions>
-					<ColumnDefinition Width="auto" MinWidth="50"></ColumnDefinition>
-					<ColumnDefinition Width="*"></ColumnDefinition>
-				</Grid.ColumnDefinitions>
-				<!--<Image Grid.Row="1" x:Name="imgOrderItem" Grid.Column="0" VerticalAlignment="Top" Height="100" Width="100" Margin="0,2,8,2" Source="{Binding thumb_img, Converter={StaticResource ImageUrlToBitmapImage}}"></Image>-->
-				<Image Grid.Row="1" x:Name="imgOrderItem" Grid.Column="0" VerticalAlignment="Top" Height="100" Width="100" Margin="0,2,8,2"
-                       Cursor="Hand" MouseEnter="imgOrderItem_MouseEnter" MouseLeave="imgOrderItem_MouseLeave" MouseDown="imgOrderItem_MouseDown"></Image>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="2" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="2" />
+        </Grid.RowDefinitions>
+        <Grid
+            x:Name="gridListItem"
+            Grid.Row="1"
+            VerticalAlignment="Center">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="36" />
+                <ColumnDefinition Width="28" />
+                <ColumnDefinition Width="200*" />
+                <ColumnDefinition Width="95*" />
+                <ColumnDefinition Width="75*" />
+                <ColumnDefinition Width="170*" />
+                <ColumnDefinition Width="120*" />
+                <ColumnDefinition Width="120*" />
+                <ColumnDefinition Width="72*" />
+            </Grid.ColumnDefinitions>
+            <TextBlock
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Text="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListBoxItem}}, Converter={StaticResource listBoxIndexConverter}}" />
+            <CheckBox
+                Grid.Column="1"
+                Margin="0,0,0,0"
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Background="Transparent"
+                Click="CheckBox_Click"
+                IsChecked="{Binding ItemOrder.IsSelect, Mode=TwoWay}"
+                Tag="{Binding order_id}" />
+            <!--  订单商品信息  -->
+            <Grid
+                Grid.Column="2"
+                VerticalAlignment="Center"
+                Background="Transparent">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto" MinWidth="50" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <!--<Image Grid.Row="1" x:Name="imgOrderItem" Grid.Column="0" VerticalAlignment="Top" Height="100" Width="100" Margin="0,2,8,2" Source="{Binding thumb_img, Converter={StaticResource ImageUrlToBitmapImage}}"></Image>-->
+                <Image
+                    x:Name="imgOrderItem"
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Width="100"
+                    Height="100"
+                    Margin="0,2,8,2"
+                    VerticalAlignment="Top"
+                    Cursor="Hand"
+                    MouseDown="imgOrderItem_MouseDown"
+                    MouseEnter="imgOrderItem_MouseEnter"
+                    MouseLeave="imgOrderItem_MouseLeave" />
 
-				<Grid Grid.Column="1">
-					<Grid.RowDefinitions>
-						<RowDefinition Height="*"></RowDefinition>
-						<RowDefinition Height="Auto"></RowDefinition>
-						<RowDefinition Height="Auto"></RowDefinition>
-						<RowDefinition Height="Auto"></RowDefinition>
-						<RowDefinition Height="Auto"></RowDefinition>
-						<RowDefinition Height="Auto"></RowDefinition>
-						<RowDefinition Height="Auto"></RowDefinition>
-						<RowDefinition Height="Auto"></RowDefinition>
-						<RowDefinition Height="Auto"></RowDefinition>
-						<RowDefinition Height="*"></RowDefinition>
-					</Grid.RowDefinitions>
+                <Grid Grid.Column="1">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                    </Grid.RowDefinitions>
 
-					<!--<Image Grid.RowSpan="20" Grid.Column="0" Height="80" Width="80" Margin="0,0,8,0" Source="{DynamicResource imgErrPic}"></Image>-->
-					<uc:UcWaterMarkTextBox1 Grid.Column="0" Grid.Row="1" WaterMark="商品名称" x:Name="txtGoodsName" Text="{Binding title}" Margin="0,2,4,2" 
-											d:Visibility="Visible"  d:Text="商品名称"
-                        Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" FontWeight="Bold" HorizontalAlignment="Left"/>
-					<!--<Grid Grid.Row="1">
+                    <!--<Image Grid.RowSpan="20" Grid.Column="0" Height="80" Width="80" Margin="0,0,8,0" Source="{DynamicResource imgErrPic}"></Image>-->
+                    <uc:UcWaterMarkTextBox1
+                        x:Name="txtGoodsName"
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="0,2,4,2"
+                        HorizontalAlignment="Left"
+                        d:Text="商品名称"
+                        d:Visibility="Visible"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        FontWeight="Bold"
+                        IsReadOnly="True"
+                        Text="{Binding title}"
+                        TextWrapping="Wrap"
+                        WaterMark="商品名称" />
+                    <!--<Grid Grid.Row="1">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="auto" />
                             <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
-                        
+
                         <Border Grid.Column="1" Grid.Row="1" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand" HorizontalAlignment="Left"
                                 MouseLeftButtonDown="pathCopyProdName_MouseLeftButtonDown" Visibility="{Binding ElementName=txtUserAddress,Path=Visibility}">
                             <Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" MouseLeftButtonDown="pathCopyProdName_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" />
                         </Border>
                     </Grid>-->
 
-					<TextBox Text="数量：" Grid.Column="1" Grid.Row="2" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-					<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
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="0,2,4,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="数量：" />
+                    <uc:UcWaterMarkTextBox1
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="36,2,4,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="{Binding sku_cnt}"
+                        TextWrapping="Wrap"
+                        WaterMark="SKU数量" />
 
-					<TextBox Text="规格：" Grid.Column="1" Grid.Row="3" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-					<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
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Margin="0,2,4,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="规格：" />
+                    <uc:UcWaterMarkTextBox1
+                        Grid.Row="3"
+                        Grid.Column="1"
+                        Margin="36,2,4,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="{Binding sku_attr_str}"
+                        TextWrapping="Wrap"
+                        WaterMark="规格" />
 
-					<TextBox Text="平台商品ID：" Grid.Column="1" Grid.Row="4" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-					<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
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Margin="0,2,4,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="平台商品ID：" />
+                    <uc:UcWaterMarkTextBox1
+                        Grid.Row="4"
+                        Grid.Column="1"
+                        Margin="72,2,4,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="{Binding product_id}"
+                        TextWrapping="Wrap"
+                        WaterMark="平台商品ID" />
 
-					<TextBox Text="系统商品ID：" Grid.Column="1" Grid.Row="5" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-					<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: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>
-			<!--订单时间信息-->
-			<Grid Grid.Column="3" Background="Transparent" VerticalAlignment="Center">
-				<Grid.RowDefinitions>
-					<RowDefinition Height="*"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<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:UcWaterMarkTextBox1 WaterMark="成交时间" Text="{Binding CreateDateTimeStr}" 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: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:UcWaterMarkTextBox1 WaterMark="退款时间" Text="{Binding RefundDateTimeStr}" Grid.Column="1" Grid.Row="3" Margin="60,2,4,2" VerticalAlignment="Top" 
-                                        Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Visibility="{Binding RefundTimeVisibility}"/>
-				<!--<TextBox Text="更新时间：" Grid.Column="1" Grid.Row="4" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                <uc:UcWaterMarkTextBox1 WaterMark="更新时间" Text="{Binding UpdateDateTimeStr}" Grid.Column="1" Grid.Row="4" Margin="60,2,4,2" VerticalAlignment="Top" 
+                    <TextBox
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Margin="0,2,4,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="系统商品ID：" />
+                    <uc:UcWaterMarkTextBox1
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Margin="72,2,4,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="{Binding out_product_id}"
+                        TextWrapping="Wrap"
+                        WaterMark="系统商品ID" />
+                    <TextBox
+                        Grid.Row="6"
+                        Grid.Column="1"
+                        Margin="0,2,4,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="系统sku编码：" />
+                    <uc:UcWaterMarkTextBox1
+                        Grid.Row="6"
+                        Grid.Column="1"
+                        Margin="78,2,4,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="{Binding out_sku_id}"
+                        TextWrapping="Wrap"
+                        WaterMark="系统sku编码" />
+                </Grid>
+            </Grid>
+            <!--  订单时间信息  -->
+            <Grid
+                Grid.Column="3"
+                VerticalAlignment="Center"
+                Background="Transparent">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <TextBox
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Margin="0,2,4,2"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="成交时间：" />
+                <uc:UcWaterMarkTextBox1
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Margin="60,2,4,2"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="{Binding CreateDateTimeStr}"
+                    TextWrapping="Wrap"
+                    WaterMark="成交时间" />
+                <TextBox
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Margin="0,2,4,2"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="发货时间："
+                    Visibility="{Binding ItemOrder.ship_done_time_visibility}" />
+                <uc:UcWaterMarkTextBox1
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Margin="60,2,4,2"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="{Binding ItemOrder.ship_done_time_str}"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding ItemOrder.ship_done_time_visibility}"
+                    WaterMark="发货时间" />
+                <TextBox
+                    Grid.Row="3"
+                    Grid.Column="1"
+                    Margin="0,2,4,2"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="退款时间："
+                    Visibility="{Binding RefundTimeVisibility}" />
+                <uc:UcWaterMarkTextBox1
+                    Grid.Row="3"
+                    Grid.Column="1"
+                    Margin="60,2,4,2"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="{Binding RefundDateTimeStr}"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding RefundTimeVisibility}"
+                    WaterMark="退款时间" />
+                <!--<TextBox Text="更新时间：" Grid.Column="1" Grid.Row="4" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+                <uc:UcWaterMarkTextBox1 WaterMark="更新时间" Text="{Binding UpdateDateTimeStr}" Grid.Column="1" Grid.Row="4" Margin="60,2,4,2" VerticalAlignment="Top"
                                    Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>-->
-			</Grid>
-			<!--订单利润-->
-			<Grid Grid.Column="4" Background="Transparent" VerticalAlignment="Center">
-				<Grid.RowDefinitions>
-					<RowDefinition Height="*"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<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: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: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: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 FreightVisibility}"/>
-				<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 FreightVisibility}"/>
-				<TextBox Text="平台服务费：" Grid.Column="1" Grid.Row="5" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-				<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: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: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" 
+            </Grid>
+            <!--  订单利润  -->
+            <Grid
+                Grid.Column="4"
+                VerticalAlignment="Center"
+                Background="Transparent">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <TextBox
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Margin="0,0,4,0"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="售价：" />
+                <uc:UcWaterMarkTextBox1
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Margin="36,0,4,0"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="{Binding RealPriceStr}"
+                    TextWrapping="Wrap"
+                    WaterMark="售价" />
+                <TextBox
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Margin="0,0,4,0"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="平台优惠：" />
+                <uc:UcWaterMarkTextBox1
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Margin="60,0,4,0"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="{Binding CashCouponDiscountedPriceStr}"
+                    TextWrapping="Wrap"
+                    WaterMark="平台优惠" />
+                <TextBox
+                    Grid.Row="3"
+                    Grid.Column="1"
+                    Margin="0,0,4,0"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="进价："
+                    Visibility="{Binding purchase_price_visibility}" />
+                <uc:UcWaterMarkTextBox1
+                    Grid.Row="3"
+                    Grid.Column="1"
+                    Margin="36,0,4,0"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="{Binding purchase_price_str}"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding purchase_price_visibility}"
+                    WaterMark="进价" />
+                <TextBox
+                    Grid.Row="4"
+                    Grid.Column="1"
+                    Margin="0,0,4,0"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="运费："
+                    Visibility="{Binding FreightVisibility}" />
+                <uc:UcWaterMarkTextBox1
+                    Grid.Row="4"
+                    Grid.Column="1"
+                    Margin="36,0,4,0"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="{Binding freight_str}"
+                    TextWrapping="Wrap"
+                    Visibility="{Binding FreightVisibility}"
+                    WaterMark="运费" />
+                <TextBox
+                    Grid.Row="5"
+                    Grid.Column="1"
+                    Margin="0,0,4,0"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="平台服务费：" />
+                <uc:UcWaterMarkTextBox1
+                    Grid.Row="5"
+                    Margin="72,0,4,0"
+                    VerticalAlignment="Center"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="{Binding predict_commission_fee_str}"
+                    TextWrapping="Wrap"
+                    WaterMark="平台服务费" />
+                <TextBox
+                    Grid.Row="6"
+                    Grid.Column="1"
+                    Margin="0,0,4,0"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="达人佣金：" />
+                <uc:UcWaterMarkTextBox1
+                    Grid.Row="6"
+                    Margin="60,0,4,0"
+                    VerticalAlignment="Center"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="{Binding commission_amount_str}"
+                    TextWrapping="Wrap"
+                    WaterMark="达人佣金" />
+                <TextBox
+                    Grid.Row="7"
+                    Grid.Column="1"
+                    Margin="0,0,4,0"
+                    VerticalAlignment="Top"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="外采金额：" />
+                <uc:UcWaterMarkTextBox1
+                    Grid.Row="7"
+                    Margin="60,0,4,0"
+                    VerticalAlignment="Center"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    IsReadOnly="True"
+                    Text="{Binding out_amount_str}"
+                    TextWrapping="Wrap"
+                    WaterMark="外采金额" />
+                <WrapPanel Grid.Row="8" Grid.Column="1">
+                    <!--<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: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>
-			<!--订单状态/地址-->
-			<Grid Grid.Column="5" Background="Transparent" VerticalAlignment="Center">
-				<Grid.RowDefinitions>
-					<RowDefinition Height="*"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="*"></RowDefinition>
-				</Grid.RowDefinitions>
+                    <TextBox
+                        Grid.Row="8"
+                        Grid.Column="1"
+                        Margin="0,0,-4,0"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="利润：" />
+                    <uc:UcWaterMarkTextBox1
+                        Grid.Row="8"
+                        Margin="0,0,4,0"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        FontWeight="Bold"
+                        Foreground="{Binding ProfitStrColor}"
+                        IsReadOnly="True"
+                        Text="{Binding ProfitCountStr}"
+                        TextWrapping="Wrap"
+                        WaterMark="利润" />
+                </WrapPanel>
+            </Grid>
+            <!--  订单状态/地址  -->
+            <Grid
+                Grid.Column="5"
+                VerticalAlignment="Center"
+                Background="Transparent">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
 
-				<WrapPanel Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-					<Border Grid.Row="1" Margin="8,0,0,0" Background="{Binding OrderItemStatusBackColor}" BorderBrush="{Binding OrderItemStatusBorderColor}" 
-                            BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center">
-						<TextBox Grid.Column="1" Margin="2,0,2,1" Foreground="{Binding OrderItemStatusStrColor}" VerticalContentAlignment="Center" VerticalAlignment="Center" 
-                                 Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding OrderItemStatusStr}" BorderThickness="0" />
-					</Border>
-					<Border Grid.Row="1" Margin="8,0,0,0" Background="{StaticResource PageWarningBrush50}" BorderBrush="{StaticResource PageWarningBrushCC}" 
-                            BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" 
-                            Visibility="{Binding ElementName=txtWaybillException,Path=Text,Converter={StaticResource HasTextVisibility}}">
-						<TextBox x:Name="txtWaybillException" Grid.Column="1" Margin="2,0,2,1" Foreground="{StaticResource PageWarningBrush}" VerticalContentAlignment="Center" VerticalAlignment="Center" 
-                                 Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding ShopWaybillExceptionStr}" BorderThickness="0" />
-					</Border>
-				</WrapPanel>
-				<TextBox Text="{Binding ItemRefund.RefundStatusStr}" Grid.Column="1" Grid.Row="2" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" 
-                         x:Name="txtStatusStr" BorderThickness="0" Foreground="{Binding ItemRefund.RefundStatusColor}" HorizontalAlignment="Center" 
-                         Visibility="{Binding ElementName=txtStatusStr,Path=Text,Converter={StaticResource HasTextVisibility}}"/>
-				<TextBox Text="{Binding ItemRefund.reasonTextStr}" Grid.Column="1" Grid.Row="3" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" 
-                         x:Name="txtRefundReasonTextStr" BorderThickness="0" Foreground="#f56c6c" HorizontalAlignment="Center"
-                         Visibility="{Binding ElementName=txtRefundReasonTextStr,Path=Text,Converter={StaticResource HasTextVisibility}}"/>
-				<TextBox Text="{Binding RefundResultStr}" Grid.Column="1" Grid.Row="4" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" 
-                         x:Name="txtRefundResult" BorderThickness="0" Foreground="#f56c6c" HorizontalAlignment="Center"
-                         Visibility="{Binding ElementName=txtRefundResult,Path=Text,Converter={StaticResource HasTextVisibility}}"/>
+                <WrapPanel
+                    Grid.Column="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center">
+                    <Border
+                        Grid.Row="1"
+                        Height="auto"
+                        MinWidth="30"
+                        Margin="8,0,0,0"
+                        HorizontalAlignment="Center"
+                        d:Background="{StaticResource PageWarningBrush20}"
+                        d:BorderBrush="{StaticResource PageWarningBrushCC}"
+                        Background="{StaticResource PageWarningBrush20}"
+                        BorderBrush="{StaticResource PageWarningBrushCC}"
+                        BorderThickness="1"
+                        CornerRadius="2"
+                        Visibility="{Binding ItemOrder.gift_order_status, Converter={StaticResource MoreThanZeroVisibilityConverter}}">
+                        <Grid>
+                            <Path
+                                Width="12"
+                                Height="12"
+                                Margin="2,0,0,1"
+                                HorizontalAlignment="Left"
+                                Data="M 9,5 L 9,3 L10,3 L10,5 Z M5,1 L7,0 L9,2 L10,2 L12,0 L14,1 L14,2 L13,2 L12,1 L10,3 L9,3 L7,1 L6,2 L5,2 Z M5,2 M5,3 L8,5 L9,5 L6,3 L6,2 L5,2 Z M14,2 M14,3 L11,5 L10,5 L13,3 L13,2 L14,2 Z M 0,5 L 19,5 L 19,6 L 0,6 Z M 2,6 L 2,20 L 3,20 L 3,6 Z M 17,6 L 17,20 L 16,20 L 16,6 Z M 3,20 L 16,20 L 16,19 L 3,19 Z M 3,13 L 16,13 L 16,12 L 3,12 Z M 9,6 L 9,19 L 10,19 L 10,6 Z"
+                                Fill="{StaticResource PageWarningBrush}"
+                                Stretch="Uniform" />
+                            <TextBox
+                                Grid.Column="1"
+                                MinWidth="20"
+                                Margin="12,0,2,0"
+                                VerticalAlignment="Center"
+                                VerticalContentAlignment="Center"
+                                Background="Transparent"
+                                BorderThickness="0"
+                                Foreground="{StaticResource PageWarningBrush}"
+                                IsReadOnly="True"
+                                Text="礼品单已购买" />
+                        </Grid>
 
-				<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:UcWaterMarkTextBox1  Grid.Column="1" Grid.Row="5" x:Name="txtUserAddress" WaterMark="收货地址" Text="{Binding ItemOrder.AddressStr,Converter={StaticResource TextEllipsisConverter26}}"
-                                            Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" ToolTip="{Binding ItemOrder.AddressStr}"/>
-					<Border Grid.Column="6" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand" 
-                            MouseLeftButtonDown="pathCopyAddress_MouseLeftButtonDown" Visibility="{Binding ElementName=txtUserAddress,Path=Visibility}">
-						<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" MouseLeftButtonDown="pathCopyAddress_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" />
-					</Border>
-					<Button x:Name="btnSeeAddressDetail" Background="Transparent" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
-                            Margin="4,0,0,0" Content="👁" Click="btnSeeAddressDetail_Click" Tag="{Binding order_id}" Cursor="Hand"></Button>
-				</WrapPanel>
-				<!--<Button Grid.Column="1" Grid.Row="6" x:Name="btnGetRefundAddress" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
+                    </Border>
+                    <Border
+                        Grid.Row="1"
+                        Height="auto"
+                        MinWidth="30"
+                        Margin="8,0,0,0"
+                        HorizontalAlignment="Center"
+                        d:Background="{StaticResource pageColorLightBrush}"
+                        d:BorderBrush="{StaticResource pageColorBrush}"
+                        Background="{Binding OrderItemStatusBackColor}"
+                        BorderBrush="{Binding OrderItemStatusBorderColor}"
+                        BorderThickness="1"
+                        CornerRadius="2">
+                        <TextBox
+                            Grid.Column="1"
+                            MinWidth="20"
+                            Margin="2,0,2,0"
+                            VerticalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            d:Foreground="{StaticResource pageColorBrush}"
+                            d:Text="订单状态"
+                            Background="Transparent"
+                            BorderThickness="0"
+                            Foreground="{Binding OrderItemStatusStrColor}"
+                            IsReadOnly="True"
+                            Text="{Binding OrderItemStatusStr}" />
+                    </Border>
+                    <Border
+                        Grid.Row="1"
+                        Height="auto"
+                        MinWidth="30"
+                        Margin="8,0,0,0"
+                        HorizontalAlignment="Center"
+                        Background="{StaticResource PageWarningBrush20}"
+                        BorderBrush="{StaticResource PageWarningBrushCC}"
+                        BorderThickness="1"
+                        CornerRadius="2"
+                        Visibility="{Binding ElementName=txtWaybillException, Path=Text, Converter={StaticResource HasTextVisibility}}">
+                        <TextBox
+                            x:Name="txtWaybillException"
+                            Grid.Column="1"
+                            MinWidth="20"
+                            Margin="2,0,2,0"
+                            VerticalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            d:Text="物流异常"
+                            Background="Transparent"
+                            BorderThickness="0"
+                            Foreground="{StaticResource PageWarningBrush}"
+                            IsReadOnly="True"
+                            Text="{Binding ShopWaybillExceptionStr}" />
+                    </Border>
+                </WrapPanel>
+                <TextBox
+                    x:Name="txtStatusStr"
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Margin="0,2,0,2"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    d:Text="售后状态"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    Foreground="{Binding ItemRefund.RefundStatusColor}"
+                    IsReadOnly="True"
+                    Text="{Binding ItemRefund.RefundStatusStr}"
+                    Visibility="{Binding ElementName=txtStatusStr, Path=Text, Converter={StaticResource HasTextVisibility}}" />
+                <TextBox
+                    x:Name="txtRefundReasonTextStr"
+                    Grid.Row="3"
+                    Grid.Column="1"
+                    Margin="0,2,0,2"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    d:Text="售后原因"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    Foreground="#f56c6c"
+                    IsReadOnly="True"
+                    Text="{Binding ItemRefund.reasonTextStr}"
+                    Visibility="{Binding ElementName=txtRefundReasonTextStr, Path=Text, Converter={StaticResource HasTextVisibility}}" />
+                <TextBox
+                    x:Name="txtRefundResult"
+                    Grid.Row="4"
+                    Grid.Column="1"
+                    Margin="0,2,0,2"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Top"
+                    d:Text="售后结果"
+                    Background="Transparent"
+                    BorderThickness="0"
+                    Foreground="#f56c6c"
+                    IsReadOnly="True"
+                    Text="{Binding RefundResultStr}"
+                    Visibility="{Binding ElementName=txtRefundResult, Path=Text, Converter={StaticResource HasTextVisibility}}" />
+
+                <WrapPanel
+                    Grid.Row="5"
+                    Grid.Column="1"
+                    Width="auto"
+                    HorizontalAlignment="Center"
+                    Orientation="Horizontal">
+                    <TextBox
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Margin="0,2,0,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="收货地址：" />
+                    <uc:UcWaterMarkTextBox1
+                        x:Name="txtUserAddress"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Margin="0,2,4,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="{Binding ItemOrder.AddressStr, Converter={StaticResource TextEllipsisConverter26}}"
+                        TextWrapping="Wrap"
+                        ToolTip="{Binding ItemOrder.AddressStr}"
+                        WaterMark="收货地址" />
+                    <Border
+                        Grid.Column="6"
+                        Width="12"
+                        Height="12"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        Cursor="Hand"
+                        MouseLeftButtonDown="pathCopyAddress_MouseLeftButtonDown"
+                        Visibility="{Binding ElementName=txtUserAddress, Path=Visibility}">
+                        <Path
+                            Margin="0,0,0,0"
+                            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"
+                            Fill="{StaticResource PageLinkBrush}"
+                            MouseLeftButtonDown="pathCopyAddress_MouseLeftButtonDown"
+                            Stretch="Uniform" />
+                    </Border>
+                    <Button
+                        x:Name="btnSeeAddressDetail"
+                        Margin="4,0,0,0"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        Click="btnSeeAddressDetail_Click"
+                        Content="👁"
+                        Cursor="Hand"
+                        Foreground="{StaticResource PageLinkBrush}"
+                        Tag="{Binding order_id}" />
+                </WrapPanel>
+                <!--<Button Grid.Column="1" Grid.Row="6" x:Name="btnGetRefundAddress" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
                                         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: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" 
-                            MouseLeftButtonDown="pathRefundId_MouseLeftButtonDown" Visibility="{Binding ElementName=txtRefundId,Path=Visibility}">
-						<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}"  MouseLeftButtonDown="pathRefundId_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" />
-					</Border>
-				</WrapPanel>
-				<WrapPanel Orientation="Horizontal" Grid.Row="7" Width="auto" HorizontalAlignment="Center" Visibility="{Binding RefundAddressStr,Converter={StaticResource HasTextVisibility}}">
-					<TextBox Text="退货地址：" Grid.Column="1" Grid.Row="5" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-					<uc:UcWaterMarkTextBox1 Grid.Column="1" Grid.Row="5" x:Name="txtRefundAddress" WaterMark="退货地址" 
-                                            Text="{Binding RefundAddressStr,Converter={StaticResource TextEllipsisConverter26}}"
-                                            Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0" 
-                                            TextWrapping="Wrap" ToolTip="{Binding RefundAddressStr}"/>
-					<Border Grid.Column="6" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand" 
-                            MouseLeftButtonDown="pathCopyRefundAddress_MouseLeftButtonDown" Visibility="{Binding ElementName=txtUserAddress,Path=Visibility}">
-						<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" MouseLeftButtonDown="pathCopyRefundAddress_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" />
-					</Border>
-				</WrapPanel>
-			</Grid>
-			<!--单号-->
-			<Grid Grid.Column="6" Background="Transparent" VerticalAlignment="Center">
-				<Grid.RowDefinitions>
-					<RowDefinition Height="*"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="*"></RowDefinition>
-				</Grid.RowDefinitions>
+                <WrapPanel
+                    Grid.Row="6"
+                    Grid.Column="1"
+                    Width="auto"
+                    HorizontalAlignment="Center"
+                    Orientation="Horizontal">
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        Text="退款单号："
+                        Visibility="{Binding ElementName=txtRefundId, Path=Visibility}" />
+                    <uc:UcWaterMarkTextBox1
+                        x:Name="txtRefundId"
+                        Grid.Row="6"
+                        Grid.Column="1"
+                        Margin="0,2,4,2"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Cursor="Hand"
+                        Foreground="{StaticResource PageLinkBrush}"
+                        IsReadOnly="True"
+                        Text="{Binding ItemRefund.after_sale_order_id}"
+                        TextWrapping="Wrap"
+                        Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}"
+                        WaterMark="退款单号" />
+                    <Border
+                        Grid.Column="6"
+                        Width="12"
+                        Height="12"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        Cursor="Hand"
+                        MouseLeftButtonDown="pathRefundId_MouseLeftButtonDown"
+                        Visibility="{Binding ElementName=txtRefundId, Path=Visibility}">
+                        <Path
+                            Margin="0,0,0,0"
+                            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"
+                            Fill="{StaticResource PageLinkBrush}"
+                            MouseLeftButtonDown="pathRefundId_MouseLeftButtonDown"
+                            Stretch="Uniform" />
+                    </Border>
+                </WrapPanel>
+                <WrapPanel
+                    Grid.Row="7"
+                    Width="auto"
+                    HorizontalAlignment="Center"
+                    Orientation="Horizontal"
+                    Visibility="{Binding RefundAddressStr, Converter={StaticResource HasTextVisibility}}">
+                    <TextBox
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Margin="0,2,0,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="退货地址：" />
+                    <uc:UcWaterMarkTextBox1
+                        x:Name="txtRefundAddress"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Margin="0,2,4,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="{Binding RefundAddressStr, Converter={StaticResource TextEllipsisConverter26}}"
+                        TextWrapping="Wrap"
+                        ToolTip="{Binding RefundAddressStr}"
+                        WaterMark="退货地址" />
+                    <Border
+                        Grid.Column="6"
+                        Width="12"
+                        Height="12"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        Cursor="Hand"
+                        MouseLeftButtonDown="pathCopyRefundAddress_MouseLeftButtonDown"
+                        Visibility="{Binding ElementName=txtUserAddress, Path=Visibility}">
+                        <Path
+                            Margin="0,0,0,0"
+                            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"
+                            Fill="{StaticResource PageLinkBrush}"
+                            MouseLeftButtonDown="pathCopyRefundAddress_MouseLeftButtonDown"
+                            Stretch="Uniform" />
+                    </Border>
+                </WrapPanel>
+            </Grid>
+            <!--  单号  -->
+            <Grid
+                Grid.Column="6"
+                VerticalAlignment="Center"
+                Background="Transparent">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
 
-				<WrapPanel x:Name="wpTransitBuyerRefundStatus" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center">
-				</WrapPanel>
-				<WrapPanel x:Name="wpTransitWaybillStatus" Grid.Row="2" HorizontalAlignment="Center" Margin="0,0,0,4">
-					<Border x:Name="borderBuyStatas" Grid.Row="1" Margin="0,0,4,0" Background="{Binding BuyerTransitWaybillStatusBackColor}" BorderBrush="{Binding BuyerTransitWaybillStatusBorderColor}" 
-                            BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" Visibility="{Binding BuyerTransitWaybillStatusStr,Converter={StaticResource HasTextVisibility}}">
-						<TextBox x:Name="txtBuyStatus" Grid.Column="1" Margin="0" Foreground="{Binding BuyerTransitWaybillStatusStrColor}" VerticalContentAlignment="Center" VerticalAlignment="Center" 
-                                 Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding BuyerTransitWaybillStatusStr}" BorderThickness="0" />
-					</Border>
-					<Border x:Name="borderWarehouseStatas" Grid.Row="1" Margin="0,0,4,0" Background="{Binding WarehouseWaybillStatusBackColor}" BorderBrush="{Binding WarehouseWaybillStatusBorderColor}" 
-                            BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" Visibility="{Binding WarehouseWaybillStatusStr,Converter={StaticResource HasTextVisibility}}">
-						<TextBox x:Name="txtWarehouseStatus" Grid.Column="1" Margin="0" Foreground="{Binding WarehouseWaybillStatusStrColor}" VerticalContentAlignment="Center" VerticalAlignment="Center" 
-                                 Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding WarehouseWaybillStatusStr}" BorderThickness="0" MouseEnter="txtWarehouseStatus_MouseEnter"/>
-					</Border>
-					<Border Grid.Row="1" Margin="0,0,4,0" Background="{StaticResource pageColorBrush}" BorderBrush="{StaticResource pageColorBrush}" 
-                        BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" Visibility="{Binding TransitRefundVoidStatusStr,Converter={StaticResource HasTextVisibility}}">
-						<TextBox Grid.Column="1" Margin="0" Foreground="White" VerticalContentAlignment="Center" VerticalAlignment="Center" 
-                             Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding TransitRefundVoidStatusStr}" BorderThickness="0" Padding="0" />
-					</Border>
-				</WrapPanel>
+                <WrapPanel
+                    x:Name="wpTransitBuyerRefundStatus"
+                    Grid.Row="1"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center" />
+                <WrapPanel
+                    x:Name="wpTransitWaybillStatus"
+                    Grid.Row="2"
+                    Margin="0,0,0,4"
+                    HorizontalAlignment="Center">
+                    <Border
+                        x:Name="borderBuyStatas"
+                        Grid.Row="1"
+                        Height="auto"
+                        MinWidth="30"
+                        Margin="0,0,4,0"
+                        HorizontalAlignment="Center"
+                        d:Background="{StaticResource PageOkBrush50}"
+                        d:BorderBrush="{StaticResource PageOkBrush}"
+                        Background="{Binding BuyerTransitWaybillStatusBackColor}"
+                        BorderBrush="{Binding BuyerTransitWaybillStatusBorderColor}"
+                        BorderThickness="1"
+                        CornerRadius="2"
+                        Visibility="{Binding BuyerTransitWaybillStatusStr, Converter={StaticResource HasTextVisibility}}">
+                        <TextBox
+                            x:Name="txtBuyStatus"
+                            Grid.Column="1"
+                            MinWidth="20"
+                            Margin="0,0,0,0"
+                            VerticalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            d:Text="买手状态"
+                            Background="Transparent"
+                            BorderThickness="0"
+                            Foreground="{Binding BuyerTransitWaybillStatusStrColor}"
+                            IsReadOnly="True"
+                            Text="{Binding BuyerTransitWaybillStatusStr}" />
+                    </Border>
+                    <Border
+                        x:Name="borderWarehouseStatas"
+                        Grid.Row="1"
+                        Height="auto"
+                        MinWidth="30"
+                        Margin="0,0,4,0"
+                        HorizontalAlignment="Center"
+                        d:Background="{StaticResource PageOkBrush50}"
+                        d:BorderBrush="{StaticResource PageOkBrush}"
+                        Background="{Binding WarehouseWaybillStatusBackColor}"
+                        BorderBrush="{Binding WarehouseWaybillStatusBorderColor}"
+                        BorderThickness="1"
+                        CornerRadius="2"
+                        Visibility="{Binding WarehouseWaybillStatusStr, Converter={StaticResource HasTextVisibility}}">
+                        <TextBox
+                            x:Name="txtWarehouseStatus"
+                            Grid.Column="1"
+                            MinWidth="20"
+                            Margin="0,0,0,0"
+                            VerticalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            d:Text="仓库状态"
+                            Background="Transparent"
+                            BorderThickness="0"
+                            Foreground="{Binding WarehouseWaybillStatusStrColor}"
+                            IsReadOnly="True"
+                            MouseEnter="txtWarehouseStatus_MouseEnter"
+                            Text="{Binding WarehouseWaybillStatusStr}" />
+                    </Border>
+                    <Border
+                        Grid.Row="1"
+                        Height="auto"
+                        MinWidth="30"
+                        Margin="0,0,4,0"
+                        HorizontalAlignment="Center"
+                        Background="{StaticResource pageColorBrush}"
+                        BorderBrush="{StaticResource pageColorBrush}"
+                        BorderThickness="1"
+                        CornerRadius="2"
+                        Visibility="{Binding TransitRefundVoidStatusStr, Converter={StaticResource HasTextVisibility}}">
+                        <TextBox
+                            Grid.Column="1"
+                            MinWidth="20"
+                            Margin="0,0,0,0"
+                            Padding="0"
+                            VerticalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            d:Text="作废状态"
+                            Background="Transparent"
+                            BorderThickness="0"
+                            Foreground="White"
+                            IsReadOnly="True"
+                            Text="{Binding TransitRefundVoidStatusStr}" />
+                    </Border>
+                </WrapPanel>
 
-				<WrapPanel x:Name="wpBuyAccount" Orientation="Horizontal" Grid.Column="1" Grid.Row="3">
-					<TextBlock Text="采购账户：" IsHitTestVisible="False" Foreground="LightGray" VerticalAlignment="Center"
-                               Visibility="{Binding ElementName=txtTransitOrderBuyerStr,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
-					<uc:UcWaterMarkTextBox1 WaterMark="采购账户：" Text="{Binding ItemTransitOrderWithVoid.OutOrderBuyerStr}" Grid.Column="1" Grid.Row="1" 
-                                            Padding="0" Margin="-2,2,4,2" VerticalAlignment="Top" x:Name="txtTransitOrderBuyerStr" Background="Transparent" 
-                                            IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Cursor="Hand" Foreground="#0099ff"/>
-					<Border x:Name="borderTransitBuyerRefundStatus" Grid.Row="1" Margin="0,0,0,0" Background="{Binding TransitRefundStatusBackColor}" BorderBrush="{Binding TransitRefundStatusBackColor}" 
-                            BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" Visibility="{Binding TransitRefundStatusStr,Converter={StaticResource HasTextVisibility}}">
-						<TextBox x:Name="txtRefundStatus" Grid.Column="1" Margin="0,0,0,0" Foreground="White" VerticalContentAlignment="Center" VerticalAlignment="Center" 
-                                 Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding TransitRefundStatusStr}" BorderThickness="0" Padding="0" />
-					</Border>
-				</WrapPanel>
-				<WrapPanel x:Name="wpBuyOrderId" Orientation="Horizontal" Grid.Column="1" Grid.Row="4">
-					<TextBlock Text="采购单号：" IsHitTestVisible="False" Foreground="LightGray" VerticalAlignment="Center"
-                               Visibility="{Binding ElementName=txtTransitOrderNumStr,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
-					<uc:UcWaterMarkTextBox1 WaterMark="采购单号：" Text="{Binding ItemTransitOrderWithVoid.OutOrderNumStr}" Grid.Column="1" Grid.Row="1" 
-                                           Padding="0" Margin="-2,2" VerticalAlignment="Top" x:Name="txtTransitOrderNumStr"  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=txtTransitOrderBuyerStr,Path=Text,Converter={StaticResource HasTextVisibility}}"
-                            Tag="{Binding order_id}" MouseLeftButtonDown="Path_MouseLeftButtonDown">
-						<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" 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" />
-					</Border>
-				</WrapPanel>
-				<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: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}}"
+                <WrapPanel
+                    x:Name="wpBuyAccount"
+                    Grid.Row="3"
+                    Grid.Column="1"
+                    Orientation="Horizontal">
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        Foreground="LightGray"
+                        IsHitTestVisible="False"
+                        Text="采购账户："
+                        Visibility="{Binding ElementName=txtTransitOrderBuyerStr, Path=Text, Converter={StaticResource NotHasTextVisibility}}" />
+                    <uc:UcWaterMarkTextBox1
+                        x:Name="txtTransitOrderBuyerStr"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2,4,2"
+                        Padding="0"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Cursor="Hand"
+                        Foreground="#0099ff"
+                        IsReadOnly="True"
+                        Text="{Binding ItemTransitOrderWithVoid.OutOrderBuyerStr}"
+                        TextWrapping="Wrap"
+                        WaterMark="采购账户：" />
+                    <Border
+                        x:Name="borderTransitBuyerRefundStatus"
+                        Grid.Row="1"
+                        Height="auto"
+                        MinWidth="30"
+                        Margin="0,0,0,0"
+                        HorizontalAlignment="Center"
+                        d:Background="{StaticResource PageOkBrush}"
+                        d:BorderBrush="{StaticResource PageOkBrush}"
+                        Background="{Binding TransitRefundStatusBackColor}"
+                        BorderBrush="{Binding TransitRefundStatusBackColor}"
+                        BorderThickness="1"
+                        CornerRadius="2"
+                        Visibility="{Binding TransitRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
+                        <TextBox
+                            x:Name="txtRefundStatus"
+                            Grid.Column="1"
+                            MinWidth="20"
+                            Margin="0,0,0,0"
+                            Padding="0"
+                            VerticalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            d:Text="买手退货状态"
+                            Background="Transparent"
+                            BorderThickness="0"
+                            Foreground="White"
+                            IsReadOnly="True"
+                            Text="{Binding TransitRefundStatusStr}" />
+                    </Border>
+                </WrapPanel>
+                <WrapPanel
+                    x:Name="wpBuyOrderId"
+                    Grid.Row="4"
+                    Grid.Column="1"
+                    Orientation="Horizontal">
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        Foreground="LightGray"
+                        IsHitTestVisible="False"
+                        Text="采购单号："
+                        Visibility="{Binding ElementName=txtTransitOrderNumStr, Path=Text, Converter={StaticResource NotHasTextVisibility}}" />
+                    <uc:UcWaterMarkTextBox1
+                        x:Name="txtTransitOrderNumStr"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2"
+                        Padding="0"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Cursor="Hand"
+                        Foreground="#0099ff"
+                        IsReadOnly="True"
+                        Text="{Binding ItemTransitOrderWithVoid.OutOrderNumStr}"
+                        TextWrapping="Wrap"
+                        WaterMark="采购单号：" />
+                    <Border
+                        Grid.Column="2"
+                        Width="12"
+                        Height="12"
+                        Margin="4,0,0,0"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        Cursor="Hand"
+                        MouseLeftButtonDown="Path_MouseLeftButtonDown"
+                        Tag="{Binding order_id}"
+                        Visibility="{Binding ElementName=txtTransitOrderBuyerStr, Path=Text, Converter={StaticResource HasTextVisibility}}">
+                        <Path
+                            Margin="0,0,0,0"
+                            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"
+                            Fill="{StaticResource PageLinkBrush}"
+                            MouseLeftButtonDown="Path_MouseLeftButtonDown"
+                            Stretch="Uniform" />
+                    </Border>
+                </WrapPanel>
+                <WrapPanel
+                    x:Name="wpBuyTime"
+                    Grid.Row="5"
+                    Grid.Column="1"
+                    Orientation="Horizontal">
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        Foreground="LightGray"
+                        IsHitTestVisible="False"
+                        Text="采购时间："
+                        Visibility="{Binding ElementName=txtOutOrderTimeQualifiedStr, Path=Text, Converter={StaticResource NotHasTextVisibility}}" />
+                    <uc:UcWaterMarkTextBox1
+                        x:Name="txtOutOrderTimeQualifiedStr"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2"
+                        Padding="0"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Foreground="{Binding OutOrderTimeQualifiedBrush}"
+                        IsReadOnly="True"
+                        Text="{Binding OutOrderTimeQualifiedStr}"
+                        TextWrapping="Wrap"
+                        WaterMark="采购时间：" />
+                    <!--<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}}"
                             Tag="{Binding order_id}" MouseLeftButtonDown="Path_MouseLeftButtonDown">
                         <Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" 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" />
                     </Border>-->
-				</WrapPanel>
+                </WrapPanel>
 
-				<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: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: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: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
+                    Grid.Row="6"
+                    Grid.Column="1"
+                    Orientation="Horizontal"
+                    Visibility="{Binding TransitOrderWaybillToWareHouseStr, Converter={StaticResource HasTextVisibility}}">
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        Foreground="LightGray"
+                        IsHitTestVisible="False"
+                        Text="取号物流："
+                        Visibility="{Binding TransitOrderWaybillToWareHouseStr, Converter={StaticResource NotHasTextVisibility}}" />
+                    <uc:UcWaterMarkTextBox1
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2"
+                        Padding="0"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Foreground="{StaticResource PageOkBrush}"
+                        IsReadOnly="True"
+                        Text="{Binding TransitOrderWaybillToWareHouseStr}"
+                        TextWrapping="Wrap"
+                        WaterMark="取号物流" />
+                </WrapPanel>
+                <!--<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="6" Visibility="{Binding TransitOrderWaybillFakeStr, Converter={StaticResource HasTextVisibility}}">-->
+                <WrapPanel
+                    Grid.Row="7"
+                    Grid.Column="1"
+                    Orientation="Horizontal"
+                    Visibility="Collapsed">
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        Foreground="LightGray"
+                        IsHitTestVisible="False"
+                        Text="提前物流："
+                        Visibility="{Binding TransitOrderWaybillFakeStr, Converter={StaticResource NotHasTextVisibility}}" />
+                    <uc:UcWaterMarkTextBox1
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2"
+                        Padding="0"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Foreground="{StaticResource PageWarningBrush}"
+                        IsReadOnly="True"
+                        Text="{Binding TransitOrderWaybillFakeStr}"
+                        TextWrapping="Wrap"
+                        WaterMark="提前物流" />
+                </WrapPanel>
+                <WrapPanel
+                    Grid.Row="8"
+                    Grid.Column="1"
+                    Orientation="Horizontal"
+                    Visibility="{Binding TransitOrderWaybillFromWareHouseStr, Converter={StaticResource HasTextVisibility}}">
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        Foreground="LightGray"
+                        IsHitTestVisible="False"
+                        Text="仓库物流："
+                        Visibility="{Binding TransitOrderWaybillFromWareHouseStr, Converter={StaticResource NotHasTextVisibility}}" />
+                    <uc:UcWaterMarkTextBox1
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2"
+                        Padding="0"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="{Binding TransitOrderWaybillFromWareHouseStr}"
+                        TextWrapping="Wrap"
+                        WaterMark="仓库物流" />
+                </WrapPanel>
 
-				<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="9" Visibility="{Binding ItemOrder.out_account, Converter={StaticResource HasTextVisibility}}">
-					<TextBox Text="外采买手：" Grid.Column="1" Grid.Row="1" Margin="-2,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-					<uc:UcWaterMarkTextBox1 WaterMark="外采买手：" Text="{Binding ItemOrder.out_account}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2,4,2" VerticalAlignment="Top" 
-                                            x:Name="txtDirectBuyer" Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Cursor="Hand" Foreground="#0099ff"/>
-					<Border x:Name="borderOutBuyerRefundStatus" Grid.Row="1" Margin="0,0,0,0" Background="{Binding DirectRefundStatusBackColor}" BorderBrush="{Binding DirectRefundStatusBackColor}" 
-                            BorderThickness="1" MinWidth="30" Height="auto" CornerRadius="2" HorizontalAlignment="Center" 
-                            Visibility="{Binding DirectRefundStatusStr,Converter={StaticResource HasTextVisibility}}">
-						<TextBox x:Name="txtOutBuyerRefundStatus" Grid.Column="1" Margin="0,0,0,0" Foreground="White" VerticalContentAlignment="Center" VerticalAlignment="Center" 
-                                 Background="Transparent" IsReadOnly="True" MinWidth="20" Text="{Binding DirectRefundStatusStr}" BorderThickness="0" Padding="0" />
-					</Border>
+                <WrapPanel
+                    Grid.Row="9"
+                    Grid.Column="1"
+                    Orientation="Horizontal"
+                    Visibility="{Binding ItemOrder.out_account, Converter={StaticResource HasTextVisibility}}">
+                    <TextBox
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="外采买手：" />
+                    <uc:UcWaterMarkTextBox1
+                        x:Name="txtDirectBuyer"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2,4,2"
+                        Padding="0"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Cursor="Hand"
+                        Foreground="#0099ff"
+                        IsReadOnly="True"
+                        Text="{Binding ItemOrder.out_account}"
+                        TextWrapping="Wrap"
+                        WaterMark="外采买手：" />
+                    <Border
+                        x:Name="borderOutBuyerRefundStatus"
+                        Grid.Row="1"
+                        Height="auto"
+                        MinWidth="30"
+                        Margin="0,0,0,0"
+                        HorizontalAlignment="Center"
+                        d:Background="{StaticResource PageOkBrush}"
+                        d:BorderBrush="{StaticResource PageOkBrush}"
+                        Background="{Binding DirectRefundStatusBackColor}"
+                        BorderBrush="{Binding DirectRefundStatusBackColor}"
+                        BorderThickness="1"
+                        CornerRadius="2"
+                        Visibility="{Binding DirectRefundStatusStr, Converter={StaticResource HasTextVisibility}}">
+                        <TextBox
+                            x:Name="txtOutBuyerRefundStatus"
+                            Grid.Column="1"
+                            MinWidth="20"
+                            Margin="0,0,0,0"
+                            Padding="0"
+                            VerticalAlignment="Center"
+                            VerticalContentAlignment="Center"
+                            d:Text="直发买手退货状态"
+                            Background="Transparent"
+                            BorderThickness="0"
+                            Foreground="White"
+                            IsReadOnly="True"
+                            Text="{Binding DirectRefundStatusStr}" />
+                    </Border>
 
-				</WrapPanel>
-				<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="10" Visibility="{Binding ItemOrder.out_order_no, Converter={StaticResource HasTextVisibility}}">
-					<TextBox Text="外采单号：" Grid.Column="1" Grid.Row="1" Margin="-2,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-					<uc:UcWaterMarkTextBox1 WaterMark="外采单号" Text="{Binding ItemOrder.out_order_no}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
-                                            x:Name="txtDirectBuyerOrderNo" 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=txtDirectBuyerOrderNo,Path=Text,Converter={StaticResource HasTextVisibility}}" MouseLeftButtonDown="PathCopyDirectBuyerOrderNo_MouseLeftButtonDown">
-						<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" MouseLeftButtonDown="PathCopyDirectBuyerOrderNo_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" />
-					</Border>
-				</WrapPanel>
-				<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="11" Visibility="{Binding ItemOrder.OutExpressNoStr, Converter={StaticResource HasTextVisibility}}">
-					<TextBox Text="外采物流：" Grid.Column="1" Grid.Row="1" Margin="-2,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-					<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" Foreground="{Binding ItemOrder.OutExpressNoBrush}"/>
-					<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" Foreground="{Binding ItemOrder.OutExpressNoBrush}"/>
-					<uc:UcWaterMarkTextBox1 WaterMark="外采物流" Text="{Binding ItemOrder.OutExpressNoStr}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2,4,2" VerticalAlignment="Top" 
-                           Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Foreground="{Binding ItemOrder.OutExpressNoBrush}"/>
-				</WrapPanel>
-				<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="12" Visibility="{Binding ReturnWaybillIdStr, Converter={StaticResource HasTextVisibility}}">
-					<TextBox Text="买家退货：" Grid.Column="1" Grid.Row="1" Margin="-2,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-					<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: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: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>
-				<!--
+                </WrapPanel>
+                <WrapPanel
+                    Grid.Row="10"
+                    Grid.Column="1"
+                    Orientation="Horizontal"
+                    Visibility="{Binding ItemOrder.out_order_no, Converter={StaticResource HasTextVisibility}}">
+                    <TextBox
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="外采单号：" />
+                    <uc:UcWaterMarkTextBox1
+                        x:Name="txtDirectBuyerOrderNo"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2"
+                        Padding="0"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Cursor="Hand"
+                        Foreground="#0099ff"
+                        IsReadOnly="True"
+                        Text="{Binding ItemOrder.out_order_no}"
+                        TextWrapping="Wrap"
+                        WaterMark="外采单号" />
+                    <Border
+                        Grid.Column="2"
+                        Width="12"
+                        Height="12"
+                        Margin="4,0,0,0"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        Cursor="Hand"
+                        MouseLeftButtonDown="PathCopyDirectBuyerOrderNo_MouseLeftButtonDown"
+                        Visibility="{Binding ElementName=txtDirectBuyerOrderNo, Path=Text, Converter={StaticResource HasTextVisibility}}">
+                        <Path
+                            Margin="0,0,0,0"
+                            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"
+                            Fill="{StaticResource PageLinkBrush}"
+                            MouseLeftButtonDown="PathCopyDirectBuyerOrderNo_MouseLeftButtonDown"
+                            Stretch="Uniform" />
+                    </Border>
+                </WrapPanel>
+                <WrapPanel
+                    Grid.Row="11"
+                    Grid.Column="1"
+                    Orientation="Horizontal"
+                    Visibility="{Binding ItemOrder.OutExpressNoStr, Converter={StaticResource HasTextVisibility}}">
+                    <TextBox
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="外采物流：" />
+                    <uc:UcWaterMarkTextBox1
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2"
+                        Padding="0"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Foreground="{Binding ItemOrder.OutExpressNoBrush}"
+                        IsReadOnly="True"
+                        Text="{Binding ItemOrder.out_express_company}"
+                        TextWrapping="Wrap"
+                        WaterMark="外采物流" />
+                    <uc:UcWaterMarkTextBox1
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2"
+                        Padding="0"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Foreground="{Binding ItemOrder.OutExpressNoBrush}"
+                        IsReadOnly="True"
+                        Text="-"
+                        TextWrapping="Wrap"
+                        WaterMark="-" />
+                    <uc:UcWaterMarkTextBox1
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2,4,2"
+                        Padding="0"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        Foreground="{Binding ItemOrder.OutExpressNoBrush}"
+                        IsReadOnly="True"
+                        Text="{Binding ItemOrder.OutExpressNoStr}"
+                        TextWrapping="Wrap"
+                        WaterMark="外采物流" />
+                </WrapPanel>
+                <WrapPanel
+                    Grid.Row="12"
+                    Grid.Column="1"
+                    Orientation="Horizontal"
+                    Visibility="{Binding ReturnWaybillIdStr, Converter={StaticResource HasTextVisibility}}">
+                    <TextBox
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="买家退货：" />
+                    <uc:UcWaterMarkTextBox1
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2"
+                        Padding="0"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="{Binding ItemRefund.return_delivery_name}"
+                        TextWrapping="Wrap"
+                        WaterMark="买家退货" />
+                    <uc:UcWaterMarkTextBox1
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2"
+                        Padding="0"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="-"
+                        TextWrapping="Wrap"
+                        WaterMark="-" />
+                    <uc:UcWaterMarkTextBox1
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="-2,2,4,2"
+                        Padding="0"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="0"
+                        IsReadOnly="True"
+                        Text="{Binding ReturnWaybillIdStr}"
+                        TextWrapping="Wrap"
+                        WaterMark="买家退货" />
+                </WrapPanel>
+                <!--
                 <TextBox Text="店铺备注：" Grid.Column="1" Grid.Row="2" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                <uc:UcWaterMarkTextBox WaterMark="店铺备注" Text="{Binding ItemOrder.shop_remark}" Grid.Column="1" Grid.Row="2" Margin="0,2,4,2" VerticalAlignment="Top" 
+                <uc:UcWaterMarkTextBox WaterMark="店铺备注" Text="{Binding ItemOrder.shop_remark}" Grid.Column="1" Grid.Row="2" Margin="0,2,4,2" VerticalAlignment="Top"
                            Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
                 <Button Grid.Column="1" Grid.Row="2" x:Name="btnCopyRemark" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
                 Margin="4,0,0,0" Content="编辑" Click="btnCopyRemark_Click"></Button>-->
-			</Grid>
-			<!--备注-->
-			<Grid Grid.Column="7" Background="Transparent" VerticalAlignment="Center">
-				<Grid.RowDefinitions>
-					<RowDefinition Height="*"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="*"></RowDefinition>
-				</Grid.RowDefinitions>
+            </Grid>
+            <!--  备注  -->
+            <Grid
+                Grid.Column="7"
+                VerticalAlignment="Center"
+                Background="Transparent">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
 
-				<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: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
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Orientation="Horizontal">
+                    <TextBox
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="0,1,-8,1"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Text="买家留言：" />
+                    <uc:UcWaterMarkTextBox1
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="0,1,0,1"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Text=""
+                        TextWrapping="Wrap"
+                        WaterMark="买家留言" />
+                </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: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" Cursor="Hand"></Button>
-					<Button Grid.Column="1" Grid.Row="2" x:Name="btnCancelEditShopRemark" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
-                            Margin="0,0,0,0" Content="取消" Click="btnCancelEditShopRemark_Click" Visibility="Collapsed" Cursor="Hand"></Button>
-				</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: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" Cursor="Hand"></Button>
-					<Button Grid.Column="1" Grid.Row="2" x:Name="btnCancelEditAppRemark" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
-                            Margin="0,0,0,0" Content="取消" Click="btnCancelEditAppRemark_Click" Visibility="Collapsed" Cursor="Hand"></Button>
-				</WrapPanel>
-				<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="4" Visibility="{Binding AddEditTransitWarehouseRejectStr,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:UcWaterMarkTextBox1 x:Name="txtTransitWarehouseReject" WaterMark="中转仓拒收占位" Text="" 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="btnAddEditTransitWarehouseReject" Background="Transparent" HorizontalAlignment="Center" 
-                            Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent" Margin="2,0,0,0" Content="{Binding AddEditTransitWarehouseRejectStr}"
-                            Click="btnAddEditTransitWarehouseReject_Click" Cursor="Hand"></Button>
-				</WrapPanel>
-				<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="5" 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:UcWaterMarkTextBox1 x:Name="txtTransitWarehouseAfterSale" WaterMark="退回中转仓" Text="{Binding TransitWarehouseAfterSaleWayBillStr}" Grid.Column="1" Grid.Row="2" Margin="0,1,0,1"
-                                           VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="1" TextWrapping="Wrap"/>
-					<!--Visibility="{Binding Text,RelativeSource={RelativeSource Self},Converter={StaticResource HasTextVisibility}}"-->
-					<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" Cursor="Hand"></Button>
-				</WrapPanel>
-				<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="6" Width="auto" 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"/>
-					<!--<TextBlock Text="{Binding PddBuyerAfterSaleAddressStr}" TextTrimming="CharacterEllipsis" Width="100" ToolTip="这是一个非常长的文本字符串，需要显示省略号..." Visibility="Collapsed" x:Name="tbBuyerRefundAddress"/>-->
-					<uc:UcWaterMarkTextBox1 WaterMark="总店退货地址" Text="{Binding PddBuyerAfterSaleAddressStr,Converter={StaticResource TextEllipsisConverter}}" ToolTip="{Binding PddBuyerAfterSaleAddressStr}" 
-                            x:Name="txtBuyerRefundAddress"  Margin="0,1,0,1" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="1" TextWrapping="Wrap" 
-                            Visibility="{Binding Text,RelativeSource={RelativeSource Self},Converter={StaticResource HasTextVisibility}}"/>
-					<Border Grid.Column="6" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand" 
-                            MouseLeftButtonDown="pathBuyerAfterSaleAddress_MouseLeftButtonDown" Visibility="{Binding ElementName=txtBuyerRefundAddress,Path=Visibility}">
-						<Path Margin="0,0,0,0" Fill="{StaticResource PageLinkBrush}" MouseLeftButtonDown="pathBuyerAfterSaleAddress_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" />
-					</Border>
-				</WrapPanel>
+                <WrapPanel
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Orientation="Horizontal">
+                    <TextBox
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="0,1,-8,1"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Text="店铺备注：" />
+                    <uc:UcWaterMarkTextBox1
+                        x:Name="txtShopRemark"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="0,1,0,1"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Text="{Binding ItemOrder.shop_remark}"
+                        TextWrapping="Wrap"
+                        WaterMark="店铺备注" />
+                    <Button
+                        x:Name="btnEditShopRemark"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="2,0,0,0"
+                        HorizontalAlignment="Center"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        Click="btnEditShopRemark_Click"
+                        Content="编辑"
+                        Cursor="Hand"
+                        Foreground="{StaticResource PageLinkBrush}" />
+                    <Button
+                        x:Name="btnCancelEditShopRemark"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="0,0,0,0"
+                        HorizontalAlignment="Center"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        Click="btnCancelEditShopRemark_Click"
+                        Content="取消"
+                        Cursor="Hand"
+                        Foreground="{StaticResource PageLinkBrush}"
+                        Visibility="Collapsed" />
+                </WrapPanel>
+                <WrapPanel
+                    Grid.Row="3"
+                    Grid.Column="1"
+                    Orientation="Horizontal">
+                    <TextBox
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="0,1,-8,1"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Text="软件备注：" />
+                    <uc:UcWaterMarkTextBox1
+                        x:Name="txtAppRemark"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="0,1,0,1"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Text="{Binding ItemOrder.soft_remark}"
+                        TextWrapping="Wrap"
+                        WaterMark="软件备注" />
+                    <Button
+                        x:Name="btnEditAppRemark"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="2,0,0,0"
+                        HorizontalAlignment="Center"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        Click="btnEditAppRemark_Click"
+                        Content="编辑"
+                        Cursor="Hand"
+                        Foreground="{StaticResource PageLinkBrush}" />
+                    <Button
+                        x:Name="btnCancelEditAppRemark"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="0,0,0,0"
+                        HorizontalAlignment="Center"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        Click="btnCancelEditAppRemark_Click"
+                        Content="取消"
+                        Cursor="Hand"
+                        Foreground="{StaticResource PageLinkBrush}"
+                        Visibility="Collapsed" />
+                </WrapPanel>
+                <WrapPanel
+                    Grid.Row="4"
+                    Grid.Column="1"
+                    Orientation="Horizontal"
+                    Visibility="{Binding AddEditTransitWarehouseRejectStr, Converter={StaticResource HasTextVisibility}}">
+                    <TextBox
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="0,1,-8,1"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Text="中转仓拒收：" />
+                    <uc:UcWaterMarkTextBox1
+                        x:Name="txtTransitWarehouseReject"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="0,1,0,1"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Text=""
+                        TextWrapping="Wrap"
+                        WaterMark="中转仓拒收占位" />
+                    <Button
+                        x:Name="btnAddEditTransitWarehouseReject"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="2,0,0,0"
+                        HorizontalAlignment="Center"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        Click="btnAddEditTransitWarehouseReject_Click"
+                        Content="{Binding AddEditTransitWarehouseRejectStr}"
+                        Cursor="Hand"
+                        Foreground="{StaticResource PageLinkBrush}" />
+                </WrapPanel>
+                <WrapPanel
+                    Grid.Row="5"
+                    Grid.Column="1"
+                    Orientation="Horizontal"
+                    Visibility="{Binding AddEditTransitWarehouseAfterSaleStr, Converter={StaticResource HasTextVisibility}}">
+                    <TextBox
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="0,1,-8,1"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Text="中转仓退回：" />
+                    <uc:UcWaterMarkTextBox1
+                        x:Name="txtTransitWarehouseAfterSale"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="0,1,0,1"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Text="{Binding TransitWarehouseAfterSaleWayBillStr}"
+                        TextWrapping="Wrap"
+                        WaterMark="退回中转仓" />
+                    <!--  Visibility="{Binding Text,RelativeSource={RelativeSource Self},Converter={StaticResource HasTextVisibility}}"  -->
+                    <Button
+                        x:Name="btnAddEditTransitWarehouseAfterSale"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="2,0,0,0"
+                        HorizontalAlignment="Center"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        Click="btnAddEditTransitWarehouseAfterSale_Click"
+                        Content="{Binding AddEditTransitWarehouseAfterSaleStr}"
+                        Cursor="Hand"
+                        Foreground="{StaticResource PageLinkBrush}" />
+                </WrapPanel>
+                <WrapPanel
+                    Grid.Row="6"
+                    Grid.Column="1"
+                    Width="auto"
+                    Orientation="Horizontal"
+                    Visibility="{Binding AddEditTransitWarehouseAfterSaleStr, Converter={StaticResource HasTextVisibility}}">
+                    <TextBox
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Margin="0,1,-8,1"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderBrush="Transparent"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Text="总店地址：" />
+                    <!--<TextBlock Text="{Binding PddBuyerAfterSaleAddressStr}" TextTrimming="CharacterEllipsis" Width="100" ToolTip="这是一个非常长的文本字符串，需要显示省略号..." Visibility="Collapsed" x:Name="tbBuyerRefundAddress"/>-->
+                    <uc:UcWaterMarkTextBox1
+                        x:Name="txtBuyerRefundAddress"
+                        Margin="0,1,0,1"
+                        VerticalAlignment="Top"
+                        Background="Transparent"
+                        BorderThickness="1"
+                        IsReadOnly="True"
+                        Text="{Binding PddBuyerAfterSaleAddressStr, Converter={StaticResource TextEllipsisConverter}}"
+                        TextWrapping="Wrap"
+                        ToolTip="{Binding PddBuyerAfterSaleAddressStr}"
+                        Visibility="{Binding Text, RelativeSource={RelativeSource Self}, Converter={StaticResource HasTextVisibility}}"
+                        WaterMark="总店退货地址" />
+                    <Border
+                        Grid.Column="6"
+                        Width="12"
+                        Height="12"
+                        VerticalAlignment="Center"
+                        Background="Transparent"
+                        Cursor="Hand"
+                        MouseLeftButtonDown="pathBuyerAfterSaleAddress_MouseLeftButtonDown"
+                        Visibility="{Binding ElementName=txtBuyerRefundAddress, Path=Visibility}">
+                        <Path
+                            Margin="0,0,0,0"
+                            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"
+                            Fill="{StaticResource PageLinkBrush}"
+                            MouseLeftButtonDown="pathBuyerAfterSaleAddress_MouseLeftButtonDown"
+                            Stretch="Uniform" />
+                    </Border>
+                </WrapPanel>
 
-				<!--<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="7" Width="auto" Visibility="{Binding AddEditTransitWarehouseAfterSaleStr,Converter={StaticResource HasTextVisibility}}">
+                <!--<WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="7" Width="auto" 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"/>
                     <Button Grid.Column="1" Grid.Row="2" x:Name="btnRetrunOrder" Background="Transparent" HorizontalAlignment="Center" Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent"
                         Margin="2,0,0,0" Content="退货" Click="btnReturnOrder_Click" Cursor="Hand"></Button>
                 </WrapPanel>-->
 
-			</Grid>
-			<!--操作-->
-			<Grid Grid.Column="8" Background="Transparent" VerticalAlignment="Center">
-				<Grid.RowDefinitions>
-					<RowDefinition Height="*"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="Auto"></RowDefinition>
-					<RowDefinition Height="*"></RowDefinition>
-				</Grid.RowDefinitions>
-				<!--<Button Grid.Column="1" Grid.Row="2" Background="Transparent" HorizontalAlignment="Center" 
+            </Grid>
+            <!--  操作  -->
+            <Grid
+                Grid.Column="8"
+                VerticalAlignment="Center"
+                Background="Transparent">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <!--<Button Grid.Column="1" Grid.Row="2" Background="Transparent" HorizontalAlignment="Center"
                         Foreground="{StaticResource PageLinkBrush}" BorderBrush="Transparent" Margin="4,0,0,0" Content="核对拍单" Click=""></Button>-->
-				<!--<Button Grid.Column="1" Grid.Row="1" Background="Transparent" x:Name="btnBuyOrder" Click="btnBuyOrder_Click" 
+                <!--<Button Grid.Column="1" Grid.Row="1" Background="Transparent" x:Name="btnBuyOrder" Click="btnBuyOrder_Click"
                         Visibility="{Binding ItemOrder.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}"
                         Style="{StaticResource BasePageButtonLightStyle}" Margin="4,0,0,0" Content="关联拍单" Width="56" Height="24"/>-->
-				<WrapPanel Grid.Row="1" HorizontalAlignment="Center">
+                <WrapPanel Grid.Row="1" HorizontalAlignment="Center">
 
-					<Button Grid.Column="1" Grid.Row="1" x:Name="btnBuyOrder" Click="btnBuyOrder_Click" 
-                        d:Visibility="Visible"  Visibility="{Binding ItemOrder.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}"
-                        BorderBrush="{Binding BuyGoodsBtnColor}" Background="{Binding BuyGoodsBtnBackColor}" Foreground="{Binding BuyGoodsBtnColor}"
-                        Content="{Binding BuyGoodsBtnTxt}" IsEnabled="{Binding IsBuyGoodsBtnEnabled}" Style="{StaticResource BasePageButtonLightStyle}"
-                        HorizontalAlignment="Center" MinWidth="38" Height="24" Margin="4,0,0,0">
-					</Button>
+                    <Button
+                        x:Name="btnBuyOrder"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Height="24"
+                        MinWidth="38"
+                        Margin="4,0,0,0"
+                        HorizontalAlignment="Center"
+                        d:Background="{StaticResource pageColorLightBrush}"
+                        d:BorderBrush="{StaticResource pageColorBrush}"
+                        d:Content="拍　　单"
+                        d:Foreground="{StaticResource pageColorBrush}"
+                        d:Visibility="Visible"
+                        Background="{Binding BuyGoodsBtnBackColor}"
+                        BorderBrush="{Binding BuyGoodsBtnColor}"
+                        Click="btnBuyOrder_Click"
+                        Content="{Binding BuyGoodsBtnTxt}"
+                        Foreground="{Binding BuyGoodsBtnColor}"
+                        IsEnabled="{Binding IsBuyGoodsBtnEnabled}"
+                        Style="{StaticResource BasePageButtonLightStyle}"
+                        Visibility="{Binding ItemOrder.IsWaitBuy, Converter={StaticResource visibleToVisibilityConverter}}" />
 
-					<Button Grid.Column="1" Grid.Row="2" x:Name="btnVoidTransitOrder" Click="btnVoidTransitOrder_Click" 
-                         d:Visibility="Visible"  Visibility="Collapsed" Content="作废重拍" Style="{StaticResource BasePageButtonLightStyle}" HorizontalAlignment="Center" MinWidth="38" Height="24" Margin="4,0,0,0">
-					</Button>
+                    <Button
+                        x:Name="btnVoidTransitOrder"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Height="24"
+                        MinWidth="38"
+                        Margin="4,0,0,0"
+                        HorizontalAlignment="Center"
+                        d:Visibility="Visible"
+                        Click="btnVoidTransitOrder_Click"
+                        Content="作废重拍"
+                        Style="{StaticResource BasePageButtonLightStyle}"
+                        Visibility="Collapsed" />
 
-					<Button Grid.Column="1" Grid.Row="2" x:Name="btnAbnormalOrderRebuy" Click="btnAbnormalOrderRebuy_Click" 
-                            d:Visibility="Visible" Visibility="Collapsed" Content="异常重拍" Style="{StaticResource BasePageButtonLightStyle}" HorizontalAlignment="Center" MinWidth="38" Height="24" Margin="4,0,0,0">
-					</Button>
+                    <Button
+                        x:Name="btnAbnormalOrderRebuy"
+                        Grid.Row="2"
+                        Grid.Column="1"
+                        Height="24"
+                        MinWidth="38"
+                        Margin="4,0,0,0"
+                        HorizontalAlignment="Center"
+                        d:Visibility="Visible"
+                        Click="btnAbnormalOrderRebuy_Click"
+                        Content="异常重拍"
+                        Style="{StaticResource BasePageButtonLightStyle}"
+                        Visibility="Collapsed" />
 
-				</WrapPanel>
-				<Button Grid.Column="1" Grid.Row="2" x:Name="btnDirectBuyOrder" Click="btnDirectBuyOrder_Click" 
-                            Visibility="{Binding BtnDirectBuyOrderVisibility}"
-                            Content="直发拍单" Style="{StaticResource BasePageButtonLightStyle}"
-                            HorizontalAlignment="Center" MinWidth="38" Height="24" Margin="4,20,0,0">
-				</Button>
-				<Button Grid.Column="1" Grid.Row="2"  Click="btn_ShipGiftCommand" x:Name="btnShipGift"
-						Visibility="{Binding ItemOrder.IsWaitSend,Converter={StaticResource VisibleToVisibilityConverter}}"
-            d:Visibility="Visible"  Content="礼物拍单" Style="{StaticResource BasePageButtonLightStyle}" HorizontalAlignment="Center" MinWidth="38" Height="24" Margin="4,5,0,0">
-				</Button>
-			</Grid>
-		</Grid>
-	</Grid>
+                </WrapPanel>
+                <Button
+                    x:Name="btnDirectBuyOrder"
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    Height="24"
+                    MinWidth="38"
+                    Margin="4,16,0,0"
+                    HorizontalAlignment="Center"
+                    Click="btnDirectBuyOrder_Click"
+                    Content="直发拍单"
+                    Style="{StaticResource BasePageButtonLightStyle}"
+                    Visibility="{Binding BtnDirectBuyOrderVisibility}" />
+                <Button
+                    x:Name="btnShipGift"
+                    Grid.Row="3"
+                    Grid.Column="1"
+                    Height="24"
+                    MinWidth="38"
+                    Margin="4,16,0,0"
+                    HorizontalAlignment="Center"
+                    d:Visibility="Visible"
+                    Click="btn_ShipGiftCommand"
+                    Content="礼品发货"
+                    Style="{StaticResource BasePageButtonLightStyle}"
+                    Visibility="{Binding ItemOrder.IsWaitSend, Converter={StaticResource VisibleToVisibilityConverter}}" />
+            </Grid>
+        </Grid>
+    </Grid>
 </UserControl>
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
index 51add91..c159016 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
@@ -1217,7 +1217,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 				if (apiSearchDropship.Contains("ds_order_id_list") && !apiSearchDropship.Contains("\"ds_order_id_list\":[]"))
 				{
 					var dsOrderId = JsonHelper.JObjectParse(apiSearchDropship)["ds_order_id_list"].FirstOrDefault().ParseToString();
-					var apiCancelDropship = new WxApiBLL().WxApiDropshipCancel(orderItem.Shop, orderItem.order_id, dsOrderId, orderItem.product_id, orderItem.sku_id, orderItem.sku_cnt.ParseToInt());
+					var apiCancelDropship = new WxApiBLL().WxApiDropshipCancel(orderItem.Shop, orderItem.ItemOrder, dsOrderId);
 				}
 				apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(orderItem.Shop, orderItem.order_id, 100);
 				if (!apiSearchDropship.Contains("\"ds_order_id_list\":[]"))
@@ -1377,20 +1377,24 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			}
 			else
 			{
-				giftType = GiftType._155;
+				giftType = GiftType._160;
 			}
 			Task.Run(async () =>
 			{
 				try
 				{
-					var ret = await MainWindow.Instance.orderListCtrl._shipGiftService.Send(orderItem.order_id, giftType);
-					if (ret)
+					var rst = await WxApiBLL.WxSearchAndDropshipCancel(orderItem.Shop, orderItem.ItemOrder);
+					if (rst == "success")
 					{
-						Application.Current.Dispatcher.Invoke(() =>
+						var ret = await MainWindow.Instance.orderListCtrl._shipGiftService.Send(orderItem.order_id, giftType);
+						if (ret)
 						{
-							orderItem.ItemOrder.gift_order_status = 1;
-							MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.ItemOrder, true);
-						});
+							Application.Current.Dispatcher.Invoke(() =>
+							{
+								orderItem.ItemOrder.gift_order_status = 1;
+								MainWindow.Instance.orderListCtrl.FilterOneOrder(orderItem.ItemOrder, true);
+							});
+						}
 					}
 				}
 				catch (Exception ex)
diff --git a/29WxOrderWpf/Ctrls/ShopCtrls/ShopListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/ShopCtrls/ShopListCtrl.xaml.cs
index 8abeedc..9e0658d 100644
--- a/29WxOrderWpf/Ctrls/ShopCtrls/ShopListCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/ShopCtrls/ShopListCtrl.xaml.cs
@@ -41,7 +41,8 @@ namespace _29WxOrderWpf.Ctrls.ShopCtrls
         {
             this.lbxShop.ItemsSource = GlobalConfig.ShopLoginList;
 
-            Task.Run(() => { 
+            Task.Run(() =>
+			{ 
                 while(MainWindow.Instance.hasReadShop == false)
                 {
                     Thread.Sleep(100);
diff --git a/29WxOrderWpf/Services/ShipGiftService.cs b/29WxOrderWpf/Services/ShipGiftService.cs
index ddcec31..4652a09 100644
--- a/29WxOrderWpf/Services/ShipGiftService.cs
+++ b/29WxOrderWpf/Services/ShipGiftService.cs
@@ -65,8 +65,8 @@ public class ShipGiftService
 			userId = BaseClass.UserId,
 			userName = BaseClass.UserName,
 			giftOrderType = (int)giftType,
-			amount = amount * 100,
-			oemAmount = BaseClass.OemGiftAmount * 100
+			amount = (int)(amount * 100),
+			oemAmount = (int)(BaseClass.OemGiftAmount * 100)
 		}); 
 		Debug.WriteLine($"礼品单:{data}");
 		string ret = await HttpResponseWXBLL.e57PostResponseAsync("https://po.e57.cn//prod-api/api/oms-api/gift/order/deliveryFor29Erp", data, "");
diff --git a/29WxOrderWpf/Styles/StaticColorBrushDictionary.xaml b/29WxOrderWpf/Styles/StaticColorBrushDictionary.xaml
index e33b1fe..20af15a 100644
--- a/29WxOrderWpf/Styles/StaticColorBrushDictionary.xaml
+++ b/29WxOrderWpf/Styles/StaticColorBrushDictionary.xaml
@@ -1,29 +1,29 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <SolidColorBrush x:Key="mainColorBrush" Color="#FF98638f"/>
-    <SolidColorBrush x:Key="mainColorLightBrush" Color="#f5ebff"/>
-    <SolidColorBrush x:Key="mainColorDarkBrush" Color="#FF6b5393"/>
-    <SolidColorBrush x:Key="mainForegroundColorBrush" Color="#FF666666"/>
-    <LinearGradientBrush x:Key="mainLinearColorBrush" StartPoint="0,0" EndPoint="1,0" >
-        <GradientStop Color="#FF98638f" Offset="0.0"/>
-        <GradientStop Color="#FF6b5393" Offset="1.0"/>
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <SolidColorBrush x:Key="mainColorBrush" Color="#FF98638f" />
+    <SolidColorBrush x:Key="mainColorLightBrush" Color="#f5ebff" />
+    <SolidColorBrush x:Key="mainColorDarkBrush" Color="#FF6b5393" />
+    <SolidColorBrush x:Key="mainForegroundColorBrush" Color="#FF666666" />
+    <LinearGradientBrush x:Key="mainLinearColorBrush" StartPoint="0,0" EndPoint="1,0">
+        <GradientStop Offset="0.0" Color="#FF98638f" />
+        <GradientStop Offset="1.0" Color="#FF6b5393" />
     </LinearGradientBrush>
-    <SolidColorBrush x:Key="pageColorBrush" Color="#FF98638f"/>
-    <SolidColorBrush x:Key="pageColorLightBrush" Color="#f5ebff"/>
-    <SolidColorBrush x:Key="pageColorDarkBrush" Color="#FF6b5393"/>
+    <SolidColorBrush x:Key="pageColorBrush" Color="#FF98638f" />
+    <SolidColorBrush x:Key="pageColorLightBrush" Color="#f5ebff" />
+    <SolidColorBrush x:Key="pageColorDarkBrush" Color="#FF6b5393" />
 
-    <SolidColorBrush x:Key="ListCtrlBackColorBrush" Color="#FFFFFFFF"/>
-    <SolidColorBrush x:Key="ListHeadBackColorBrush" Color="#FFf8f8f9"/>
-    <SolidColorBrush x:Key="ListHeadBorderColorBrush" Color="#FFe9e9ea"/>
-    <SolidColorBrush x:Key="ListBackColorBrush" Color="#FFFFFFFF"/>
-    <SolidColorBrush x:Key="ListRowTitleBackColorBrush" Color="#FFf5f7fa"/>
-    <SolidColorBrush x:Key="ListRowBorderColorBrush" Color="#FFf8f8f9"/>
-    <SolidColorBrush x:Key="ListRowHoverBackColorBrush" Color="#FFf5f7fa"/>
+    <SolidColorBrush x:Key="ListCtrlBackColorBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ListHeadBackColorBrush" Color="#FFf8f8f9" />
+    <SolidColorBrush x:Key="ListHeadBorderColorBrush" Color="#FFe9e9ea" />
+    <SolidColorBrush x:Key="ListBackColorBrush" Color="#FFFFFFFF" />
+    <SolidColorBrush x:Key="ListRowTitleBackColorBrush" Color="#FFf5f7fa" />
+    <SolidColorBrush x:Key="ListRowBorderColorBrush" Color="#FFf8f8f9" />
+    <SolidColorBrush x:Key="ListRowHoverBackColorBrush" Color="#FFf5f7fa" />
 
-    <SolidColorBrush x:Key="HorizontalGridLinesBrush" Color="#FFf5f7fa"/>
-    <SolidColorBrush x:Key="VerticalGridLinesBrush" Color="#FFFFFFFF"/>
+    <SolidColorBrush x:Key="HorizontalGridLinesBrush" Color="#FFf5f7fa" />
+    <SolidColorBrush x:Key="VerticalGridLinesBrush" Color="#FFFFFFFF" />
 
     <SolidColorBrush x:Key="PageOkBrush" Color="#FF67c23a" />
+    <SolidColorBrush x:Key="PageOkBrush50" Color="#5067c23a" />
     <SolidColorBrush x:Key="PageWarningBrush" Color="#FFfa4733" />
     <SolidColorBrush x:Key="PageWarningBrushCC" Color="#CCfa4733" />
     <SolidColorBrush x:Key="PageWarningBrush80" Color="#80fa4733" />
diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index f0b75aa..39e46e5 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,7 +27,7 @@ namespace AllBase
 		public static bool IsShowRegister { get; set; } = true;
 		public static bool IsShowOpenAccount { get; set; } = true;
 		/// <summary>
-		/// 礼品单价格
+		/// 礼品单oem额外价格
 		/// </summary>
 		public static decimal OemGiftAmount { get; set; } = 0;
 		#endregion
@@ -36,7 +36,7 @@ namespace AllBase
 		/// 版本ID
 		/// </summary>
 
-        public static int VersionCount = 230;
+        public static int VersionCount = 232;
 
 		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/oms_wei_order_info.cs b/AllBase/Model/DBModel/oms_wei_order_info.cs
index 5fc6546..8bbb79a 100644
--- a/AllBase/Model/DBModel/oms_wei_order_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_info.cs
@@ -18,7 +18,16 @@ namespace AllBase.Model.DBModel
 {
     public class oms_wei_order_info : PropertyNotifyObject
     {
-        public string OrderBuyType
+		/// <summary>
+		/// 订单对应店铺
+		/// </summary>
+		public ShopLoginInfo Shop
+		{
+			get { return this.GetValue(x => x.Shop); }
+			set { this.SetValue(x => x.Shop, value); }
+		}
+
+		public string OrderBuyType
         {
             get { return this.GetValue(x => x.OrderBuyType); }
             set { this.SetValue(x => x.OrderBuyType, value); }
@@ -33,6 +42,12 @@ namespace AllBase.Model.DBModel
 
         public ObservableCollection<oms_wei_refund_info> refundItems { get; set; } = new ObservableCollection<oms_wei_refund_info>();
 
+		public bool IsWaitBuyOrIsWaitSend
+		{
+			get { return IsWaitBuy || IsWaitSend; }
+			set { }
+		}
+
         /// <summary>
         /// 待采购
         /// </summary>
@@ -596,7 +611,11 @@ namespace AllBase.Model.DBModel
         /// <summary>
         /// 礼物单状态，默认值0：不存在礼物单，1：礼物单已发货，2：礼物单信息已更正
         /// </summary>
-        public int? gift_order_status { get; set; }
+        public int? gift_order_status
+		{
+			get { return this.GetValue(x => x.gift_order_status); }
+			set { this.SetValue(x => x.gift_order_status, value); }
+		}
         /// <summary>
         /// 店铺备注：取微信ext_info.merchant_notes
         /// </summary>
@@ -660,11 +679,9 @@ namespace AllBase.Model.DBModel
 
         public void SetOrderTextProperty()
         {
-            if (order_id == "3737914129536416512")
-            {
+			Shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ErpShopId == shop_id.ParseToString());
 
-            }
-            if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
+			if (this.orderItems.Any(oi => oi.OrderItemExt?.buy_type == "直发") && this.orderItems.Any(oi => oi.ItemTransitOrderWithVoid != null))
             {
                 OrderBuyType = "云改直";
                 OrderBuyTypeColor = GlobalConfig.PurpleBrush190;
diff --git a/Work/UserLogin.cs b/Work/UserLogin.cs
index 0916592..f53955a 100644
--- a/Work/UserLogin.cs
+++ b/Work/UserLogin.cs
@@ -137,6 +137,7 @@ namespace Work
 			BaseClass.PostagePerOrder = Math.Max(2.2m, BaseRegex.GetDecimalJson(ref html, "postage_per_order"));
 			BaseClass.RefundPostagePerOrder = Math.Max(2.5m, BaseRegex.GetDecimalJson(ref html, "refund_postage_per_order"));
 			BaseClass.RechargeAmountTotal = BaseRegex.GetDecimalJson(ref html, "recharge_amount_total");
+			BaseClass.OemGiftAmount = BaseRegex.GetDecimalJson(ref html, "gift_oem_amount_per_order");
 			BaseClass.OemId = BaseRegex.GetStringJson(ref html, "oem_id");
             BaseClass.OemName = BaseRegex.GetStringJson(ref html, "oem_name");
             BaseClass.IsOemOwner = BaseRegex.GetBoolJson(ref html, "is_oem_owner");
diff --git a/Work/_29Tools/BLL/HttpResponseWXBLL.cs b/Work/_29Tools/BLL/HttpResponseWXBLL.cs
index 58114f5..be8b77f 100644
--- a/Work/_29Tools/BLL/HttpResponseWXBLL.cs
+++ b/Work/_29Tools/BLL/HttpResponseWXBLL.cs
@@ -661,9 +661,9 @@ namespace Work._29Tools.BLL
 
 		public static async Task<string> e57PostResponseAsync(string _url, string _data, string referer)
 		{
-			await Task.Delay(2000);
-			return await Task.FromResult("<AjaxResult><msg>SUCCESS</msg><code>200</code></AjaxResult>");
-			//if (string.IsNullOrEmpty(Authorization)) Authorization = "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjQ3YmRlOGNlLWY5MDUtNDIzOS05M2VjLWZiN2U3MjRmOTY0NiJ9.vwxhj3t4zTDdBQTyfVjcKr-0Oma8-VtPDzE2LVkw4A4aWftncY1ikXgEhGwoYHn9E7yOnhS_Pb7FfzgecTqqHA";
+			//await Task.Delay(2000);
+			//return await Task.FromResult("<AjaxResult><msg>SUCCESS</msg><code>200</code></AjaxResult>");
+			////if (string.IsNullOrEmpty(Authorization)) Authorization = "eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjQ3YmRlOGNlLWY5MDUtNDIzOS05M2VjLWZiN2U3MjRmOTY0NiJ9.vwxhj3t4zTDdBQTyfVjcKr-0Oma8-VtPDzE2LVkw4A4aWftncY1ikXgEhGwoYHn9E7yOnhS_Pb7FfzgecTqqHA";
 
 			bool isRetry = false;
 			if (string.IsNullOrEmpty(sAuthorization))
diff --git a/Work/_29Tools/BLL/WxApiBLL.cs b/Work/_29Tools/BLL/WxApiBLL.cs
index 4fa0f14..3b49871 100644
--- a/Work/_29Tools/BLL/WxApiBLL.cs
+++ b/Work/_29Tools/BLL/WxApiBLL.cs
@@ -1,6 +1,7 @@
 using AllBase;
 using AllBase.Helper;
 using AllBase.Model.DBModel;
+using NaiBa.Util.Extension;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
@@ -95,14 +96,20 @@ namespace Work._29Tools.BLL
 			return html;
 		}
 
-		public string WxApiDropshipCancel(ShopLoginInfo shop, string orderId, string dropShopOrderId, string spuId, string skuId, int cnt)
+		public string WxApiDropshipCancel(ShopLoginInfo shop, oms_wei_order_info order, string dropShopOrderId)
 		{
 			StringBuilder sb = new StringBuilder();
 			sb.Append(UserLogin.GetSignaturex());
 			sb.Append("&token=").Append(GetWxToken(shop).accessToken);
-			sb.Append("&order_id=").Append(orderId);
+			sb.Append("&order_id=").Append(order.order_id);
 			sb.Append("&ds_order_id=").Append(dropShopOrderId);
-			sb.Append("&dropship_product_list=").Append("[{\"spu_id\":\"").Append(spuId).Append("\",\"sku_id\":\"").Append(skuId).Append("\",\"product_cnt\":").Append(cnt).Append("}]");
+			sb.Append("&dropship_product_list=").Append("[");
+			foreach (var item in order.orderItems)
+			{
+				sb.Append("{\"spu_id\":\"").Append(item.product_id).Append("\",\"sku_id\":\"").Append(item.sku_id).Append("\",\"product_cnt\":").Append(item.sku_cnt).Append("},");
+			}
+			sb.Remove(sb.Length - 1, 1);
+			sb.Append("]");
 
 			var url = BaseClass.Build29WxObjString("product/wx_api_dropship_cancel");
 			var data = sb.ToString();
@@ -111,5 +118,27 @@ namespace Work._29Tools.BLL
 				html = GetHtml.PostUtf8(url, data);
 			return html;
 		}
+
+		public static async Task<string> WxSearchAndDropshipCancel(ShopLoginInfo shop, oms_wei_order_info order)
+		{
+			string orderId = order.order_id;
+
+			var apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(shop, orderId, 100);
+			if (!apiSearchDropship.Contains("\"errcode\":0"))
+			{
+				return apiSearchDropship;
+			}
+			if (apiSearchDropship.Contains("ds_order_id_list") && !apiSearchDropship.Contains("\"ds_order_id_list\":[]"))
+			{
+				var dsOrderId = JsonHelper.JObjectParse(apiSearchDropship)["ds_order_id_list"].FirstOrDefault().ParseToString();
+				var apiCancelDropship = new WxApiBLL().WxApiDropshipCancel(shop, order, dsOrderId);
+				if (!apiCancelDropship.Contains("\"errcode\":0"))
+				{
+					return apiCancelDropship;
+				}
+			}
+			//apiSearchDropship = new WxApiBLL().WxApiDropshipSearch(shop, orderId, 100);
+			return "success";
+		}
 	}
 }
diff --git a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
index 9c3c90a..b4f1f59 100644
--- a/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
+++ b/Work/_29Tools/Forms/PddMobileBuyOrderForm.cs
@@ -849,6 +849,13 @@ namespace TemuKJD.ToolForms
                 return;
             }
 
+			this.Enabled = false;
+			if (this.cefWebBrowser.Address.StartsWith("https://mobile.yangkeduo.com/order.html?order_sn="))
+			{
+
+			}
+
+
             var url = BaseClass.Build29WxObjString("order/wx_add_mdy_buy_prod_map");
             var data = UserLogin.GetSignaturex()
                 + "&spu_code=" + GetHtml.UrlEncodeUtf8(txtUpSpuCode.Text.Trim())
@@ -865,8 +872,9 @@ namespace TemuKJD.ToolForms
                 result = GetHtml.PostUtf8(url, data);
             if (!result.Contains("\"code\":200"))
             {
-                BaseMsgForm.ShowError("保存失败" + BaseRegex.GetStringJson(ref result, "msg"));
-            }
+				this.Enabled = true;
+				BaseMsgForm.ShowError("保存失败" + BaseRegex.GetStringJson(ref result, "msg") + "，请稍后重试");
+			}
             else
             {
                 var urlMap = BaseClass.Build29WxObjString("order/wx_get_buy_prod_map");
@@ -878,8 +886,8 @@ namespace TemuKJD.ToolForms
                 if (string.IsNullOrEmpty(resultMap) || !resultMap.Contains("\"code\":200"))
                     resultMap = GetHtml.PostUtf8(urlMap, dataMap);
                 if (string.IsNullOrEmpty(resultMap) || !resultMap.Contains("\"code\":200"))
-                { 
-                }
+                {
+				}
                 else
                 {
                     List<WXBuyMapInfo> buyMapList = new List<WXBuyMapInfo>();
@@ -1371,5 +1379,5 @@ namespace TemuKJD.ToolForms
                 ChangeAddress(null);
             });
         }
-    }
+	}
 }
diff --git a/Work/_29Tools/Forms/PddMobileBuyOrderForm.designer.cs b/Work/_29Tools/Forms/PddMobileBuyOrderForm.designer.cs
index e1edc45..2ed369e 100644
--- a/Work/_29Tools/Forms/PddMobileBuyOrderForm.designer.cs
+++ b/Work/_29Tools/Forms/PddMobileBuyOrderForm.designer.cs
@@ -84,7 +84,6 @@
             this.splitContainer2 = new System.Windows.Forms.SplitContainer();
             this.txtAddress = new System.Windows.Forms.TextBox();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.pnlMap = new System.Windows.Forms.Panel();
             this.pnlDirectAddressAnalysis = new System.Windows.Forms.Panel();
             this.btnAnalysis = new DevComponents.DotNetBar.PanelEx();
             this.label25 = new System.Windows.Forms.Label();
@@ -103,6 +102,7 @@
             this.label29 = new System.Windows.Forms.Label();
             this.chkAutoChangeWarehouseAddress = new Work.UserComponents.UcCheckBox(this.components);
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.pnlMap = new System.Windows.Forms.Panel();
             ((System.ComponentModel.ISupportInitialize)(this.pbCloseBase)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
@@ -113,10 +113,10 @@
             this.splitContainer2.Panel2.SuspendLayout();
             this.splitContainer2.SuspendLayout();
             this.panel1.SuspendLayout();
-            this.pnlMap.SuspendLayout();
             this.pnlDirectAddressAnalysis.SuspendLayout();
             this.pnlBuy.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.pnlMap.SuspendLayout();
             this.SuspendLayout();
             // 
             // pbCloseBase
@@ -779,30 +779,6 @@
             this.panel1.Size = new System.Drawing.Size(487, 730);
             this.panel1.TabIndex = 0;
             // 
-            // pnlMap
-            // 
-            this.pnlMap.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.pnlMap.Controls.Add(this.txtSendProvince);
-            this.pnlMap.Controls.Add(this.label13);
-            this.pnlMap.Controls.Add(this.label20);
-            this.pnlMap.Controls.Add(this.label1);
-            this.pnlMap.Controls.Add(this.txtMapGoodsName);
-            this.pnlMap.Controls.Add(this.btnManualUpdateSendProvince);
-            this.pnlMap.Controls.Add(this.label2);
-            this.pnlMap.Controls.Add(this.label3);
-            this.pnlMap.Controls.Add(this.txtMapSkuId);
-            this.pnlMap.Controls.Add(this.label4);
-            this.pnlMap.Controls.Add(this.label5);
-            this.pnlMap.Controls.Add(this.btnManualUpdateTransitWarehouse);
-            this.pnlMap.Controls.Add(this.cmbTransitWarehouse);
-            this.pnlMap.Controls.Add(this.txtMapGoodsId);
-            this.pnlMap.Controls.Add(this.txtMapSkuName);
-            this.pnlMap.Location = new System.Drawing.Point(12, 525);
-            this.pnlMap.Name = "pnlMap";
-            this.pnlMap.Size = new System.Drawing.Size(468, 203);
-            this.pnlMap.TabIndex = 871;
-            // 
             // pnlDirectAddressAnalysis
             // 
             this.pnlDirectAddressAnalysis.Controls.Add(this.btnAnalysis);
@@ -1041,6 +1017,30 @@
             this.pictureBox1.TabStop = false;
             this.pictureBox1.Click += new System.EventHandler(this.pictureBox1_Click);
             // 
+            // pnlMap
+            // 
+            this.pnlMap.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.pnlMap.Controls.Add(this.txtSendProvince);
+            this.pnlMap.Controls.Add(this.label13);
+            this.pnlMap.Controls.Add(this.label20);
+            this.pnlMap.Controls.Add(this.label1);
+            this.pnlMap.Controls.Add(this.txtMapGoodsName);
+            this.pnlMap.Controls.Add(this.btnManualUpdateSendProvince);
+            this.pnlMap.Controls.Add(this.label2);
+            this.pnlMap.Controls.Add(this.label3);
+            this.pnlMap.Controls.Add(this.txtMapSkuId);
+            this.pnlMap.Controls.Add(this.label4);
+            this.pnlMap.Controls.Add(this.label5);
+            this.pnlMap.Controls.Add(this.btnManualUpdateTransitWarehouse);
+            this.pnlMap.Controls.Add(this.cmbTransitWarehouse);
+            this.pnlMap.Controls.Add(this.txtMapGoodsId);
+            this.pnlMap.Controls.Add(this.txtMapSkuName);
+            this.pnlMap.Location = new System.Drawing.Point(12, 525);
+            this.pnlMap.Name = "pnlMap";
+            this.pnlMap.Size = new System.Drawing.Size(468, 203);
+            this.pnlMap.TabIndex = 871;
+            // 
             // PddMobileBuyOrderForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1068,13 +1068,13 @@
             this.splitContainer2.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            this.pnlMap.ResumeLayout(false);
-            this.pnlMap.PerformLayout();
             this.pnlDirectAddressAnalysis.ResumeLayout(false);
             this.pnlDirectAddressAnalysis.PerformLayout();
             this.pnlBuy.ResumeLayout(false);
             this.pnlBuy.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            this.pnlMap.ResumeLayout(false);
+            this.pnlMap.PerformLayout();
             this.ResumeLayout(false);
 
         }