Kaynağa Gözat

сделакл все задания,но не работают кнопки перехода и пропала кнопка "назад"

Ethosa 3 yıl önce
ebeveyn
işleme
8be8f2091f

+ 7 - 0
DanilovProject/DanilovProject.csproj

@@ -75,6 +75,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Pages\CustomerMenu.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Pages\Page2.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -84,6 +88,9 @@
     <Compile Include="Pages\AuthPage.xaml.cs">
       <DependentUpon>AuthPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\CustomerMenu.xaml.cs">
+      <DependentUpon>CustomerMenu.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\Page2.xaml.cs">
       <DependentUpon>Page2.xaml</DependentUpon>
     </Compile>

+ 1 - 1
DanilovProject/Dictionary1.xaml

@@ -1,4 +1,4 @@
-e<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:DanilovProject">
     <Style TargetType="{x:Type Label}">

+ 1 - 1
DanilovProject/Pages/AuthPage.xaml

@@ -28,7 +28,7 @@
     <Label Content="Пароль" Grid.Column="1" Grid.Row="1" VerticalAlignment="Top" Height="25" Margin="0,30,0,0"/>
     <PasswordBox x:Name="PasswordBox" Grid.Column="2" Margin="0,30,0,0" Grid.Row="1" VerticalAlignment="Top" Height="25"/>
     <Button Click="ButtunEnter_OnClick" Content="Вход" Grid.Column="2" Margin="0,60,0,0" Grid.Row="1" VerticalAlignment="Top"/>
-    <Button x:Name="ButtonRegistration" Content="Регистрация" Grid.Column="2" Margin="0,85,0,0" Grid.Row="1" VerticalAlignment="Top" Height="20" Click="ButtonRegistration_Onclick"/>
+    <Button x:Name="ButtonRegistration" Content="Регистрация" Grid.Column="2" Margin="0,85,0,0" Grid.Row="1" Click="ButtonRegistration_Onclick"/>
       
 
   </Grid>

+ 1 - 1
DanilovProject/Pages/AuthPage.xaml.cs

@@ -41,7 +41,7 @@ namespace DanilovProject.Pages
 
         private void ButtonRegistration_Onclick(object sender, RoutedEventArgs e)
         {
-            NavigationService?.Navigate(new Page2());
+            NavigationService?.Navigate(new CustomerMenu());
         }
     }
 }

+ 27 - 0
DanilovProject/Pages/CustomerMenu.xaml

@@ -0,0 +1,27 @@
+<Page x:Class="DanilovProject.Pages.CustomerMenu"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:DanilovProject.Pages"
+      mc:Ignorable="d" 
+      d:DesignHeight="450" d:DesignWidth="800"
+      Title="CustomerMenu">
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="70"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="257"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+        <Button Content="Переход 1" Click="ButtonPage1_OnClick" HorizontalAlignment="Center" Margin="0,160,0,0" VerticalAlignment="Top" Height="51" Width="204" Grid.Column="1" Grid.RowSpan="2"/>
+        <Button Content="Переход 2" Click="ButtonPage2_OnClick" HorizontalAlignment="Center" Margin="0,35,0,0" VerticalAlignment="Top" Height="51" Width="204" Grid.Column="1" Grid.RowSpan="2" Grid.Row="1"/>
+        <Button Content="Переход 3" Click="ButtonPage3_OnClick"  HorizontalAlignment="Center" Margin="0,44,0,0" VerticalAlignment="Top" Height="51" Width="204" Grid.Column="1" Grid.Row="2"/>
+
+    </Grid>
+</Page>

+ 42 - 0
DanilovProject/Pages/CustomerMenu.xaml.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace DanilovProject.Pages
+{
+    /// <summary>
+    /// Логика взаимодействия для CustomerMenu.xaml
+    /// </summary>
+    public partial class CustomerMenu : Page
+    {
+        private void ButtonPage1_OnClick(object sender, RoutedEventArgs e)
+        {
+            NavigationService?.Navigate(new Page2());
+        }
+
+        private void ButtonPage2_OnClick(object sender, RoutedEventArgs e)
+        {
+            NavigationService?.Navigate(new AuthPage());
+        }
+        private void ButtonPage3_OnClick(object sender, RoutedEventArgs e)
+        {
+            NavigationService?.Navigate(new Menu());
+        }
+            
+            
+        
+            
+        
+    }
+}