Merge branch 'master' of http://192.168.0.95:3000/PRY/HBLConsole

HBLConsole/View/MainView.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using HBLConsole.ViewModel;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -38,6 +39,7 @@ namespace HBLConsole.View
                 }
                 this.DragMove();
             };
+            OrderStatusViewModel.GetInstance();
         }
     }
 }

HBLConsole/View/OrderStatusView.xaml

@@ -12,9 +12,9 @@
     Background="{x:Null}"
     mc:Ignorable="d">
 
-    <UserControl.DataContext>
+    <!--<UserControl.DataContext>
         <vm:OrderStatusViewModel />
-    </UserControl.DataContext>
+    </UserControl.DataContext>-->
 
     <UserControl.Resources>
         <SolidColorBrush x:Key="BorderSolid" Color="#5523CACA" />
@@ -142,13 +142,13 @@
                                     Grid.Column="0"
                                     Foreground="{Binding OrderStatus, Converter={StaticResource ColorConverter}}"
                                     Style="{StaticResource TextBlockStyle}"
-                                    Text="{Binding SortNo}" />
+                                    Text="{Binding OrderPush.SortNum}" />
 
                                 <Grid Grid.Column="1">
                                     <TextBlock
                                         Foreground="{Binding OrderStatus, Converter={StaticResource ColorConverter}}"
                                         Style="{StaticResource TextBlockStyle}"
-                                        Text="{Binding GoodName}" />
+                                        Text="{Binding OrderPush.GoodsName}" />
                                     <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
                                 </Grid>
 
@@ -157,13 +157,13 @@
                                     Grid.Column="2"
                                     Foreground="{Binding OrderStatus, Converter={StaticResource ColorConverter}}"
                                     Style="{StaticResource TextBlockStyle}"
-                                    Text="开始时间" />
+                                    Text="{Binding StartDate}" />
 
                                 <Grid Grid.Column="3">
                                     <TextBlock
                                         Foreground="{Binding OrderStatus, Converter={StaticResource ColorConverter}}"
                                         Style="{StaticResource TextBlockStyle}"
-                                        Text="结束时间" />
+                                        Text="{Binding EndDate}" />
                                     <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
                                 </Grid>
 
@@ -297,13 +297,13 @@
                                     Grid.Column="0"
                                     Foreground="{Binding OrderStatus, Converter={StaticResource ColorConverter}}"
                                     Style="{StaticResource TextBlockStyle}"
-                                    Text="{Binding SortNo}" />
+                                    Text="{Binding OrderPush.SortNum}" />
 
                                 <Grid Grid.Column="1">
                                     <TextBlock
                                         Foreground="{Binding OrderStatus, Converter={StaticResource ColorConverter}}"
                                         Style="{StaticResource TextBlockStyle}"
-                                        Text="{Binding GoodName}" />
+                                        Text="{Binding OrderPush.GoodsName}" />
                                     <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
                                 </Grid>
 
@@ -312,13 +312,13 @@
                                     Grid.Column="2"
                                     Foreground="{Binding OrderStatus, Converter={StaticResource ColorConverter}}"
                                     Style="{StaticResource TextBlockStyle}"
-                                    Text="开始时间" />
+                                    Text="{Binding StartDate}" />
 
                                 <Grid Grid.Column="3">
                                     <TextBlock
                                         Foreground="{Binding OrderStatus, Converter={StaticResource ColorConverter}}"
                                         Style="{StaticResource TextBlockStyle}"
-                                        Text="结束时间" />
+                                        Text="{Binding EndDate}" />
                                     <Border BorderBrush="{StaticResource BorderSolid}" BorderThickness="1,0,1,0" />
                                 </Grid>
 

HBLConsole/View/OrderStatusView.xaml.cs

@@ -1,4 +1,5 @@
-using System;
+using HBLConsole.ViewModel;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -23,6 +24,7 @@ namespace HBLConsole.View
         public OrderStatusView()
         {
             InitializeComponent();
+            this.DataContext = OrderStatusViewModel.GetInstance();
         }
     }
 }

HBLConsole/ViewModel/OrderStatusViewModel.cs

@@ -9,10 +9,19 @@ namespace HBLConsole.ViewModel
 {
     public class OrderStatusViewModel : ViewModelBase
     {
+        #region 不需要监听
+        private static OrderStatusViewModel _instance;
+        public static OrderStatusViewModel GetInstance()
+        {
+            if (_instance == null)
+                _instance = new OrderStatusViewModel();
+            return _instance;
+        }
         public OrderStatusViewModel()
         {
             MqttReceive();
             WindowName = "订单状态";
         }
+        #endregion
     }
 }