Merge branch 'master' of http://www.scserverddns.top:13000/sc/SunlightAggregationTerminal

QueryPage.xaml

@@ -4,8 +4,9 @@
              x:Class="SunlightAggregationTerminal.QueryPage"
              Title="">
     <Grid>
-        <VerticalStackLayout>
-            <Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto">
+        <Grid RowDefinitions="Auto, *" >
+            <Grid RowDefinitions="Auto, *" ColumnDefinitions="*, Auto" 
+                  Grid.Row="0" Grid.Column="0">
                 <Border Grid.Row="0" Grid.Column="0" Stroke="#CCCCCC"                          
                         StrokeThickness="1" StrokeShape="RoundRectangle 10"                      
                         BackgroundColor="White" Padding="0,0"                
@@ -26,16 +27,16 @@
                 </Button>
                 <StackLayout Grid.Row="1"  Grid.Column="0" >
                     <HorizontalStackLayout>
-                        <DatePicker x:Name="StartTime" Format="yyyy-MM-dd" FontSize="18"/>
+                        <DatePicker x:Name="StartTime" Format="yyyy年MM月dd日" FontSize="16"/>
                         <Label Text="~" FontSize="32"/>
-                        <DatePicker x:Name="EndTime" Format="yyyy-MM-dd" FontSize="18"/>
-                        <Button Text="搜索" Margin="5"/>
+                        <DatePicker x:Name="EndTime" Format="yyyy年MM月dd日" FontSize="16"/>
+                        <Button Text="搜索" Clicked="Button_Clicked" Padding="25,0,25,0"/>
                     </HorizontalStackLayout>
                 </StackLayout>
             </Grid>
-            <Grid>
-                <CollectionView x:Name="CardCollectionView"  
-                 RemainingItemsThreshold="5">
+      
+            <Grid Grid.Row="1" Grid.Column="0">
+                <CollectionView x:Name="CardCollectionView" RemainingItemsThreshold="5">
                     <!-- 保持滚动条 -->
                     <CollectionView.ItemTemplate>
                         <DataTemplate>
@@ -81,10 +82,10 @@
                             </Border>
                         </DataTemplate>
                     </CollectionView.ItemTemplate>
-                </CollectionView>
-               
+                </CollectionView>               
             </Grid>
-        </VerticalStackLayout>
+        </Grid>
+        
         <!-- 查询中动画页面 -->
         <Grid x:Name="LoadingIndicator" BackgroundColor="Gray"       
               IsVisible="False" Opacity="0.9">