change - 界面调整

SlnMesnac.WPF/Page/IndexControl.xaml

@@ -123,19 +123,19 @@
         </Border>
         <Border Grid.Row="0" Grid.Column="5">
             <Button Background="Transparent" BorderBrush="Transparent" Width="100" Height="85" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="40,80,10,10"
-                    Command="{Binding LoadProductInfoCommand}" CommandParameter="414C7E0B-3DCE-47D2-86A7-31032A110EA4"/>
+                    Command="{Binding LoadProductInfoCommand}" CommandParameter="4E59FD85-98B7-420E-8197-B8CF37978350"/>
         </Border>
         <Border Grid.Row="3" Grid.Column="1">
             <Button Background="Transparent" BorderBrush="Transparent" Width="90" Height="80" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="45,50,10,10"
-                    Command="{Binding LoadProductInfoCommand}" CommandParameter="414C7E0B-3DCE-47D2-86A7-31032A110EA4"/>
+                    Command="{Binding LoadProductInfoCommand}" CommandParameter="C7FE8F01-8F7A-4916-B20F-CB9F3C7E76DF"/>
         </Border>
         <Border Grid.Row="3" Grid.Column="3">
             <Button Background="Transparent" BorderBrush="Transparent" Width="85" Height="130" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="35,30,10,10"
-                    Command="{Binding LoadProductInfoCommand}" CommandParameter="414C7E0B-3DCE-47D2-86A7-31032A110EA4"/>
+                    Command="{Binding LoadProductInfoCommand}" CommandParameter="FF5D79EB-D675-49F0-ABF1-E0B1BFC49D84"/>
         </Border>
         <Border Grid.Row="3" Grid.Column="5">
             <Button Background="Transparent" BorderBrush="Transparent" Width="100" Height="95" HorizontalAlignment="Center" VerticalAlignment="Top" Margin="40,50,10,10"
-                    Command="{Binding LoadProductInfoCommand}" CommandParameter="414C7E0B-3DCE-47D2-86A7-31032A110EA4"/>
+                    Command="{Binding LoadProductInfoCommand}" CommandParameter="9CA30061-2E04-496A-BD4B-29F6667B3340"/>
         </Border>
     </Grid>
 </UserControl>

SlnMesnac.WPF/Page/ProductInfo/ProductInfoControl.xaml

@@ -15,7 +15,7 @@
             <RowDefinition Height="1*"/>
             <RowDefinition Height="8*"/>
         </Grid.RowDefinitions>
-        <Border Grid.Row="0" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Margin="0,0,0,10">
+        <Border Grid.Row="0" Background="White" BorderBrush="White" BorderThickness="2" CornerRadius="5" Margin="0,10,0,10">
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center">
 
                 <TextBlock Text="产品编号:" FontSize="20" Foreground="Black" VerticalAlignment="Center" Margin="10,0,10,0"/>
@@ -24,14 +24,14 @@
                 <TextBlock Text="产品名称:" FontSize="20" Foreground="Black" VerticalAlignment="Center" Margin="30,0,10,0"/>
                 <TextBox Text="{Binding ProductNameStr}" Foreground="Black" FontSize="18" Width="200" Height="35"/>
 
-                <Button Content="查  询" FontSize="16"  Width="120" Height="35" Background="#007DFA" BorderBrush="#007DFA" Margin="20,0,10,0" Command="{Binding QueryProductInfoCommand}" />
+                <Button Content="查  询" FontSize="16" Foreground="White" Width="120" Height="35" Background="#007DFA" BorderBrush="#007DFA" Margin="20,0,10,0" Command="{Binding QueryProductInfoCommand}" />
 
             </StackPanel>
         </Border>
-        <Border Grid.Row="1" BorderBrush="Green" BorderThickness="2" CornerRadius="5" Margin="0,0,0,10">
+        <Border Grid.Row="1" Background="White" BorderBrush="White" BorderThickness="2" CornerRadius="5" Margin="0,0,0,10">
             <DataGrid x:Name="datagrid" Grid.Row="0" ItemsSource="{Binding ProductInfoItems}" Background="Transparent" 
-                FontSize="15" ColumnHeaderHeight="50" 
-                RowHeight="50" AutoGenerateColumns="False" RowHeaderWidth="0" 
+                FontSize="15" ColumnHeaderHeight="55" 
+                RowHeight="55" AutoGenerateColumns="False" RowHeaderWidth="0" 
                 GridLinesVisibility="None" ScrollViewer.HorizontalScrollBarVisibility="Hidden" 
                 ScrollViewer.VerticalScrollBarVisibility="Hidden" BorderThickness="0" CanUserAddRows="False" HorizontalAlignment="Center"
                 Foreground="Black" >
@@ -44,7 +44,7 @@
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
                                 <StackPanel Orientation="Horizontal">
-                                    <Button Content="产品信息" CommandParameter="{Binding productCode}" Background="#009999" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="#009999" BorderThickness="0" Width="100" Command="{Binding DataContext.EditProductInfoCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"/>
+                                    <Button Content="产品信息" CommandParameter="{Binding productCode}" Background="#009999" Foreground="White" Margin="10,0,0,0" Height="30" BorderBrush="#009999" BorderThickness="0" Width="100" Command="{Binding DataContext.EditProductInfoCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"/>
                                 </StackPanel>
                             </DataTemplate>
                         </DataGridTemplateColumn.CellTemplate>

SlnMesnac.WPF/ViewModel/MainWindowViewModel.cs

@@ -73,7 +73,7 @@ namespace SlnMesnac.WPF.ViewModel
             _productDetailsControl = productDetailsControl;
 
 
-            this.UserContent = _generateControl;
+            this.UserContent = _indexControl;
         }
 
         /// <summary>