新增加 利润统计Window。
隐藏利润统计按钮 增加 Common 文件夹 内部是WPF公用类库
This commit is contained in:
1 parent
4a7af051b2
commit
7c6f91f207
25 files changed
+6462
-3554
No files matched your search
@@ -2,6 +2,7 @@
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:c="clr-namespace:_29WxOrderWpf.Common"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:local="clr-namespace:_29WxOrderWpf.Ctrls.OrderCtrls"
|
||||
xmlns:utils="clr-namespace:_29WxOrderWpf.Utils"
|
||||
@@ -37,7 +38,8 @@
|
||||
<ColumnDefinition Width="*"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto"></ColumnDefinition>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
|
||||
<usercontrols:UcWaterMarkTextBox Grid.Column="0" x:Name="txtOrderId" Margin="0,0,8,0" Height="28" WaterMark="店铺单号" />
|
||||
@@ -93,7 +95,12 @@
|
||||
</Image>
|
||||
<CheckBox Content="自动读单" x:Name="chkAutoReadOrder" BorderBrush="{StaticResource mainColorBrush}" FontSize="12" HorizontalAlignment="Left"
|
||||
Margin="2,0" VerticalAlignment="Center" Checked="chkAutoReadBuyerOrder_CheckedChanged" Unchecked="chkAutoReadBuyerOrder_CheckedChanged" IsChecked="true"/>
|
||||
|
||||
</WrapPanel>
|
||||
|
||||
<Button c:DebugVisibility.Enable="True" Grid.Column="11" Content="利润统计" Style="{StaticResource BasePageButtonStyle}" Width="60" Height="28" Click="btn_ShowShopRevenueStatisticsView" Padding="4">
|
||||
|
||||
</Button>
|
||||
</Grid>
|
||||
|
||||
<Grid x:Name="gridListHeader" Margin="8,2,8,0" Grid.Row="2">
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user