轻会员-bug修复

PDF Office/Helper/ConverterHelper.cs

@@ -621,7 +621,7 @@ namespace PDF_Master.Helper
         /// </summary>
         public static void convertUnlock()
         {      
-                Process.Start(new ProcessStartInfo("http://test-pdf-pro.kdan.cn:3021/windows/store/master?email=" + Settings.Default.UserDate.Email));
+                Process.Start(new ProcessStartInfo(ServiceHelper.WebHost + "/windows/store/master?email=" + Settings.Default.UserDate.Email));
         }
 
     }

PDF Office/Helper/ServiceHelper.cs

@@ -45,9 +45,12 @@ namespace PDF_Master.Helper
 #if DEBUG
         //测试环境
         public static string RequestHost = "http://139.196.160.101:8081";
+        public static string WebHost = "http://test-pdf-pro.kdan.cn:3021";
+
 #else
         //正式环境
         public static string RequestHost = "https://pdfmaster.pdfreaderpro.com";
+        public static string WebHost = "https://www.pdfreaderpro.com";
 #endif
 
 

PDF Office/ViewModels/Dialog/NoviceGuidDialogViewModel.cs

@@ -196,7 +196,7 @@ namespace PDF_Master.ViewModels.Dialog
             //忽略，下次再看
             //2023.7.17 策略调整，因配图较多，不显示再提示字样 
             //this.RequestClose(new DialogResult(ButtonResult.Ignore));
-            Process.Start(new ProcessStartInfo("http://test-pdf-pro.kdan.cn:3021/windows/store/master?email=" + Settings.Default.UserDate.Email));     
+            Process.Start(new ProcessStartInfo(ServiceHelper.WebHost + "/windows/store/master?email=" + Settings.Default.UserDate.Email));     
         }
 
         private void InitItemSource()

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

@@ -132,7 +132,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
         private void Linkstore()
         {
-            Process.Start(new ProcessStartInfo("http://test-pdf-pro.kdan.cn:3021/windows/store/master?email=" + Settings.Default.UserDate.Email));
+            Process.Start(new ProcessStartInfo(ServiceHelper.WebHost+"/windows/store/master?email=" + Settings.Default.UserDate.Email));
 
         }
 

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

@@ -180,7 +180,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
 
 
-        private string _uristore = "http://test-pdf-pro.kdan.cn:3021/windows/store/master?email=" + Settings.Default.UserDate.Email;
+        private string _uristore = ServiceHelper.WebHost + "/windows/store/master?email=" + Settings.Default.UserDate.Email;
         public string Uristore
         {
             get { return _uristore; }

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

@@ -318,7 +318,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             get { return _Subscriptionauto; }
             set { _Subscriptionauto = value; }
         }
-        private string _uristore = "http://test-pdf-pro.kdan.cn:3021/windows/store/master-subscription?email=" + Settings.Default.UserDate.Email;
+        private string _uristore = ServiceHelper.WebHost + "/windows/store/master-subscription?email=" + Settings.Default.UserDate.Email;
         public string Uristore
         {
             get { return _uristore; }
@@ -328,7 +328,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
             }
         }
-        private string _Uriuserdata = "http://test-pdf-pro.kdan.cn:3021/windows/account/master-subscription?appid=16&productId=22&token=" + Settings.Default.AppProperties.LoginToken;
+        private string _Uriuserdata = ServiceHelper.WebHost + "/windows/account/master-subscription?appid=16&productId=22&token=" + Settings.Default.AppProperties.LoginToken;
         public string Uriuserdata
         {
             get { return _Uriuserdata; }

PDF Office/ViewModels/MainWindowViewModel.cs

@@ -419,7 +419,7 @@ namespace PDF_Master.ViewModels
         private void Upgradelink()
         {
             DataTrackingHelper.SendEvent(DataTrackingHelper.EventType.Tbr, "Tbr_Btn", "Btn_Tbr_Upgrade");
-            Process.Start(new ProcessStartInfo("http://test-pdf-pro.kdan.cn:3021/windows/store/master?email=" + Settings.Default.UserDate.Email));
+            Process.Start(new ProcessStartInfo(ServiceHelper.WebHost + "/windows/store/master?email=" + Settings.Default.UserDate.Email));
         }
         //显示新手引导弹窗
         private bool ShowGuidDialog()

PDF Office/Views/MainWindow.xaml.cs

@@ -134,7 +134,7 @@ namespace PDF_Master.Views
                             App.mainWindowViewModel.OpenUser();
                             App.WebOpencase = "";
                         }
-                        else if(App.LoginOpen == false)
+                        else if(App.IsLogin == false&&App.LoginOpen == false)
                         {
                             App.mainWindowViewModel.OpenLogin();
                             App.WebOpencase = "";