From a005946410e9ae5a93e449fb4ca3e798387f5830 Mon Sep 17 00:00:00 2001
From: wule <jtt_fan@qq.com>
Date: Mon, 22 Jun 2026 21:54:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=A7=E7=BB=AD=E8=B0=83=E6=95=B4=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 29WxOrderWpf/29WxOrderWpf.csproj              |   7 +
 .../Ctrls/OrderCtrls/OrderListCtrl.xaml       |   3 +-
 .../Ctrls/OrderCtrls/OrderListCtrl.xaml.cs    |  55 ++-
 .../Ctrls/OrderCtrls/OrderListRowCtrl.xaml    | 144 ++------
 .../Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs |  39 ++-
 .../OrderCtrls/OrderListRowItemCtrl.xaml      | 254 ++++++++++++++
 .../OrderCtrls/OrderListRowItemCtrl.xaml.cs   |  54 +++
 29WxOrderWpf/Utils/UiCtrlUtils.cs             |  19 ++
 AllBase/29WxOrderAllBase.csproj               |   4 +-
 AllBase/Model/oms_wei_order_info.cs           | 239 ++++++++++---
 AllBase/Model/oms_wei_order_item.cs           | 154 ---------
 AllBase/Model/oms_wei_order_item_info.cs      | 320 ++++++++++++++++++
 AllBase/Model/oms_wei_refund_info.cs          | 200 +++++++++++
 13 files changed, 1166 insertions(+), 326 deletions(-)
 create mode 100644 29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
 create mode 100644 29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
 delete mode 100644 AllBase/Model/oms_wei_order_item.cs
 create mode 100644 AllBase/Model/oms_wei_order_item_info.cs
 create mode 100644 AllBase/Model/oms_wei_refund_info.cs

diff --git a/29WxOrderWpf/29WxOrderWpf.csproj b/29WxOrderWpf/29WxOrderWpf.csproj
index 9ab11fe..7bcc330 100644
--- a/29WxOrderWpf/29WxOrderWpf.csproj
+++ b/29WxOrderWpf/29WxOrderWpf.csproj
@@ -94,6 +94,9 @@
     <Compile Include="Ctrls\OrderCtrls\OrderListRowHeaderCtrl.xaml.cs">
       <DependentUpon>OrderListRowHeaderCtrl.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Ctrls\OrderCtrls\OrderListRowItemCtrl.xaml.cs">
+      <DependentUpon>OrderListRowItemCtrl.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Ctrls\ShopCtrls\ShopDataGridCtrl.xaml.cs">
       <DependentUpon>ShopDataGridCtrl.xaml</DependentUpon>
     </Compile>
@@ -127,6 +130,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Ctrls\OrderCtrls\OrderListRowItemCtrl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Ctrls\ShopCtrls\ShopDataGridCtrl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
index 73b48e3..8df7233 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml
@@ -142,7 +142,7 @@
                 </DataGrid>
             </Border>
         </Grid>
-        <ListBox IsHitTestVisible="True" BorderThickness="0" ItemsSource="{Binding lstFilterOrder}" Grid.Row="3" HorizontalContentAlignment="Stretch" x:Name="lbxOrder" Margin="0,0,0,4">
+        <ListBox BorderThickness="0" ItemsSource="{Binding lstFilterOrder}" Grid.Row="3" HorizontalContentAlignment="Stretch" x:Name="lbxOrder" Margin="0,0,0,4">
             <!--使用自定义属性模板去除ListBox高亮显示框-->
             <ListBox.ItemContainerStyle>
                 <Style TargetType="ListBoxItem">
@@ -162,6 +162,7 @@
                     <!--此处绑定将数据源传递给子自定义控件OrderListRowCtrl-->
                     <local:OrderListRowCtrl DataContext="{Binding}" VerticalAlignment="Center" VerticalContentAlignment="Center"></local:OrderListRowCtrl>
                 </DataTemplate>
+                
             </ListBox.ItemTemplate>
         </ListBox>
         <Grid x:Name="gridFooter" Grid.Row="4">
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
index 3707341..7996b06 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListCtrl.xaml.cs
@@ -70,6 +70,10 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             lstOrder.SortDesc(o => o.order_id.ParseToLong());
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="filterGetCondition">按过滤条件读取读取服务端订单</param>
         void GetOrder(bool filterGetCondition = false)
         {
             Dispatcher.Invoke(new Action(() =>
@@ -92,6 +96,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                     page++;
                     var url = BaseClass.Build29WxObjString("order/get_order_list");
                     var data = UserLogin.GetSignaturex() + "&page=" + page;
+                    if (page > 1)
+                        data += "&is_not_count=true";
                     data += "&page_size=" + pageSize;
                     var shop_id = string.Join(",", GlobalConfig.ShopLoginList.Select(s => s.ErpShopId).Where(s => !s.IsNullOrEmpty()));
                     Dispatcher.Invoke(new Action(() =>
@@ -131,6 +137,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 
                     }
 
+                    // 读取订单详情
+                    Thread.Sleep(100);
                     var url1 = BaseClass.Build29WxObjString("order/get_order_item_list");
                     var data1 = UserLogin.GetSignaturex();
                     data1 += "&erp_order_id_in=" + order_ids;
@@ -142,9 +150,25 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                         BaseMsgWindow.ShowError(MainWindow.Instance, "订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
                         break;
                     }
+                    List<oms_wei_order_item_info> orderItems = new List<oms_wei_order_item_info>();
+                    try { orderItems = JsonHelper.DeserializeJsonToList<oms_wei_order_item_info>(JObject.Parse(html1)["data"].ParseToString()); } catch { }
+                    
 
-                    List<oms_wei_order_item> orderItems = new List<oms_wei_order_item>();
-                    try { orderItems = JsonHelper.DeserializeJsonToList<oms_wei_order_item>(JObject.Parse(html1)["data"].ParseToString()); } catch { }
+                    // 读取售后单
+                    Thread.Sleep(100);
+                    var url2 = BaseClass.Build29WxObjString("order/get_refund_list");
+                    var data2 = UserLogin.GetSignaturex();
+                    data2 += "&erp_order_id_in=" + order_ids;
+                    var html2 = GetHtml.PostUtf8(url2, data2);
+                    if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
+                        html2 = GetHtml.PostUtf8(url, data);
+                    if (string.IsNullOrEmpty(html2) || !html2.Contains("\"code\":200"))
+                    {
+                        BaseMsgWindow.ShowError(MainWindow.Instance, "订单读取失败 " + BaseRegex.GetStringJson(ref html, "msg"));
+                        break;
+                    }
+                    List<oms_wei_refund_info> refunds = new List<oms_wei_refund_info>();
+                    try { refunds = JsonHelper.DeserializeJsonToList<oms_wei_refund_info>(JObject.Parse(html2)["data"].ParseToString()); } catch { }
 
                     foreach (JObject jObj in jArr)
                     {
@@ -153,15 +177,19 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                             try
                             {
                                 var order = JsonHelper.DeserializeJsonToObject<oms_wei_order_info>(JsonHelper.SerializeObject(jObj));
-                                order.order_items = new ObservableCollection<oms_wei_order_item>();
-                                foreach(var item in orderItems.Where(oi => oi.order_id == order.order_id))
+                                //装载订单商品详情
+                                order.order_items = new ObservableCollection<oms_wei_order_item_info>();
+                                foreach (var item in orderItems.Where(oi => oi.order_id == order.order_id))
                                 {
-                                    if (item.cash_coupon_discounted_price > 0)
-                                    {
-
-                                    }
+                                    item.item_order = order;
                                     order.order_items.Add(item);
                                 }
+                                //装载订单售后详情
+                                order.refunds = new ObservableCollection<oms_wei_refund_info>();
+                                foreach (var item in refunds.Where(of => of.order_id == order.order_id))
+                                {
+                                    order.refunds.Add(item);
+                                }
 
                                 var orderExist = lstOrder.FirstOrDefault(o => o.order_id == order.order_id);
                                 if (orderExist != null)
@@ -176,6 +204,9 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                                 {
                                     lstOrder.Add(order);
                                 }
+                                if (order.order_items.Count > 1)
+                                {
+                                }
 
                                 FilterOneOrder(order);
                             }
@@ -204,7 +235,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                         tabItem = this.tabOrderType.Items.Cast<TabItem>().FirstOrDefault(t => t.Header.ParseToString().StartsWith("退款单"));
                         if (tabItem != null)
                         {
-                            tabItem.Header = "退款单(" + lstOrder.Where(r => r.status == 200).Count() + ")";
+                            tabItem.Header = "退款单(" + lstOrder.Where(r => /*r.status == 200 ||*/ r.refunds?.Count > 0).Count() + ")";
                         }
                         tabItem = this.tabOrderType.Items.Cast<TabItem>().FirstOrDefault(t => t.Header.ParseToString().StartsWith("全部订单"));
                         if (tabItem != null)
@@ -302,7 +333,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             {
                 return true;
             }
-            if (((tabOrderType.SelectedItem as TabItem)?.Header).ParseToString().StartsWith("退款单") && (order.status != 200))
+            if (((tabOrderType.SelectedItem as TabItem)?.Header).ParseToString().StartsWith("退款单") && (/*order.status != 200 &&*/ (order.refunds?.Count).ParseToInt() == 0))
             {
                 return true;
             }
@@ -353,8 +384,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
                 if (container != null)
                 {
                     // 找到grid控件并修改列大小
-                    Grid grid = UiCtrlUtils.FindVisualChild<Grid>(container, "gridListItem");
-                    if (grid != null)
+                    var grids = UiCtrlUtils.FindVisualChildAll<Grid>(container, "gridListItem");
+                    foreach (var grid in grids)
                     {
                         for (int i = 0; i < grid.ColumnDefinitions.Count; i++)
                         {
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml
index 61e4e0e..2bc83aa 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml
@@ -24,131 +24,41 @@
                 <RowDefinition Height="auto"></RowDefinition>
                 <RowDefinition Height="*"></RowDefinition>
             </Grid.RowDefinitions>
+
             <!--子控件是普通控件而非模板页控件，无需指定DataContext="{Binding}"-->
             <local:OrderListRowHeaderCtrl></local:OrderListRowHeaderCtrl>
             <!--<local:OrderListRowHeaderCtrl DataContext="{Binding}"></local:OrderListRowHeaderCtrl>-->
             <Border Grid.Row="1" Background="Transparent" CornerRadius="0,0,12,12" >
-                <Grid>
+                <Grid x:Name="gridChildOrder">
                     <Grid.RowDefinitions>
                         <RowDefinition Height="6"></RowDefinition>
-                        <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="6"></RowDefinition>
                     </Grid.RowDefinitions>
-                    <Grid x:Name="gridListItem" Grid.Row="1" VerticalAlignment="Center">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="50"></ColumnDefinition>
-                            <ColumnDefinition Width="200*"></ColumnDefinition>
-                            <ColumnDefinition Width="100*"></ColumnDefinition>
-                            <ColumnDefinition Width="100*"></ColumnDefinition>
-                            <ColumnDefinition Width="160*"></ColumnDefinition>
-                            <ColumnDefinition Width="100*"></ColumnDefinition>
-                            <ColumnDefinition Width="120*"></ColumnDefinition>
-                            <ColumnDefinition Width="82*"></ColumnDefinition>
-                        </Grid.ColumnDefinitions>
-                        <!--选择框-->
-                        <CheckBox Grid.Column="0" Background="Transparent" HorizontalAlignment="Center" VerticalAlignment="Center" Tag="{Binding order_id}" IsChecked="{Binding IsSelect, Mode=TwoWay}" Click="CheckBox_Click"/>
-                        <!--订单商品信息-->
-                        <Grid Grid.Column="1" Background="Transparent" VerticalAlignment="Center">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="auto" MinWidth="50"></ColumnDefinition>
-                                <ColumnDefinition Width="*"></ColumnDefinition>
-                            </Grid.ColumnDefinitions>
-                            <Image Grid.Row="1" Grid.Column="0" VerticalAlignment="Top" Height="100" Width="100" Margin="0,2,8,2" Source="{Binding order_item.thumb_img, Converter={StaticResource ImageUrlToBitmapImage}}"></Image>
-
-                            <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>
-
-                                <!--<Image Grid.RowSpan="20" Grid.Column="0" Height="80" Width="80" Margin="0,0,8,0" Source="{DynamicResource err_pic}"></Image>-->
-                                <uc:UcWaterMarkTextBox WaterMark="商品名称" x:Name="txtGoodsName" Text="{Binding order_item.title}" Grid.Column="1" Grid.Row="1" Margin="0,2,4,2" 
-                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" FontWeight="Bold"/>
-
-                                <TextBox Text="数量：" Grid.Column="1" Grid.Row="2" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                                <uc:UcWaterMarkTextBox WaterMark="SKU数量" Text="{Binding order_item.sku_cnt}" Grid.Column="1" Grid.Row="2" Margin="36,2,4,2" VerticalAlignment="Top" 
-                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
-
-                                <TextBox Text="规格：" Grid.Column="1" Grid.Row="3" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                                <uc:UcWaterMarkTextBox WaterMark="规格" Text="待连表查询" Grid.Column="1" Grid.Row="3" Margin="36,2,4,2" VerticalAlignment="Top" 
-                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
-
-                                <TextBox Text="平台商品ID：" Grid.Column="1" Grid.Row="4" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                                <uc:UcWaterMarkTextBox WaterMark="平台商品ID" Text="{Binding order_item.product_id}" Grid.Column="1" Grid.Row="4" Margin="72,2,4,2" VerticalAlignment="Top" 
-                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
-
-                                <TextBox Text="系统商品ID：" Grid.Column="1" Grid.Row="5" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                                <uc:UcWaterMarkTextBox WaterMark="系统商品ID" Text="{Binding order_item.out_product_id}" Grid.Column="1" Grid.Row="5" Margin="72,2,4,2" VerticalAlignment="Top" 
-                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
-                                <TextBox Text="系统sku编码：" Grid.Column="1" Grid.Row="6" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                                <uc:UcWaterMarkTextBox WaterMark="系统sku编码" Text="{Binding order_item.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="2" 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="4" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                            <uc:UcWaterMarkTextBox WaterMark="成交时间" Text="{Binding create_time_str}" 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="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="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:UcWaterMarkTextBox WaterMark="售价" Text="{Binding sale_price_total_str}" Grid.Column="1" Grid.Row="1" Margin="36,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"/>
-                            <uc:UcWaterMarkTextBox WaterMark="平台优惠" Text="{Binding cash_coupon_discounted_price_str}" Grid.Column="1" Grid.Row="2" Margin="60,2,4,2" VerticalAlignment="Top" 
-                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
-                            <TextBox Text="进价：" Grid.Column="1" Grid.Row="3" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                            <uc:UcWaterMarkTextBox WaterMark="进价" Text="" Grid.Column="1" Grid.Row="3" Margin="36,2,4,2" VerticalAlignment="Top" 
-                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
-                            <TextBox Text="运费：" Grid.Column="1" Grid.Row="4" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                            <uc:UcWaterMarkTextBox WaterMark="运费" Text="" Grid.Column="1" Grid.Row="4" Margin="36,2,4,2" VerticalAlignment="Top" 
-                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
-                            <TextBox Text="平台服务费：" Grid.Column="1" Grid.Row="5" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                            <uc:UcWaterMarkTextBox WaterMark="平台服务费" Text="" 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,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                            <uc:UcWaterMarkTextBox WaterMark="达人佣金" Text="" 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,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                            <uc:UcWaterMarkTextBox WaterMark="外采金额" Text="" Grid.Row="7" Margin="60,0,4,0" VerticalAlignment="Center" 
-                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
-                            <TextBox Text="利润：" Grid.Column="1" Grid.Row="8" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
-                            <uc:UcWaterMarkTextBox WaterMark="外采金额" Text="" Grid.Row="8" Margin="36,0,4,0" VerticalAlignment="Center" 
-                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" FontWeight="Bold"/>
-                        </Grid>
-                    </Grid>
+                    <!--<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/OrderListRowCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs
index a093165..ace29a2 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowCtrl.xaml.cs
@@ -30,7 +30,30 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             //bitImage.BeginInit();
             //bitImage.UriSource = new Uri(imageUrl, UriKind.Absolute);
             //bitImage.EndInit();
-            //img.Source = bitImage;
+            //img.Source = bitImage; 
+
+
+            //gridChildOrder.Children.Clear();
+            this.DataContextChanged += OrderListRowCtrl_DataContextChanged;
+        }
+
+        private void OrderListRowCtrl_DataContextChanged(object sender, DependencyPropertyChangedEventArgs e)
+        {
+            //if (gridChildOrder.Children.Count > 0)
+            //    return;
+
+            var order = this.DataContext as AllBase.Model.oms_wei_order_info;
+            if (order == null)
+                return;
+
+            int index = 0;
+            foreach (var orderItem in order.order_items)
+            {
+                index++;
+                var rowItem = new OrderListRowItemCtrl() { DataContext = orderItem, Name = "rowItem" + index };
+                Grid.SetRow(rowItem, index);
+                this.gridChildOrder.Children.Add(rowItem);
+            }
         }
 
         private void CheckBox_Click(object sender, RoutedEventArgs e)
@@ -43,5 +66,19 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
             { 
             }
         }
+
+        private void btnSeeAddressDetail_Click(object sender, RoutedEventArgs e)
+        {
+            var order = this.DataContext as AllBase.Model.oms_wei_order_info;
+            if (order == null)
+                return;
+        }
+
+        private void btnGetRefundAddress_Click(object sender, RoutedEventArgs e)
+        {
+            var order = this.DataContext as AllBase.Model.oms_wei_order_info;
+            if (order == null)
+                return;
+        }
     }
 }
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
new file mode 100644
index 0000000..b7e21f1
--- /dev/null
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml
@@ -0,0 +1,254 @@
+<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:uc="clr-namespace:_29WxOrderWpf.UserControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="250" d:DesignWidth="1200">
+
+    <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="50"></ColumnDefinition>
+                <ColumnDefinition Width="200*"></ColumnDefinition>
+                <ColumnDefinition Width="100*"></ColumnDefinition>
+                <ColumnDefinition Width="100*"></ColumnDefinition>
+                <ColumnDefinition Width="160*"></ColumnDefinition>
+                <ColumnDefinition Width="100*"></ColumnDefinition>
+                <ColumnDefinition Width="120*"></ColumnDefinition>
+                <ColumnDefinition Width="82*"></ColumnDefinition>
+            </Grid.ColumnDefinitions>
+            <!--选择框-->
+            <CheckBox Grid.Column="0" Background="Transparent" HorizontalAlignment="Center" VerticalAlignment="Center" Tag="{Binding order_id}" IsChecked="{Binding item_order.IsSelect, Mode=TwoWay}" Click="CheckBox_Click"/>
+            <!--订单商品信息-->
+            <Grid Grid.Column="1" Background="Transparent" VerticalAlignment="Center">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="auto" MinWidth="50"></ColumnDefinition>
+                    <ColumnDefinition Width="*"></ColumnDefinition>
+                </Grid.ColumnDefinitions>
+                <Image Grid.Row="1" Grid.Column="0" VerticalAlignment="Top" Height="100" Width="100" Margin="0,2,8,2" Source="{Binding thumb_img, Converter={StaticResource ImageUrlToBitmapImage}}"></Image>
+
+                <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>
+
+                    <!--<Image Grid.RowSpan="20" Grid.Column="0" Height="80" Width="80" Margin="0,0,8,0" Source="{DynamicResource err_pic}"></Image>-->
+                    <uc:UcWaterMarkTextBox WaterMark="商品名称" x:Name="txtGoodsName" Text="{Binding title}" Grid.Column="1" Grid.Row="1" Margin="0,2,4,2" 
+                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" FontWeight="Bold"/>
+
+                    <TextBox Text="数量：" Grid.Column="1" Grid.Row="2" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+                    <uc:UcWaterMarkTextBox WaterMark="SKU数量" Text="{Binding sku_cnt}" Grid.Column="1" Grid.Row="2" Margin="36,2,4,2" VerticalAlignment="Top" 
+                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+
+                    <TextBox Text="规格：" Grid.Column="1" Grid.Row="3" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+                    <uc:UcWaterMarkTextBox WaterMark="规格" Text="{Binding sku_attr_str}" Grid.Column="1" Grid.Row="3" Margin="36,2,4,2" VerticalAlignment="Top" 
+                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+
+                    <TextBox Text="平台商品ID：" Grid.Column="1" Grid.Row="4" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+                    <uc:UcWaterMarkTextBox WaterMark="平台商品ID" Text="{Binding product_id}" Grid.Column="1" Grid.Row="4" Margin="72,2,4,2" VerticalAlignment="Top" 
+                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+
+                    <TextBox Text="系统商品ID：" Grid.Column="1" Grid.Row="5" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+                    <uc:UcWaterMarkTextBox WaterMark="系统商品ID" Text="{Binding out_product_id}" Grid.Column="1" Grid.Row="5" Margin="72,2,4,2" VerticalAlignment="Top" 
+                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+                    <TextBox Text="系统sku编码：" Grid.Column="1" Grid.Row="6" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+                    <uc:UcWaterMarkTextBox WaterMark="系统sku编码" Text="{Binding out_sku_id}" Grid.Column="1" Grid.Row="6" Margin="78,2,4,2" VerticalAlignment="Top" 
+                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+                </Grid>
+            </Grid>
+            <!--订单时间信息-->
+            <Grid Grid.Column="2" 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:UcWaterMarkTextBox WaterMark="成交时间" Text="{Binding item_order.create_time_str}" Grid.Column="1" Grid.Row="1" Margin="60,2,4,2" VerticalAlignment="Top" 
+                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+                <TextBox Text="发货时间：" Grid.Column="1" Grid.Row="2" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"
+                                     Visibility="{Binding item_order.ship_done_time_visibility}"/>
+                <uc:UcWaterMarkTextBox WaterMark="发货时间" Text="{Binding item_order.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 item_order.ship_done_time_visibility}"/>
+                <!--refund_time_str-->
+                <TextBox Text="退款时间：" Grid.Column="1" Grid.Row="3" Margin="0,2,4,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"
+                                     Visibility="{Binding refund_time_visibility}"/>
+                <uc:UcWaterMarkTextBox WaterMark="退款时间" Text="{Binding refund_time_str}" Grid.Column="1" Grid.Row="3" Margin="60,2,4,2" VerticalAlignment="Top" 
+                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Visibility="{Binding refund_time_visibility}"/>
+            </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="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:UcWaterMarkTextBox WaterMark="售价" Text="{Binding real_price_str}" Grid.Column="1" Grid.Row="1" Margin="36,0,4,0" VerticalAlignment="Top" 
+                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+                <TextBox Text="平台优惠：" Grid.Column="1" Grid.Row="2" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+                <uc:UcWaterMarkTextBox WaterMark="平台优惠" Text="{Binding cash_coupon_discounted_price_str}" Grid.Column="1" Grid.Row="2" Margin="60,0,4,0" VerticalAlignment="Top" 
+                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+                <TextBox Text="进价：" Grid.Column="1" Grid.Row="3" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"
+                                     Visibility="{Binding purchase_price_visibility}"/>
+                <uc:UcWaterMarkTextBox WaterMark="进价" Text="{Binding purchase_price_str}" Grid.Column="1" Grid.Row="3" Margin="36,0,4,0" VerticalAlignment="Top" 
+                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Visibility="{Binding purchase_price_visibility}"/>
+                <TextBox Text="运费：" Grid.Column="1" Grid.Row="4" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"
+                                     Visibility="{Binding freight_visibility}"/>
+                <uc:UcWaterMarkTextBox WaterMark="运费" Text="{Binding freight_str}" Grid.Column="1" Grid.Row="4" Margin="36,0,4,0" VerticalAlignment="Top" 
+                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" Visibility="{Binding freight_visibility}"/>
+                <TextBox Text="平台服务费：" Grid.Column="1" Grid.Row="5" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+                <uc:UcWaterMarkTextBox WaterMark="平台服务费" Text="{Binding predict_commission_fee_string}" Grid.Row="5" Margin="72,0,4,0" VerticalAlignment="Center" 
+                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+                <TextBox Text="达人佣金：" Grid.Column="1" Grid.Row="6" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+                <uc:UcWaterMarkTextBox WaterMark="达人佣金" Text="{Binding commission_amount_str}" Grid.Row="6" Margin="60,0,4,0" VerticalAlignment="Center" 
+                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+                <TextBox Text="外采金额：" Grid.Column="1" Grid.Row="7" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+                <uc:UcWaterMarkTextBox WaterMark="外采金额" Text="{Binding out_amount_str}" Grid.Row="7" Margin="60,0,4,0" VerticalAlignment="Center" 
+                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+                <TextBox Text="利润：" Grid.Column="1" Grid.Row="8" Margin="0,0,4,0" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+                <uc:UcWaterMarkTextBox WaterMark="利润"  Text="{Binding profit_str}" Grid.Row="8" Margin="36,0,4,0" VerticalAlignment="Center" 
+                                                   Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap" FontWeight="Bold"/>
+            </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>
+
+                <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="3">
+
+                </WrapPanel>
+
+                <TextBox Text="{Binding item_refund.statusStr}" Grid.Column="1" Grid.Row="1" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" 
+                         BorderThickness="0" Foreground="{Binding item_refund.refundStatusColor}" HorizontalAlignment="Center"/>
+                <TextBox Text="{Binding item_refund.reasonTextStr}" Grid.Column="1" Grid.Row="2" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" 
+                         BorderThickness="0" Foreground="#f56c6c" HorizontalAlignment="Center"/>
+                <TextBox Text="{Binding refundResult}" Grid.Column="1" Grid.Row="3" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" 
+                         BorderThickness="0" Foreground="#f56c6c" HorizontalAlignment="Center"/>
+
+                <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="4">
+                    <TextBox Text="收货地址：" Grid.Column="1" Grid.Row="1" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+                    <uc:UcWaterMarkTextBox WaterMark="收货地址" Text="{Binding item_order.address_str}" Grid.Column="1" Grid.Row="1" Margin="0,2,4,2" VerticalAlignment="Top" 
+                                                       Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+                    <Button Grid.Column="10" x:Name="btnSeeAddressDetail" Background="Transparent" Foreground="#409eff" BorderBrush="Transparent"
+                                        Margin="4,0,0,0" Content="👁" Click="btnSeeAddressDetail_Click" Tag="{Binding order_id}"></Button>
+                </WrapPanel>
+                <Button Grid.Column="1" Grid.Row="5" x:Name="btnGetRefundAddress" Background="Transparent" HorizontalAlignment="Center" Foreground="#409eff" BorderBrush="Transparent"
+                                        Margin="4,0,0,0" Content="仓库退货地址：点击复制" Click="btnGetRefundAddress_Click" Tag="{Binding order_id}"></Button>
+            </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 Text="发货：" Grid.Column="1" Grid.Row="1" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+                <uc:UcWaterMarkTextBox WaterMark="发货" Text="" Grid.Column="1" Grid.Row="1" Margin="0,2,4,2" VerticalAlignment="Top" 
+                           Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>-->
+                <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="2">
+                    <TextBox Text="外采：" Grid.Column="1" Grid.Row="1" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+                    <uc:UcWaterMarkTextBox WaterMark="外采" Text="{Binding  item_order.out_express_company}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
+                           Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+                    <uc:UcWaterMarkTextBox WaterMark="外采" Text="-" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
+                           Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+                    <uc:UcWaterMarkTextBox WaterMark="外采" Text="{Binding  item_order.out_express_no}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2,4,2" VerticalAlignment="Top" 
+                           Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+                </WrapPanel>
+                <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="3">
+                    <TextBox Text="退货：" Grid.Column="1" Grid.Row="1" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+                    <uc:UcWaterMarkTextBox WaterMark="退货" Text="{Binding item_refund.return_delivery_name}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
+                           Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+                    <uc:UcWaterMarkTextBox WaterMark="退货" Text="-" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2" VerticalAlignment="Top" 
+                           Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+                    <uc:UcWaterMarkTextBox WaterMark="退货" Text="{Binding item_refund.return_waybill_id}" Grid.Column="1" Grid.Row="1" Padding="0" Margin="-2,2,4,2" VerticalAlignment="Top" 
+                           Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+                </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 item_order.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="#409eff" BorderBrush="Transparent"
+                Margin="4,0,0,0" Content="编辑" Click="btnCopyRemark_Click"></Button>-->
+            </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="*"></RowDefinition>
+                </Grid.RowDefinitions>
+
+                <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="1">
+                    <TextBox Text="买家留言：" Grid.Column="1" Grid.Row="1" Margin="0,2,0,2" VerticalAlignment="Top" Background="Transparent" IsReadOnly="True" BorderThickness="0"/>
+                    <uc:UcWaterMarkTextBox WaterMark="买家留言" Text="" Grid.Column="1" Grid.Row="1" Margin="0,2,4,2" VerticalAlignment="Top" 
+                                       Background="Transparent" IsReadOnly="True" BorderThickness="0" TextWrapping="Wrap"/>
+                </WrapPanel>
+
+                <WrapPanel Orientation="Horizontal" Grid.Column="1" Grid.Row="2">
+                    <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 item_order.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="#409eff" BorderBrush="Transparent"
+                            Margin="4,0,0,0" Content="编辑" Click="btnCopyRemark_Click"></Button>
+                </WrapPanel>
+            </Grid>
+        </Grid>
+    </Grid>
+</UserControl>
diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
new file mode 100644
index 0000000..059922d
--- /dev/null
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace _29WxOrderWpf.Ctrls.OrderCtrls
+{
+    /// <summary>
+    /// OrderListRowItemCtrl.xaml 的交互逻辑
+    /// </summary>
+    public partial class OrderListRowItemCtrl : UserControl
+    {
+        public OrderListRowItemCtrl()
+        {
+            InitializeComponent();
+        }
+
+        private void btnSeeAddressDetail_Click(object sender, RoutedEventArgs e)
+        {
+            var order = this.DataContext as AllBase.Model.oms_wei_order_info;
+            if (order == null)
+                return;
+        }
+
+        private void btnGetRefundAddress_Click(object sender, RoutedEventArgs e)
+        {
+            var order = this.DataContext as AllBase.Model.oms_wei_order_info;
+            if (order == null)
+                return;
+        }
+
+        private void CheckBox_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+
+        private void btnCopyRemark_Click(object sender, RoutedEventArgs e)
+        {
+
+        }
+    }
+
+
+}
diff --git a/29WxOrderWpf/Utils/UiCtrlUtils.cs b/29WxOrderWpf/Utils/UiCtrlUtils.cs
index 30e24ed..d32d516 100644
--- a/29WxOrderWpf/Utils/UiCtrlUtils.cs
+++ b/29WxOrderWpf/Utils/UiCtrlUtils.cs
@@ -66,5 +66,24 @@ namespace _29WxOrderWpf.Utils
             }
             return null;
         }
+
+        public static List<T> FindVisualChildAll<T>(DependencyObject obj, string xName) where T : DependencyObject
+        {
+            List<T> list= new List<T>();
+            for (int i = 0; i < VisualTreeHelper.GetChildrenCount(obj); i++)
+            {
+                DependencyObject child = VisualTreeHelper.GetChild(obj, i);
+                string controlName = child?.GetValue(Control.NameProperty) as string;
+                if (controlName == xName)
+                {
+                    list.Add((T)child);
+                }
+                else
+                {
+                    list.AddRange(FindVisualChildAll<T>(child, xName));
+                }
+            }
+            return list;
+        }
     }
 }
diff --git a/AllBase/29WxOrderAllBase.csproj b/AllBase/29WxOrderAllBase.csproj
index df78344..65966ea 100644
--- a/AllBase/29WxOrderAllBase.csproj
+++ b/AllBase/29WxOrderAllBase.csproj
@@ -100,6 +100,7 @@
     <Reference Include="NPOI.OpenXmlFormats, Version=2.5.4.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
       <HintPath>..\packages\NPOI.2.5.4\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
     </Reference>
+    <Reference Include="PresentationCore" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -140,7 +141,8 @@
     <Compile Include="Md5Base.cs" />
     <Compile Include="Model\MvvmBaseClasses\PropertyNotifyObject.cs" />
     <Compile Include="Model\oms_wei_order_info.cs" />
-    <Compile Include="Model\oms_wei_order_item.cs" />
+    <Compile Include="Model\oms_wei_order_item_info.cs" />
+    <Compile Include="Model\oms_wei_refund_info.cs" />
     <Compile Include="Model\o_shop_info.cs" />
     <Compile Include="Model\PddMultiBuyerInfo.cs" />
     <Compile Include="Model\PddPifaShopInfo.cs" />
diff --git a/AllBase/Model/oms_wei_order_info.cs b/AllBase/Model/oms_wei_order_info.cs
index 59ebf46..8a2041f 100644
--- a/AllBase/Model/oms_wei_order_info.cs
+++ b/AllBase/Model/oms_wei_order_info.cs
@@ -1,6 +1,7 @@
 using AllBase.Helper;
 using AllBase.Model.MvvmBaseClasses;
 using NaiBa.Util.Extension;
+using NPOI.OpenXmlFormats.Spreadsheet;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -8,27 +9,89 @@ using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows;
 
 namespace AllBase.Model
 {
     public class oms_wei_order_info : PropertyNotifyObject
     {
-        public ObservableCollection<oms_wei_order_item> order_items { get; set; } = new ObservableCollection<oms_wei_order_item>();
-        public oms_wei_order_item order_item
+
+        public ObservableCollection<oms_wei_order_item_info> order_items { get; set; } = new ObservableCollection<oms_wei_order_item_info>();
+        public oms_wei_order_item_info order_item1 { get { return order_items?.Count > 0 ? order_items[0] : null; } }
+        public oms_wei_order_item_info order_item2 { get { return order_items?.Count > 1 ? order_items[1] : null; } }
+        public oms_wei_order_item_info order_item3 { get { return order_items?.Count > 2 ? order_items[2] : null; } }
+        public oms_wei_order_item_info order_item4 { get { return order_items?.Count > 3 ? order_items[3] : null; } }
+        public oms_wei_order_item_info order_item5 { get { return order_items?.Count > 4 ? order_items[4] : null; } }
+        public Visibility order_item1_visibility { get { return order_item1 == null ? Visibility.Collapsed : Visibility.Visible; } }
+        public Visibility order_item2_visibility { get { return order_item2 == null ? Visibility.Collapsed : Visibility.Visible; } }
+        public Visibility order_item3_visibility { get { return order_item3 == null ? Visibility.Collapsed : Visibility.Visible; } }
+        public Visibility order_item4_visibility { get { return order_item4 == null ? Visibility.Collapsed : Visibility.Visible; } }
+        public Visibility order_item5_visibility { get { return order_item5 == null ? Visibility.Collapsed : Visibility.Visible; } }
+
+        public ObservableCollection<oms_wei_refund_info> refunds { get; set; } = new ObservableCollection<oms_wei_refund_info>();
+        //public oms_wei_refund_info refund
+        //{
+        //    get
+        //    {
+        //        if (refunds.FirstOrDefault() != null)
+        //            return refunds.FirstOrDefault();
+        //        return new oms_wei_refund_info();
+        //    }
+        //}
+
+
+        public string orderStatusStr
         {
             get
             {
-                if (order_items.FirstOrDefault() != null) 
-                    return order_items.FirstOrDefault();
-                return new oms_wei_order_item();
+                //状态10	待付款；20	待发货；21	部分发货；30	待收货；100	完成；200	全部商品售后之后，订单取消；250	未付款用户主动取消或超时未付款订单自动取消；
+                if (status == 10)
+                    return "待付款";
+                if (status == 21)
+                    return "部分发货";
+                if (status == 30)
+                    return "待收货";
+                if (status == 100)
+                    return "完成";
+                if (status == 200)
+                    return "已取消";
+                if (status == 250)
+                    return "未付款已取消";
+                return "未知状态";
             }
+            set { }
         }
 
+        /// <summary>
+        /// 订单生成时间
+        /// </summary>
         public string create_time_str
         {
             get { return BaseClass.StampToDateTime(create_time).ToString("yyyy-MM-dd HH:mm:ss"); }
-            set { create_time_str = value; }
+            set { }
         }
+
+        /// <summary>
+        /// 订单发货完成时间
+        /// </summary>
+        public string ship_done_time_str
+        {
+            get { return BaseClass.StampToDateTime(this.ship_done_time.ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"); }
+            set { }
+        }
+        /// <summary>
+        /// 订单发货完成时间可见
+        /// </summary>
+        public Visibility ship_done_time_visibility
+        {
+            get { return this.ship_done_time.ParseToInt() > 0 ? Visibility.Visible : Visibility.Collapsed; }
+            set { }
+        }
+
+
+        /// <summary>
+        /// 订单延迟发货时间状态文本
+        /// </summary>
         public string delivery_deadline_status_str
         {
             get
@@ -39,26 +102,137 @@ namespace AllBase.Model
                 }
                 return "剩余";
             }
-            set { delivery_deadline_status_str = value; }
+            set { /*delivery_deadline_status_str = value;*/ }
+        }
+        /// <summary>
+        /// 延迟发货时间(微信小店：商品发货时效，超时此时间未发货即为发货超时)文本
+        /// </summary>
+        public string delivery_deadline_str
+        {
+            get
+            {
+                if (this.status == 20 || this.status == 21)
+                {
+                    var deadlineTime = BaseClass.StampToDateTime(delivery_deadline.ParseToInt());
+                    var nowTime = DateTime.Now;
+                    if (deadlineTime < nowTime)
+                        return "已超时";
+
+                    var timeSpan = BaseClass.StampToDateTime(delivery_deadline.ParseToInt()) - nowTime;
+                    var durationStr = Math.Floor(timeSpan.TotalHours).ParseToInt() + "时" + timeSpan.Minutes + "分" + timeSpan.Seconds + "秒";
+                    return durationStr;
+                }
+                return "待获取状态";
+            }
+            set { /*delivery_deadline_str = value;*/ }
         }
 
-        /// <summary>
-        /// 订单中所有商品加起来的总售价
-        /// </summary>
-        public string sale_price_total_str
+        public string address_str
         {
-            get { return "￥" + (order_items.Sum(oi => oi.sale_price * oi.sku_cnt) * 0.01m).ParseToDecimal().ToString("0.00"); }
-            set { sale_price_total_str = value; }
-        }
-        /// <summary>
-        /// 订单内商品维度平台券优惠金额(利润需要计算这个金额在内)字符串
-        /// </summary>
-        public string cash_coupon_discounted_price_str
-        {
-            get { return "￥" + (order_items.Sum(oi => oi.cash_coupon_discounted_price.ParseToInt() * oi.sku_cnt) * 0.01m).ParseToDecimal().ToString("0.00"); }
-            set { cash_coupon_discounted_price_str = value; }
+            get { return user_name + " " + tel_number + " " + province_name + " " + city_name + " " + county_name + " " + detail_info; }
+            set { }
         }
 
+
+
+
+
+
+
+
+        ///// <summary>
+        ///// 订单中所有商品加起来的总售价文本
+        ///// </summary>
+        //public string real_price_str
+        //{
+        //    //get { return "￥" + (order_items.Sum(oi => oi.sale_price * oi.sku_cnt) * 0.01m).ParseToDecimal().ToString("0.00"); }
+        //    get { return "￥" + (order_items.Sum(oi => oi.real_price) * 0.01m).ParseToDecimal().ToString("0.00"); }
+        //    set { }
+        //}
+        ///// <summary>
+        ///// 订单内商品维度平台券优惠金额(利润需要计算这个金额在内)文本
+        ///// </summary>
+        //public string cash_coupon_discounted_price_str
+        //{
+        //    //get { return "￥" + (order_items.Sum(oi => oi.cash_coupon_discounted_price.ParseToInt() * oi.sku_cnt) * 0.01m).ParseToDecimal().ToString("0.00"); }
+        //    get { return "￥" + (order_items.Sum(oi => oi.cash_coupon_discounted_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
+        //    //get { return "￥" + (discounted_price * 0.01m).ParseToDecimal().ToString("0.00"); }
+        //    set { }
+        //}
+        ///// <summary>
+        ///// 采购价文本
+        ///// </summary>
+        //public string purchase_price_str
+        //{
+        //    get { return "￥" + (order_items.Sum(oi => oi.purchase_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
+        //    //get { return "￥" + (purchase_price * 0.01m).ParseToDecimal().ToString("0.00"); }
+        //    set { }
+        //}
+        //public Visibility purchase_price_visibility
+        //{
+        //    get { if (out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; }
+        //    set { }
+        //}
+        ///// <summary>
+        ///// 运费文本
+        ///// </summary>
+        //public string freight_str
+        //{
+        //    get { return "￥" + (order_items.Sum(oi => oi.freight.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
+        //    //get { return "￥" + (freight * 0.01m).ParseToDecimal().ToString("0.00"); }
+        //    set { }
+        //}
+        //public Visibility freight_visibility
+        //{
+        //    get { if (out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; }
+        //    set { }
+        //}
+        ///// <summary>
+        ///// 平台服务费
+        ///// </summary>
+        //public string predict_commission_fee_string
+        //{
+        //    get { return "￥" + (order_items.Sum(oi => oi.predict_commission_fee.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
+        //    //get { return "￥" + (predict_commission_fee * 0.01m).ParseToDecimal().ToString("0.00"); }
+        //    set { }
+        //}
+        ///// <summary>
+        ///// 达人佣金
+        ///// </summary>
+        //public string commission_amount_str
+        //{
+        //    get { return "￥" + (order_items.Sum(oi => oi.commission_amount.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
+        //    //get { return "￥" + (commission_amount * 0.01m).ParseToDecimal().ToString("0.00"); }
+        //    set { }
+        //}
+        ///// <summary>
+        ///// 外采金额文本
+        ///// </summary>
+        //public string out_amount_str
+        //{
+        //    get { return "￥" + (out_amount * 0.01m).ParseToDecimal().ToString("0.00"); }
+        //    set { /*out_amount_str = value;*/ }
+        //}
+        ///// <summary>
+        ///// 利润文本
+        ///// </summary>
+        //public string profit_str
+        //{
+        //    //get { return "￥" + (profit * 0.01m).ParseToDecimal().ToString("0.00"); }
+        //    get { return "￥" + ((profit - out_amount) * 0.01m).ParseToDecimal().ToString("0.00"); }
+        //    set { }
+        //}
+
+
+
+
+
+
+
+
+
+
+
         /// <summary>
         /// 是否被选中
         /// </summary>
@@ -83,25 +257,6 @@ namespace AllBase.Model
         /// </summary>
         public string openid { get; set; }
         public int create_time { get; set; }
-        public string delivery_deadline_str
-        {
-            get
-            {
-                if (this.status == 20 || this.status == 21)
-                {
-                    var deadlineTime = BaseClass.StampToDateTime(delivery_deadline.ParseToInt());
-                    var nowTime = DateTime.Now;
-                    if (deadlineTime < nowTime)
-                        return "已超时";
-
-                    var timeSpan = BaseClass.StampToDateTime(delivery_deadline.ParseToInt()) - nowTime;
-                    var durationStr = Math.Floor(timeSpan.TotalHours).ParseToInt() + "时" + timeSpan.Minutes + "分" + timeSpan.Seconds + "秒";
-                    return durationStr;
-                }
-                return "待获取状态";
-            }
-            set { delivery_deadline_str = value; }
-        }
 
         public int update_time { get; set; }
         public string unionid { get; set; }
@@ -154,6 +309,10 @@ namespace AllBase.Model
         /// </summary>
         public int? discounted_price { get; set; }
         /// <summary>
+        /// 利润（实付金额-采购价-平台服务费-达人佣金，达人佣金、采购价为空值则为0）
+        /// </summary>
+        public int? profit { get; set; }
+        /// <summary>
         /// 采购状态，默认值为：0未采购，推送仓库时修改为1采购
         /// </summary>
         public int? purchase_status { get; set; }
diff --git a/AllBase/Model/oms_wei_order_item.cs b/AllBase/Model/oms_wei_order_item.cs
deleted file mode 100644
index 38d73ea..0000000
--- a/AllBase/Model/oms_wei_order_item.cs
+++ /dev/null
@@ -1,154 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AllBase.Model
-{
-    public class oms_wei_order_item
-    {
-        /// <summary>
-        /// 订单商品表数据库id
-        /// </summary>
-        public long id { get; set; }
-        public long shop_id { get; set; }
-        /// <summary>
-        /// 商户ID
-        /// </summary>
-        public long merchant_id { get; set; }
-        /// <summary>
-        /// 订单id（平台订单id）
-        /// </summary>
-        public string order_id {  get; set; }
-        /// <summary>
-        /// 商品spuid
-        /// </summary>
-        public string product_id { get; set; }
-        public string sku_id { get; set; }
-        /// <summary>
-        /// sku小图
-        /// </summary>
-        public string thumb_img { get; set; }
-        /// <summary>
-        /// sku数量
-        /// </summary>
-        public int? sku_cnt { get; set; }
-        /// <summary>
-        /// 售卖单价（单位：分）
-        /// </summary>
-        public int? sale_price { get; set; }
-        /// <summary>
-        /// 商品名称
-        /// </summary>
-        public string title { get; set; }
-        /// <summary>
-        /// 正在售后/退款流程中的 sku 数量
-        /// </summary>
-        public int? on_aftersale_sku_cnt { get; set; }
-        /// <summary>
-        /// 完成售后/退款的 sku 数量
-        /// </summary>
-        public int? finish_aftersale_sku_cnt { get; set; }
-        /// <summary>
-        /// 商品编码
-        /// </summary>
-        public string sku_code { get; set; }
-        /// <summary>
-        /// 市场单价（单位：分）
-        /// </summary>
-        public int? market_price { get; set; }
-        /// <summary>
-        /// sku属性JSON
-        /// </summary>
-        public string sku_attrs { get; set; }
-        /// <summary>
-        /// sku实付总价，取estimate_price和change_price中较小值
-        /// </summary>
-        public int? real_price { get; set; }
-        /// <summary>
-        /// 商品外部spuid
-        /// </summary>
-        public string out_product_id { get; set; }
-        /// <summary>
-        /// 采购价
-        /// </summary>
-        public int? purchase_price { get; set; }
-        /// <summary>
-        /// 运费
-        /// </summary>
-        public int? freight { get; set; }
-        /// <summary>
-        /// 商品外部skuid
-        /// </summary>
-        public string out_sku_id { get; set; }
-        /// <summary>
-        /// 是否有优惠金额，非必填，默认为false
-        /// </summary>
-        public string is_discounted { get; set; }
-        /// <summary>
-        /// 优惠后sku总价，非必填，is_discounted为true时有值
-        /// </summary>
-        public int? estimate_price { get; set; }
-        /// <summary>
-        /// 是否修改过价格，非必填，默认为false
-        /// </summary>
-        public string is_change_price { get; set; }
-        /// <summary>
-        /// 改价后sku总价，非必填，is_change_price为true时有值
-        /// </summary>
-        public int? change_price { get; set; }
-        /// <summary>
-        /// 订单内商品维度平台券优惠金额(利润需要计算这个金额在内)
-        /// </summary>
-        public int? cash_coupon_discounted_price { get; set; }
-        /// <summary>
-        /// 区域库存id
-        /// </summary>
-        public string out_warehouse_id { get; set; }
-        /// <summary>
-        /// 退货地址
-        /// </summary>
-        public string return_address { get; set; }
-        /// <summary>
-        /// 商品发货信息JSON
-        /// </summary>
-        public string sku_deliver_info { get; set; }
-        /// <summary>
-        /// 商品额外服务信息JSON
-        /// </summary>
-        public string extra_service { get; set; }
-        /// <summary>
-        /// 是否使用了会员积分抵扣
-        /// </summary>
-        public string use_deduction { get; set; }
-        /// <summary>
-        /// 会员积分抵扣金额，单位为分
-        /// </summary>
-        public int? deduction_price { get; set; }
-        /// <summary>
-        /// 达人佣金（微信小店：分账金额），单位为分
-        /// </summary>
-        public int? predict_commission_fee { get; set; }
-        /// <summary>
-        /// 达人佣金（微信小店：分账金额），单位为分
-        /// </summary>
-        public int? commission_amount { get; set; }
-        /// <summary>
-        /// 商品优惠券信息，逐步替换 order.order_detail.coupon_info
-        /// </summary>
-        public string order_product_coupon_info_list { get; set; }
-        /// <summary>
-        /// 商品id(o_goods外键)
-        /// </summary>
-        public long? erp_goods_id { get; set; }
-        /// <summary>
-        /// 商品skuid(o_goods_sku外键)
-        /// </summary>
-        public long? erp_goods_sku_id { get; set; }
-        /// <summary>
-        /// 售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功  11 已取消
-        /// </summary>
-        public int? refund_status { get; set; }
-    }
-}
diff --git a/AllBase/Model/oms_wei_order_item_info.cs b/AllBase/Model/oms_wei_order_item_info.cs
new file mode 100644
index 0000000..ef69fc8
--- /dev/null
+++ b/AllBase/Model/oms_wei_order_item_info.cs
@@ -0,0 +1,320 @@
+using NaiBa.Util.Extension;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using static System.Windows.Forms.VisualStyles.VisualStyleElement;
+
+namespace AllBase.Model
+{
+    public class oms_wei_order_item_info
+    {
+
+        public oms_wei_order_info item_order { get; set; }
+        public oms_wei_refund_info item_refund 
+        {
+            get
+            {
+                if (item_order?.refunds?.Count == 0)
+                    return null;
+                if (item_order?.refunds?.Count == 1)
+                    return item_order?.refunds?.FirstOrDefault();
+                return item_order?.refunds?.FirstOrDefault(r => r.sku_id == this.sku_id);
+            }
+            set { }
+        }
+
+        public string refundResult
+        {
+            get
+            {
+                if (item_refund == null)
+                    return "";
+                if (item_refund.status != "MERCHANT_REFUND_SUCCESS" && item_refund.status != "MERCHANT_RETURN_SUCCESS")
+                    return "";
+                
+                return "商品退款数量：" + item_refund.count + "，订单状态：" + item_order.orderStatusStr; 
+            }
+            set { }
+        }
+
+        ///// <summary>
+        ///// 发货信息
+        ///// </summary>
+        //public string send_delivery_info
+        //{
+        //    get;
+        //    set;
+        //}
+
+        /// <summary>
+        /// 订单退款时间
+        /// </summary>
+        public string refund_time_str
+        {
+            get { return BaseClass.StampToDateTime((item_refund?.create_time).ParseToInt()).ToString("yyyy-MM-dd HH:mm:ss"); }
+            set { }
+        }
+        /// <summary>
+        /// 订单退款时间可见
+        /// </summary>
+        public Visibility refund_time_visibility
+        {
+            get 
+            { 
+                return (this.item_refund?.create_time) > 0 ? Visibility.Visible : Visibility.Collapsed; 
+            }
+            set { }
+        }
+
+
+        /// <summary>
+        /// 订单中所有商品加起来的总售价文本
+        /// </summary>
+        public string real_price_str
+        {
+            //get { return "￥" + (order_items.Sum(oi => oi.sale_price * oi.sku_cnt) * 0.01m).ParseToDecimal().ToString("0.00"); }
+            //get { return "￥" + (order_items.Sum(oi => oi.real_price) * 0.01m).ParseToDecimal().ToString("0.00"); }
+            get { return "￥" + (real_price * 0.01m).ParseToDecimal().ToString("0.00"); }
+            set { }
+        }
+        /// <summary>
+        /// 订单内商品维度平台券优惠金额(利润需要计算这个金额在内)文本
+        /// </summary>
+        public string cash_coupon_discounted_price_str
+        {
+            //get { return "￥" + (order_items.Sum(oi => oi.cash_coupon_discounted_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
+            get { return "￥" + (cash_coupon_discounted_price * 0.01m).ParseToDecimal().ToString("0.00"); }
+            set { }
+        }
+        /// <summary>
+        /// 采购价文本
+        /// </summary>
+        public string purchase_price_str
+        {
+            //get { return "￥" + (order_items.Sum(oi => oi.purchase_price.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
+            get { return "￥" + (purchase_price * 0.01m).ParseToDecimal().ToString("0.00"); }
+            set { }
+        }
+        public Visibility purchase_price_visibility
+        {
+            get { if (item_order.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; }
+            set { }
+        }
+        /// <summary>
+        /// 运费文本
+        /// </summary>
+        public string freight_str
+        {
+            //get { return "￥" + (order_items.Sum(oi => oi.freight.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
+            get { return "￥" + (freight * 0.01m).ParseToDecimal().ToString("0.00"); }
+            set { }
+        }
+        public Visibility freight_visibility
+        {
+            get { if (item_order.out_amount > 0) return Visibility.Collapsed; return Visibility.Visible; }
+            set { }
+        }
+        /// <summary>
+        /// 平台服务费
+        /// </summary>
+        public string predict_commission_fee_string
+        {
+            //get { return "￥" + (order_items.Sum(oi => oi.predict_commission_fee.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
+            get { return "￥" + (predict_commission_fee * 0.01m).ParseToDecimal().ToString("0.00"); }
+            set { }
+        }
+        /// <summary>
+        /// 达人佣金
+        /// </summary>
+        public string commission_amount_str
+        {
+            //get { return "￥" + (order_items.Sum(oi => oi.commission_amount.ParseToInt()) * 0.01m).ParseToDecimal().ToString("0.00"); }
+            get { return "￥" + (commission_amount * 0.01m).ParseToDecimal().ToString("0.00"); }
+            set { }
+        }
+        /// <summary>
+        /// 外采金额文本
+        /// </summary>
+        public string out_amount_str
+        {
+            //get { return "￥" + (item_order.out_amount * 0.01m).ParseToDecimal().ToString("0.00"); }
+            get { return "￥" + ((commission_amount.ParseToDecimal()) * 0.01m).ParseToDecimal().ToString("0.00"); }
+            set { }
+        }
+        /// <summary>
+        /// 利润文本
+        /// </summary>
+        public string profit_str
+        {
+            //get { return "￥" + (profit * 0.01m).ParseToDecimal().ToString("0.00"); }
+            //get { return "￥" + ((item_order.profit - item_order.out_amount) * 0.01m).ParseToDecimal().ToString("0.00"); }
+            get { return "￥" + ((real_price.ParseToDecimal() + cash_coupon_discounted_price.ParseToDecimal() - purchase_price.ParseToDecimal() - freight.ParseToDecimal() -
+                    predict_commission_fee.ParseToDecimal() - commission_amount.ParseToDecimal() - item_order.out_amount / item_order.order_items.Count) * 0.01m)
+                    .ParseToDecimal().ToString("0.00"); }
+            set { }
+        }
+
+
+        public string sku_attr_str
+        {
+            get 
+            {
+                try
+                {
+                    var jObj = JArray.Parse(sku_attrs);
+                    var str = string.Join(",", jObj.Select(j => j["attr_value"].ParseToString()));
+                    return str;
+                }
+                catch { return "获取失败"; }
+            }
+            set { }
+        }
+
+        /// <summary>
+        /// 订单商品表数据库id
+        /// </summary>
+        public long id { get; set; }
+        public long shop_id { get; set; }
+        /// <summary>
+        /// 商户ID
+        /// </summary>
+        public long merchant_id { get; set; }
+        /// <summary>
+        /// 订单id（平台订单id）
+        /// </summary>
+        public string order_id {  get; set; }
+        /// <summary>
+        /// 商品spuid
+        /// </summary>
+        public string product_id { get; set; }
+        public string sku_id { get; set; }
+        /// <summary>
+        /// sku小图
+        /// </summary>
+        public string thumb_img { get; set; }
+        /// <summary>
+        /// sku数量
+        /// </summary>
+        public int? sku_cnt { get; set; }
+        /// <summary>
+        /// 售卖单价（单位：分）
+        /// </summary>
+        public int? sale_price { get; set; }
+        /// <summary>
+        /// 商品名称
+        /// </summary>
+        public string title { get; set; }
+        /// <summary>
+        /// 正在售后/退款流程中的 sku 数量
+        /// </summary>
+        public int? on_aftersale_sku_cnt { get; set; }
+        /// <summary>
+        /// 完成售后/退款的 sku 数量
+        /// </summary>
+        public int? finish_aftersale_sku_cnt { get; set; }
+        /// <summary>
+        /// 商品编码
+        /// </summary>
+        public string sku_code { get; set; }
+        /// <summary>
+        /// 市场单价（单位：分）
+        /// </summary>
+        public int? market_price { get; set; }
+        /// <summary>
+        /// sku属性JSON
+        /// </summary>
+        public string sku_attrs { get; set; }
+        /// <summary>
+        /// sku实付总价，取estimate_price和change_price中较小值
+        /// </summary>
+        public int? real_price { get; set; }
+        /// <summary>
+        /// 商品外部spuid
+        /// </summary>
+        public string out_product_id { get; set; }
+        /// <summary>
+        /// 采购价
+        /// </summary>
+        public int? purchase_price { get; set; }
+        /// <summary>
+        /// 运费
+        /// </summary>
+        public int? freight { get; set; }
+        /// <summary>
+        /// 商品外部skuid
+        /// </summary>
+        public string out_sku_id { get; set; }
+        /// <summary>
+        /// 是否有优惠金额，非必填，默认为false
+        /// </summary>
+        public string is_discounted { get; set; }
+        /// <summary>
+        /// 优惠后sku总价，非必填，is_discounted为true时有值
+        /// </summary>
+        public int? estimate_price { get; set; }
+        /// <summary>
+        /// 是否修改过价格，非必填，默认为false
+        /// </summary>
+        public string is_change_price { get; set; }
+        /// <summary>
+        /// 改价后sku总价，非必填，is_change_price为true时有值
+        /// </summary>
+        public int? change_price { get; set; }
+        /// <summary>
+        /// 订单内商品维度平台券优惠金额(利润需要计算这个金额在内)
+        /// </summary>
+        public int? cash_coupon_discounted_price { get; set; }
+        /// <summary>
+        /// 区域库存id
+        /// </summary>
+        public string out_warehouse_id { get; set; }
+        /// <summary>
+        /// 退货地址
+        /// </summary>
+        public string return_address { get; set; }
+        /// <summary>
+        /// 商品发货信息JSON
+        /// </summary>
+        public string sku_deliver_info { get; set; }
+        /// <summary>
+        /// 商品额外服务信息JSON
+        /// </summary>
+        public string extra_service { get; set; }
+        /// <summary>
+        /// 是否使用了会员积分抵扣
+        /// </summary>
+        public string use_deduction { get; set; }
+        /// <summary>
+        /// 会员积分抵扣金额，单位为分
+        /// </summary>
+        public int? deduction_price { get; set; }
+        /// <summary>
+        /// 平台服务费（微信小店：预计技术服务费），单位为分
+        /// </summary>
+        public int? predict_commission_fee { get; set; }
+        /// <summary>
+        /// 达人佣金（微信小店：分账金额），单位为分
+        /// </summary>
+        public int? commission_amount { get; set; }
+        /// <summary>
+        /// 商品优惠券信息，逐步替换 order.order_detail.coupon_info
+        /// </summary>
+        public string order_product_coupon_info_list { get; set; }
+        /// <summary>
+        /// 商品id(o_goods外键)
+        /// </summary>
+        public long? erp_goods_id { get; set; }
+        /// <summary>
+        /// 商品skuid(o_goods_sku外键)
+        /// </summary>
+        public long? erp_goods_sku_id { get; set; }
+        /// <summary>
+        /// 售后状态 1：无售后或售后关闭，2：售后处理中，3：退款中，4： 退款成功  11 已取消
+        /// </summary>
+        public int? refund_status { get; set; }
+    }
+}
diff --git a/AllBase/Model/oms_wei_refund_info.cs b/AllBase/Model/oms_wei_refund_info.cs
new file mode 100644
index 0000000..4d8fee1
--- /dev/null
+++ b/AllBase/Model/oms_wei_refund_info.cs
@@ -0,0 +1,200 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Media;
+
+namespace AllBase.Model
+{
+    public class oms_wei_refund_info
+    {
+        public string statusStr
+        {
+            get
+            {
+                if (status == "USER_CANCELD") return "用户取消申请";
+                if (status == "MERCHANT_PROCESSING") return "商家受理中";
+                if (status == "MERCHANT_REJECT_REFUND") return "商家拒绝退款";
+                if (status == "MERCHANT_REJECT_RETURN") return "商家拒绝退货退款";
+                if (status == "USER_WAIT_RETURN") return "待买家退货";
+                if (status == "RETURN_CLOSED") return "退货退款关闭";
+                if (status == "MERCHANT_WAIT_RECEIPT") return "待商家收货";
+                if (status == "MERCHANT_OVERDUE_REFUND") return "商家逾期未退款";
+                if (status == "MERCHANT_REFUND_SUCCESS") return "退款完成";
+                if (status == "MERCHANT_RETURN_SUCCESS") return "退货退款完成";
+                if (status == "PLATFORM_REFUNDING") return "平台退款中";
+                if (status == "PLATFORM_REFUND_FAIL") return "平台退款失败";
+                if (status == "USER_WAIT_CONFIRM") return "待用户确认";
+                if (status == "MERCHANT_REFUND_RETRY_FAIL") return "商家打款失败，客服关闭售后";
+                if (status == "MERCHANT_FAIL") return "售后关闭";
+                if (status == "USER_WAIT_CONFIRM_UPDATE") return "待用户处理商家协商";
+                if (status == "USER_WAIT_HANDLE_MERCHANT_AFTER_SALE") return "待用户处理商家代发起的售后申请";
+                return "售后状态读取失败";                                                              
+            }
+            set { }
+        }
+        /// <summary>
+        /// 退款状态颜色
+        /// </summary>
+        public SolidColorBrush refundStatusColor
+        {
+            get
+            {
+                //230, 162, 60
+                if (status == "MERCHANT_PROCESSING" || status == "PLATFORM_REFUNDING" || status == "USER_WAIT_RETURN" || status == "MERCHANT_WAIT_RECEIPT" || 
+                    status == "USER_WAIT_CONFIRM" || status == "USER_WAIT_CONFIRM_UPDATE" || status == "USER_WAIT_HANDLE_MERCHANT_AFTER_SALE")
+                    return new SolidColorBrush(Color.FromRgb(103, 194, 58));
+                if (status == "MERCHANT_REFUND_SUCCESS" || status == "MERCHANT_RETURN_SUCCESS")
+                    return new SolidColorBrush(Color.FromRgb(103, 194, 58));
+                return new SolidColorBrush(Color.FromRgb(245, 108, 108));
+            }
+            set { }
+        }
+        /// <summary>
+        /// 售后原因文字
+        /// </summary>
+        public string reasonTextStr
+        {
+            get
+            {
+                return string.IsNullOrEmpty(reason_text) ? string.Empty : "售后原因：" + reason_text;
+            }
+            set { }
+        }
+
+
+        public long id { get; set; }
+        public long? shop_id { get; set; }
+        public string after_sale_order_id { get; set; }
+        /// <summary>
+        /// 售后单当前状态，参考：
+        /// USER_CANCELD	用户取消申请
+        /// MERCHANT_PROCESSING	商家受理中
+        /// MERCHANT_REJECT_REFUND	商家拒绝退款
+        /// MERCHANT_REJECT_RETURN	商家拒绝退货退款
+        /// USER_WAIT_RETURN	待买家退货
+        /// RETURN_CLOSED	退货退款关闭
+        /// MERCHANT_WAIT_RECEIPT	待商家收货
+        /// MERCHANT_OVERDUE_REFUND	商家逾期未退款
+        /// MERCHANT_REFUND_SUCCESS	退款完成
+        /// MERCHANT_RETURN_SUCCESS	退货退款完成
+        /// PLATFORM_REFUNDING	平台退款中
+        /// PLATFORM_REFUND_FAIL	平台退款失败
+        /// USER_WAIT_CONFIRM	待用户确认
+        /// MERCHANT_REFUND_RETRY_FAIL	商家打款失败，客服关闭售后
+        /// MERCHANT_FAIL	售后关闭
+        /// USER_WAIT_CONFIRM_UPDATE	待用户处理商家协商
+        /// USER_WAIT_HANDLE_MERCHANT_AFTER_SALE	待用户处理商家代发起的售后申请
+        /// </summary>
+        public string status { get; set; }
+        /// <summary>
+        /// 买家身份标识
+        /// </summary>
+        public string openid { get; set; }
+        /// <summary>
+        /// 买家在开放平台的唯一标识符，若当前视频号小店已绑定到微信开放平台账号下会返回
+        /// </summary>
+        public string unionid { get; set; }
+        /// <summary>
+        /// 商品spuid
+        /// </summary>
+        public string product_id { get; set; }
+        /// <summary>
+        /// 商品skuid
+        /// </summary>
+        public string sku_id { get; set; }
+        /// <summary>
+        /// 售后数量
+        /// </summary>
+        public int? count { get; set; }
+        /// <summary>
+        /// 是否极速退款RefundInfo
+        /// </summary>
+        public string fast_refund { get; set; }
+        /// <summary>
+        /// 标明售后单退款直接原因, 枚举值参考 RefundReason
+        /// </summary>
+        public int? refund_reason { get; set; }
+        /// <summary>
+        /// 退款金额（分）
+        /// </summary>
+        public int? refund_amount { get; set; }
+        /// <summary>
+        /// 退款快递单号
+        /// </summary>
+        public string return_waybill_id { get; set; }
+        /// <summary>
+        /// 物流公司id
+        /// </summary>
+        public string return_delivery_id { get; set; }
+        /// <summary>
+        /// 物流公司名称
+        /// </summary>
+        public string return_delivery_name { get; set; }
+        /// <summary>
+        /// 售后相关商品信息JSON
+        /// </summary>
+        public string merchant_upload_info { get; set; }
+        /// <summary>
+        /// 售后单创建时间戳
+        /// </summary>
+        public int? create_time { get; set; }
+        /// <summary>
+        /// 售后单更新时间戳
+        /// </summary>
+        public int? update_time { get; set; }
+        /// <summary>
+        /// 退款原因
+        /// </summary>
+        public string reason { get; set; }
+        /// <summary>
+        /// 退款原因解释
+        /// </summary>
+        public string reason_text { get; set; }
+        /// <summary>
+        /// 售后类型。REFUND:退款；RETURN:退货退款。
+        /// </summary>
+        public string type { get; set; }
+        /// <summary>
+        /// 订单号，该字段可用于获取订单
+        /// </summary>
+        public string order_id { get; set; }
+        /// <summary>
+        /// detail json
+        /// </summary>
+        public string details { get; set; }
+        /// <summary>
+        /// 纠纷id，该字段可用于获取纠纷信息
+        /// </summary>
+        public string complaint_id { get; set; }
+        /// <summary>
+        /// 微信支付退款的响应
+        /// </summary>
+        public string refund_resp { get; set; }
+        /// <summary>
+        /// 推送状态（0未推送；1推送成功；2推送失败）
+        /// </summary>
+        public int? pull_status { get; set; }
+        /// <summary>
+        /// 订单审核时间
+        /// </summary>
+        public DateTime pull_time { get; set; }
+        /// <summary>
+        /// 商品id(o_goods外键)
+        /// </summary>
+        public long? erp_goods_id { get; set; }
+        /// <summary>
+        /// 商品skuid(o_goods_sku外键)
+        /// </summary>
+        public long? erp_goods_sku_id { get; set; }
+        /// <summary>
+        /// 商户id
+        /// </summary>
+        public long merchant_id { get; set; }
+        /// <summary>
+        /// 仓库受理状态
+        /// </summary>
+        public int? warehouse_status { get; set; }
+    }
+}