Commit 7427deda authored by 姜春辉's avatar 姜春辉

界面细节调优

parent 153b9b6a
......@@ -30,7 +30,9 @@
<ControlTemplate x:Key="AppointmentDetailPage_ExtendInfoListTemplate" TargetType="ListView">
<ScrollViewer HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto"
Style="{DynamicResource scrollviewerStyle}">
<ItemsPresenter/>
<Border Margin="45,0,45,0">
<ItemsPresenter/>
</Border>
</ScrollViewer>
</ControlTemplate>
......@@ -124,17 +126,19 @@
<ControlTemplate x:Key="AppointmentDetailPage_ExtendInfo" TargetType="ContentControl">
<Grid Background="Transparent" >
<Border Width="920" Height="1630" BorderThickness="6"
CornerRadius="15" Padding="45,25,45,25"
CornerRadius="15" Padding="0,25,0,25"
Background="#ffffff" BorderBrush="#f1f1f1">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="100"/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock Text="附加信息" Foreground="#2a2b2d" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="48"/>
<gs:IconButton Icon="圆圈叉号" HorizontalAlignment="Right"
<Grid Margin="45,0,45,0">
<TextBlock Text="附加信息" Foreground="#2a2b2d" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="48"/>
<gs:IconButton Icon="圆圈叉号" HorizontalAlignment="Right"
Command="{Binding CloseExtendInfoCommand}"
VerticalAlignment="Center" FontSize="100"/>
</Grid>
<ListView Grid.Row="1" Template="{StaticResource AppointmentDetailPage_ExtendInfoListTemplate}"
ItemsSource="{Binding Appointment.extends}"
ItemsPanel="{StaticResource AppointmentDetailPage_ExtendInfoListItemsPanel}"
......
......@@ -14,14 +14,14 @@
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Page.Resources>
<Border Padding="80,50,80,0">
<Border Padding="0,50,0,0">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="60"/>
<RowDefinition/>
<RowDefinition Height="200"/>
</Grid.RowDefinitions>
<Grid>
<Grid Margin="80,0,80,0">
<TextBlock Text="历史预约记录查询" FontSize="36" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<Button Template="{StaticResource CommonButton}" TextBlock.Foreground="#2a2b2d"
Command="{Binding BackCommand}"
......@@ -34,7 +34,9 @@
Background="Transparent"
VerticalScrollBarVisibility="Auto"
Style="{DynamicResource scrollviewerStyle}">
<ItemsPresenter/>
<Border Margin="80,0,80,0">
<ItemsPresenter/>
</Border>
</ScrollViewer>
</ControlTemplate>
</ListView.Template>
......@@ -112,7 +114,7 @@
</ListView.ItemContainerStyle>
</ListView>
<ContentControl Grid.Row="2">
<ContentControl Grid.Row="2" Margin="80,0,80,0">
<ContentControl.Template>
<ControlTemplate TargetType="ContentControl">
<Grid>
......
......@@ -15,14 +15,14 @@
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Page.Resources>
<Border Padding="80,50,80,0">
<Border Padding="0,50,0,0">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="60"/>
<RowDefinition/>
<RowDefinition Height="200"/>
</Grid.RowDefinitions>
<Grid>
<Grid Margin="80,0,80,0">
<TextBlock Text="历史到访记录查询" FontSize="36" HorizontalAlignment="Left" VerticalAlignment="Center"/>
<Button Template="{StaticResource CommonButton}" TextBlock.Foreground="#2a2b2d"
Command="{Binding BackCommand}"
......@@ -35,7 +35,9 @@
Background="Transparent"
VerticalScrollBarVisibility="Auto"
Style="{DynamicResource scrollviewerStyle}">
<ItemsPresenter/>
<Border Margin="80,0,80,0">
<ItemsPresenter/>
</Border>
</ScrollViewer>
</ControlTemplate>
</ListView.Template>
......@@ -57,7 +59,7 @@
</Style>
</ListView.ItemContainerStyle>
</ListView>
<ContentControl Grid.Row="2">
<ContentControl Grid.Row="2" Margin="80,0,80,0">
<ContentControl.Template>
<ControlTemplate TargetType="ContentControl">
<Grid>
......
......@@ -19,7 +19,7 @@
<Grid Background="Transparent">
<Border x:Name="PART_bg" BorderThickness="1" BorderBrush="#e3e3e2" CornerRadius="30">
<Border.Effect>
<DropShadowEffect Direction="90" ShadowDepth="0" BlurRadius="30" Color="#FF9B9A9A"/>
<DropShadowEffect Direction="90" ShadowDepth="0" BlurRadius="30" Color="#FFD4D4D4"/>
</Border.Effect>
</Border>
<TextBlock Text="查询历史记录" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="24"/>
......
......@@ -5,7 +5,7 @@
<Grid Background="Transparent">
<Border x:Name="PART_bg" BorderThickness="1" BorderBrush="#e3e3e2" CornerRadius="30">
<Border.Effect>
<DropShadowEffect Direction="90" ShadowDepth="0" BlurRadius="30" Color="#FF9B9A9A"/>
<DropShadowEffect Direction="90" ShadowDepth="0" BlurRadius="30" Color="#FFD4D4D4"/>
</Border.Effect>
</Border>
<TextBlock Text="{TemplateBinding Content}" HorizontalAlignment="Center"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment