From bd2f6a396f779f9093fffa1cb0bab389b8806910 Mon Sep 17 00:00:00 2001
From: shanji <18996038927@163.com>
Date: Mon, 19 Jun 2023 16:45:06 +0800
Subject: [PATCH] 1

---
 BBWYB.Client/Models/Enums.cs            | 26 ++++++++++++++++++++++---
 BBWYB.Client/Views/Order/OrderList.xaml |  8 ++++----
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/BBWYB.Client/Models/Enums.cs b/BBWYB.Client/Models/Enums.cs
index 2b89113..4786cd3 100644
--- a/BBWYB.Client/Models/Enums.cs
+++ b/BBWYB.Client/Models/Enums.cs
@@ -81,21 +81,41 @@
         银行卡转账 = 6
     }
 
+
     /// <summary>
-    /// 订单状态
+    /// 订单状态 
+    /// <para>待付款 = 0</para>
+    /// <para>等待采购 = 1, 部分采购 = 110</para>
+    /// <para>待发货 = 2, 部分发货 = 120</para>
+    /// <para>待收货 = 3, 部分收货 = 130</para>
+    /// <para>已完成 = 4</para>
+    /// <para>锁定 = 5</para>
+    /// <para>已取消 = 6</para>
+    /// <para>暂停 = 7</para>
+    /// <para>已退款 = 8</para>
+    /// <para>Unknow = 100</para>
+    /// <para>打包中 = 140</para>
+    /// <para>待完结 = 150</para>
     /// </summary>
     public enum OrderState
     {
         待付款 = 0,
         等待采购 = 1,
-        待出库 = 2,
+        部分采购 = 110,
+        待发货 = 2,
+        部分发货 = 120,
         待收货 = 3,
+        部分收货 = 130,
         已完成 = 4,
         锁定 = 5,
         已取消 = 6,
         暂停 = 7,
         已退款 = 8,
-        待配置 = 101,
+        Unknow = 100,
+        打包中 = 140,
+        待完结 = 150
+
+        //待配置 = 101,
     }
 
     /// <summary>
diff --git a/BBWYB.Client/Views/Order/OrderList.xaml b/BBWYB.Client/Views/Order/OrderList.xaml
index 7f4a714..5756a5a 100644
--- a/BBWYB.Client/Views/Order/OrderList.xaml
+++ b/BBWYB.Client/Views/Order/OrderList.xaml
@@ -189,12 +189,12 @@
                     </c:BButton.Content>
                 </c:BButton>
                 <c:BButton Width="100" 
-                           Background="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待出库:#8080FF:#F2F2F2}"
-                           Foreground="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待出库:White:#4A4A4A}"
-                           Command="{Binding SetOrderStateCommand}" CommandParameter="{x:Static cmodel:OrderState.待出库}">
+                           Background="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待发货:#8080FF:#F2F2F2}"
+                           Foreground="{Binding OrderState,Converter={StaticResource objConverter},ConverterParameter=待发货:White:#4A4A4A}"
+                           Command="{Binding SetOrderStateCommand}" CommandParameter="{x:Static cmodel:OrderState.待发货}">
                     <c:BButton.Content>
                         <TextBlock>
-                            <Run Text="待出库"/>
+                            <Run Text="待发货"/>
                             <!--<Run Text="{Binding WaitOutStoreCount,Mode=OneWay,UpdateSourceTrigger=PropertyChanged}"
                                  Foreground="{StaticResource Text.Pink}"/>-->
                         </TextBlock>