Merge branch 'dev' into practice2

PDF Office/Views/MainContent.xaml

@@ -18,6 +18,6 @@
         </i:EventTrigger>
     </i:Interaction.Triggers>-->
     <Grid>
-        <ContentControl Name="ContentMain" prism:RegionManager.RegionName="{Binding MainContentRegionName}" Margin="-64,-10,64,10" />
+        <ContentControl Name="ContentMain" prism:RegionManager.RegionName="{Binding MainContentRegionName}" />
     </Grid>
 </UserControl>

PDF Office/Views/MainWindow.xaml

@@ -127,8 +127,7 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="40" />
-                <RowDefinition Height="65*" />
-                <RowDefinition Height="121*"/>
+                <RowDefinition Height="*" />
             </Grid.RowDefinitions>
             <dragablz:TabablzControl
                 Name="TabablzControl"
@@ -162,9 +161,9 @@
             </dragablz:TabablzControl>
             <!--  标题栏右侧栏，关闭按钮，会员，试用等  -->
             <StackPanel
-                HorizontalAlignment="Left"
+                HorizontalAlignment="Right"
                 Orientation="Horizontal"
-                WindowChrome.IsHitTestVisibleInChrome="True" Margin="1160,0,0,0">
+                WindowChrome.IsHitTestVisibleInChrome="True">
                 <Button
                     Name="BtnMiniSize"
                     Width="40"