@@ -173,6 +173,7 @@ | |||||
<None Remove="Image\日历.png" /> | <None Remove="Image\日历.png" /> | ||||
<None Remove="Image\日期1.png" /> | <None Remove="Image\日期1.png" /> | ||||
<None Remove="Image\时间.png" /> | <None Remove="Image\时间.png" /> | ||||
<None Remove="Image\时间_1.png" /> | |||||
<None Remove="Image\智慧城市科技风登录页面.png" /> | <None Remove="Image\智慧城市科技风登录页面.png" /> | ||||
<None Remove="Image\智慧城市科技风登录页面边框.png" /> | <None Remove="Image\智慧城市科技风登录页面边框.png" /> | ||||
<None Remove="Image\有告警.png" /> | <None Remove="Image\有告警.png" /> | ||||
@@ -422,6 +423,7 @@ | |||||
<Resource Include="Image\按钮背景黄.png" /> | <Resource Include="Image\按钮背景黄.png" /> | ||||
<Resource Include="Image\提示.png" /> | <Resource Include="Image\提示.png" /> | ||||
<Resource Include="Image\时间.png" /> | <Resource Include="Image\时间.png" /> | ||||
<Resource Include="Image\时间_1.png" /> | |||||
<Resource Include="Image\智慧城市科技风登录页面.png" /> | <Resource Include="Image\智慧城市科技风登录页面.png" /> | ||||
<Resource Include="Image\智慧城市科技风登录页面边框.png" /> | <Resource Include="Image\智慧城市科技风登录页面边框.png" /> | ||||
<Resource Include="Image\权限背景.png" /> | <Resource Include="Image\权限背景.png" /> | ||||
@@ -168,7 +168,7 @@ namespace BPASmartClient.CustomResource.Pages.Model | |||||
break; | break; | ||||
case DialogType.Information: | case DialogType.Information: | ||||
PV.TextBlockIcon = ""; | PV.TextBlockIcon = ""; | ||||
PV.TextBlockForeground = Brushes.White; | |||||
PV.TextBlockForeground = Brushes.Black; | |||||
PV.infoType.Text = "提示:"; | PV.infoType.Text = "提示:"; | ||||
//PV.Cancel.Visibility = Visibility.Visible; | //PV.Cancel.Visibility = Visibility.Visible; | ||||
break; | break; | ||||
@@ -37,7 +37,7 @@ | |||||
</Style> | </Style> | ||||
</Window.Resources> | </Window.Resources> | ||||
<Border Background="{StaticResource infoColor}" BorderBrush="White" BorderThickness="3" CornerRadius="10"> | |||||
<Border Background="{StaticResource infoColor}" BorderBrush="Black" BorderThickness="3" CornerRadius="10"> | |||||
<Grid Name="main" > | <Grid Name="main" > | ||||
<Grid Margin="18,16"> | <Grid Margin="18,16"> | ||||
@@ -45,7 +45,7 @@ | |||||
Width="30" | Width="30" | ||||
Height="20" | Height="20" | ||||
Content="关闭" | Content="关闭" | ||||
Foreground="White" | |||||
Foreground="Black" | |||||
HorizontalAlignment="Right" | HorizontalAlignment="Right" | ||||
VerticalAlignment="Top" | VerticalAlignment="Top" | ||||
Background="Transparent" | Background="Transparent" | ||||
@@ -68,7 +68,7 @@ Click="Button_Click" /> | |||||
VerticalAlignment="Center" | VerticalAlignment="Center" | ||||
HorizontalAlignment="Center" | HorizontalAlignment="Center" | ||||
FontSize="20" | FontSize="20" | ||||
Foreground="White" | |||||
Foreground="White" FontWeight="Black" | |||||
Text="警告:" | Text="警告:" | ||||
TextWrapping="Wrap" /> | TextWrapping="Wrap" /> | ||||
</Grid> | </Grid> | ||||
@@ -78,11 +78,11 @@ Click="Button_Click" /> | |||||
Margin="0,0,10,0" | Margin="0,0,10,0" | ||||
HorizontalAlignment="Right" | HorizontalAlignment="Right" | ||||
Orientation="Horizontal"> | Orientation="Horizontal"> | ||||
<Border CornerRadius="5" Margin="5,0,5,0" Background="#ECBB52" HorizontalAlignment="Center" VerticalAlignment="Center" Height="30" Width="90" BorderBrush="White" BorderThickness="2"> | |||||
<Button x:Name="Cancel" Background="Transparent" Click="Cancel_Click" Style="{StaticResource adbtn}" Foreground="White" Content="取消" BorderThickness="0" FontSize="20" FontWeight="Black"/> | |||||
<Border CornerRadius="5" Margin="5,0,5,0" Background="#ECBB52" HorizontalAlignment="Center" VerticalAlignment="Center" Height="30" Width="90" BorderBrush="Black" BorderThickness="2"> | |||||
<Button x:Name="Cancel" Background="Transparent" Click="Cancel_Click" Style="{StaticResource adbtn}" Foreground="Black" Content="取消" BorderThickness="0" FontSize="20" FontWeight="Black"/> | |||||
</Border> | </Border> | ||||
<Border CornerRadius="5" Margin="5,0,5,0" Background="#ECBB52" HorizontalAlignment="Center" VerticalAlignment="Center" Height="30" Width="90" BorderBrush="White" BorderThickness="2"> | |||||
<Button x:Name="ok" Background="Transparent" Click="ok_Click" Style="{StaticResource adbtn}" Content="确定" Foreground="White" BorderThickness="0" FontSize="20" FontWeight="Black"/> | |||||
<Border CornerRadius="5" Margin="5,0,5,0" Background="#ECBB52" HorizontalAlignment="Center" VerticalAlignment="Center" Height="30" Width="90" BorderBrush="Black" BorderThickness="2"> | |||||
<Button x:Name="ok" Background="Transparent" Click="ok_Click" Style="{StaticResource adbtn}" Content="确定" Foreground="Black" BorderThickness="0" FontSize="20" FontWeight="Black"/> | |||||
</Border> | </Border> | ||||
</StackPanel> | </StackPanel> | ||||
@@ -112,13 +112,55 @@ namespace BPASmartClient | |||||
StartDate = DateTime.Now.ToString("HH:mm:ss"), | StartDate = DateTime.Now.ToString("HH:mm:ss"), | ||||
FoodMenuModel = localOrder | FoodMenuModel = localOrder | ||||
}); | }); | ||||
FoodMenuViewModel.orderStatusLists.Insert(0, new MorkOrder() | |||||
#region 展示使用 | |||||
if (FoodMenuViewModel.orderStatusLists.Count==0) | |||||
{ | { | ||||
OrderPush = new MorkOrderPush() { DeviceId = res.DeviceId, GoodsName = localOrder.GoodName, SortNum = FoodMenuViewModel.SortNum++ }, | |||||
OrderStatus = ORDER_STATUS.WAIT, | |||||
StartDate = DateTime.Now.ToString("HH:mm:ss"), | |||||
FoodMenuModel = localOrder | |||||
}); | |||||
FoodMenuViewModel.orderStatusLists.Insert(0, new MorkOrder() | |||||
{ | |||||
OrderPush = new MorkOrderPush() { DeviceId = res.DeviceId, GoodsName = localOrder.GoodName, SortNum = FoodMenuViewModel.SortNum++ }, | |||||
OrderStatus = ORDER_STATUS.COMPLETED_TAKE, | |||||
StartDate = DateTime.Now.ToString("HH:mm:ss"), | |||||
FoodMenuModel = localOrder | |||||
}); | |||||
} | |||||
else if (FoodMenuViewModel.orderStatusLists.Count == 1) | |||||
{ | |||||
FoodMenuViewModel.orderStatusLists.Insert(0, new MorkOrder() | |||||
{ | |||||
OrderPush = new MorkOrderPush() { DeviceId = res.DeviceId, GoodsName = localOrder.GoodName, SortNum = FoodMenuViewModel.SortNum++ }, | |||||
OrderStatus = ORDER_STATUS.COMPLETED_COOK, | |||||
StartDate = DateTime.Now.ToString("HH:mm:ss"), | |||||
FoodMenuModel = localOrder | |||||
}); | |||||
} | |||||
else if (FoodMenuViewModel.orderStatusLists.Count == 2) | |||||
{ | |||||
FoodMenuViewModel.orderStatusLists.Insert(0, new MorkOrder() | |||||
{ | |||||
OrderPush = new MorkOrderPush() { DeviceId = res.DeviceId, GoodsName = localOrder.GoodName, SortNum = FoodMenuViewModel.SortNum++ }, | |||||
OrderStatus = ORDER_STATUS.COOKING, | |||||
StartDate = DateTime.Now.ToString("HH:mm:ss"), | |||||
FoodMenuModel = localOrder | |||||
}); | |||||
} | |||||
else | |||||
{ | |||||
FoodMenuViewModel.orderStatusLists.Insert(0, new MorkOrder() | |||||
{ | |||||
OrderPush = new MorkOrderPush() { DeviceId = res.DeviceId, GoodsName = localOrder.GoodName, SortNum = FoodMenuViewModel.SortNum++ }, | |||||
OrderStatus = ORDER_STATUS.WAIT, | |||||
StartDate = DateTime.Now.ToString("HH:mm:ss"), | |||||
FoodMenuModel = localOrder | |||||
}); | |||||
} | |||||
#endregion | |||||
//FoodMenuViewModel.orderStatusLists.Insert(0, new MorkOrder() | |||||
//{ | |||||
// OrderPush = new MorkOrderPush() { DeviceId = res.DeviceId, GoodsName = localOrder.GoodName, SortNum = FoodMenuViewModel.SortNum++ }, | |||||
// OrderStatus = ORDER_STATUS.WAIT, | |||||
// StartDate = DateTime.Now.ToString("HH:mm:ss"), | |||||
// FoodMenuModel = localOrder | |||||
//}); | |||||
}); | }); | ||||
Json<NoodOrder>.Data.localOrder[localOrder.GoodName].Publish(); | Json<NoodOrder>.Data.localOrder[localOrder.GoodName].Publish(); | ||||
@@ -113,14 +113,26 @@ | |||||
<Setter Property="Background" TargetName="tGrid"> | <Setter Property="Background" TargetName="tGrid"> | ||||
<Setter.Value> | <Setter.Value> | ||||
<LinearGradientBrush StartPoint="0,0" EndPoint="1,1" > | <LinearGradientBrush StartPoint="0,0" EndPoint="1,1" > | ||||
<GradientStop Offset="0" Color="#7796E5"/> | |||||
<GradientStop Offset="0" Color="#4A79F2"/> | |||||
<GradientStop Offset="0.5" Color="#7499F7" /> | |||||
<GradientStop Offset="1" Color="#235CEC"/> | <GradientStop Offset="1" Color="#235CEC"/> | ||||
</LinearGradientBrush> | </LinearGradientBrush> | ||||
</Setter.Value> | </Setter.Value> | ||||
</Setter> | </Setter> | ||||
<Trigger.EnterActions> | |||||
<BeginStoryboard x:Name="test"> | |||||
<Storyboard AutoReverse="True" RepeatBehavior="Forever" > | |||||
<DoubleAnimation Storyboard.TargetName="tGrid" Storyboard.TargetProperty="Background.(LinearGradientBrush.GradientStops)[1].Offset" From="0.2" To="0.8" Duration="0:0:2" RepeatBehavior="1" AutoReverse="True"/> | |||||
<DoubleAnimation Storyboard.TargetName="content" Storyboard.TargetProperty="FontSize" From="45" To="40" Duration="0:0:0.4" RepeatBehavior="Forever" AutoReverse="True" /> | |||||
</Storyboard> | |||||
</BeginStoryboard> | |||||
</Trigger.EnterActions> | |||||
</Trigger> | </Trigger> | ||||
<Trigger Property="IsChecked" Value="False"> | <Trigger Property="IsChecked" Value="False"> | ||||
<Setter Property="Background" Value="White" TargetName="tGrid"/> | <Setter Property="Background" Value="White" TargetName="tGrid"/> | ||||
<Trigger.EnterActions> | |||||
<RemoveStoryboard BeginStoryboardName="test"/> | |||||
</Trigger.EnterActions> | |||||
</Trigger> | </Trigger> | ||||
<Trigger Property="IsMouseOver" Value="True"> | <Trigger Property="IsMouseOver" Value="True"> | ||||
<Setter Property="Opacity" Value="0.8" TargetName="tGrid"/> | <Setter Property="Opacity" Value="0.8" TargetName="tGrid"/> | ||||
@@ -135,6 +147,13 @@ | |||||
<Setter.Value> | <Setter.Value> | ||||
<ControlTemplate TargetType="{x:Type RadioButton}"> | <ControlTemplate TargetType="{x:Type RadioButton}"> | ||||
<Grid x:Name="tGrid" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> | <Grid x:Name="tGrid" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> | ||||
<!--<Grid.Background> | |||||
<LinearGradientBrush StartPoint="0,0" EndPoint="1,1" > | |||||
<GradientStop Offset="0" Color="#235CEC"/> | |||||
<GradientStop Offset="0.5" Color="#7796E5" /> | |||||
<GradientStop Offset="1" Color="#235CEC"/> | |||||
</LinearGradientBrush> | |||||
</Grid.Background>--> | |||||
<ContentControl x:Name="content" BorderThickness="0" Background="White" Content="{TemplateBinding Content}" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="Center" VerticalAlignment="Center"/> | <ContentControl x:Name="content" BorderThickness="0" Background="White" Content="{TemplateBinding Content}" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="Center" VerticalAlignment="Center"/> | ||||
</Grid> | </Grid> | ||||
<ControlTemplate.Triggers> | <ControlTemplate.Triggers> | ||||
@@ -142,14 +161,26 @@ | |||||
<Setter Property="Background" TargetName="tGrid"> | <Setter Property="Background" TargetName="tGrid"> | ||||
<Setter.Value> | <Setter.Value> | ||||
<LinearGradientBrush StartPoint="0,0" EndPoint="1,1" > | <LinearGradientBrush StartPoint="0,0" EndPoint="1,1" > | ||||
<GradientStop Offset="0" Color="#7796E5"/> | |||||
<GradientStop Offset="0" Color="#4A79F2"/> | |||||
<GradientStop Offset="0.5" Color="#7499F7" /> | |||||
<GradientStop Offset="1" Color="#235CEC"/> | <GradientStop Offset="1" Color="#235CEC"/> | ||||
</LinearGradientBrush> | </LinearGradientBrush> | ||||
</Setter.Value> | </Setter.Value> | ||||
</Setter> | </Setter> | ||||
<Trigger.EnterActions> | |||||
<BeginStoryboard x:Name="test"> | |||||
<Storyboard AutoReverse="True" RepeatBehavior="Forever" > | |||||
<DoubleAnimation Storyboard.TargetName="tGrid" Storyboard.TargetProperty="Background.(LinearGradientBrush.GradientStops)[1].Offset" From="0.2" To="0.8" Duration="0:0:2" RepeatBehavior="1" AutoReverse="True"/> | |||||
<DoubleAnimation Storyboard.TargetName="content" Storyboard.TargetProperty="FontSize" From="45" To="40" Duration="0:0:0.4" RepeatBehavior="Forever" AutoReverse="True" /> | |||||
</Storyboard> | |||||
</BeginStoryboard> | |||||
</Trigger.EnterActions> | |||||
</Trigger> | </Trigger> | ||||
<Trigger Property="IsChecked" Value="False"> | <Trigger Property="IsChecked" Value="False"> | ||||
<Setter Property="Background" Value="#D7D7D7" TargetName="tGrid"/> | <Setter Property="Background" Value="#D7D7D7" TargetName="tGrid"/> | ||||
<Trigger.EnterActions> | |||||
<RemoveStoryboard BeginStoryboardName="test"/> | |||||
</Trigger.EnterActions> | |||||
</Trigger> | </Trigger> | ||||
<Trigger Property="IsMouseOver" Value="True"> | <Trigger Property="IsMouseOver" Value="True"> | ||||
<Setter Property="Opacity" Value="0.8" TargetName="tGrid"/> | <Setter Property="Opacity" Value="0.8" TargetName="tGrid"/> | ||||
@@ -270,25 +301,25 @@ | |||||
<Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}"> | <Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}"> | ||||
<Setter Property="OverridesDefaultStyle" Value="true"/> | <Setter Property="OverridesDefaultStyle" Value="true"/> | ||||
<Setter Property="BorderBrush" Value="Red"/> | |||||
<Setter Property="Focusable" Value="false"/> | <Setter Property="Focusable" Value="false"/> | ||||
<Setter Property="ClickMode" Value="Press"/> | <Setter Property="ClickMode" Value="Press"/> | ||||
<Setter Property="Template"> | <Setter Property="Template"> | ||||
<Setter.Value> | <Setter.Value> | ||||
<ControlTemplate TargetType="{x:Type ToggleButton}"> | <ControlTemplate TargetType="{x:Type ToggleButton}"> | ||||
<Border x:Name="templateRoot" Background="Transparent" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0,0,0,1" SnapsToDevicePixels="true"> | |||||
<Border x:Name="templateRoot" Background="Transparent" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0,0,0,2" SnapsToDevicePixels="true"> | |||||
<Border x:Name="splitBorder" BorderBrush="Transparent" BorderThickness="1" HorizontalAlignment="Right" Margin="0" SnapsToDevicePixels="true" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"> | <Border x:Name="splitBorder" BorderBrush="Transparent" BorderThickness="1" HorizontalAlignment="Right" Margin="0" SnapsToDevicePixels="true" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}"> | ||||
<TextBlock x:Name="arrow" FontSize="10" Text="" FontFamily="../../Image/#iconfont" Background="Transparent" Foreground="{TemplateBinding BorderBrush}" HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center"/> | |||||
<TextBlock x:Name="arrow" FontSize="10" Text="" FontFamily="../../Image/#iconfont" Background="Transparent" Foreground="Black" HorizontalAlignment="Center" Margin="0" VerticalAlignment="Center"/> | |||||
</Border> | </Border> | ||||
</Border> | </Border> | ||||
<ControlTemplate.Triggers> | <ControlTemplate.Triggers> | ||||
<Trigger Property="IsMouseOver" Value="true"> | <Trigger Property="IsMouseOver" Value="true"> | ||||
<Setter Property="Foreground" TargetName="arrow" Value="white"/> | |||||
<Setter Property="Background" TargetName="templateRoot" Value="{Binding BorderBrush,RelativeSource={RelativeSource Mode=TemplatedParent}}"/> | |||||
<Setter Property="Foreground" TargetName="arrow" Value="Black"/> | |||||
<Setter Property="Background" TargetName="templateRoot" Value="#DDDDDD"/> | |||||
<Setter Property="Opacity" TargetName="templateRoot" Value="0.8"/> | <Setter Property="Opacity" TargetName="templateRoot" Value="0.8"/> | ||||
</Trigger> | </Trigger> | ||||
<Trigger Property="IsPressed" Value="true"> | <Trigger Property="IsPressed" Value="true"> | ||||
<Setter Property="Foreground" TargetName="arrow" Value="Black"/> | |||||
<Setter Property="Opacity" TargetName="templateRoot" Value="0.6"/> | <Setter Property="Opacity" TargetName="templateRoot" Value="0.6"/> | ||||
</Trigger> | </Trigger> | ||||
</ControlTemplate.Triggers> | </ControlTemplate.Triggers> | ||||
@@ -318,11 +349,11 @@ | |||||
</theme:SystemDropShadowChrome> | </theme:SystemDropShadowChrome> | ||||
</Popup> | </Popup> | ||||
<ToggleButton x:Name="toggleButton" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"/> | <ToggleButton x:Name="toggleButton" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource Mode=TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"/> | ||||
<ContentControl x:Name="contentPresenter" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" Content="{TemplateBinding SelectionBoxItem}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/> | |||||
<ContentControl x:Name="contentPresenter" ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}" ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" Content="{TemplateBinding SelectionBoxItem}" ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" IsHitTestVisible="false" Margin="{TemplateBinding Padding}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/> | |||||
</Grid> | </Grid> | ||||
<ControlTemplate.Triggers> | <ControlTemplate.Triggers> | ||||
<Trigger Property="IsMouseOver" Value="true"> | <Trigger Property="IsMouseOver" Value="true"> | ||||
<Setter Property="Foreground" TargetName="contentPresenter" Value="white"/> | |||||
<Setter Property="Foreground" TargetName="contentPresenter" Value="Black"/> | |||||
</Trigger> | </Trigger> | ||||
<Trigger Property="HasItems" Value="false"> | <Trigger Property="HasItems" Value="false"> | ||||
<Setter Property="Height" TargetName="dropDownBorder" Value="95"/> | <Setter Property="Height" TargetName="dropDownBorder" Value="95"/> | ||||
@@ -28,7 +28,7 @@ | |||||
<Border Margin="0,180,30,0" Width="500" VerticalAlignment="Center" HorizontalAlignment="Right" Height="400"> | <Border Margin="0,180,30,0" Width="500" VerticalAlignment="Center" HorizontalAlignment="Right" Height="400"> | ||||
<StackPanel Orientation="Vertical" Width="500"> | <StackPanel Orientation="Vertical" Width="500"> | ||||
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center"> | <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center"> | ||||
<TextBlock HorizontalAlignment="Center" Margin="0,0,0,20" Text="选择煮面位置" FontSize="30" FontWeight="Black" Foreground="Black"/> | |||||
<TextBlock HorizontalAlignment="Center" Margin="0,0,0,20" Text="选择煮面位置" FontSize="40" FontWeight="Black" Foreground="Black"/> | |||||
<ItemsControl HorizontalAlignment="Center" ItemsSource="{Binding doNoodles}"> | <ItemsControl HorizontalAlignment="Center" ItemsSource="{Binding doNoodles}"> | ||||
<ItemsControl.ItemsPanel> | <ItemsControl.ItemsPanel> | ||||
<ItemsPanelTemplate> | <ItemsPanelTemplate> | ||||
@@ -37,14 +37,14 @@ | |||||
</ItemsControl.ItemsPanel> | </ItemsControl.ItemsPanel> | ||||
<ItemsControl.ItemTemplate> | <ItemsControl.ItemTemplate> | ||||
<DataTemplate> | <DataTemplate> | ||||
<CheckBox x:Name="ad" IsChecked="{Binding BtnIsChecked,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" Grid.Row="2" FontSize="25" FontWeight="Black" Width="120" Height="50" Margin="10,5" ContentStringFormat="{Binding Reset}" Command="{Binding ChooseSet,ElementName=device}" CommandParameter="{Binding ElementName=ad,Path=ContentStringFormat}" Background="#ECBB52" Foreground="Black" Style="{StaticResource MenuCheck_1}"/> | |||||
<CheckBox x:Name="ad" IsChecked="{Binding BtnIsChecked,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" Grid.Row="2" FontSize="40" FontWeight="Black" Width="120" Height="100" Margin="10,5" ContentStringFormat="{Binding Reset}" Command="{Binding ChooseSet,ElementName=device}" CommandParameter="{Binding ElementName=ad,Path=ContentStringFormat}" Background="#ECBB52" Foreground="Black" Style="{StaticResource MenuCheck_1}"/> | |||||
</DataTemplate> | </DataTemplate> | ||||
</ItemsControl.ItemTemplate> | </ItemsControl.ItemTemplate> | ||||
</ItemsControl> | </ItemsControl> | ||||
</StackPanel> | </StackPanel> | ||||
<StackPanel Margin="0,20,0,0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"> | <StackPanel Margin="0,20,0,0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"> | ||||
<TextBlock Text="设定时间:" FontSize="30" FontWeight="Black" Foreground="#ECBB52"/> | |||||
<TextBlock Text="设定时间:" FontSize="30" FontWeight="Black" Foreground="Black"/> | |||||
<con:TimeUi Min="{Binding DoN.Min,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" Sec="{Binding DoN.Senc,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"/> | <con:TimeUi Min="{Binding DoN.Min,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" Sec="{Binding DoN.Senc,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}"/> | ||||
</StackPanel> | </StackPanel> | ||||
@@ -53,16 +53,16 @@ | |||||
<!--#endregion--> | <!--#endregion--> | ||||
<Grid Margin="0,0,300,0"> | <Grid Margin="0,0,300,0"> | ||||
<!--#region 转台控制按钮 --> | <!--#region 转台控制按钮 --> | ||||
<Border Margin="0,30,300,0" Width="800" VerticalAlignment="Top" HorizontalAlignment="Center" Height="500"> | |||||
<Border Margin="0,30,200,0" Width="800" VerticalAlignment="Top" HorizontalAlignment="Center" Height="500"> | |||||
<ItemsControl ItemsSource="{Binding CtrlTurns}"> | <ItemsControl ItemsSource="{Binding CtrlTurns}"> | ||||
<ItemsControl.ItemsPanel> | <ItemsControl.ItemsPanel> | ||||
<ItemsPanelTemplate> | <ItemsPanelTemplate> | ||||
<WrapPanel Width="450"/> | |||||
<WrapPanel Width="700"/> | |||||
</ItemsPanelTemplate> | </ItemsPanelTemplate> | ||||
</ItemsControl.ItemsPanel> | </ItemsControl.ItemsPanel> | ||||
<ItemsControl.ItemTemplate> | <ItemsControl.ItemTemplate> | ||||
<DataTemplate> | <DataTemplate> | ||||
<RadioButton x:Name="ad" Grid.Row="2" FontSize="24" FontWeight="Black" Width="120" Height="100" Margin="10,5" GroupName="w" ContentStringFormat="{Binding Set}" IsChecked="{Binding UnderSet,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" Click="Turn_Click" Background="#ECBB52" Foreground="Black" Style="{StaticResource MenuCheck}"/> | |||||
<RadioButton x:Name="ad" Grid.Row="2" FontSize="40" FontWeight="Black" Width="200" Height="100" Margin="10,5" GroupName="w" ContentStringFormat="{Binding Set}" IsChecked="{Binding UnderSet,UpdateSourceTrigger=PropertyChanged,Mode=TwoWay}" Click="Turn_Click" Background="#ECBB52" Foreground="Black" Style="{StaticResource MenuCheck}"/> | |||||
</DataTemplate> | </DataTemplate> | ||||
</ItemsControl.ItemTemplate> | </ItemsControl.ItemTemplate> | ||||
@@ -80,7 +80,7 @@ | |||||
<!--#region 大小碗控制 --> | <!--#region 大小碗控制 --> | ||||
<Grid> | <Grid> | ||||
<Grid Height="60" Width="60" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,200,0"> | <Grid Height="60" Width="60" VerticalAlignment="Center" HorizontalAlignment="Right" Margin="0,0,200,0"> | ||||
<Ellipse Width="20" Height="20" Fill="Red" HorizontalAlignment="Center" VerticalAlignment="Center"> | |||||
<Ellipse Width="40" Height="40" Fill="Black" HorizontalAlignment="Center" VerticalAlignment="Center"> | |||||
<Ellipse.RenderTransform> | <Ellipse.RenderTransform> | ||||
<ScaleTransform ScaleX="1" ScaleY="1"/> | <ScaleTransform ScaleX="1" ScaleY="1"/> | ||||
</Ellipse.RenderTransform> | </Ellipse.RenderTransform> | ||||
@@ -88,8 +88,8 @@ | |||||
<EventTrigger RoutedEvent="Ellipse.Loaded"> | <EventTrigger RoutedEvent="Ellipse.Loaded"> | ||||
<BeginStoryboard> | <BeginStoryboard> | ||||
<Storyboard RepeatBehavior="Forever"> | <Storyboard RepeatBehavior="Forever"> | ||||
<DoubleAnimation Storyboard.TargetProperty="Height" From="15" To="20" Duration="0:0:1" AutoReverse="True"/> | |||||
<DoubleAnimation Storyboard.TargetProperty="Width" From="15" To="20" Duration="0:0:1" AutoReverse="True"/> | |||||
<DoubleAnimation Storyboard.TargetProperty="Height" From="30" To="40" Duration="0:0:1" AutoReverse="True"/> | |||||
<DoubleAnimation Storyboard.TargetProperty="Width" From="30" To="40" Duration="0:0:1" AutoReverse="True"/> | |||||
</Storyboard> | </Storyboard> | ||||
</BeginStoryboard> | </BeginStoryboard> | ||||
</EventTrigger> | </EventTrigger> | ||||
@@ -97,25 +97,25 @@ | |||||
</Ellipse> | </Ellipse> | ||||
</Grid> | </Grid> | ||||
<Path Stroke="Red" > | |||||
<Path Stroke="Black" StrokeThickness="4"> | |||||
<Path.Data> | <Path.Data> | ||||
<PathGeometry> | <PathGeometry> | ||||
<PathFigure StartPoint="580,500" IsClosed="False" IsFilled="False"> | <PathFigure StartPoint="580,500" IsClosed="False" IsFilled="False"> | ||||
<LineSegment Point="520,420"/> | <LineSegment Point="520,420"/> | ||||
<LineSegment Point="350,420"/> | |||||
<LineSegment Point="320,420"/> | |||||
</PathFigure> | </PathFigure> | ||||
</PathGeometry> | </PathGeometry> | ||||
</Path.Data> | </Path.Data> | ||||
</Path> | </Path> | ||||
<TextBlock Text="大小碗控制" FontSize="20" Foreground="Red" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="70,0,0,200"/> | |||||
<Border Height="800" Width="400" Margin="0,0,300,160" > | |||||
<TextBlock Text="大小碗控制" FontSize="30" Foreground="Black" HorizontalAlignment="Center" FontWeight="Black" VerticalAlignment="Center" Margin="40,0,0,200"/> | |||||
<Border Height="800" Width="400" Margin="0,0,400,160" > | |||||
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center"> | <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center"> | ||||
<Border CornerRadius="20" Margin="0,0,0,30" Background="#ECBB52" HorizontalAlignment="Center" VerticalAlignment="Center" Height="50" Width="150" BorderBrush="Black" BorderThickness="2"> | |||||
<Button Background="Transparent" Style="{StaticResource adbtn}" Click="BowCtrl_Click" Content="大 碗" BorderThickness="0" FontSize="25" FontWeight="Black"/> | |||||
<Border CornerRadius="20" Margin="0,0,0,30" Background="#ECBB52" HorizontalAlignment="Center" VerticalAlignment="Center" Height="100" Width="200" BorderBrush="Black" BorderThickness="2"> | |||||
<Button Background="Transparent" Style="{StaticResource adbtn}" Click="BowCtrl_Click" Content="大 碗" BorderThickness="0" FontSize="40" FontWeight="Black"/> | |||||
</Border> | </Border> | ||||
<Border CornerRadius="20" Background="#ECBB52" HorizontalAlignment="Center" VerticalAlignment="Center" Height="50" Width="150" BorderBrush="Black" BorderThickness="2"> | |||||
<Button Background="Transparent" Style="{StaticResource adbtn}" Click="BowCtrl_Click" Content="小 碗" BorderThickness="0" FontSize="25" FontWeight="Black"/> | |||||
<Border CornerRadius="20" Background="#ECBB52" HorizontalAlignment="Center" VerticalAlignment="Center" Height="100" Width="200" BorderBrush="Black" BorderThickness="2"> | |||||
<Button Background="Transparent" Style="{StaticResource adbtn}" Click="BowCtrl_Click" Content="小 碗" BorderThickness="0" FontSize="40" FontWeight="Black"/> | |||||
</Border> | </Border> | ||||
</StackPanel> | </StackPanel> | ||||
@@ -127,7 +127,7 @@ | |||||
<!--#region 转台控制 --> | <!--#region 转台控制 --> | ||||
<Grid Grid.Column="1"> | <Grid Grid.Column="1"> | ||||
<Grid Height="60" Width="60" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="300,0,0,500"> | <Grid Height="60" Width="60" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="300,0,0,500"> | ||||
<Ellipse Width="20" Height="20" Fill="Red" HorizontalAlignment="Center" VerticalAlignment="Center"> | |||||
<Ellipse Width="40" Height="40" Fill="Black" HorizontalAlignment="Center" VerticalAlignment="Center"> | |||||
<Ellipse.RenderTransform> | <Ellipse.RenderTransform> | ||||
<ScaleTransform ScaleX="1" ScaleY="1"/> | <ScaleTransform ScaleX="1" ScaleY="1"/> | ||||
</Ellipse.RenderTransform> | </Ellipse.RenderTransform> | ||||
@@ -135,8 +135,8 @@ | |||||
<EventTrigger RoutedEvent="Ellipse.Loaded"> | <EventTrigger RoutedEvent="Ellipse.Loaded"> | ||||
<BeginStoryboard> | <BeginStoryboard> | ||||
<Storyboard RepeatBehavior="Forever"> | <Storyboard RepeatBehavior="Forever"> | ||||
<DoubleAnimation Storyboard.TargetProperty="Height" From="15" To="20" Duration="0:0:1" AutoReverse="True"/> | |||||
<DoubleAnimation Storyboard.TargetProperty="Width" From="15" To="20" Duration="0:0:1" AutoReverse="True"/> | |||||
<DoubleAnimation Storyboard.TargetProperty="Height" From="30" To="40" Duration="0:0:1" AutoReverse="True"/> | |||||
<DoubleAnimation Storyboard.TargetProperty="Width" From="30" To="40" Duration="0:0:1" AutoReverse="True"/> | |||||
</Storyboard> | </Storyboard> | ||||
</BeginStoryboard> | </BeginStoryboard> | ||||
</EventTrigger> | </EventTrigger> | ||||
@@ -144,7 +144,7 @@ | |||||
</Ellipse> | </Ellipse> | ||||
</Grid> | </Grid> | ||||
<Path Stroke="Red" > | |||||
<Path Stroke="Black" StrokeThickness="4" > | |||||
<Path.Data> | <Path.Data> | ||||
<PathGeometry> | <PathGeometry> | ||||
<PathFigure StartPoint="330,250" IsClosed="False" IsFilled="False"> | <PathFigure StartPoint="330,250" IsClosed="False" IsFilled="False"> | ||||
@@ -155,7 +155,7 @@ | |||||
</Path.Data> | </Path.Data> | ||||
</Path> | </Path> | ||||
<TextBlock Text="转台控制" FontSize="20" Foreground="Red" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,500,640"/> | |||||
<TextBlock Text="转台控制" FontSize="30" Foreground="Black" FontWeight="Black" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,0,500,640"/> | |||||
</Grid> | </Grid> | ||||
<!--#endregion--> | <!--#endregion--> | ||||
@@ -164,7 +164,7 @@ | |||||
<!--#region 煮面时间设定 --> | <!--#region 煮面时间设定 --> | ||||
<Grid Grid.Column="1" > | <Grid Grid.Column="1" > | ||||
<Grid Height="60" Width="60" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="200,0,0,380"> | <Grid Height="60" Width="60" VerticalAlignment="Bottom" HorizontalAlignment="Left" Margin="200,0,0,380"> | ||||
<Ellipse Width="20" Height="20" Fill="Red" HorizontalAlignment="Center" VerticalAlignment="Center"> | |||||
<Ellipse Width="40" Height="40" Fill="Black" HorizontalAlignment="Center" VerticalAlignment="Center"> | |||||
<Ellipse.RenderTransform> | <Ellipse.RenderTransform> | ||||
<ScaleTransform ScaleX="1" ScaleY="1"/> | <ScaleTransform ScaleX="1" ScaleY="1"/> | ||||
</Ellipse.RenderTransform> | </Ellipse.RenderTransform> | ||||
@@ -172,8 +172,8 @@ | |||||
<EventTrigger RoutedEvent="Ellipse.Loaded"> | <EventTrigger RoutedEvent="Ellipse.Loaded"> | ||||
<BeginStoryboard> | <BeginStoryboard> | ||||
<Storyboard RepeatBehavior="Forever"> | <Storyboard RepeatBehavior="Forever"> | ||||
<DoubleAnimation Storyboard.TargetProperty="Height" From="15" To="20" Duration="0:0:1" AutoReverse="True"/> | |||||
<DoubleAnimation Storyboard.TargetProperty="Width" From="15" To="20" Duration="0:0:1" AutoReverse="True"/> | |||||
<DoubleAnimation Storyboard.TargetProperty="Height" From="30" To="40" Duration="0:0:1" AutoReverse="True"/> | |||||
<DoubleAnimation Storyboard.TargetProperty="Width" From="30" To="40" Duration="0:0:1" AutoReverse="True"/> | |||||
</Storyboard> | </Storyboard> | ||||
</BeginStoryboard> | </BeginStoryboard> | ||||
</EventTrigger> | </EventTrigger> | ||||
@@ -181,7 +181,7 @@ | |||||
</Ellipse> | </Ellipse> | ||||
</Grid> | </Grid> | ||||
<Path Stroke="Red" HorizontalAlignment="Left" VerticalAlignment="Center"> | |||||
<Path Stroke="Black" StrokeThickness="3" HorizontalAlignment="Left" VerticalAlignment="Center"> | |||||
<Path.Data> | <Path.Data> | ||||
<PathGeometry> | <PathGeometry> | ||||
<PathFigure StartPoint="230,210" IsClosed="False" IsFilled="False"> | <PathFigure StartPoint="230,210" IsClosed="False" IsFilled="False"> | ||||
@@ -192,7 +192,7 @@ | |||||
</Path.Data> | </Path.Data> | ||||
</Path> | </Path> | ||||
<TextBlock Text="煮面时间设定" FontSize="20" Foreground="red" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="100,200,0,0"/> | |||||
<TextBlock Text="煮面时间设定" FontSize="30" Foreground="Black" FontWeight="Black" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="100,200,0,0"/> | |||||
</Grid> | </Grid> | ||||
@@ -40,24 +40,24 @@ | |||||
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center"> | <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center"> | ||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"> | <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"> | ||||
<Image Source="/BPASmartClient.CustomResource;component/Image/菜品_1.png" Height="40" Width="40"/> | <Image Source="/BPASmartClient.CustomResource;component/Image/菜品_1.png" Height="40" Width="40"/> | ||||
<TextBlock Margin="20,0,0,0" Text="面条名称 :" Foreground="Black" FontSize="30" FontWeight="Black"/> | |||||
<TextBlock Margin="20,0,0,0" Text="面条名称 :" Foreground="Black" FontSize="32" FontWeight="Black"/> | |||||
<Border BorderBrush="Black" BorderThickness="0,0,0,2" Width="200"> | <Border BorderBrush="Black" BorderThickness="0,0,0,2" Width="200"> | ||||
<TextBox x:Name="nameText" Margin="0,0,0,2" Foreground="Black" Text="{Binding LocalOrder.GoodName}" Style="{StaticResource ComboBoxEditableTextBox}" FontSize="28" Background="Transparent" Height="40" /> | |||||
<TextBox x:Name="nameText" Margin="0,0,0,2" Foreground="Black" Text="{Binding LocalOrder.GoodName}" Style="{StaticResource ComboBoxEditableTextBox}" FontSize="30" Background="Transparent" Height="40" /> | |||||
</Border> | </Border> | ||||
</StackPanel> | </StackPanel> | ||||
<StackPanel Margin="0,40,0,0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"> | <StackPanel Margin="0,40,0,0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"> | ||||
<Image Source="/BPASmartClient.CustomResource;component/Image/面条_1.png" Height="40" Width="40"/> | |||||
<TextBlock Margin="20,0,0,0" Text="面条位置 :" Foreground="#F08454" FontSize="30" FontWeight="Black"/> | |||||
<ComboBox x:Name="NoodLoc" Width="200" Margin="0,0,0,2" Style="{StaticResource ComboBoxStyle1}" SelectedItem="{Binding LocalOrder.NoodleLoc,Converter={StaticResource noodleConvert}}" Foreground="#F08454" BorderBrush="#F08454" /> | |||||
<Image Source="/BPASmartClient.CustomResource;component/Image/面条.png" Height="40" Width="40"/> | |||||
<TextBlock Margin="20,0,0,0" Text="面条位置 :" Foreground="Black" FontSize="33" FontWeight="Black"/> | |||||
<ComboBox x:Name="NoodLoc" Width="200" Margin="0,0,0,2" Style="{StaticResource ComboBoxStyle1}" FontSize="30" SelectedItem="{Binding LocalOrder.NoodleLoc,Converter={StaticResource noodleConvert}}" Foreground="Black" BorderBrush="Black" /> | |||||
</StackPanel> | </StackPanel> | ||||
<StackPanel Margin="0,40,0,0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"> | <StackPanel Margin="0,40,0,0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"> | ||||
<Image Source="/BPASmartClient.CustomResource;component/Image/碗.png" Height="40" Width="40"/> | <Image Source="/BPASmartClient.CustomResource;component/Image/碗.png" Height="40" Width="40"/> | ||||
<TextBlock Margin="20,0,0,0" Text="面碗位置 :" Foreground="#EA7BD1" FontSize="30" FontWeight="Black"/> | |||||
<ComboBox Width="200" x:Name="BowLoc" Margin="0,0,0,2" Style="{StaticResource ComboBoxStyle1}" SelectedItem="{Binding LocalOrder.BowLoc,Converter={StaticResource BowConvert}}" Foreground="#EA7BD1" BorderBrush="#EA7BD1" /> | |||||
<TextBlock Margin="20,0,0,0" Text="面碗位置 :" Foreground="Black" FontSize="32" FontWeight="Black"/> | |||||
<ComboBox Width="200" x:Name="BowLoc" Margin="0,0,0,2" Style="{StaticResource ComboBoxStyle1}" FontSize="30" SelectedItem="{Binding LocalOrder.BowLoc,Converter={StaticResource BowConvert}}" Foreground="Black" BorderBrush="Black" /> | |||||
</StackPanel> | </StackPanel> | ||||
<StackPanel Margin="0,40,0,0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"> | <StackPanel Margin="0,40,0,0" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"> | ||||
<Image Source="/BPASmartClient.CustomResource;component/Image/时间.png" Height="40" Width="40"/> | |||||
<TextBlock Margin="20,0,0,0" Text="煮面时间 :" Foreground="#ECBB52" FontSize="30" FontWeight="Black"/> | |||||
<Image Source="/BPASmartClient.CustomResource;component/Image/时间_1.png" Height="40" Width="40"/> | |||||
<TextBlock Margin="20,0,0,0" Text="煮面时间 :" Foreground="Black" FontSize="32" FontWeight="Black"/> | |||||
<!--<Border BorderBrush="#ECBB52" BorderThickness="0,0,0,2" Width="200"> | <!--<Border BorderBrush="#ECBB52" BorderThickness="0,0,0,2" Width="200"> | ||||
<StackPanel Orientation="Horizontal" VerticalAlignment="Center"> | <StackPanel Orientation="Horizontal" VerticalAlignment="Center"> | ||||
<TextBox Margin="0,0,0,2" Width="60" Text="{Binding LocalOrder.FrytimeMin}" HorizontalContentAlignment="Right" Style="{StaticResource ComboBoxEditableTextBox}" Foreground="#ECBB52" FontSize="28" Background="Transparent" Height="40" /> | <TextBox Margin="0,0,0,2" Width="60" Text="{Binding LocalOrder.FrytimeMin}" HorizontalContentAlignment="Right" Style="{StaticResource ComboBoxEditableTextBox}" Foreground="#ECBB52" FontSize="28" Background="Transparent" Height="40" /> | ||||
@@ -71,8 +71,8 @@ | |||||
</StackPanel> | </StackPanel> | ||||
</StackPanel> | </StackPanel> | ||||
<Border CornerRadius="20" Background="#ECBB52" Margin="0,0,0,100" HorizontalAlignment="Center" VerticalAlignment="Bottom" Height="40" Width="200" BorderBrush="Black" BorderThickness="2"> | |||||
<Button Background="Transparent" Style="{StaticResource adbtn}" Command="{Binding SaveOrder}" Content="保 存" BorderThickness="0" FontSize="20" /> | |||||
<Border CornerRadius="20" Background="#ECBB52" Margin="0,0,0,100" HorizontalAlignment="Center" VerticalAlignment="Bottom" Height="50" Width="200" BorderBrush="Black" BorderThickness="2"> | |||||
<Button Background="Transparent" Style="{StaticResource adbtn}" Command="{Binding SaveOrder}" Content="保 存" FontWeight="Black" BorderThickness="0" FontSize="30" /> | |||||
</Border> | </Border> | ||||
</Grid> | </Grid> | ||||
</Grid> | </Grid> | ||||
@@ -89,34 +89,33 @@ | |||||
<ItemsControl.ItemTemplate> | <ItemsControl.ItemTemplate> | ||||
<DataTemplate> | <DataTemplate> | ||||
<Grid Height="220" Width="320" > | <Grid Height="220" Width="320" > | ||||
<RadioButton Content="{Binding GoodName}" Foreground="Black" Background="#D7D7D7" x:Name="checkOrder" Command="{Binding ElementName=editView,Path=EditOrder}" GroupName="hh" FontSize="40" FontWeight="Black" CommandParameter="{Binding ElementName=checkOrder,Path=Content}" Margin="5" Style="{DynamicResource togrecipebtn_1}"/> | |||||
<RadioButton Content="{Binding GoodName}" Foreground="Black" Background="#D7D7D7" x:Name="checkOrder" Command="{Binding ElementName=editView,Path=EditOrder}" GroupName="hh" FontSize="45" FontWeight="Black" CommandParameter="{Binding ElementName=checkOrder,Path=Content}" Margin="5" Style="{DynamicResource togrecipebtn_1}"/> | |||||
<Grid Height="80" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="20,0"> | <Grid Height="80" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="20,0"> | ||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | ||||
<Image Height="20" Width="20" Source="C:\Users\刘耀文\Desktop\煮面机测试\BPASmartClient.CustomResource\Image\面条_1.png"/> | |||||
<Image Source="/BPASmartClient.CustomResource;component/Image/面条.png" Height="30" Width="30"/> | |||||
<StackPanel Margin="10,0,0,0" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" > | <StackPanel Margin="10,0,0,0" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" > | ||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | ||||
<TextBlock Text="面条位置:" Foreground="#F08454" FontSize="16" FontWeight="Black"/> | |||||
<TextBlock Margin="20,0,0,0" Text="{Binding NoodleLoc,Converter={StaticResource noodleConvert}}" FontSize="14" Foreground="#F08454" FontWeight="Black"/> | |||||
<TextBlock Text="面条位置:" Foreground="Black" FontSize="20" FontWeight="Black"/> | |||||
<TextBlock Margin="20,0,0,0" Text="{Binding NoodleLoc,Converter={StaticResource noodleConvert}}" FontSize="20" Foreground="Black" FontWeight="Black"/> | |||||
</StackPanel> | </StackPanel> | ||||
<StackPanel Margin="0,5,0,0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | <StackPanel Margin="0,5,0,0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | ||||
<TextBlock Text="面碗位置:" Foreground="#F08454" FontSize="16" FontWeight="Black"/> | |||||
<TextBlock Margin="20,0,0,0" Text="{Binding BowLoc,Converter={StaticResource BowConvert}}" Foreground="#F08454" FontSize="14" FontWeight="Black"/> | |||||
<TextBlock Text="面碗位置:" Foreground="Black" FontSize="20" FontWeight="Black"/> | |||||
<TextBlock Margin="20,0,0,0" Text="{Binding BowLoc,Converter={StaticResource BowConvert}}" Foreground="Black" FontSize="20" FontWeight="Black"/> | |||||
</StackPanel> | </StackPanel> | ||||
</StackPanel> | </StackPanel> | ||||
</StackPanel> | </StackPanel> | ||||
</Grid> | </Grid> | ||||
<Grid HorizontalAlignment="Right" Height="60" Margin="0,0,20,0" VerticalAlignment="Top"> | <Grid HorizontalAlignment="Right" Height="60" Margin="0,0,20,0" VerticalAlignment="Top"> | ||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | ||||
<Image Height="20" Width="20" Source="/BPASmartClient.CustomResource;component/Image/时间.png"/> | |||||
<TextBlock Text="炒制时间:" Foreground="#FBAF1A" FontSize="16" FontWeight="Black"/> | |||||
<TextBlock Margin="5,0,0,0" Text="{Binding FrytimeMin}" VerticalAlignment="Center" Foreground="#FBAF1A" FontSize="14" FontWeight="Black"/> | |||||
<TextBlock Text="min" Foreground="#FBAF1A" FontSize="16" VerticalAlignment="Center" FontWeight="Black"/> | |||||
<TextBlock Margin="2,0,0,0" Text="{Binding FrytimeS}" Foreground="#FBAF1A" VerticalAlignment="Center" FontSize="14" FontWeight="Black"/> | |||||
<TextBlock Text="s" Foreground="#FBAF1A" FontSize="16" VerticalAlignment="Center" FontWeight="Black"/> | |||||
<Image Height="25" Width="25" Source="/BPASmartClient.CustomResource;component/Image/时间_1.png"/> | |||||
<TextBlock Text="煮面时间:" Foreground="Black" VerticalAlignment="Center" FontSize="18" FontWeight="Black"/> | |||||
<TextBlock Margin="5,0,0,0" Text="{Binding FrytimeMin}" VerticalAlignment="Center" Foreground="Black" FontSize="16" FontWeight="Black"/> | |||||
<TextBlock Text="min" FontSize="16" VerticalAlignment="Center" Foreground="Black" FontWeight="Black"/> | |||||
<TextBlock Margin="2,0,0,0" Text="{Binding FrytimeS}" Foreground="Black" VerticalAlignment="Center" FontSize="16" FontWeight="Black"/> | |||||
<TextBlock Text="s" Foreground="Black" FontSize="16" VerticalAlignment="Center" FontWeight="Black"/> | |||||
</StackPanel> | </StackPanel> | ||||
</Grid> | </Grid> | ||||
<Button Style="{StaticResource viewBtn_3}" Content="删除" Foreground="White" Command="{Binding ElementName=editView,Path=DeleteOrder}" CommandParameter="{Binding ElementName=checkOrder,Path=Content}" HorizontalAlignment="Left" VerticalAlignment="Top" Height="20" Width="60" Margin="20"> | |||||
<Button Style="{StaticResource viewBtn_3}" Content="删除" Foreground="Black" Command="{Binding ElementName=editView,Path=DeleteOrder}" CommandParameter="{Binding ElementName=checkOrder,Path=Content}" HorizontalAlignment="Left" VerticalAlignment="Top" Height="20" Width="60" Margin="20"> | |||||
<Button.Background> | <Button.Background> | ||||
<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/删除.png"/> | <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/删除.png"/> | ||||
</Button.Background> | </Button.Background> | ||||
@@ -46,7 +46,7 @@ | |||||
<Grid Background="#D7D7D7"> | <Grid Background="#D7D7D7"> | ||||
<Grid.ColumnDefinitions> | <Grid.ColumnDefinitions> | ||||
<ColumnDefinition Width="1600"/> | |||||
<ColumnDefinition Width="1500"/> | |||||
<ColumnDefinition/> | <ColumnDefinition/> | ||||
</Grid.ColumnDefinitions> | </Grid.ColumnDefinitions> | ||||
<Grid> | <Grid> | ||||
@@ -68,27 +68,27 @@ | |||||
<RadioButton Content="{Binding GoodName}" Foreground="Black" Background="White" x:Name="checkOrder" Command="{Binding ElementName=orderstatusView,Path=EditOrder}" GroupName="hh" FontSize="40" FontWeight="Black" CommandParameter="{Binding ElementName=checkOrder,Path=Content}" Margin="5" Style="{DynamicResource togrecipebtn}"/> | <RadioButton Content="{Binding GoodName}" Foreground="Black" Background="White" x:Name="checkOrder" Command="{Binding ElementName=orderstatusView,Path=EditOrder}" GroupName="hh" FontSize="40" FontWeight="Black" CommandParameter="{Binding ElementName=checkOrder,Path=Content}" Margin="5" Style="{DynamicResource togrecipebtn}"/> | ||||
<Grid Height="80" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="20,0"> | <Grid Height="80" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="20,0"> | ||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | ||||
<Image Height="20" Width="20" Source="C:\Users\刘耀文\Desktop\煮面机测试\BPASmartClient.CustomResource\Image\面条_1.png"/> | |||||
<Image Height="30" Width="30" Source="/BPASmartClient.CustomResource;component/Image/面条.png"/> | |||||
<StackPanel Margin="10,0,0,0" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" > | <StackPanel Margin="10,0,0,0" Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" > | ||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | ||||
<TextBlock Text="面条位置:" Foreground="#F08454" FontSize="16" FontWeight="Black"/> | |||||
<TextBlock Margin="20,0,0,0" Text="{Binding NoodleLoc,Converter={StaticResource noodleConvert}}" FontSize="14" Foreground="#F08454" FontWeight="Black"/> | |||||
<TextBlock Text="面条位置:" Foreground="Black" FontSize="20" FontWeight="Black"/> | |||||
<TextBlock Margin="20,0,0,0" Text="{Binding NoodleLoc,Converter={StaticResource noodleConvert}}" FontSize="20" Foreground="Black" FontWeight="Black"/> | |||||
</StackPanel> | </StackPanel> | ||||
<StackPanel Margin="0,5,0,0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | <StackPanel Margin="0,5,0,0" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | ||||
<TextBlock Text="面碗位置:" Foreground="#F08454" FontSize="16" FontWeight="Black"/> | |||||
<TextBlock Margin="20,0,0,0" Text="{Binding BowLoc,Converter={StaticResource BowConvert}}" Foreground="#F08454" FontSize="14" FontWeight="Black"/> | |||||
<TextBlock Text="面碗位置:" Foreground="Black" FontSize="20" FontWeight="Black"/> | |||||
<TextBlock Margin="20,0,0,0" Text="{Binding BowLoc,Converter={StaticResource BowConvert}}" Foreground="Black" FontSize="20" FontWeight="Black"/> | |||||
</StackPanel> | </StackPanel> | ||||
</StackPanel> | </StackPanel> | ||||
</StackPanel> | </StackPanel> | ||||
</Grid> | </Grid> | ||||
<Grid HorizontalAlignment="Right" Height="60" Margin="0,0,20,0" VerticalAlignment="Top"> | <Grid HorizontalAlignment="Right" Height="60" Margin="0,0,20,0" VerticalAlignment="Top"> | ||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | ||||
<Image Height="20" Width="20" Source="/BPASmartClient.CustomResource;component/Image/时间.png"/> | |||||
<TextBlock Text="炒制时间:" Foreground="#FBAF1A" FontSize="16" FontWeight="Black"/> | |||||
<TextBlock Margin="5,0,0,0" Text="{Binding FrytimeMin}" VerticalAlignment="Center" Foreground="#FBAF1A" FontSize="14" FontWeight="Black"/> | |||||
<TextBlock Text="min" Foreground="#FBAF1A" FontSize="16" VerticalAlignment="Center" FontWeight="Black"/> | |||||
<TextBlock Margin="2,0,0,0" Text="{Binding FrytimeS}" Foreground="#FBAF1A" VerticalAlignment="Center" FontSize="14" FontWeight="Black"/> | |||||
<TextBlock Text="s" Foreground="#FBAF1A" FontSize="16" VerticalAlignment="Center" FontWeight="Black"/> | |||||
<Image Height="25" Width="25" Source="/BPASmartClient.CustomResource;component/Image/时间_1.png"/> | |||||
<TextBlock Text="煮面时间:" Foreground="Black" VerticalAlignment="Center" FontSize="18" FontWeight="Black"/> | |||||
<TextBlock Margin="5,0,0,0" Text="{Binding FrytimeMin}" VerticalAlignment="Center" Foreground="Black" FontSize="16" FontWeight="Black"/> | |||||
<TextBlock Text="min" FontSize="16" VerticalAlignment="Center" Foreground="Black" FontWeight="Black"/> | |||||
<TextBlock Margin="2,0,0,0" Text="{Binding FrytimeS}" Foreground="Black" VerticalAlignment="Center" FontSize="16" FontWeight="Black"/> | |||||
<TextBlock Text="s" Foreground="Black" FontSize="16" VerticalAlignment="Center" FontWeight="Black"/> | |||||
</StackPanel> | </StackPanel> | ||||
</Grid> | </Grid> | ||||
</Grid> | </Grid> | ||||
@@ -105,8 +105,8 @@ | |||||
<ColumnDefinition Width="270"/> | <ColumnDefinition Width="270"/> | ||||
</Grid.ColumnDefinitions> | </Grid.ColumnDefinitions> | ||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center"> | ||||
<Image Source="/BPASmartClient.CustomResource;component/Image/菜品_1.png" Margin="40,30,10,30"/> | |||||
<TextBlock Margin="0,0,20,0" Text="面条名称:" Foreground="Black" FontSize="35" FontWeight="Black"/> | |||||
<Image Source="/BPASmartClient.CustomResource;component/Image/菜品_1.png" Margin="20,30,10,30"/> | |||||
<TextBlock Margin="0,0,10,0" Text="面条名称:" Foreground="Black" FontSize="35" FontWeight="Black"/> | |||||
<TextBlock Text="{Binding LocalOrder.GoodName}" FontSize="30" FontWeight="Black" Foreground="Black"/> | <TextBlock Text="{Binding LocalOrder.GoodName}" FontSize="30" FontWeight="Black" Foreground="Black"/> | ||||
<Image Margin="40,30,10,30" Source="/BPASmartClient.CustomResource;component/Image/面条.png"/> | <Image Margin="40,30,10,30" Source="/BPASmartClient.CustomResource;component/Image/面条.png"/> | ||||
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" > | <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center" > | ||||
@@ -145,7 +145,7 @@ | |||||
</LinearGradientBrush> | </LinearGradientBrush> | ||||
</Border.Background> | </Border.Background> | ||||
</Border> | </Border> | ||||
<Button Style="{StaticResource viewBtn_1}" Content="下单" Foreground="White" Command="{Binding StartOrder}" FontSize="40" FontWeight="Black"> | |||||
<Button Style="{StaticResource viewBtn_1}" Content="下单" Foreground="Black" Command="{Binding StartOrder}" FontSize="50" FontWeight="Black"> | |||||
<Button.Background> | <Button.Background> | ||||
<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/购物车.png"/> | <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/购物车.png"/> | ||||
</Button.Background> | </Button.Background> | ||||
@@ -157,49 +157,52 @@ | |||||
</Border> | </Border> | ||||
</Grid> | </Grid> | ||||
<Grid Background="{StaticResource boColor}" Grid.Column="1"> | |||||
<Grid Background="White" Grid.Column="1"> | |||||
<Grid.RowDefinitions> | <Grid.RowDefinitions> | ||||
<RowDefinition Height="50"/> | <RowDefinition Height="50"/> | ||||
<RowDefinition/> | <RowDefinition/> | ||||
</Grid.RowDefinitions> | </Grid.RowDefinitions> | ||||
<Grid> | <Grid> | ||||
<TextBlock Text="订单信息" Foreground="White" FontSize="25" HorizontalAlignment="Center" FontFamily="STHupo" VerticalAlignment="Center"/> | |||||
<TextBlock Text="订单信息" Foreground="Black" FontSize="40" HorizontalAlignment="Center" FontFamily="STHupo" VerticalAlignment="Center"/> | |||||
</Grid> | </Grid> | ||||
<ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"> | <ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"> | ||||
<ItemsControl ItemsSource="{Binding orderStatusLists}"> | <ItemsControl ItemsSource="{Binding orderStatusLists}"> | ||||
<ItemsControl.ItemTemplate> | <ItemsControl.ItemTemplate> | ||||
<DataTemplate> | <DataTemplate> | ||||
<Border x:Name="MyGrid" Margin="10,5" Background="White" CornerRadius="10" Height="100"> | |||||
<Border x:Name="MyGrid" Margin="10,5" Background="{Binding OrderStatus, Converter={StaticResource ColorConverter}}" CornerRadius="10" Height="150"> | |||||
<Border.Effect> | <Border.Effect> | ||||
<DropShadowEffect ShadowDepth="1" Color="Black" Opacity="0.2" Direction="-45" /> | <DropShadowEffect ShadowDepth="1" Color="Black" Opacity="0.2" Direction="-45" /> | ||||
</Border.Effect> | </Border.Effect> | ||||
<Grid> | <Grid> | ||||
<Grid.RowDefinitions> | <Grid.RowDefinitions> | ||||
<RowDefinition Height="60"/> | |||||
<RowDefinition Height="40"/> | <RowDefinition Height="40"/> | ||||
<RowDefinition Height="30"/> | |||||
<RowDefinition Height="30"/> | |||||
<RowDefinition Height="50"/> | |||||
</Grid.RowDefinitions> | </Grid.RowDefinitions> | ||||
<StackPanel Grid.Row="1" Margin="20,0,0,0" HorizontalAlignment="Left" Orientation="Horizontal"> | |||||
<TextBlock Text="订单编号:" VerticalAlignment="Center" Foreground="#777777" FontFamily="黑体" FontSize="15"/> | |||||
<TextBlock x:Name="SortNum" Text="{Binding OrderPush.SortNum}" VerticalAlignment="Center" Foreground="Black" FontFamily="STHupo" FontSize="25" /> | |||||
<StackPanel Grid.Row="0" Margin="20,0,0,0" HorizontalAlignment="Left" Orientation="Horizontal"> | |||||
<TextBlock x:Name="SortNum" Text="{Binding OrderPush.SortNum}" VerticalAlignment="Center" Foreground="Black" FontWeight="Black" FontSize="40" /> | |||||
<TextBlock Grid.Row="0" Margin="20,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding OrderPush.GoodsName}" FontWeight="Black" Foreground="Black" FontSize="30" /> | |||||
</StackPanel> | </StackPanel> | ||||
<StackPanel Margin="10,0,0,0" Grid.Row="3" HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Horizontal"> | <StackPanel Margin="10,0,0,0" Grid.Row="3" HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Horizontal"> | ||||
<TextBlock Text="下单时间:" Foreground="#999999" FontFamily="黑体" FontSize="15"/> | |||||
<TextBlock Text="{Binding StartDate}" VerticalAlignment="Center" Foreground="#999999" FontWeight="Black" FontFamily="黑体" FontSize="14" /> | |||||
<TextBlock Text="下单时间:" VerticalAlignment="Center" Foreground="Black" FontFamily="黑体" FontSize="20"/> | |||||
<TextBlock Text="{Binding StartDate}" VerticalAlignment="Center" Foreground="Black" FontWeight="Black" FontFamily="黑体" FontSize="25" /> | |||||
</StackPanel> | </StackPanel> | ||||
<StackPanel Margin="0,0,10,0" Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal"> | <StackPanel Margin="0,0,10,0" Grid.Row="2" HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal"> | ||||
<TextBlock Text="状态:" Foreground="#999999" FontFamily="黑体" FontSize="15"/> | |||||
<TextBlock HorizontalAlignment="Right" FontSize="14" VerticalAlignment="Center" Foreground="{Binding OrderStatus, Converter={StaticResource ColorConverter}}" FontFamily="幼圆" Text="{Binding OrderStatus, Converter={StaticResource TextConverter}}" /> | |||||
<TextBlock HorizontalAlignment="Right" FontSize="20" VerticalAlignment="Center" Foreground="Black" FontWeight="Black" Text="{Binding OrderStatus, Converter={StaticResource TextConverter}}" /> | |||||
</StackPanel> | </StackPanel> | ||||
<TextBlock Grid.Row="0" Margin="20,0,0,0" HorizontalAlignment="Left" VerticalAlignment="Center" Text="{Binding OrderPush.GoodsName}" FontWeight="Black" Foreground="{StaticResource wordColor}" FontSize="20" /> | |||||
<Button x:Name="Exit" Click="Exit_Click" Margin="0,0,20,0" Style="{StaticResource adbtn}" Command="{Binding ElementName=orderstatusView,Path=ExitOrder}" CommandParameter="{Binding ElementName=SortNum,Path=Text}" BorderThickness="0" HorizontalAlignment="Right" Background="Transparent" Content="取消订单" Foreground="{StaticResource nameColor}" FontFamily="STHupo" FontSize="20"/> | |||||
<TextBlock Margin="10,0,0,0" Text="{Binding FoodMenuModel.BowLoc,Converter={StaticResource BowConvert}}" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="Black" FontFamily="STHupo" FontSize="15"/> | |||||
<Button x:Name="Exit" Click="Exit_Click" Margin="0,0,20,0" Style="{StaticResource adbtn}" Command="{Binding ElementName=orderstatusView,Path=ExitOrder}" CommandParameter="{Binding ElementName=SortNum,Path=Text}" BorderThickness="0" HorizontalAlignment="Right" Background="Transparent" Content="取消订单" Foreground="Black" FontFamily="STHupo" FontSize="30"/> | |||||
<StackPanel Margin="0,0,10,0" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal"> | <StackPanel Margin="0,0,10,0" Grid.Row="1" HorizontalAlignment="Right" VerticalAlignment="Center" Orientation="Horizontal"> | ||||
<TextBlock Text="面条:" Foreground="#999999" FontFamily="黑体" FontSize="15"/> | |||||
<TextBlock Text="{Binding FoodMenuModel.NoodleLoc,Converter={StaticResource noodleConvert}}" VerticalAlignment="Center" HorizontalAlignment="Right" Foreground="Black" FontWeight="Black" FontFamily="黑体" FontSize="15"/> | |||||
<TextBlock Text="面条:" Foreground="Black" FontFamily="黑体" VerticalAlignment="Center" FontSize="20"/> | |||||
<TextBlock Text="{Binding FoodMenuModel.NoodleLoc,Converter={StaticResource noodleConvert}}" VerticalAlignment="Center" HorizontalAlignment="Right" Foreground="Black" FontWeight="Black" FontFamily="黑体" FontSize="30"/> | |||||
</StackPanel> | |||||
<StackPanel Margin="10,0,0,0" Grid.Row="1" HorizontalAlignment="Left" VerticalAlignment="Center" Orientation="Horizontal"> | |||||
<TextBlock Text="面碗:" Foreground="Black" FontFamily="黑体" VerticalAlignment="Center" FontSize="20"/> | |||||
<TextBlock Margin="10,0,0,0" Text="{Binding FoodMenuModel.BowLoc,Converter={StaticResource BowConvert}}" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="Black" FontFamily="STHupo" FontSize="30"/> | |||||
</StackPanel> | </StackPanel> | ||||
</Grid> | </Grid> | ||||
@@ -210,7 +213,7 @@ | |||||
<Storyboard AutoReverse="False"> | <Storyboard AutoReverse="False"> | ||||
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="MyGrid" Storyboard.TargetProperty="Height"> | <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MyGrid" Storyboard.TargetProperty="Height"> | ||||
<EasingDoubleKeyFrame KeyTime="0" Value="0"/> | <EasingDoubleKeyFrame KeyTime="0" Value="0"/> | ||||
<EasingDoubleKeyFrame KeyTime="0:0:0.5" Value="100"/> | |||||
<EasingDoubleKeyFrame KeyTime="0:0:0.5" Value="150"/> | |||||
</DoubleAnimationUsingKeyFrames> | </DoubleAnimationUsingKeyFrames> | ||||
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="MyGrid" Storyboard.TargetProperty="Opacity"> | <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MyGrid" Storyboard.TargetProperty="Opacity"> | ||||
<EasingDoubleKeyFrame KeyTime="0" Value="0"/> | <EasingDoubleKeyFrame KeyTime="0" Value="0"/> | ||||
@@ -222,7 +225,7 @@ | |||||
<EventTrigger SourceName="Exit" RoutedEvent="Button.Click"> | <EventTrigger SourceName="Exit" RoutedEvent="Button.Click"> | ||||
<BeginStoryboard> | <BeginStoryboard> | ||||
<Storyboard AutoReverse="False" Duration="1" RepeatBehavior="1"> | <Storyboard AutoReverse="False" Duration="1" RepeatBehavior="1"> | ||||
<DoubleAnimation From="100" To="0" Storyboard.TargetName="MyGrid" Duration="0:0:0.5" Storyboard.TargetProperty="Height" AutoReverse="True" /> | |||||
<DoubleAnimation From="150" To="0" Storyboard.TargetName="MyGrid" Duration="0:0:0.5" Storyboard.TargetProperty="Height" AutoReverse="True" /> | |||||
<DoubleAnimation From="1" To="0" Storyboard.TargetName="MyGrid" Duration="0:0:0.5" Storyboard.TargetProperty="Opacity" AutoReverse="True" /> | <DoubleAnimation From="1" To="0" Storyboard.TargetName="MyGrid" Duration="0:0:0.5" Storyboard.TargetProperty="Opacity" AutoReverse="True" /> | ||||
</Storyboard> | </Storyboard> | ||||
</BeginStoryboard> | </BeginStoryboard> | ||||
@@ -9,27 +9,27 @@ | |||||
<UserControl.Resources> | <UserControl.Resources> | ||||
<Style x:Key="timeToggle" TargetType="{x:Type ToggleButton}"> | <Style x:Key="timeToggle" TargetType="{x:Type ToggleButton}"> | ||||
<Setter Property="FontSize" Value="30"/> | <Setter Property="FontSize" Value="30"/> | ||||
<Setter Property="Foreground" Value="#ECBB52"/> | |||||
<Setter Property="Foreground" Value="Black"/> | |||||
<Setter Property="VerticalContentAlignment" Value="Center"/> | <Setter Property="VerticalContentAlignment" Value="Center"/> | ||||
<Setter Property="Template"> | <Setter Property="Template"> | ||||
<Setter.Value> | <Setter.Value> | ||||
<ControlTemplate TargetType="{x:Type ToggleButton}"> | <ControlTemplate TargetType="{x:Type ToggleButton}"> | ||||
<Grid Background="Transparent" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> | <Grid Background="Transparent" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> | ||||
<Border x:Name="toBoder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="Transparent" BorderBrush="#ECBB52" BorderThickness="0,0,0,1"/> | |||||
<Border x:Name="toBoder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Background="Transparent" BorderBrush="Black" BorderThickness="0,0,0,2"/> | |||||
<ContentControl x:Name="content" Content="{TemplateBinding Content}" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="Center" VerticalAlignment="Center"/> | <ContentControl x:Name="content" Content="{TemplateBinding Content}" Foreground="{TemplateBinding Foreground}" HorizontalAlignment="Center" VerticalAlignment="Center"/> | ||||
</Grid> | </Grid> | ||||
<ControlTemplate.Triggers> | <ControlTemplate.Triggers> | ||||
<Trigger Property="IsMouseOver" Value="True"> | <Trigger Property="IsMouseOver" Value="True"> | ||||
<Setter Property="Background" TargetName="toBoder" Value="#ECBB52"/> | |||||
<Setter Property="Foreground" TargetName="content" Value="white"/> | |||||
<Setter Property="Background" TargetName="toBoder" Value="#DDDDDD"/> | |||||
<Setter Property="Foreground" TargetName="content" Value="Black"/> | |||||
</Trigger> | </Trigger> | ||||
<Trigger Property="IsChecked" Value="True"> | <Trigger Property="IsChecked" Value="True"> | ||||
<Setter Property="Background" TargetName="toBoder" Value="#ECBB52"/> | |||||
<Setter Property="Foreground" TargetName="content" Value="white"/> | |||||
<Setter Property="Background" TargetName="toBoder" Value="#DDDDDD"/> | |||||
<Setter Property="Foreground" TargetName="content" Value="Black"/> | |||||
</Trigger> | </Trigger> | ||||
<Trigger Property="IsChecked" Value="False"> | <Trigger Property="IsChecked" Value="False"> | ||||
<Setter Property="Background" TargetName="toBoder" Value="Transparent"/> | <Setter Property="Background" TargetName="toBoder" Value="Transparent"/> | ||||
<Setter Property="Foreground" TargetName="content" Value="#ECBB52"/> | |||||
<Setter Property="Foreground" TargetName="content" Value="Black"/> | |||||
</Trigger> | </Trigger> | ||||
</ControlTemplate.Triggers> | </ControlTemplate.Triggers> | ||||
</ControlTemplate> | </ControlTemplate> | ||||
@@ -39,19 +39,19 @@ | |||||
</UserControl.Resources> | </UserControl.Resources> | ||||
<Grid Height="auto" Width="auto" Background="Transparent"> | <Grid Height="auto" Width="auto" Background="Transparent"> | ||||
<StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center"> | <StackPanel Orientation="Vertical" HorizontalAlignment="Center" VerticalAlignment="Center"> | ||||
<ToggleButton x:Name="timeText" Height="40" Width="200" Style="{StaticResource timeToggle}" Content="选择时间....."/> | |||||
<ToggleButton x:Name="timeText" Height="40" Width="200" Style="{StaticResource timeToggle}" Content="选择时间....."/> | |||||
<Popup x:Name="popup" MouseLeave="popup_MouseLeave" IsOpen="{Binding ElementName=timeText,Path=IsChecked}" Width="{Binding ElementName=timeText,Path=Width}" Height="200"> | <Popup x:Name="popup" MouseLeave="popup_MouseLeave" IsOpen="{Binding ElementName=timeText,Path=IsChecked}" Width="{Binding ElementName=timeText,Path=Width}" Height="200"> | ||||
<Border Background="White" BorderBrush="{Binding ElementName=timeText,Path=Foreground}" BorderThickness="1"> | |||||
<Border Background="White" BorderBrush="{Binding ElementName=timeText,Path=Foreground}" BorderThickness="2"> | |||||
<Grid Background="Transparent"> | <Grid Background="Transparent"> | ||||
<Grid.RowDefinitions> | <Grid.RowDefinitions> | ||||
<RowDefinition Height="30"/> | <RowDefinition Height="30"/> | ||||
<RowDefinition/> | <RowDefinition/> | ||||
</Grid.RowDefinitions> | </Grid.RowDefinitions> | ||||
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"> | <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"> | ||||
<TextBlock Text="0" x:Name="minText" Foreground="Black" FontSize="20"/> | |||||
<TextBlock Margin="20,0" Text="分" Foreground="Black" FontSize="20"/> | |||||
<TextBlock Text="0" x:Name="secText" Foreground="Black" FontSize="20"/> | |||||
<TextBlock Margin="20,0,0,0" Text="秒" Foreground="Black" FontSize="20"/> | |||||
<TextBlock Text="0" x:Name="minText" Foreground="Black" FontSize="20" FontWeight="Black"/> | |||||
<TextBlock Margin="20,0" Text="分" Foreground="Black" FontSize="20" FontWeight="Black"/> | |||||
<TextBlock Text="0" x:Name="secText" Foreground="Black" FontSize="20" FontWeight="Black"/> | |||||
<TextBlock Margin="20,0,0,0" Text="秒" Foreground="Black" FontSize="20" FontWeight="Black"/> | |||||
</StackPanel> | </StackPanel> | ||||
<Grid Grid.Row="1"> | <Grid Grid.Row="1"> | ||||
<Grid.ColumnDefinitions> | <Grid.ColumnDefinitions> | ||||
@@ -59,12 +59,12 @@ | |||||
<ColumnDefinition/> | <ColumnDefinition/> | ||||
</Grid.ColumnDefinitions> | </Grid.ColumnDefinitions> | ||||
<Border Margin="10,0,0,10" BorderBrush="{Binding ElementName=timeText,Path=Foreground}" BorderThickness="1,1,1,1"> | <Border Margin="10,0,0,10" BorderBrush="{Binding ElementName=timeText,Path=Foreground}" BorderThickness="1,1,1,1"> | ||||
<ScrollViewer HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"> | |||||
<ScrollViewer HorizontalScrollBarVisibility="Hidden" PanningMode="VerticalOnly" IsManipulationEnabled="True" VerticalScrollBarVisibility="Hidden"> | |||||
<ItemsControl x:Name="minCtrl"> | <ItemsControl x:Name="minCtrl"> | ||||
<ItemsControl.ItemTemplate> | <ItemsControl.ItemTemplate> | ||||
<DataTemplate> | <DataTemplate> | ||||
<Grid> | <Grid> | ||||
<RadioButton Style="{StaticResource timeCheck}" Tag="分" Click="RadioButton_Click" Foreground="White" Background="#777777" FontSize="14" GroupName="min" ContentStringFormat="{Binding Min}" /> | |||||
<RadioButton Style="{StaticResource timeCheck}" Tag="分" FontWeight="Black" Click="RadioButton_Click" Foreground="White" Background="#777777" FontSize="14" GroupName="min" ContentStringFormat="{Binding Min}" /> | |||||
</Grid> | </Grid> | ||||
</DataTemplate> | </DataTemplate> | ||||
</ItemsControl.ItemTemplate> | </ItemsControl.ItemTemplate> | ||||
@@ -77,7 +77,7 @@ | |||||
<ItemsControl.ItemTemplate> | <ItemsControl.ItemTemplate> | ||||
<DataTemplate> | <DataTemplate> | ||||
<Grid Background="Transparent"> | <Grid Background="Transparent"> | ||||
<RadioButton Style="{StaticResource timeCheck}" Tag="秒" Click="RadioButton_Click" Foreground="White" Background="#777777" FontSize="14" GroupName="sec" ContentStringFormat="{Binding Sec}" /> | |||||
<RadioButton Style="{StaticResource timeCheck}" FontWeight="Black" Tag="秒" Click="RadioButton_Click" Foreground="White" Background="#777777" FontSize="14" GroupName="sec" ContentStringFormat="{Binding Sec}" /> | |||||
</Grid> | </Grid> | ||||
</DataTemplate> | </DataTemplate> | ||||
</ItemsControl.ItemTemplate> | </ItemsControl.ItemTemplate> | ||||
@@ -160,17 +160,17 @@ | |||||
<Grid HorizontalAlignment="Center" Margin="0,20" VerticalAlignment="Top" Background="Transparent"> | <Grid HorizontalAlignment="Center" Margin="0,20" VerticalAlignment="Top" Background="Transparent"> | ||||
<TextBlock Text="主页" x:Name="titleText" HorizontalAlignment="Center" Foreground="White" FontSize="40" VerticalAlignment="Center"/> | <TextBlock Text="主页" x:Name="titleText" HorizontalAlignment="Center" Foreground="White" FontSize="40" VerticalAlignment="Center"/> | ||||
</Grid> | </Grid> | ||||
<Border Margin="40,0" HorizontalAlignment="Right" VerticalAlignment="Top" Height="60" Width="60" > | |||||
<Button Style="{StaticResource adbtn}" Height="40" Click="Close_Click" Width="40" BorderThickness="0" HorizontalAlignment="Center" VerticalAlignment="Center"> | |||||
<Border Margin="0,10,40,0" HorizontalAlignment="Right" VerticalAlignment="Top" Height="60" Width="60" > | |||||
<Button Style="{StaticResource adbtn}" Height="60" Click="Close_Click" Width="60" BorderThickness="0" HorizontalAlignment="Center" VerticalAlignment="Center"> | |||||
<Button.Background> | <Button.Background> | ||||
<ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/退出_1.png"/> | <ImageBrush ImageSource="/BPASmartClient.CustomResource;component/Image/退出_1.png"/> | ||||
</Button.Background> | </Button.Background> | ||||
</Button> | </Button> | ||||
</Border> | </Border> | ||||
<Grid Visibility="Collapsed" x:Name="infoGrid" Margin="0,120" HorizontalAlignment="Center" Height="60" Width="400" VerticalAlignment="Top" Background="Transparent"> | <Grid Visibility="Collapsed" x:Name="infoGrid" Margin="0,120" HorizontalAlignment="Center" Height="60" Width="400" VerticalAlignment="Top" Background="Transparent"> | ||||
<Border Background="{DynamicResource infoColor}" /> | |||||
<Button Margin="5,4,0,0" Click="Info_Click" Style="{StaticResource adbtn}" Background="Transparent" Content="关闭" FontSize="12" BorderThickness="0" Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Top"/> | |||||
<TextBlock Text="下单成功" x:Name="infoText" Foreground="White" HorizontalAlignment="Center" FontSize="16" FontFamily="黑体"/> | |||||
<Border Background="{DynamicResource infoColor}" BorderBrush="Black" BorderThickness="2" /> | |||||
<Button Margin="5,4,0,0" Click="Info_Click" Style="{StaticResource adbtn}" Background="Transparent" Content="关闭" FontSize="12" BorderThickness="0" Foreground="Black" HorizontalAlignment="Left" VerticalAlignment="Top"/> | |||||
<TextBlock Text="下单成功" x:Name="infoText" Foreground="Black" FontWeight="Black" HorizontalAlignment="Center" FontSize="18" FontFamily="黑体"/> | |||||
<Image Margin="0,0,20,0" Source="/BPASmartClient.CustomResource;component/Image/提示.png" HorizontalAlignment="Right" VerticalAlignment="Center" Height="30"/> | <Image Margin="0,0,20,0" Source="/BPASmartClient.CustomResource;component/Image/提示.png" HorizontalAlignment="Right" VerticalAlignment="Center" Height="30"/> | ||||
</Grid> | </Grid> | ||||
</Grid> | </Grid> | ||||
@@ -40,7 +40,7 @@ namespace BPASmartClient | |||||
} | } | ||||
public void infoView() | public void infoView() | ||||
{ | { | ||||
Thread.Sleep(2000); | |||||
Thread.Sleep(3000); | |||||
App.Current.Dispatcher.Invoke(() => { | App.Current.Dispatcher.Invoke(() => { | ||||
infoGrid.Visibility = Visibility.Collapsed; | infoGrid.Visibility = Visibility.Collapsed; | ||||
}); | }); | ||||