From 5740b1473fba24424722702da67fbdc612a3bb20 Mon Sep 17 00:00:00 2001
From: xxe <xxe@163.com>
Date: Tue, 13 Sep 2022 11:51:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5=E5=8D=A1?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HKCardIN/ViewModels/RootViewModel.cs |  8 ++++++++
 HKCardIN/Views/RootView.xaml         | 14 ++++++++++++--
 HKCardOUT/COM/COMHelper.cs           |  2 +-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/HKCardIN/ViewModels/RootViewModel.cs b/HKCardIN/ViewModels/RootViewModel.cs
index 01a6ab2..49a1530 100644
--- a/HKCardIN/ViewModels/RootViewModel.cs
+++ b/HKCardIN/ViewModels/RootViewModel.cs
@@ -47,6 +47,12 @@ namespace HKCardIN.ViewModels
                 ShowMoney = data;
             }
         }
+        string _CardNo;
+        public string CardNo
+        {
+            get => _CardNo;
+            set => SetAndNotify(ref _CardNo, value);
+        }
         #endregion
 
         #region 命令
@@ -72,6 +78,8 @@ namespace HKCardIN.ViewModels
         }
         public void SaveAction()
         {
+            var c = CardNo;
+            var m = ShowMoney;
             if (!DataBus.NetWordState)
             {
                 HandyControl.Controls.Growl.InfoGlobal("系统已离线,请连接网络!!!");
diff --git a/HKCardIN/Views/RootView.xaml b/HKCardIN/Views/RootView.xaml
index 6263d80..327e133 100644
--- a/HKCardIN/Views/RootView.xaml
+++ b/HKCardIN/Views/RootView.xaml
@@ -11,10 +11,11 @@
     x:Name="Root"
     Title="海科智慧一卡通平台"
     Width="800"
-    Height="420"
+    Height="460"
     d:DataContext="{d:DesignInstance Type=viewModels:RootViewModel}"
+    ResizeMode="CanMinimize"
     WindowStartupLocation="CenterScreen"
-    mc:Ignorable="d" ResizeMode="CanMinimize">
+    mc:Ignorable="d">
     <Window.Resources>
         <Style
             x:Key="充值"
@@ -285,6 +286,15 @@
                         </TextBox.Text>
                     </TextBox>
                 </WrapPanel>
+                <WrapPanel HorizontalAlignment="Center">
+                    <TextBox
+                        Width="330"
+                        Margin="5,0,0,10"
+                        HorizontalAlignment="Left"
+                        hc:InfoElement.Placeholder="手动录入卡号"
+                        Style="{StaticResource TextBoxExtend}"
+                        Text="{Binding CardNo}" />
+                </WrapPanel>
                 <hc:Divider
                     Content="操作"
                     FontSize="16"
diff --git a/HKCardOUT/COM/COMHelper.cs b/HKCardOUT/COM/COMHelper.cs
index 420166f..a402b64 100644
--- a/HKCardOUT/COM/COMHelper.cs
+++ b/HKCardOUT/COM/COMHelper.cs
@@ -12,7 +12,7 @@ namespace COM
         public void OpenCOM()
         {
             serialPort = new SerialPort("COM3", 9600, Parity.None, 8, StopBits.One);
-            //数据接受
+            //数据接收
             serialPort.DataReceived += new SerialDataReceivedEventHandler(DataReceived);
             serialPort.ReceivedBytesThreshold = 1;
             serialPort.RtsEnable = true;