From 2592431dfab408d827120dd68518cc64f9cddb47 Mon Sep 17 00:00:00 2001
From: ThomasWFan <ThomasW.Fan@outlook.com>
Date: Tue, 18 Oct 2016 15:25:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=A4=A7=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=87=E9=A2=98UI=EF=BC=8C=E8=BF=98?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E7=B2=BE=E7=BB=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bilibili2/Pages/ActivityPage.xaml    | 2 +-
 bilibili2/Pages/AllBangumiPage.xaml  | 2 +-
 bilibili2/Pages/AllLivePage.xaml     | 2 +-
 bilibili2/Pages/BanByTagPage.xaml    | 2 +-
 bilibili2/Pages/BanInfoPage.xaml     | 2 +-
 bilibili2/Pages/BanTagPage.xaml      | 2 +-
 bilibili2/Pages/BanTimelinePage.xaml | 2 +-
 bilibili2/Pages/ChatPage.xaml        | 2 +-
 bilibili2/Pages/CommentPage.xaml     | 2 +-
 bilibili2/Pages/DiliDiliPage.xaml    | 2 +-
 bilibili2/Pages/DiliInfo.xaml        | 2 +-
 bilibili2/Pages/DownloadPage.xaml    | 2 +-
 bilibili2/Pages/EditPage.xaml        | 2 +-
 bilibili2/Pages/FavPage.xaml         | 2 +-
 bilibili2/Pages/HistoryPage.xaml     | 2 +-
 bilibili2/Pages/LivePlayerPage.xaml  | 2 +-
 bilibili2/Pages/LoginPage.xaml       | 2 +-
 bilibili2/Pages/MessagePage.xaml     | 2 +-
 bilibili2/Pages/PlayerPage.xaml      | 2 +-
 bilibili2/Pages/QuanInfoPage.xaml    | 2 +-
 bilibili2/Pages/QuanPage.xaml        | 2 +-
 bilibili2/Pages/RankPage.xaml        | 2 +-
 bilibili2/Pages/SPPage.xaml          | 2 +-
 bilibili2/Pages/SearchLivePage.xaml  | 2 +-
 bilibili2/Pages/SearchPage.xaml      | 2 +-
 bilibili2/Pages/SettingPage.xaml     | 2 +-
 bilibili2/Pages/TopicPage.xaml       | 2 +-
 bilibili2/Pages/UserBangumiPage.xaml | 2 +-
 bilibili2/Pages/UserInfoPage.xaml    | 2 +-
 bilibili2/Pages/VideoInfoPage.xaml   | 2 +-
 bilibili2/Pages/WebViewPage.xaml     | 2 +-
 31 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/bilibili2/Pages/ActivityPage.xaml b/bilibili2/Pages/ActivityPage.xaml
index 2d366d3..12da20d 100644
--- a/bilibili2/Pages/ActivityPage.xaml
+++ b/bilibili2/Pages/ActivityPage.xaml
@@ -27,7 +27,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!-- AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="活动中心" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="活动中心" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
         </Grid>
         <GridView x:Name="grid_View" IsItemClickEnabled="True" SelectionMode="None" ItemClick="grid_View_ItemClick" Style="{StaticResource GridViewStyle1}" Grid.Row="1">
             <GridView.ItemContainerStyle>
diff --git a/bilibili2/Pages/AllBangumiPage.xaml b/bilibili2/Pages/AllBangumiPage.xaml
index cbf8afb..2df2a27 100644
--- a/bilibili2/Pages/AllBangumiPage.xaml
+++ b/bilibili2/Pages/AllBangumiPage.xaml
@@ -27,7 +27,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="全部番剧" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="全部番剧" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
             <StackPanel  Grid.Column="2" Orientation="Horizontal">
                 <AppBarButton x:Name="btn_Order"  Icon="Sort" Width="48" Height="48" Foreground="White">
                     <AppBarButton.Flyout>
diff --git a/bilibili2/Pages/AllLivePage.xaml b/bilibili2/Pages/AllLivePage.xaml
index 7849df6..514ce90 100644
--- a/bilibili2/Pages/AllLivePage.xaml
+++ b/bilibili2/Pages/AllLivePage.xaml
@@ -58,7 +58,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="全部直播" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="全部直播" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
             <AppBarButton Foreground="White" ToolTipService.ToolTip="刷新" Grid.Column="2" Width="48" Height="48" Icon="Refresh" Click="AppBarButton_Click"></AppBarButton>
         </Grid>
         <ProgressBar x:Name="pr_Load" VerticalAlignment="Top" Background="{x:Null}" Foreground="White" IsIndeterminate="True"></ProgressBar>
diff --git a/bilibili2/Pages/BanByTagPage.xaml b/bilibili2/Pages/BanByTagPage.xaml
index 3dc81b6..aadd14f 100644
--- a/bilibili2/Pages/BanByTagPage.xaml
+++ b/bilibili2/Pages/BanByTagPage.xaml
@@ -31,7 +31,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="番剧" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="番剧" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
             <AppBarButton Icon="Sort" Foreground="White" Grid.Column="2">
                 <AppBarButton.Flyout>
                     <MenuFlyout>
diff --git a/bilibili2/Pages/BanInfoPage.xaml b/bilibili2/Pages/BanInfoPage.xaml
index 97d3113..9186cdb 100644
--- a/bilibili2/Pages/BanInfoPage.xaml
+++ b/bilibili2/Pages/BanInfoPage.xaml
@@ -95,7 +95,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="番剧详情" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="番剧详情" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
         </Grid>
        
         <Pivot x:Name="pivot" Style="{StaticResource PivotStyle2}" BorderBrush="{StaticResource BG}" SelectionChanged="pivot_SelectionChanged" Grid.Row="2">
diff --git a/bilibili2/Pages/BanTagPage.xaml b/bilibili2/Pages/BanTagPage.xaml
index e3b9dac..95ed4b1 100644
--- a/bilibili2/Pages/BanTagPage.xaml
+++ b/bilibili2/Pages/BanTagPage.xaml
@@ -24,7 +24,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="番剧索引" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="番剧索引" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
         </Grid>
         <ScrollViewer VerticalScrollBarVisibility="Auto"  Grid.Row="1">
             <GridView x:Name="gridview_List" ScrollViewer.VerticalScrollMode="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled" HorizontalAlignment="Center" SelectionMode="None" ItemClick="gridview_List_ItemClick" IsItemClickEnabled="True" >
diff --git a/bilibili2/Pages/BanTimelinePage.xaml b/bilibili2/Pages/BanTimelinePage.xaml
index 0cd886e..6eb78d0 100644
--- a/bilibili2/Pages/BanTimelinePage.xaml
+++ b/bilibili2/Pages/BanTimelinePage.xaml
@@ -23,7 +23,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="番剧更新时间表" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="番剧更新时间表" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
         </Grid>
         <ScrollViewer Grid.Row="1" x:Name="B_Timeline" VerticalScrollBarVisibility="Auto" >
             <StackPanel Margin="10 0">
diff --git a/bilibili2/Pages/ChatPage.xaml b/bilibili2/Pages/ChatPage.xaml
index ade7df1..228eb36 100644
--- a/bilibili2/Pages/ChatPage.xaml
+++ b/bilibili2/Pages/ChatPage.xaml
@@ -26,7 +26,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="私聊" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="私聊" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
         </Grid>
         <ListView x:Name="list_view" ItemClick="list_view_ItemClick" Grid.Row="1" ItemTemplateSelector="{StaticResource MessageItemDataTemplateSelector}" SelectionMode="None" IsItemClickEnabled="True" Style="{StaticResource ListViewStyle1}">
             <ListView.ItemContainerStyle>
diff --git a/bilibili2/Pages/CommentPage.xaml b/bilibili2/Pages/CommentPage.xaml
index 992a97c..d8674cb 100644
--- a/bilibili2/Pages/CommentPage.xaml
+++ b/bilibili2/Pages/CommentPage.xaml
@@ -26,7 +26,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="查看评论" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="查看评论" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
         </Grid>
         <ScrollViewer x:Name="sv1" Style="{StaticResource ScrollViewerStyle1}" ScrollViewer.VerticalScrollBarVisibility="Auto" Grid.Row="1" ViewChanged="sv1_ViewChanged">
             <StackPanel HorizontalAlignment="Stretch">
diff --git a/bilibili2/Pages/DiliDiliPage.xaml b/bilibili2/Pages/DiliDiliPage.xaml
index 7d781d2..51eaae2 100644
--- a/bilibili2/Pages/DiliDiliPage.xaml
+++ b/bilibili2/Pages/DiliDiliPage.xaml
@@ -26,7 +26,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="嘀哩嘀哩" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="嘀哩嘀哩" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
             <StackPanel Grid.Column="2" VerticalAlignment="Center" Margin="10 0" Orientation="Horizontal">
                 <ComboBox x:Name="cb_Year" SelectionChanged="cb_Year_SelectionChanged">
                     <ComboBoxItem Tag="2016" Content="2016年"/>
diff --git a/bilibili2/Pages/DiliInfo.xaml b/bilibili2/Pages/DiliInfo.xaml
index 1245fe8..0bccbd0 100644
--- a/bilibili2/Pages/DiliInfo.xaml
+++ b/bilibili2/Pages/DiliInfo.xaml
@@ -24,7 +24,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="{Binding title}" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="{Binding title}" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
         </Grid>
         <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
             <Grid x:Name="BanSeason_Grid">
diff --git a/bilibili2/Pages/DownloadPage.xaml b/bilibili2/Pages/DownloadPage.xaml
index 6b8d334..dfad598 100644
--- a/bilibili2/Pages/DownloadPage.xaml
+++ b/bilibili2/Pages/DownloadPage.xaml
@@ -29,7 +29,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="离线管理" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="离线管理" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
         </Grid>
         <Pivot x:Name="pivot" Grid.Row="1" Style="{StaticResource PivotStyle2}" BorderBrush="{StaticResource BG}" SelectionChanged="Pivot_SelectionChanged">
             <PivotItem Margin="0">
diff --git a/bilibili2/Pages/EditPage.xaml b/bilibili2/Pages/EditPage.xaml
index 32e29bb..d09af3e 100644
--- a/bilibili2/Pages/EditPage.xaml
+++ b/bilibili2/Pages/EditPage.xaml
@@ -23,7 +23,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="编辑资料" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="编辑资料" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
         </Grid>
         <ScrollViewer VerticalScrollBarVisibility="Auto" Grid.Row="1">
             <StackPanel Margin="10">
diff --git a/bilibili2/Pages/FavPage.xaml b/bilibili2/Pages/FavPage.xaml
index 4c3a05b..7dba5fb 100644
--- a/bilibili2/Pages/FavPage.xaml
+++ b/bilibili2/Pages/FavPage.xaml
@@ -27,7 +27,7 @@
                     <ColumnDefinition Width="auto"/>
                 </Grid.ColumnDefinitions>
                 <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-                <TextBlock  Text="收藏夹" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+                <TextBlock  Text="收藏夹" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
                 <ComboBox x:Name="cb_favbox" Grid.Column="3" Margin="5 0"  VerticalAlignment="Center" BorderThickness="0" Foreground="White" SelectionChanged="cb_favbox_SelectionChanged">
                     <ComboBox.ItemTemplate>
                         <DataTemplate>
diff --git a/bilibili2/Pages/HistoryPage.xaml b/bilibili2/Pages/HistoryPage.xaml
index 9a0157e..356b64c 100644
--- a/bilibili2/Pages/HistoryPage.xaml
+++ b/bilibili2/Pages/HistoryPage.xaml
@@ -24,7 +24,7 @@
                     <ColumnDefinition Width="auto"/>
                 </Grid.ColumnDefinitions>
                 <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-                <TextBlock  Text="历史记录" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+                <TextBlock  Text="历史记录" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
                 <ProgressBar x:Name="pro_Load" Grid.ColumnSpan="3" VerticalAlignment="Top" Background="{x:Null}" IsIndeterminate="True"></ProgressBar>
                 <AppBarButton x:Name="btn_ClearHistory" Click="btn_ClearHistory_Click" HorizontalAlignment="Right" Icon="Delete" ToolTipService.ToolTip="清空" Grid.Column="2" Width="48" Foreground="White"></AppBarButton>
             </Grid>
diff --git a/bilibili2/Pages/LivePlayerPage.xaml b/bilibili2/Pages/LivePlayerPage.xaml
index c9f40b9..12de55e 100644
--- a/bilibili2/Pages/LivePlayerPage.xaml
+++ b/bilibili2/Pages/LivePlayerPage.xaml
@@ -140,6 +140,6 @@
                 </Grid>
             </Grid>
         </SplitView>
-        <AppBarButton Icon="Back" Width="48" HorizontalAlignment="Left" VerticalAlignment="Top" Height="48" Foreground="Gray"></AppBarButton>
+        <!--AppBarButton Icon="Back" Width="48" HorizontalAlignment="Left" VerticalAlignment="Top" Height="48" Foreground="Gray"/-->
     </Grid>
 </Page>
diff --git a/bilibili2/Pages/LoginPage.xaml b/bilibili2/Pages/LoginPage.xaml
index 36858cd..feb236b 100644
--- a/bilibili2/Pages/LoginPage.xaml
+++ b/bilibili2/Pages/LoginPage.xaml
@@ -48,7 +48,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="登录" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="登录" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
         </Grid>
         <ScrollViewer x:Name="sc"  Grid.Row="1" VerticalScrollBarVisibility="Auto">
             <StackPanel x:Name="heh" VerticalAlignment="Top">
diff --git a/bilibili2/Pages/MessagePage.xaml b/bilibili2/Pages/MessagePage.xaml
index 124ac51..8458af5 100644
--- a/bilibili2/Pages/MessagePage.xaml
+++ b/bilibili2/Pages/MessagePage.xaml
@@ -54,7 +54,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="消息中心" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="消息中心" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
         </Grid>
         <Grid Background="{StaticResource BG}"   Grid.Row="1" >
             <Grid.ColumnDefinitions>
diff --git a/bilibili2/Pages/PlayerPage.xaml b/bilibili2/Pages/PlayerPage.xaml
index 680e428..fcee1f4 100644
--- a/bilibili2/Pages/PlayerPage.xaml
+++ b/bilibili2/Pages/PlayerPage.xaml
@@ -595,7 +595,7 @@
                         <ColumnDefinition Width="auto"/>
                     </Grid.ColumnDefinitions>
                     <!--AppBarButton x:Name="top_btn_Back" Width="48" Height="48" Icon="Back" Foreground="White" ToolTipService.ToolTip="退出播放" Click="top_btn_Back_Click"/-->
-                    <ScrollViewer Grid.Column="1" HorizontalScrollMode="Enabled" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Disabled" VerticalScrollMode="Disabled">
+                    <ScrollViewer Grid.Column="0" Grid.ColumnSpan="2" HorizontalScrollMode="Enabled" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Disabled" VerticalScrollMode="Disabled">
                         <TextBlock x:Name="top_Title" Text="视频标题" VerticalAlignment="Center" Margin="5 0"  HorizontalAlignment="Left" Foreground="White"/>
                     </ScrollViewer>
                     <StackPanel Grid.Column="2" Orientation="Horizontal" >
diff --git a/bilibili2/Pages/QuanInfoPage.xaml b/bilibili2/Pages/QuanInfoPage.xaml
index 958ced8..1772316 100644
--- a/bilibili2/Pages/QuanInfoPage.xaml
+++ b/bilibili2/Pages/QuanInfoPage.xaml
@@ -71,7 +71,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="主题帖" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="主题帖" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
             <StackPanel Visibility="Collapsed" Orientation="Horizontal" Grid.Column="2">
                 <AppBarButton Icon="Favorite" Width="48" Height="48" Foreground="White"/>
                 <AppBarButton Icon="More" Width="48" Height="48" Foreground="White"/>
diff --git a/bilibili2/Pages/QuanPage.xaml b/bilibili2/Pages/QuanPage.xaml
index 0eb2fce..67528c0 100644
--- a/bilibili2/Pages/QuanPage.xaml
+++ b/bilibili2/Pages/QuanPage.xaml
@@ -26,7 +26,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="兴趣圈" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="兴趣圈" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
             <AppBarButton Foreground="White" ToolTipService.ToolTip="搜索" Grid.Column="2" Width="48" Height="48" Icon="Find" Click="AppBarButton_Click"/>
         </Grid>
         <ProgressBar x:Name="pr_Load" VerticalAlignment="Top" Background="{x:Null}" Foreground="White" IsIndeterminate="True"/>
diff --git a/bilibili2/Pages/RankPage.xaml b/bilibili2/Pages/RankPage.xaml
index dec2555..2a85baa 100644
--- a/bilibili2/Pages/RankPage.xaml
+++ b/bilibili2/Pages/RankPage.xaml
@@ -60,7 +60,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="排行榜" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="排行榜" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
         </Grid>
         <Pivot x:Name="pivot" Grid.Row="1" SelectionChanged="pivot_SelectionChanged">
             <PivotItem Margin=" 0">
diff --git a/bilibili2/Pages/SPPage.xaml b/bilibili2/Pages/SPPage.xaml
index e92cea9..0fe407a 100644
--- a/bilibili2/Pages/SPPage.xaml
+++ b/bilibili2/Pages/SPPage.xaml
@@ -24,7 +24,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="专题详情" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="专题详情" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
         </Grid>
         <ProgressBar x:Name="pr_Load" VerticalAlignment="Top" Background="{x:Null}" Foreground="White" IsIndeterminate="True"/>
         <!--<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">-->
diff --git a/bilibili2/Pages/SearchLivePage.xaml b/bilibili2/Pages/SearchLivePage.xaml
index 69b915b..989d833 100644
--- a/bilibili2/Pages/SearchLivePage.xaml
+++ b/bilibili2/Pages/SearchLivePage.xaml
@@ -60,7 +60,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <AutoSuggestBox Style="{StaticResource AutoSuggestBoxStyle1}" BorderThickness="1"  x:Name="txt_Find"  PlaceholderText="搜索主播、房间" Grid.Column="1" Margin="5" QueryIcon="Find" VerticalAlignment="Center" QuerySubmitted="txt_Find_QuerySubmitted" ></AutoSuggestBox>
+            <AutoSuggestBox Style="{StaticResource AutoSuggestBoxStyle1}" BorderThickness="1"  x:Name="txt_Find"  PlaceholderText="搜索主播、房间" Grid.Column="0" Grid.ColumnSpan="2" Margin="5" QueryIcon="Find" VerticalAlignment="Center" QuerySubmitted="txt_Find_QuerySubmitted" ></AutoSuggestBox>
         </Grid>
         <Grid Background="{StaticResource BG}"   Grid.Row="1" >
             <Grid.ColumnDefinitions>
diff --git a/bilibili2/Pages/SearchPage.xaml b/bilibili2/Pages/SearchPage.xaml
index b575fc6..3f16e06 100644
--- a/bilibili2/Pages/SearchPage.xaml
+++ b/bilibili2/Pages/SearchPage.xaml
@@ -27,7 +27,7 @@
                     <ColumnDefinition Width="auto"/>
                 </Grid.ColumnDefinitions>
                 <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-                <TextBlock x:Name="text_Title" Visibility="Collapsed" Text="搜索" Margin="5 0" HorizontalAlignment="Left" Grid.Column="1" VerticalAlignment="Center"  FontSize="16" Foreground="White"/>
+                <TextBlock x:Name="text_Title" Visibility="Collapsed" Text="搜索" Margin="5 0" HorizontalAlignment="Left" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center"  FontSize="16" Foreground="White"/>
                 <AutoSuggestBox x:Name="autoSug_Box" BorderBrush="#00808080" BorderThickness="1" Margin="5 0" Grid.Column="1" PlaceholderText="输入关键字" QueryIcon="Find" VerticalAlignment="Center" QuerySubmitted="autoSug_Box_QuerySubmitted" TextChanged="autoSug_Box_TextChanged" SuggestionChosen="autoSug_Box_SuggestionChosen" Style="{StaticResource AutoSuggestBoxStyle1}"></AutoSuggestBox>
                 <StackPanel Orientation="Horizontal" x:Name="btn_Filter" Margin="5 0" Grid.Column="2">
 
diff --git a/bilibili2/Pages/SettingPage.xaml b/bilibili2/Pages/SettingPage.xaml
index e4f6789..5d44976 100644
--- a/bilibili2/Pages/SettingPage.xaml
+++ b/bilibili2/Pages/SettingPage.xaml
@@ -26,7 +26,7 @@
                     <ColumnDefinition Width="auto"/>
                 </Grid.ColumnDefinitions>
                 <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-                <TextBlock  Text="设置" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+                <TextBlock  Text="设置" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
             </Grid>
             <SplitView x:Name="dan_Sp" Grid.Row="1"  OpenPaneLength="350" PanePlacement="Right">
                 <SplitView.Pane>
diff --git a/bilibili2/Pages/TopicPage.xaml b/bilibili2/Pages/TopicPage.xaml
index b10a77c..51b5ead 100644
--- a/bilibili2/Pages/TopicPage.xaml
+++ b/bilibili2/Pages/TopicPage.xaml
@@ -27,7 +27,7 @@ xmlns:c="using:bilibili2"
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="话题" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="话题" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
         </Grid>
         <ScrollViewer x:Name="sc" ViewChanged="sc_ViewChanged" Style="{StaticResource ScrollViewerStyle1}" Grid.Row="1">
             <StackPanel>
diff --git a/bilibili2/Pages/UserBangumiPage.xaml b/bilibili2/Pages/UserBangumiPage.xaml
index f3d453f..71952d0 100644
--- a/bilibili2/Pages/UserBangumiPage.xaml
+++ b/bilibili2/Pages/UserBangumiPage.xaml
@@ -23,7 +23,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="全部追番" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="全部追番" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
         </Grid>
 
         <ScrollViewer x:Name="sc" Grid.Row="1" ViewChanged="sc_ViewChanged" Style="{StaticResource ScrollViewerStyle1}">
diff --git a/bilibili2/Pages/UserInfoPage.xaml b/bilibili2/Pages/UserInfoPage.xaml
index 5187fde..312b75e 100644
--- a/bilibili2/Pages/UserInfoPage.xaml
+++ b/bilibili2/Pages/UserInfoPage.xaml
@@ -26,7 +26,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_Back" Click="btn_Back_Click"  Width="48" Height="48" Icon="Back" Foreground="White"/-->
-            <TextBlock Grid.Column="1" Text="用户信息" VerticalAlignment="Center" Margin="5 0" FontSize="16" Foreground="White"/>
+            <TextBlock Grid.Column="0" Grid.ColumnSpan="2" Text="用户信息" VerticalAlignment="Center" Margin="5 0" FontSize="16" Foreground="White"/>
             <StackPanel Grid.Column="2" Orientation="Horizontal" Margin="5 0" VerticalAlignment="Top" HorizontalAlignment="Right">
                 <AppBarButton x:Name="btn_Attention" Width="48" Visibility="Collapsed" Height="48" ToolTipService.ToolTip="关注" Click="btn_Attention_Click">
                     <AppBarButton.Icon>
diff --git a/bilibili2/Pages/VideoInfoPage.xaml b/bilibili2/Pages/VideoInfoPage.xaml
index cc72494..e41851b 100644
--- a/bilibili2/Pages/VideoInfoPage.xaml
+++ b/bilibili2/Pages/VideoInfoPage.xaml
@@ -110,7 +110,7 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <!--AppBarButton x:Name="btn_back" Click="btn_back_Click" Icon="Back" Width="48" Height="48" Foreground="White"/-->
-            <TextBlock  Text="AV" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock  Text="AV" Margin="5 0" FontSize="16" x:Name="top_txt_Header" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
             <AppBarButton x:Name="btn_Sort" Grid.Column="2" Width="48" Height="48" Icon="Sort" Foreground="White">
                 <AppBarButton.Flyout>
                     <MenuFlyout>
diff --git a/bilibili2/Pages/WebViewPage.xaml b/bilibili2/Pages/WebViewPage.xaml
index f0e0baf..665ea35 100644
--- a/bilibili2/Pages/WebViewPage.xaml
+++ b/bilibili2/Pages/WebViewPage.xaml
@@ -22,7 +22,7 @@
                 <ColumnDefinition/>
             </Grid.ColumnDefinitions>
             <AppBarButton x:Name="webview_btn_Refresh" Grid.Column="1" HorizontalAlignment="Right"  Width="48" Height="48" Icon="Refresh"  Foreground="White" Click="webview_btn_Refresh_Click"></AppBarButton>
-            <TextBlock Text="浏览网页" FontSize="16" x:Name="text" Grid.Column="1" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
+            <TextBlock Text="浏览网页" FontSize="16" x:Name="text" Grid.Column="0" Grid.ColumnSpan="2" VerticalAlignment="Center" HorizontalAlignment="Left" Foreground="White" />
             <!--AppBarButton x:Name="webview_btn_Close"  Grid.Column="0" Width="48" Icon="Back" Foreground="White" Click="webview_btn_Close_Click" VerticalAlignment="Stretch"/-->