From 1a964bc59b4258a0793c28488ee9cd1d504a9c31 Mon Sep 17 00:00:00 2001
From: shanj <18996038927@163.com>
Date: Sat, 1 Oct 2022 12:04:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2-=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E9=80=89=E9=A1=B9=E5=8D=A1=E4=B8=8D=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/Order/OrderListViewModel.cs        | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
index 08462a8b..450d9e39 100644
--- a/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/OrderListViewModel.cs
@@ -171,8 +171,8 @@ namespace BBWY.Client.ViewModels
             this.choosePurchaseSchemeViewModel = choosePurchaseSchemeViewModel;
             OrderList = new ObservableCollection<Order>();
             AfterSaleOrderList = new ObservableCollection<AfterSaleOrder>();
-            //EndDate = DateTime.Now;
-            //StartDate = DateTime.Now.Date.AddDays(-6);
+            EndDate = DateTime.Now;
+            StartDate = DateTime.Now.Date.AddDays(-6);
             ToDayOrderAchievement = new ToDayOrderAchievement();
             InitSearchParam();
 
@@ -223,7 +223,7 @@ namespace BBWY.Client.ViewModels
             SearchOrderCommand.Execute(null);
         }
 
-        private void InitSearchParam()
+        private void InitSearchParam(bool isInitDate = false)
         {
             this.OrderState = null;
             SearchOrderId = string.Empty;
@@ -232,8 +232,11 @@ namespace BBWY.Client.ViewModels
             SearchSku = string.Empty;
             SearchProductId = string.Empty;
             SearchWaybill = string.Empty;
-            EndDate = DateTime.Now;
-            StartDate = DateTime.Now.Date.AddDays(-6);
+            if (isInitDate)
+            {
+                EndDate = DateTime.Now;
+                StartDate = DateTime.Now.Date.AddDays(-6);
+            }
             PageIndex = 1;
             IncludeAfterOrder = null;
             IncludeExceptionOrder = false;
@@ -264,7 +267,7 @@ namespace BBWY.Client.ViewModels
 
         public void SetOrderState(OrderState? orderState)
         {
-            InitSearchParam();
+            InitSearchParam(orderState == null);
             this.OrderState = orderState;
             Task.Factory.StartNew(() => LoadOrder(1));  //选择状态查询订单
         }