From 44503f91cf147931985491f390cbf1b9f8aa5572 Mon Sep 17 00:00:00 2001
From: wule <jtt_fan@qq.com>
Date: Sun, 21 Jun 2026 10:01:03 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=AF=8F?=
 =?UTF-8?q?=E4=B8=80=E8=A1=8C=E7=9A=84=E8=A1=A8=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 29WxOrderWpf/29WxOrderWpf.csproj              |  6 +++
 29WxOrderWpf/App.xaml                         |  3 ++
 .../VisibleToVisibilityConverter.cs           | 24 ++++++++++++
 .../Ctrls/OrderCtrls/OrderListCtrl.xaml       | 28 ++++++++-----
 .../Ctrls/OrderCtrls/OrderListCtrl.xaml.cs    | 39 ++++++++++---------
 .../Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs | 15 +------
 .../OrderCtrls/OrderListRowHeaderCtrl.xaml    | 31 ++++++++++++---
 .../OrderCtrls/OrderListRowHeaderCtrl.xaml.cs |  4 +-
 29WxOrderWpf/Styles/BaseButtonStyle.xaml      | 24 ++++++------
 .../Styles/StaticColorBrushDictionary.xaml    |  3 ++
 .../Styles/StaticImageDictionary.xaml         |  1 +
 .../Styles/UcWaterMarkTextBoxStyle.xaml       | 38 ++++++++++++++++++
 .../UserControls/UcWaterMarkTextBox.cs        | 26 +++++++++++++
 AllBase/Model/oms_wei_order_info.cs           |  3 ++
 14 files changed, 186 insertions(+), 59 deletions(-)
 create mode 100644 29WxOrderWpf/Converters/VisibleToVisibilityConverter.cs
 create mode 100644 29WxOrderWpf/Styles/UcWaterMarkTextBoxStyle.xaml
 create mode 100644 29WxOrderWpf/UserControls/UcWaterMarkTextBox.cs

diff --git a/29WxOrderWpf/29WxOrderWpf.csproj b/29WxOrderWpf/29WxOrderWpf.csproj
index 54e45be..6f84b3f 100644
--- a/29WxOrderWpf/29WxOrderWpf.csproj
+++ b/29WxOrderWpf/29WxOrderWpf.csproj
@@ -85,6 +85,7 @@
     </Compile>
     <Compile Include="BaseWindows\BaseWindow.cs" />
     <Compile Include="Converters\TextToVisibilityConverter.cs" />
+    <Compile Include="Converters\VisibleToVisibilityConverter.cs" />
     <Compile Include="Ctrls\OrderCtrls\OrderListRowCtrl.xaml.cs">
       <DependentUpon>OrderListRowCtrl.xaml</DependentUpon>
     </Compile>
@@ -107,6 +108,7 @@
       <DependentUpon>Icons.xaml</DependentUpon>
     </Compile>
     <Compile Include="UserControls\UcImageButton.cs" />
+    <Compile Include="UserControls\UcWaterMarkTextBox.cs" />
     <Compile Include="UserControls\UcWindowBoxes.xaml.cs">
       <DependentUpon>UcWindowBoxes.xaml</DependentUpon>
     </Compile>
@@ -187,6 +189,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Styles\UcWaterMarkTextBoxStyle.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ToolCtrls\Icons.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/29WxOrderWpf/App.xaml b/29WxOrderWpf/App.xaml
index aa1c3d6..34882f3 100644
--- a/29WxOrderWpf/App.xaml
+++ b/29WxOrderWpf/App.xaml
@@ -2,9 +2,12 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:local="clr-namespace:_29WxOrderWpf"
+             xmlns:converters="clr-namespace:_29WxOrderWpf.Converters"
              StartupUri="MainWindow.xaml">
     <Application.Resources>
         <ResourceDictionary>
+            <converters:HasTextToVisibilityConverter x:Key="HasTextVisibility"/>
+            <converters:NotHasTextToVisibilityConverter x:Key="NotHasTextVisibility"/>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceDictionary Source="Styles/BaseWindowStyle.xaml" />
                 <ResourceDictionary Source="Styles/BaseDataGridStyle.xaml" />
diff --git a/29WxOrderWpf/Converters/VisibleToVisibilityConverter.cs b/29WxOrderWpf/Converters/VisibleToVisibilityConverter.cs
new file mode 100644
index 0000000..e89410c
--- /dev/null
+++ b/29WxOrderWpf/Converters/VisibleToVisibilityConverter.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 VisibleToVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value.ParseToBool() ? 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 434f0d3..66da706 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
@@ -9,10 +9,7 @@
         mc:Ignorable="d" 
         d:DesignHeight="450" d:DesignWidth="800" Loaded="Window_Loaded">
 
-    <UserControl.Resources>
-        <converters:NotHasTextToVisibilityConverter x:Key="NotHasTextVisibility"/>
-    </UserControl.Resources>
-    
+
     <Grid Background="{StaticResource ListCtrlBackColorBrush}">
         <Grid.RowDefinitions>
             <RowDefinition Height="50"></RowDefinition>
@@ -26,7 +23,6 @@
                 <ColumnDefinition Width="*"></ColumnDefinition>
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
                 <ColumnDefinition Width="*"></ColumnDefinition>
-                <ColumnDefinition Width="Auto"></ColumnDefinition>
                 <ColumnDefinition Width="*"></ColumnDefinition>
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
                 <ColumnDefinition Width="*"></ColumnDefinition>
@@ -35,14 +31,28 @@
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
             </Grid.ColumnDefinitions>
-            <TextBox x:Name="txtShopName" Grid.Column="0" Margin="4,0,-4,0" BorderBrush="{StaticResource mainColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center"
+            <TextBox x:Name="txtShopName" Grid.Column="0" Margin="4,0,-4,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center"
                      Style="{StaticResource BaseRoundCornerTextBoxStyle}" />
             <TextBlock Text="全部店铺" Grid.Column="0" Margin="8,0,8,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtShopName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
-            <Button Grid.Column="1" x:Name="btnMultiShopChoice" Style="{StaticResource BasePageButtonStyle}" Margin="-4,0,0,0" Grid.Row="4" Content=" ... " Width="28" Height="28" Click="btnMultiShopChoice_Click"></Button>
-            <TextBox x:Name="txtGoodsName" Grid.Column="2" Margin="4,0" BorderBrush="{StaticResource mainColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center" 
+            <Button Grid.Column="1" x:Name="btnMultiShopChoice" Style="{StaticResource BasePageButtonStyle}" Margin="-4,0,4,0" Grid.Row="4" Content=" ... " Width="28" Height="28" Click="btnMultiShopChoice_Click"></Button>
+            <TextBox x:Name="txtGoodsName" Grid.Column="2" Margin="0,0,4,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1" Height="28" VerticalContentAlignment="Center" 
                      Style="{StaticResource BaseRoundCornerTextBoxStyle}"/>
             <TextBlock Text="商品标题" Grid.Column="2" Margin="8,0,8,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtGoodsName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
 
+
+
+            <ComboBox x:Name="cmbUserNameMobile" Margin="4,0" VerticalContentAlignment="Center" Style="{StaticResource BaseComboBoxStyle}" Grid.Column="3" Width="70" Height="28" Text="成交时间"/>
+            <Border Grid.Column="3" Margin="0,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="1,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="4,0,0,4"/>
+            <Border Grid.Column="4" Margin="0,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="0,0,0,0"/>
+            <DatePicker x:Name="dateStart" Grid.Column="4" Margin="0,0,4,0" VerticalAlignment="Center" BorderThickness="0" />
+
+            <Border Grid.Column="5" Margin="0,0,0,0" BorderBrush="{StaticResource pageColorBrush}" BorderThickness="0,1,1,1" Height="28" VerticalAlignment="Center" CornerRadius="0,4,4,0"/>
+            <DatePicker x:Name="dateEnd" Grid.Column="5"  Margin="0,0,4,0" VerticalAlignment="Center" BorderThickness="0" />
+
+            <Button Grid.Column="10" x:Name="btnRefresh" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,0,0" Grid.Row="4" Content="过滤" Width="48" Height="28" Click="btnSearch_Click"></Button>
+            <Button Grid.Column="11" x:Name="btnSearch" Style="{StaticResource BasePageButtonStyle}" Margin="4,0,4,0" Grid.Row="4" Content="读单" Width="48" Height="28" Click="btnSearch_Click"></Button>
+            
+            
         </Grid>
         <Grid x:Name="gridListHeader" Margin="4,0" Grid.Row="1">
             <Grid.ColumnDefinitions>
@@ -74,7 +84,7 @@
             <ListBox.ItemTemplate>
                 <DataTemplate>
                     <!--此处绑定将数据源传递给子自定义控件OrderListRowCtrl-->
-                    <local:OrderListRowCtrl DataContext="{Binding}"></local:OrderListRowCtrl>
+                    <local:OrderListRowCtrl Visibility="{Binding }" DataContext="{Binding}"></local:OrderListRowCtrl>
                 </DataTemplate>
             </ListBox.ItemTemplate>
         </ListBox>
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
index b2cc5d6..107ebc9 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
@@ -1,4 +1,5 @@
-using AllBase;
+using _29WxOrderWpf.BaseWindows;
+using AllBase;
 using AllBase.Extension;
 using AllBase.Helper;
 using AllBase.Model;
@@ -48,8 +49,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             //dgOrder.Items.Add(1111111);
 
             //dgOrder.ItemsSource = lstOrder;
-
             //lbxOrder.ItemsSource = lstOrder;
+
+            dateStart.SelectedDate = DateTime.Now.Date.AddDays(-30);
+            dateEnd.SelectedDate = DateTime.Now.Date.AddDays(1).AddSeconds(-1);
+
             Task.Run(() =>
             { 
                 while (!MainWindow.Instance.hasReadShop)
@@ -78,6 +82,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             {
                 int page = 0;
                 int totalPage = 1;
+                int pageSize = 50;
+
                 while (true)
                 {
                     if (page >= totalPage)
@@ -88,8 +94,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                     page++;
                     var url = BaseClass.Build29WxObjString("order/get_order_list");
                     var data = UserLogin.GetSignaturex() + "&page=" + page;
+                    data += "&page_size=" + pageSize;
                     var shop_id = string.Join(",", GlobalConfig.ShopLoginList.Select(s => s.ErpShopId).Where(s => !s.IsNullOrEmpty()));
-                    data += "&erp_shop_id_in=" + shop_id;
                     Dispatcher.Invoke(new Action(() =>
                     {
                         if (!string.IsNullOrEmpty(txtShopName.Text.Trim()))
@@ -97,6 +103,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                             var shopNames = txtShopName.Text.Trim().Split(';').Where(s => !s.IsNullOrEmpty()).ToList();
                             shop_id = string.Join(",", GlobalConfig.ShopLoginList.Where(s => shopNames.Contains(s.ShopAccount)).Select(s => s.ErpShopId).Where(s => !s.IsNullOrEmpty()));
                         }
+                        var startTime = BaseClass.DateTimeToTimestampSeconds(dateStart.SelectedDate.Value);
+                        var endTime = BaseClass.DateTimeToTimestampSeconds(dateEnd.SelectedDate.Value);
+                        data += "&erp_shop_id_in=" + shop_id;
+                        data += "&start_time=" + startTime;
+                        data += "&end_time=" + endTime;
                     }));
                     Thread.Sleep(200);
                     var html = GetHtml.PostUtf8(url, data);
@@ -133,24 +144,13 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                             }
                         }));
                     }
+
+                    var totalCount = BaseRegex.GetIntJson(ref html, "count");
+                    totalPage = Math.Ceiling(1m * totalCount / pageSize).ParseToInt();
                 }
             });
         }
 
-
-
-        private void Path_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            var orderId = ((sender as Border)?.Tag).ParseToString();
-            try
-            {
-                Clipboard.SetText(orderId);
-            }
-            catch (Exception ex)
-            {
-            }
-        }
-
         private void btnMultiShopChoice_Click(object sender, RoutedEventArgs e)
         {
             MainWindow.Instance.shopListCtrl.IsVisibleChanged -= ShopListCtrl_IsVisibleChanged;
@@ -166,9 +166,12 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                 if (list != null)
                     this.txtShopName.Text = string.Join(";", list.Where(s => s.IsSelect == true).Select(s => s.ShopAccount));
 
-                
             }
             MainWindow.Instance.shopListCtrl.IsVisibleChanged -= ShopListCtrl_IsVisibleChanged;
         }
+
+        private void btnSearch_Click(object sender, RoutedEventArgs e)
+        {
+        }
     }
 }
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs
index 9608bfc..e5b873f 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs
@@ -1,4 +1,5 @@
-using NaiBa.Util.Extension;
+using _29WxOrderWpf.BaseWindows;
+using NaiBa.Util.Extension;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -25,17 +26,5 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
         {
             InitializeComponent();
         }
-
-        private void Path_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            var orderId = ((sender as Border)?.Tag).ParseToString();
-            try
-            {
-                Clipboard.SetText(orderId);
-            }
-            catch (Exception ex)
-            {
-            }
-        }
     }
 }
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
index 021603c..b6e78d9 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml
@@ -3,9 +3,9 @@
              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:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls" xmlns:usercontrols="clr-namespace:_29WxOrderWpf.UserControls"
              mc:Ignorable="d" 
-             d:DesignHeight="150" d:DesignWidth="800">
+             d:DesignHeight="50" d:DesignWidth="800">
 
     <Border Background="{StaticResource ListRowBorderColorBrush}" CornerRadius="12,12,0,0" >
         <Grid>
@@ -16,14 +16,33 @@
                 <ColumnDefinition Width="auto"/>
                 <ColumnDefinition Width="auto"/>
                 <ColumnDefinition Width="auto"/>
+                <ColumnDefinition Width="auto"/>
+                <ColumnDefinition Width="auto"/>
+                <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
-            <TextBox Grid.Column="0" Margin="8,8,0,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True" Text="店铺单号：" BorderThickness="0" />
-            <TextBox Grid.Column="1" Margin="0,8,8,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True"
-                             Text="{Binding order_id}" BorderThickness="0" />
+            <TextBox Grid.Column="0" Margin="8,8,-4,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True" Text="店铺单号：" BorderThickness="0" />
+            <TextBox x:Name="txtOrderId" Grid.Column="1" Margin="0,8,4,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True" Text="{Binding order_id}" BorderThickness="0" />
+            <TextBlock Text="订单号" Grid.Column="1" Margin="0,8,4,8" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtOrderId,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
+            
             <Border Grid.Column="2" Width="12" Background="Transparent" Height="12" VerticalAlignment="Center" Cursor="Hand" 
-                            Tag="{Binding order_id}" MouseLeftButtonDown="Path_MouseLeftButtonDown">
+                    Tag="{Binding order_id}" MouseLeftButtonDown="Path_MouseLeftButtonDown">
                 <Path Margin="0,0,0,0" Fill="#409eff" Tag="{Binding order_id}" MouseLeftButtonDown="Path_MouseLeftButtonDown" Data="M80 432a128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128h-384a128 128 0 0 1-128-128v-384z m128-64a64 64 0 0 0-64 64v384a64 64 0 0 0 64 64h384a64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64h-384z    M816 144h-384a64 64 0 0 0-64 64 32 32 0 0 1-64 0 128 128 0 0 1 128-128h384a128 128 0 0 1 128 128v384a128 128 0 0 1-128 128 32 32 0 0 1 0-64 64 64 0 0 0 64-64v-384a64 64 0 0 0-64-64z" Stretch="Uniform" />
             </Border>
+            <Border Grid.Column="3" Margin="8,0,0,0" Background="#e8fbf9" BorderBrush="#d0fbea" BorderThickness="1" MinWidth="30" Height="24" CornerRadius="2">
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition></ColumnDefinition>
+                        <ColumnDefinition></ColumnDefinition>
+                    </Grid.ColumnDefinitions>
+                    <Border Background="#0397b5" CornerRadius="2,0,10,2">
+                        <TextBox Grid.Column="0" Margin="2,0,2,1" Foreground="White" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" Text="剩余" BorderThickness="0" />
+                    </Border>
+                    <TextBox Grid.Column="1" Margin="2,0,2,1" Foreground="#0397b5" VerticalContentAlignment="Center" VerticalAlignment="Center" Background="Transparent" IsReadOnly="True" Text="0小时0分0秒" BorderThickness="0" />
+                </Grid>
+            </Border>
+            <Image  Margin="8,8,0,8" Grid.Column="4" Width="24" Height="24" Source="{StaticResource OrderWeishopIcon}"></Image>
+            <TextBox x:Name="txtShopName" Grid.Column="5" Margin="0,8,0,8" VerticalAlignment="Center" FontSize="14" Background="Transparent" IsReadOnly="True" Text="{Binding shop_name}" BorderThickness="0" />
+            <TextBlock Text="店铺名称" Grid.Column="5" Margin="0,8,4,8" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray" Visibility="{Binding ElementName=txtOrderId,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>
         </Grid>
     </Border>
 </UserControl>
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml.cs
index eeaf151..7b0934c 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowHeaderCtrl.xaml.cs
@@ -1,4 +1,5 @@
-using NaiBa.Util.Extension;
+using _29WxOrderWpf.BaseWindows;
+using NaiBa.Util.Extension;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -35,6 +36,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             }
             catch (Exception ex)
             {
+                BaseMsgWindow.ShowError(MainWindow.Instance, "复制失败 " + ex.Message);
             }
         }
     }
diff --git a/29WxOrderWpf/Styles/BaseButtonStyle.xaml b/29WxOrderWpf/Styles/BaseButtonStyle.xaml
index b397793..2495788 100644
--- a/29WxOrderWpf/Styles/BaseButtonStyle.xaml
+++ b/29WxOrderWpf/Styles/BaseButtonStyle.xaml
@@ -99,13 +99,13 @@
         </Setter>
     </Style>
     <Style x:Key="BasePageButtonStyle" TargetType="Button">
-        <Setter Property="Foreground" Value="{DynamicResource mainColorLightBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource pageColorLightBrush}"/>
         <Setter Property="BorderThickness" Value="0"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
-                    <Border x:Name="buttonBorder" Background="{DynamicResource mainColorBrush}" Cursor="Hand"
-                        BorderBrush="{DynamicResource mainColorDarkBrush}" CornerRadius="4"
+                    <Border x:Name="buttonBorder" Background="{DynamicResource pageColorBrush}" Cursor="Hand"
+                        BorderBrush="{DynamicResource pageColorDarkBrush}" CornerRadius="4"
                         BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
                         <ContentPresenter Content="{TemplateBinding Content}"
                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
@@ -116,10 +116,10 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource mainColorDarkBrush}"/>
+                            <Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource pageColorDarkBrush}"/>
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource mainColorDarkBrush}"/>
+                            <Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource pageColorDarkBrush}"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Opacity" Value="0.5" />
@@ -130,13 +130,13 @@
         </Setter>
     </Style>
     <Style x:Key="BasePageButtonLightStyle" TargetType="Button">
-        <Setter Property="Foreground" Value="{DynamicResource mainColorBrush}"/>
+        <Setter Property="Foreground" Value="{DynamicResource pageColorBrush}"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="Button">
-                    <Border x:Name="buttonBorder" Background="{DynamicResource mainColorLightBrush}" Cursor="Hand"
-                        BorderBrush="{DynamicResource mainColorBrush}" CornerRadius="4"
+                    <Border x:Name="buttonBorder" Background="{DynamicResource pageColorLightBrush}" Cursor="Hand"
+                        BorderBrush="{DynamicResource pageColorBrush}" CornerRadius="4"
                         BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
                         <ContentPresenter Content="{TemplateBinding Content}"
                                       ContentStringFormat="{TemplateBinding ContentStringFormat}"
@@ -147,12 +147,12 @@
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource mainColorDarkBrush}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource mainColorLightBrush}"/>
+                            <Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource pageColorDarkBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource pageColorLightBrush}"/>
                         </Trigger>
                         <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource mainColorDarkBrush}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource mainColorLightBrush}"/>
+                            <Setter Property="Background" TargetName="buttonBorder" Value="{DynamicResource pageColorDarkBrush}"/>
+                            <Setter Property="Foreground" Value="{DynamicResource pageColorLightBrush}"/>
                         </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter Property="Opacity" Value="0.5" />
diff --git a/29WxOrderWpf/Styles/StaticColorBrushDictionary.xaml b/29WxOrderWpf/Styles/StaticColorBrushDictionary.xaml
index cd118fa..ac9ca80 100644
--- a/29WxOrderWpf/Styles/StaticColorBrushDictionary.xaml
+++ b/29WxOrderWpf/Styles/StaticColorBrushDictionary.xaml
@@ -8,6 +8,9 @@
         <GradientStop Color="#FF98638f" Offset="0.0"/>
         <GradientStop Color="#FF6b5393" Offset="1.0"/>
     </LinearGradientBrush>
+    <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"/>
diff --git a/29WxOrderWpf/Styles/StaticImageDictionary.xaml b/29WxOrderWpf/Styles/StaticImageDictionary.xaml
index c7da80e..8b6ad7d 100644
--- a/29WxOrderWpf/Styles/StaticImageDictionary.xaml
+++ b/29WxOrderWpf/Styles/StaticImageDictionary.xaml
@@ -13,4 +13,5 @@
     <BitmapImage x:Key="imgBaseMsgErr" UriSource="/Resources/BaseMsgErr.png"/>
     <BitmapImage x:Key="imgBaseMsgInfo" UriSource="/Resources/BaseMsgInfo.png"/>
     <BitmapImage x:Key="imgBaseMsgQue" UriSource="/Resources/BaseMsgQue.png"/>
+    <BitmapImage x:Key="OrderWeishopIcon" UriSource="/Resources/order_weishop_icon.png" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/29WxOrderWpf/Styles/UcWaterMarkTextBoxStyle.xaml b/29WxOrderWpf/Styles/UcWaterMarkTextBoxStyle.xaml
new file mode 100644
index 0000000..ed31d67
--- /dev/null
+++ b/29WxOrderWpf/Styles/UcWaterMarkTextBoxStyle.xaml
@@ -0,0 +1,38 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:_29WxOrderWpf.UserControls">
+    
+    <Style TargetType="{x:Type local:UcWaterMarkTextBox}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="WaterMark" Value="请输入"/>
+        <!--<Setter Property="Text" Value=""/>-->
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:UcWaterMarkTextBox}">
+                    <Border x:Name="border" CornerRadius="4" BorderBrush="{TemplateBinding BorderBrush}" 
+                            BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                        <Grid>
+                            <ScrollViewer x:Name="PART_ContentHost" Focusable="False" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
+                            <!--<TextBlock Text="{TemplateBinding WaterMark}" Grid.Column="2" Margin="8,0,8,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray"
+                                       Visibility="{Binding ElementName=txtGoodsName,Path=Text,Converter={StaticResource NotHasTextVisibility}}"></TextBlock>-->
+                            <TextBlock Text="{TemplateBinding WaterMark}" Grid.Column="2" Margin="8,0,8,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray"
+                                       ></TextBlock>
+
+                            <TextBlock Text="33333" Grid.Column="2" Margin="8,0,8,0" VerticalAlignment="Center" IsHitTestVisible="False" Foreground="LightGray"
+                                       ></TextBlock>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <!--去除高亮框-->
+        <Style.Triggers>
+            <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                <Setter Property="BorderBrush" Value="Transparent"/>
+                <Setter Property="BorderThickness" Value="0"/>
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+</ResourceDictionary>
\ No newline at end of file
diff --git a/29WxOrderWpf/UserControls/UcWaterMarkTextBox.cs b/29WxOrderWpf/UserControls/UcWaterMarkTextBox.cs
new file mode 100644
index 0000000..6621b62
--- /dev/null
+++ b/29WxOrderWpf/UserControls/UcWaterMarkTextBox.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace _29WxOrderWpf.UserControls
+{
+    public class UcWaterMarkTextBox : TextBox
+    {
+        public UcWaterMarkTextBox()
+        {
+            this.DataContext = this;
+        }
+
+        public static readonly DependencyProperty WaterMarkProperty = DependencyProperty.Register(
+            "WaterMark", typeof(string), typeof(UcWaterMarkTextBox), null);
+        public string WaterMark
+        {
+            get { return (string)GetValue(WaterMarkProperty); }
+            set { SetValue(WaterMarkProperty, value); }
+        }
+    }
+}
diff --git a/AllBase/Model/oms_wei_order_info.cs b/AllBase/Model/oms_wei_order_info.cs
index 86427ce..f13a25c 100644
--- a/AllBase/Model/oms_wei_order_info.cs
+++ b/AllBase/Model/oms_wei_order_info.cs
@@ -10,6 +10,9 @@ namespace AllBase.Model
     public class oms_wei_order_info
     {
         public bool is_select { get; set; }
+        public bool is_visible { get; set; } = true;
+
+
         public long id { get; set; }
         public long shop_id { get; set; }
         public string shop_name { get; set; }