轻会员-新增付费比较表、订阅成功弹窗、订阅权益弹窗、新版账号信息弹窗

PDF Office/App.xaml.cs

@@ -653,6 +653,9 @@ namespace PDF_Master
             containerRegistry.RegisterDialog<UserDialog>(DialogNames.UserDialog);
             containerRegistry.RegisterDialog<UserOutingLogin>(DialogNames.UserOutingLogin);
             containerRegistry.RegisterDialog<RegisterOKRegion>(DialogNames.RegisterOKRegion);
+            containerRegistry.RegisterDialog<SubscriptionDialog>(DialogNames.SubscriptionDialog);
+            containerRegistry.RegisterDialog<SubscriptionOKDialog>(DialogNames.SubscriptionOKDialog);
+
 
             //新手引导弹窗
             containerRegistry.RegisterDialog<NoviceGuidDialog>(DialogNames.GuidDialog);

PDF Office/DataConvert/IAPConvert.cs

@@ -1,46 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Data;
-
-namespace PDF_Master.DataConvert
-{
-    public class IAPConvert : IValueConverter
-    {
-        //用于比较表小组文案
-
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if((PDF_Master.ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType)value==ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType.CreatePDF)
-            {
-                return App.ServiceLoader.GetString("Text_CreatePDF") ;
-            }
-             else  if ((PDF_Master.ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType)value == ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType.ConvertPDF)
-            {
-                return App.ServiceLoader.GetString("Text_ConvertPDF");
-            }
-            else if ((PDF_Master.ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType)value == ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType.AdvancedEditTools)
-            {
-                return App.ServiceLoader.GetString("Text_Advanced");
-            }
-            else if ((PDF_Master.ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType)value == ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType.AnnotatePDF)
-            {
-                return App.ServiceLoader.GetString("Text_Annotate");
-            }
-            else if ((PDF_Master.ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType)value == ViewModels.Dialog.ServiceDialog.IAPCompareDialogViewModel.UseType.Security)
-            {
-                return App.ServiceLoader.GetString("Text_Security");
-            }
-            return "枚举错误";
-        }
-
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}

PDF Office/Model/DialogNames.cs

@@ -16,6 +16,20 @@ namespace PDF_Master.Model
         /// </summary>
         public static string AboutDialog = "AboutDialog";
 
+
+
+        /// <summary>
+        /// 订阅权益弹窗
+        /// </summary>
+        public static string SubscriptionDialog = "SubscriptionDialog";
+
+
+        /// <summary>
+        /// 订阅权益弹窗
+        /// </summary>
+        public static string SubscriptionOKDialog = "SubscriptionOKDialog";
+
+
         /// <summary>
         /// 付费比较表
         /// </summary>

PDF Office/PDF Master.csproj

@@ -359,7 +359,6 @@
     <Compile Include="DataConvert\CreateTimeToDate.cs" />
     <Compile Include="DataConvert\FileFormatToIconConvert.cs" />
     <Compile Include="DataConvert\GroupHeaderConverter.cs" />
-    <Compile Include="DataConvert\IAPConvert.cs" />
     <Compile Include="DataConvert\IndexConverter .cs" />
     <Compile Include="DataConvert\IntToBooleanConvert.cs" />
     <Compile Include="DataConvert\FileToImageSourceConvert.cs" />
@@ -951,6 +950,12 @@
     <Compile Include="Views\Dialog\ServiceDialog\RegisterRegion.xaml.cs">
       <DependentUpon>RegisterRegion.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Views\Dialog\ServiceDialog\SubscriptionDialog.xaml.cs">
+      <DependentUpon>SubscriptionDialog.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\Dialog\ServiceDialog\SubscriptionOKDialog.xaml.cs">
+      <DependentUpon>SubscriptionOKDialog.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\Dialog\ServiceDialog\UserDialog.xaml.cs">
       <DependentUpon>UserDialog.xaml</DependentUpon>
     </Compile>
@@ -1749,6 +1754,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\Dialog\ServiceDialog\SubscriptionDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\Dialog\ServiceDialog\SubscriptionOKDialog.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\Dialog\ServiceDialog\UserDialog.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -2275,6 +2288,8 @@
     <Resource Include="Resources\Service\edit.png" />
     <Resource Include="Resources\Service\more.png" />
     <Resource Include="Resources\Service\page-edit.png" />
+    <Resource Include="Resources\Service\Cheer.png" />
+    <Resource Include="Resources\Service\NewRegiserok.png" />
     <Content Include="source\models\OCR.model">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
@@ -2309,7 +2324,6 @@
     </Content>
     <Resource Include="Resources\PromotionIcon\black_pdfreaderpro_home_en.png" />
     <Resource Include="Resources\PromotionIcon\Mac.png" />
-    <Resource Include="Resources\Service\IAPBottom.png" />
     <Resource Include="Resources\Service\IAPTop.png" />
     <Resource Include="Resources\HomeIcon\noScanner.png" />
     <Resource Include="Resources\PropertyPanel\no link.png" />

PDF Office/ViewModels/Dialog/ServiceDialog/IAPCompareDialogViewModel.cs

@@ -33,312 +33,18 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             }
         }
 
-        private string _Text_Login = "";
 
-        public string Text_Login
-        {
-            get { return _Text_Login; }
-            set
-            {
-                SetProperty(ref _Text_Login, value);
-            }
-        }
-
-        private string _Text_Log;
-        public string Text_Log
-        {
-            get { return _Text_Log; }
-            set
-            {
-                SetProperty(ref _Text_Log, value);
-            }
-        }
-        private string _Text_Free;
-        public string Text_Free
-        {
-            get { return _Text_Free; }
-            set
-            {
-                SetProperty(ref _Text_Free, value);
-            }
-        }
-        private string _Text_Unregistered;
-        public string Text_Unregistered
-        {
-            get { return _Text_Unregistered; }
-            set
-            {
-                SetProperty(ref _Text_Unregistered, value);
-            }
-        }
-        private string _Text_Registered;
-        public string Text_Registered
-        {
-            get { return _Text_Registered; }
-            set
-            {
-                SetProperty(ref _Text_Registered, value);
-            }
-        }
-        private string _Text_CreatePDF;
-        public string Text_CreatePDF
-        {
-            get { return _Text_CreatePDF; }
-            set
-            {
-                SetProperty(ref _Text_CreatePDF, value);
-            }
-        }
-        private string _Text_CreatePDFfrom;
-        public string Text_CreatePDFfrom
-        {
-            get { return _Text_CreatePDFfrom; }
-            set
-            {
-                SetProperty(ref _Text_CreatePDFfrom, value);
-            }
-        }
-        private string _Text_CreatePDFfromscanner;
-        public string Text_CreatePDFfromscanner
-        {
-            get { return _Text_CreatePDFfromscanner; }
-            set
-            {
-                SetProperty(ref _Text_CreatePDFfromscanner, value);
-            }
-        }
-        private string _Text_ConvertPDF;
-        public string Text_ConvertPDF
-        {
-            get { return _Text_ConvertPDF; }
-            set
-            {
-                SetProperty(ref _Text_ConvertPDF, value);
-            }
-        }
-        private string _Text_ConvertPDFtoMicrosoft;
-        public string Text_ConvertPDFtoMicrosoft
-        {
-            get { return _Text_ConvertPDFtoMicrosoft; }
-            set
-            {
-                SetProperty(ref _Text_ConvertPDFtoMicrosoft, value);
-            }
-        }
-        private string _Text_TurnPDF;
-        public string Text_TurnPDF
-        {
-            get { return _Text_TurnPDF; }
-            set
-            {
-                SetProperty(ref _Text_TurnPDF, value);
-            }
-        }
-        private string _Text_Save;
-        public string Text_Save
-        {
-            get { return _Text_Save; }
-            set
-            {
-                SetProperty(ref _Text_Save, value);
-            }
-        }
-        private string _Text_Edit;
-        public string Text_Edit
-        {
-            get { return _Text_Edit; }
-            set
-            {
-                SetProperty(ref _Text_Edit, value);
-            }
-        }
-        private string _Text_Extract;
-        public string Text_Extract
-        {
-            get { return _Text_Extract; }
-            set
-            {
-                SetProperty(ref _Text_Extract, value);
-            }
-        }
-        private string _Text_Advanced;
-        public string Text_Advanced
-        {
-            get { return _Text_Advanced; }
-            set
-            {
-                SetProperty(ref _Text_Advanced, value);
-            }
-        }
-        private string _Text_Compress;
-        public string Text_Compress
-        {
-            get { return _Text_Compress; }
-            set
-            {
-                SetProperty(ref _Text_Compress, value);
-            }
-        }
-        private string _Text_Merge;
-        public string Text_Merge
-        {
-            get { return _Text_Merge; }
-            set
-            {
-                SetProperty(ref _Text_Merge, value);
-            }
-        }
-        private string _Text_Fill;
-        public string Text_Fill
-        {
-            get { return _Text_Fill; }
-            set
-            {
-                SetProperty(ref _Text_Fill, value);
-            }
-        }
-        private string _Text_Crop;
-        public string Text_Crop
-        {
-            get { return _Text_Crop; }
-            set
-            {
-                SetProperty(ref _Text_Crop, value);
-            }
-        }
-        private string _Text_Rotate;
-        public string Text_Rotate
-        {
-            get { return _Text_Rotate; }
-            set
-            {
-                SetProperty(ref _Text_Rotate, value);
-            }
-        }
-        private string _Text_Annotate;
-        public string Text_Annotate
-        {
-            get { return _Text_Annotate; }
-            set
-            {
-                SetProperty(ref _Text_Annotate, value);
-            }
-        }
-        private string _Text_Basic;
-        public string Text_Basic
-        {
-            get { return _Text_Basic; }
-            set
-            {
-                SetProperty(ref _Text_Basic, value);
-            }
-        }
-        private string _Text_Hyperlink;
-        public string Text_Hyperlink
-        {
-            get { return _Text_Hyperlink; }
-            set
-            {
-                SetProperty(ref _Text_Hyperlink, value);
-            }
-        }
-        private string _Text_Stamp;
-        public string Text_Stamp
-        {
-            get { return _Text_Stamp; }
-            set
-            {
-                SetProperty(ref _Text_Stamp, value);
-            }
-        }
-        private string _Text_Signature;
-        public string Text_Signature
-        {
-            get { return _Text_Signature; }
-            set
-            {
-                SetProperty(ref _Text_Signature, value);
-            }
-        }
-        private string _Text_Security;
-        public string Text_Security
-        {
-            get { return _Text_Security; }
-            set
-            {
-                SetProperty(ref _Text_Security, value);
-            }
-        }
-        private string _Text_Add;
-        public string Text_Add
-        {
-            get { return _Text_Add; }
-            set
-            {
-                SetProperty(ref _Text_Add, value);
-            }
-        }
-        private string _Text_Remove;
-        public string Text_Remove
-        {
-            get { return _Text_Remove; }
-            set
-            {
-                SetProperty(ref _Text_Remove, value);
-            }
-        }
         private void InitString()
         {
 
-            Text_Signup = App.ServiceLoader.GetString("Text_Signup");
-            Text_Login = App.ServiceLoader.GetString("Text_Login");
-            Text_Log = App.ServiceLoader.GetString("Text_Log");
-            Text_Free = App.ServiceLoader.GetString("Text_Free");
-            Text_Unregistered = App.ServiceLoader.GetString("Text_Unregistered");
-            Text_Registered = App.ServiceLoader.GetString("Text_Registered");
-            Text_CreatePDF = App.ServiceLoader.GetString("Text_CreatePDF");
-            Text_CreatePDFfrom = App.ServiceLoader.GetString("Text_CreatePDFfrom");
-            Text_CreatePDFfromscanner = App.ServiceLoader.GetString("Text_CreatePDFfromscanner");
-            Text_ConvertPDF = App.ServiceLoader.GetString("Text_ConvertPDF");
-            Text_ConvertPDFtoMicrosoft = App.ServiceLoader.GetString("Text_ConvertPDFtoMicrosoft");
-            Text_TurnPDF = App.ServiceLoader.GetString("Text_TurnPDF");
-            Text_Save = App.ServiceLoader.GetString("Text_Save");
-            Text_Advanced = App.ServiceLoader.GetString("Text_Advanced");
-            Text_Edit = App.ServiceLoader.GetString("Text_Edit");
-            Text_Extract = App.ServiceLoader.GetString("Text_Extract");
-            Text_Compress = App.ServiceLoader.GetString("Text_Compress");
-            Text_Merge = App.ServiceLoader.GetString("Text_Merge");
-            Text_Fill = App.ServiceLoader.GetString("Text_Fill");
-            Text_Crop = App.ServiceLoader.GetString("Text_Crop");
-            Text_Rotate = App.ServiceLoader.GetString("Text_Rotate");
-            Text_Annotate = App.ServiceLoader.GetString("Text_Annotate");
-            Text_Basic = App.ServiceLoader.GetString("Text_Basic");
-            Text_Hyperlink = App.ServiceLoader.GetString("Text_Hyperlink");
-            Text_Stamp = App.ServiceLoader.GetString("Text_Stamp");
-            Text_Signature = App.ServiceLoader.GetString("Text_Signature");
-            Text_Security = App.ServiceLoader.GetString("Text_Security");
-            Text_Add = App.ServiceLoader.GetString("Text_Add");
-            Text_Remove = App.ServiceLoader.GetString("Text_Remove");
+            //Text_Signup = App.ServiceLoader.GetString("Text_Signup");
+
 
         }
 
 
         #endregion
 
-        private string _IAPRegionName;
-        public string IAPRegionName
-        {
-            get { return _IAPRegionName; }
-            set { _IAPRegionName = value; }
-        }
-
-        private List<User> _Items= new List<User>();
-        public List<User> Items
-        {
-            get { return _Items; }
-            set { _Items = value; }
-        }
-
 
         public bool CanCloseDialog()
         {
@@ -354,74 +60,18 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         {
             
         }
-        public enum UseType { CreatePDF, ConvertPDF , AdvancedEditTools, AnnotatePDF, Security};
-
-        public class User
-        {
-          
-            public string Use { get; set; }
 
-            public bool Re { get; set; }
-
-            public bool UnRe { get; set; }
-
-
-    
-            public UseType UseType { get; set; }
-        }
 
         public DelegateCommand GoLoginCommand { get; set; }
-        public DelegateCommand GoRegisterCommand { get; set; }
 
 
        public IAPCompareDialogViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
            
-            IAPRegionName = Guid.NewGuid().ToString();
-            GoLoginCommand = new DelegateCommand(GoLogin);
-            GoRegisterCommand = new DelegateCommand(GoRegisterd);
+            //GoLoginCommand = new DelegateCommand(GoLogin);
             InitString();
 
-            Items.Add(new User() { Use = Text_CreatePDFfrom, UnRe = true, Re=true, UseType = UseType.CreatePDF });
-            Items.Add(new User() { Use = Text_CreatePDFfromscanner, UnRe = true, Re = true, UseType = UseType.CreatePDF });
-            Items.Add(new User() { Use = Text_ConvertPDFtoMicrosoft, UnRe = false, Re = true, UseType = UseType.ConvertPDF });
-            Items.Add(new User() { Use = Text_TurnPDF, UnRe = false, Re = true, UseType = UseType.ConvertPDF });
-
-            Items.Add(new User() { Use = Text_Edit, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
-            Items.Add(new User() { Use = Text_Extract, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
-            Items.Add(new User() { Use = Text_Compress, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
-            Items.Add(new User() { Use = Text_Merge, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
-            //初版先不显示填写与签名
-            //Items.Add(new User() { Use = Text_Fill, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
-            Items.Add(new User() { Use = Text_Crop, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
-            Items.Add(new User() { Use = Text_Rotate, UnRe = false, Re = true, UseType = UseType.AdvancedEditTools });
-            Items.Add(new User() { Use = Text_Basic, UnRe = true, Re = true, UseType = UseType.AnnotatePDF });
-            Items.Add(new User() { Use = Text_Hyperlink, UnRe = false, Re = true, UseType = UseType.AnnotatePDF });
-            Items.Add(new User() { Use = Text_Stamp, UnRe = false, Re = true, UseType = UseType.AnnotatePDF });
-            Items.Add(new User() { Use = Text_Signature, UnRe = false, Re = true, UseType = UseType.AnnotatePDF });
-            Items.Add(new User() { Use = Text_Add, UnRe = false, Re = true, UseType = UseType.Security });
-            Items.Add(new User() { Use = Text_Remove, UnRe = false, Re = true, UseType = UseType.Security });
-
-            
-            CollectionView view = (CollectionView)CollectionViewSource.GetDefaultView(Items);
-            IAPConvert iAPConverter = new IAPConvert();
-            PropertyGroupDescription groupDescription = new PropertyGroupDescription("UseType", iAPConverter);
-            view.GroupDescriptions.Add(groupDescription);
-        }
-
-        private void GoRegisterd()
-        {
-
-            RequestClose?.Invoke(new Prism.Services.Dialogs.DialogResult(ButtonResult.Cancel));
-            App.mainWindowViewModel.OpenRegister();
         }
-        private void GoLogin()
-        {
-
 
-            RequestClose?.Invoke(new Prism.Services.Dialogs.DialogResult(ButtonResult.Cancel));
-            App.mainWindowViewModel.OpenLogin();
-
-        }
     }
 }

PDF Office/Views/Dialog/ServiceDialog/LoginDialog.xaml

@@ -41,27 +41,27 @@
                     Margin="0,2,0,0"
                     FontFamily="SF Pro Text"
                     FontSize="10"
-                    Foreground="#60252629"
+                    Foreground="#94989C"
                     LineHeight="16"
                     Text="Register as a member and login to access all premium features for free"
                     TextWrapping="Wrap" />
             </StackPanel>
 
-            <StackPanel Margin="28,152,0,0"  HorizontalAlignment="Left" Width="195" Height="204" VerticalAlignment="Top">
-                <Grid Width="173" Height="42" HorizontalAlignment="Left">
+            <StackPanel Margin="28,152,0,0"  HorizontalAlignment="Left"  Height="204" VerticalAlignment="Top">
+                <Grid  Height="42" HorizontalAlignment="Left">
                     <Border Width="36" Height="36" HorizontalAlignment="Left">
                         <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/edit.png"/>
                     </Border>
-                    <StackPanel Width="129" Height="42" HorizontalAlignment="Right">
+                    <StackPanel Width="129" Height="42" Margin="42,0,0,0">
                         <TextBlock Text="Edit PDF" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" LineHeight="20" Height="20"/>
                         <TextBlock Margin="0,4,0,0" Text="Text editing, image editing"  FontFamily="Segoe UI"  FontSize="11" LineHeight="28" Height="18" Foreground="#616469"/>
                     </StackPanel>
                 </Grid>
-                <Grid Width="195" Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
+                <Grid  Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
                     <Border Width="36" Height="36" HorizontalAlignment="Left">
                         <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/convert.png"/>
                     </Border>
-                    <StackPanel Margin="42,0,0,0" Width="153" Height="42" >
+                    <StackPanel Margin="42,0,0,0"  Height="42" >
                         <StackPanel Orientation="Horizontal">
                             <TextBlock Text="Convert" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" LineHeight="20" Height="20"/>
                             <TextBlock Text="(Limit first 10 pages)" FontFamily="Segoe UI"  FontSize="11" LineHeight="18" Height="18" Margin="8,0,0,0" Foreground="#94989C"/>
@@ -70,25 +70,27 @@
                         <TextBlock Margin="0,4,0,0" Text="Best PDF to Office Converter"  FontFamily="Segoe UI"  FontSize="11" LineHeight="28" Height="18" Foreground="#616469"/>
                     </StackPanel>
                 </Grid>
-                <Grid Width="173" Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
+                <Grid  Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
                     <Border Width="36" Height="36" HorizontalAlignment="Left">
                         <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/page-edit.png"/>
                     </Border>
-                    <StackPanel Width="129" Height="42" HorizontalAlignment="Right">
+                    <StackPanel  Height="42" HorizontalAlignment="Left" Margin="42,0,0,0">
                         <TextBlock Text="Page Edit" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" LineHeight="20" Height="20"/>
                         <TextBlock Margin="0,4,0,0" Text="Insert, Replace, Split, Extract"  FontFamily="Segoe UI"  FontSize="11" LineHeight="28" Height="18" Foreground="#616469"/>
                     </StackPanel>
                 </Grid>
-                <Grid Width="173" Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
+                <Grid  Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
                     <Border Width="36" Height="36" HorizontalAlignment="Left">
                         <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/more.png"/>
                     </Border>
-                    <StackPanel Width="129" Height="42" HorizontalAlignment="Right">
+                    <StackPanel  Height="42" HorizontalAlignment="Left" Margin="42,0,0,0" >
                         <TextBlock Text="More Features" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" LineHeight="20" Height="20"/>
                         <TextBlock Margin="0,4,0,0" Text="More features to look forward"  FontFamily="Segoe UI"  FontSize="11" LineHeight="28" Height="18" Foreground="#616469"/>
                     </StackPanel>
                 </Grid>
             </StackPanel>
+            <!--<TextBlock Text="Subscribe Now" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" Foreground="#3F8FF6"  LineHeight="20" Margin="150,380,0,0" Width="82" Height="20" />-->
+            <Button Content="Subscribe Now" Background="Transparent"  Margin="150,380,0,0" Width="84" Height="20" Foreground="#3F8FF6" FontWeight="SemiBold" FontSize="12" FontFamily="Segoe UI" BorderThickness="0" />
         </Grid>
         <Grid Grid.Column="1" >
             <ContentControl prism:RegionManager.RegionName="{Binding LoginRegionName}" Visibility="Visible"/>

PDF Office/Views/Dialog/ServiceDialog/RegisterDialog.xaml

@@ -47,21 +47,21 @@
                     TextWrapping="Wrap" />
             </StackPanel>
 
-            <StackPanel Margin="28,152,0,0"  HorizontalAlignment="Left" Width="195" Height="204" VerticalAlignment="Top">
-                <Grid Width="173" Height="42" HorizontalAlignment="Left">
+            <StackPanel Margin="28,152,0,0"  HorizontalAlignment="Left"  Height="204" VerticalAlignment="Top">
+                <Grid  Height="42" HorizontalAlignment="Left">
                     <Border Width="36" Height="36" HorizontalAlignment="Left">
                         <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/edit.png"/>
                     </Border>
-                    <StackPanel Width="129" Height="42" HorizontalAlignment="Right">
+                    <StackPanel Width="129" Height="42" Margin="42,0,0,0">
                         <TextBlock Text="Edit PDF" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" LineHeight="20" Height="20"/>
                         <TextBlock Margin="0,4,0,0" Text="Text editing, image editing"  FontFamily="Segoe UI"  FontSize="11" LineHeight="28" Height="18" Foreground="#616469"/>
                     </StackPanel>
                 </Grid>
-                <Grid Width="195" Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
+                <Grid  Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
                     <Border Width="36" Height="36" HorizontalAlignment="Left">
                         <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/convert.png"/>
                     </Border>
-                    <StackPanel Margin="42,0,0,0" Width="153" Height="42" >
+                    <StackPanel Margin="42,0,0,0"  Height="42" >
                         <StackPanel Orientation="Horizontal">
                             <TextBlock Text="Convert" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" LineHeight="20" Height="20"/>
                             <TextBlock Text="(Limit first 10 pages)" FontFamily="Segoe UI"  FontSize="11" LineHeight="18" Height="18" Margin="8,0,0,0" Foreground="#94989C"/>
@@ -70,20 +70,20 @@
                         <TextBlock Margin="0,4,0,0" Text="Best PDF to Office Converter"  FontFamily="Segoe UI"  FontSize="11" LineHeight="28" Height="18" Foreground="#616469"/>
                     </StackPanel>
                 </Grid>
-                <Grid Width="173" Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
+                <Grid  Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
                     <Border Width="36" Height="36" HorizontalAlignment="Left">
                         <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/page-edit.png"/>
                     </Border>
-                    <StackPanel Width="153" Height="42" HorizontalAlignment="Left" Margin="42,0,0,0">
+                    <StackPanel  Height="42" HorizontalAlignment="Left" Margin="42,0,0,0">
                         <TextBlock Text="Page Edit" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" LineHeight="20" Height="20"/>
                         <TextBlock Margin="0,4,0,0" Text="Insert, Replace, Split, Extract"  FontFamily="Segoe UI"  FontSize="11" LineHeight="28" Height="18" Foreground="#616469"/>
                     </StackPanel>
                 </Grid>
-                <Grid Width="190" Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
+                <Grid  Height="42" HorizontalAlignment="Left" Margin="0,12,0,0">
                     <Border Width="36" Height="36" HorizontalAlignment="Left">
                         <Image Source="pack://application:,,,/PDF Master;component/Resources/Service/more.png"/>
                     </Border>
-                    <StackPanel Width="153" Height="42" HorizontalAlignment="Left" Margin="42,0,0,0" >
+                    <StackPanel  Height="42" HorizontalAlignment="Left" Margin="42,0,0,0" >
                         <TextBlock Text="More Features" FontFamily="Segoe UI" FontWeight="SemiBold" FontSize="12" LineHeight="20" Height="20"/>
                         <TextBlock Margin="0,4,0,0" Text="More features to look forward"  FontFamily="Segoe UI"  FontSize="11" LineHeight="28" Height="18" Foreground="#616469"/>
                     </StackPanel>

PDF Office/Views/Dialog/ServiceDialog/SubscriptionDialog.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace PDF_Master.Views.Dialog.ServiceDialog
+{
+    /// <summary>
+    /// SubscriptionDialog.xaml 的交互逻辑
+    /// </summary>
+    public partial class SubscriptionDialog : UserControl
+    {
+        public SubscriptionDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}

PDF Office/Views/Dialog/ServiceDialog/SubscriptionOKDialog.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace PDF_Master.Views.Dialog.ServiceDialog
+{
+    /// <summary>
+    /// SubscriptionOK.xaml 的交互逻辑
+    /// </summary>
+    public partial class SubscriptionOKDialog : UserControl
+    {
+        public SubscriptionOKDialog()
+        {
+            InitializeComponent();
+        }
+    }
+}