Ver código fonte

优化界面

Lishi
xxe 2 anos atrás
pai
commit
783fba4030
4 arquivos alterados com 60 adições e 53 exclusões
  1. +1
    -1
      HKCardIN/ViewModels/RootViewModel.cs
  2. +3
    -3
      HKCardIN/Views/RootView.xaml
  3. +1
    -0
      HKCardOUT/ViewModels/RootViewModel.cs
  4. +55
    -49
      HKCardOUT/Views/RootView.xaml

+ 1
- 1
HKCardIN/ViewModels/RootViewModel.cs Ver arquivo

@@ -94,7 +94,7 @@ namespace HKCardIN.ViewModels

if (BaseLogic.GetInstance().PushMoneyToServer(CardNo, ShowMoney))
{
HandyControl.Controls.Growl.SuccessGlobal($"【{CardNo}】充值成功");
HandyControl.Controls.Growl.SuccessGlobal($"【{CardNo}】充值成功,充值金额【{ShowMoney}】");
Task.Run(() =>
{
Thread.Sleep(5 * 1000);


+ 3
- 3
HKCardIN/Views/RootView.xaml Ver arquivo

@@ -172,7 +172,7 @@
Style="{StaticResource TextBlockDefaultBold}"
Text="{Binding Info.CardNum}" />
</WrapPanel>
<WrapPanel Margin="0,20,0,0">
<WrapPanel Margin="0,30,0,0">
<TextBlock
FontSize="18"
Style="{StaticResource Title}"
@@ -183,7 +183,7 @@
Style="{StaticResource TextBlockDefaultBold}"
Text="{Binding Info.Stutas}" />
</WrapPanel>
<WrapPanel Margin="0,20,0,0">
<WrapPanel Margin="0,30,0,0">
<TextBlock
FontSize="18"
Style="{StaticResource Title}"
@@ -194,7 +194,7 @@
Style="{StaticResource TextBlockDefaultBold}"
Text="{Binding Info.Money}" />
</WrapPanel>
<WrapPanel Margin="0,20,0,0">
<WrapPanel Margin="0,30,0,0">
<TextBlock
FontSize="18"
Style="{StaticResource Title}"


+ 1
- 0
HKCardOUT/ViewModels/RootViewModel.cs Ver arquivo

@@ -30,6 +30,7 @@ namespace HKCardOUT.ViewModels
Result = new ObservableCollection<SaleLog>(this.Container.Get<HKCore>().PullDaySaleLog());
Thread.Sleep(3000);
}, "消费记录查询");
//广告初始化
var Init = DataBus.StoreInfo?.Devices.Join(DataBus.StoreInfo?.Stalls, t => t.GateId, x => x.Id, (t, x) => new AdDTO
{
Ad = x.Remaek,


+ 55
- 49
HKCardOUT/Views/RootView.xaml Ver arquivo

@@ -39,15 +39,63 @@
<hc:Window.Background>
<ImageBrush ImageSource="/HKResouces/背景.jpg" />
</hc:Window.Background>
<StackPanel>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition Width="200" />
</Grid.ColumnDefinitions>
<DataGrid
AutoGenerateColumns="False"
Background="Transparent"
IsReadOnly="True"
ItemsSource="{Binding Result}"
Style="{StaticResource DataGridBaseStyle}">
<DataGrid.RowStyle>
<Style BasedOn="{StaticResource DataGridRowStyle}" TargetType="DataGridRow">
<Setter Property="Background" Value="Transparent" />
<Style.Triggers>
<Trigger Property="UIElement.IsMouseOver" Value="true">
<Setter Property="Background" Value="Transparent" />
</Trigger>
</Style.Triggers>
</Style>
</DataGrid.RowStyle>
<DataGrid.Columns>
<DataGridTextColumn
Width="300"
Binding="{Binding CardNo}"
ElementStyle="{StaticResource CenterAlignmentStyle}"
Header="卡号"
HeaderStyle="{StaticResource SaleLogHeader}" />
<DataGridTextColumn
Width="200"
Binding="{Binding Money}"
ElementStyle="{StaticResource CenterAlignmentStyle}"
Header="金额"
HeaderStyle="{StaticResource SaleLogHeader}" />
<DataGridTextColumn
Width="200"
Binding="{Binding Location}"
ElementStyle="{StaticResource CenterAlignmentStyle}"
Header="档口"
HeaderStyle="{StaticResource SaleLogHeader}" />
<DataGridTextColumn
Width="300"
Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
ElementStyle="{StaticResource CenterAlignmentStyle}"
Header="消费时间"
HeaderStyle="{StaticResource SaleLogHeader}" />
</DataGrid.Columns>
</DataGrid>
<ListBox
Grid.Column="1"
Background="Transparent"
BorderThickness="0"
ItemsSource="{Binding Ad}"
Style="{StaticResource WrapPanelHorizontalListBox}">
Style="{StaticResource WrapPanelVerticalListBox}">
<ListBox.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel HorizontalAlignment="Left" VerticalAlignment="Center" />
<WrapPanel HorizontalAlignment="Center" VerticalAlignment="Top" />
</ItemsPanelTemplate>
</ListBox.ItemsPanel>
<ListBox.ItemTemplate>
@@ -55,7 +103,7 @@
<Button
Width="160"
Height="80"
Margin="20,0,0,0"
Margin="20,20,0,0"
s:View.ActionTarget="{Binding DataContext, ElementName=Main}"
Command="{s:Action UpdateAction}"
CommandParameter="{Binding .}"
@@ -80,55 +128,13 @@
FontSize="18"
FontWeight="Bold"
Foreground="Red"
Text="{Binding IsActive, Converter={StaticResource TOC}}" />
Text="{Binding IsActive, Converter={StaticResource TOC}, StringFormat=广告:{0}}" />
</StackPanel>
</Button.Content>
</Button>
</DataTemplate>
</ListBox.ItemTemplate>
</ListBox>
<DataGrid
AutoGenerateColumns="False"
Background="Transparent"
IsReadOnly="True"
ItemsSource="{Binding Result}"
Style="{StaticResource DataGridBaseStyle}">
<DataGrid.RowStyle>
<Style BasedOn="{StaticResource DataGridRowStyle}" TargetType="DataGridRow">
<Setter Property="Background" Value="Transparent" />
<Style.Triggers>
<Trigger Property="UIElement.IsMouseOver" Value="true">
<Setter Property="Background" Value="Transparent" />
</Trigger>
</Style.Triggers>
</Style>
</DataGrid.RowStyle>
<DataGrid.Columns>
<DataGridTextColumn
Width="300"
Binding="{Binding CardNo}"
ElementStyle="{StaticResource CenterAlignmentStyle}"
Header="卡号"
HeaderStyle="{StaticResource SaleLogHeader}" />
<DataGridTextColumn
Width="260"
Binding="{Binding Money}"
ElementStyle="{StaticResource CenterAlignmentStyle}"
Header="金额"
HeaderStyle="{StaticResource SaleLogHeader}" />
<DataGridTextColumn
Width="260"
Binding="{Binding Location}"
ElementStyle="{StaticResource CenterAlignmentStyle}"
Header="档口"
HeaderStyle="{StaticResource SaleLogHeader}" />
<DataGridTextColumn
Width="260"
Binding="{Binding CreateTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"
ElementStyle="{StaticResource CenterAlignmentStyle}"
Header="消费时间"
HeaderStyle="{StaticResource SaleLogHeader}" />
</DataGrid.Columns>
</DataGrid>
</StackPanel>
</Grid>

</hc:Window>

Carregando…
Cancelar
Salvar