轻会员bug修复

PDF Office/Helper/ServiceHelper.cs

@@ -240,6 +240,10 @@ namespace PDF_Master.Helper
 
 
         //超时同步为20秒
+        /// <summary>
+        /// 用户信息获取
+        /// </summary>
+        /// <returns></returns>
         public static String GetUser()
         {
            
@@ -308,6 +312,12 @@ namespace PDF_Master.Helper
             
         }
 
+        /// <summary>
+        /// 验证email格式
+        /// </summary>
+        /// <param name="intemail"></param>
+        /// <param name="validType"></param>
+        /// <returns></returns>
         public static String Ok_email(string intemail,string validType)
         {
             
@@ -371,7 +381,13 @@ namespace PDF_Master.Helper
            
         }
 
-        //⑤报错
+       
+        /// <summary>
+        /// 获取验证码
+        /// </summary>
+        /// <param name="action"></param>
+        /// <param name="email"></param>
+        /// <returns></returns>
         public static string Get_code(string action, string email)
         {
             string post = $"?action={action}&appId=16&receiver={email}&type=0";
@@ -415,6 +431,14 @@ namespace PDF_Master.Helper
 
             
         }
+
+        /// <summary>
+        /// 验证验证码是否正确
+        /// </summary>
+        /// <param name="email"></param>
+        /// <param name="code"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
         public static String Ok_code(string email, string code, string type)
         {
            
@@ -456,6 +480,16 @@ namespace PDF_Master.Helper
             }
            
         }
+
+
+        /// <summary>
+        /// 注册账号
+        /// </summary>
+        /// <param name="intemail"></param>
+        /// <param name="intpassword"></param>
+        /// <param name="intcode"></param>
+        /// <param name="uuid"></param>
+        /// <returns></returns>
         public static String Register_email(string intemail, string intpassword, string intcode, string uuid)
         {
           
@@ -523,8 +557,9 @@ namespace PDF_Master.Helper
                         
                         GetUser();
                     }
-                    return jobject["code"].ToObject<string>().ToLower();
+                    //return jobject["code"].ToObject<string>().ToLower();
 
+                    return "200";
                 }
             }
             catch
@@ -533,6 +568,15 @@ namespace PDF_Master.Helper
             }
           
         }
+
+
+        /// <summary>
+        /// 登录
+        /// </summary>
+        /// <param name="intemail"></param>
+        /// <param name="intpassword"></param>
+        /// <param name="uuid"></param>
+        /// <returns></returns>
         public static String Login(string intemail, string intpassword, string uuid)
         {
             
@@ -582,7 +626,11 @@ namespace PDF_Master.Helper
            
         }
 
-        //⑤报错
+      
+        /// <summary>
+        /// 登出
+        /// </summary>
+        /// <param name="uuid"></param>
         public static void Logout(string uuid)
         {
             
@@ -624,6 +672,13 @@ namespace PDF_Master.Helper
             }
            
         }
+
+
+        /// <summary>
+        /// 注销
+        /// </summary>
+        /// <param name="code"></param>
+        /// <returns></returns>
         public static String Usergout(string code)
         {
            
@@ -669,6 +724,14 @@ namespace PDF_Master.Helper
            
         }
 
+        /// <summary>
+        /// 重置密码
+        /// </summary>
+        /// <param name="intemail"></param>
+        /// <param name="firstpassword"></param>
+        /// <param name="secondPassword"></param>
+        /// <param name="intcode"></param>
+        /// <returns></returns>
         public static String Rebirth(string intemail, string firstpassword, string secondPassword, string intcode)
         {
           

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

@@ -310,7 +310,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         public CodeRegionViewModel(IRegionManager regionManager, IDialogService dialogService)
         {
             
-            Timebegin();
+      
             dialogs = dialogService;
             BackRegisterLastCommand = new DelegateCommand(BackRegisterLast);
             CodetooCommand = new DelegateCommand(Codetoo);
@@ -366,7 +366,8 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
            
                 if (CodeType == "user_register")
                 {
-                if (ServiceHelper.Register_email(RegisterDialogViewModel.RegisterEmail, RegisterDialogViewModel.RegisterPassword, Codesum, uuid) == "200")
+                string code = ServiceHelper.Register_email(RegisterDialogViewModel.RegisterEmail, RegisterDialogViewModel.RegisterPassword, Codesum, uuid);
+                if (code == "200")
                 {
                     App.mainWindowViewModel.UserVis = Visibility.Visible;
                     App.mainWindowViewModel.RegisterVis = Visibility.Collapsed;
@@ -379,7 +380,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                 else
                 {
                     EnableNextStep = false;
-                    RegisterCodemsg = ErrorCodeHelper.Ercode(ServiceHelper.Register_email(RegisterDialogViewModel.RegisterEmail, RegisterDialogViewModel.RegisterPassword, Codesum, uuid));
+                    RegisterCodemsg = ErrorCodeHelper.Ercode(code);
                     RegisterCodemsgVis = Visibility.Visible;
                 }
 
@@ -405,8 +406,8 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                 {
                     if (CodeType == "user_register")
                     {
-                       
-                        if (ServiceHelper.Ok_code(RegisterDialogViewModel.RegisterEmail, Codesum, CodeType) == "200")
+                    string code = ServiceHelper.Ok_code(RegisterDialogViewModel.RegisterEmail, Codesum, CodeType);
+                        if (code == "200")
                         {
                             
                             
@@ -416,21 +417,21 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                         else
                         {
                             EnableNextStep = false;                   
-                            RegisterCodemsg = ErrorCodeHelper.Ercode(ServiceHelper.Ok_code(RegisterDialogViewModel.RegisterEmail, Codesum, CodeType));
+                            RegisterCodemsg = ErrorCodeHelper.Ercode(code);
                             RegisterCodemsgVis = Visibility.Visible;
                         }
                     }
                     else
                     {
-                        
-                        if (ServiceHelper.Ok_code(LoginDialogViewModel.LoginEmail, Codesum, CodeType) == "200")
+                    string code = ServiceHelper.Ok_code(LoginDialogViewModel.LoginEmail, Codesum, CodeType);
+                    if (code == "200")
                         {
                             EnableNextStep = true;
                         }
                         else
                         {
                             EnableNextStep = false;
-                            RegisterCodemsg = ErrorCodeHelper.Ercode(ServiceHelper.Ok_code(LoginDialogViewModel.LoginEmail, Codesum, CodeType));
+                            RegisterCodemsg = ErrorCodeHelper.Ercode(code);
                             RegisterCodemsgVis = Visibility.Visible;
                         }
                     }

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

@@ -299,9 +299,9 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         //登录
         private void Login()
         {
-            
-            
-            if (ServiceHelper.Login(LoginEmail, LoginPassword, uuid) == "200")
+
+            string code = ServiceHelper.Login(LoginEmail, LoginPassword, uuid);
+            if (code == "200")
             {
                 LoginDialogViewModel.Close();
                 App.mainWindowViewModel.UserVis = Visibility.Visible;
@@ -313,7 +313,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
            
             else
             {
-                LoginPasswordmsglook = ErrorCodeHelper.Ercode(ServiceHelper.Login(LoginEmail, LoginPassword, uuid));
+                LoginPasswordmsglook = ErrorCodeHelper.Ercode(code);
                 LoginPasswordlookVis = Visibility.Visible;
             }
         }

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

@@ -194,15 +194,15 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
         private void LoginNext()
         {
-           
-           
-            if (ServiceHelper.Ok_email(LoginEmail, "1") == "200")
+
+            string code = ServiceHelper.Ok_email(LoginEmail, "1");
+            if (code == "200")
             {
                 LoginDialogViewModel.LoginEmail = LoginEmail;
                 LoginDialogViewModel.RegionMan("LoginPasswordRegion");
             }
            
-            else if (ServiceHelper.Ok_email(LoginEmail, "1") == "318")
+            else if (code == "318")
             {
                 
                     dialogs.ShowDialog(DialogNames.UserOutingLogin, new DialogParameters(""), r =>
@@ -213,7 +213,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             }
             else
             {
-                LoginEmaillook = ErrorCodeHelper.Ercode(ServiceHelper.Ok_email(LoginEmail, "1"));
+                LoginEmaillook = ErrorCodeHelper.Ercode(code);
 
             }
         }

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

@@ -351,15 +351,15 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
 
         private void PasswordUpdata()
         {
-            
-           
-            if (ServiceHelper.Rebirth(LoginEmail, LoginPassword2, LoginPassword, LoginDialogViewModel.PasswordCode) == "200")
+
+            string code = ServiceHelper.Rebirth(LoginEmail, LoginPassword2, LoginPassword, LoginDialogViewModel.PasswordCode);
+            if (code == "200")
             {
                 LoginDialogViewModel.RegionMan("LoginRegion");
             }
             else
             {
-                PasswordUpdatamsglook = ErrorCodeHelper.Ercode(ServiceHelper.Rebirth(LoginEmail, LoginPassword2, LoginPassword, LoginDialogViewModel.PasswordCode));
+                PasswordUpdatamsglook = ErrorCodeHelper.Ercode(code);
                 PasswordUpdatalookVis = Visibility.Visible;
             }
         }

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

@@ -395,8 +395,8 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
         private void RegisterNext()
         {
 
-
-            if (ServiceHelper.Ok_email(RegisterEmail, "2") == "200")
+            string code = ServiceHelper.Ok_email(RegisterEmail, "2");
+            if (code == "200")
             {
                 RegisterDialogViewModel.RegisterEmail = RegisterEmail;
                 RegisterDialogViewModel.RegisterPassword = RegisterPassword;
@@ -405,7 +405,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             }
             else 
             {
-                RegisterEmaillook = ErrorCodeHelper.Ercode(ServiceHelper.Ok_email(RegisterEmail, "2"));
+                RegisterEmaillook = ErrorCodeHelper.Ercode(code);
             }
         }
 

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

@@ -281,7 +281,8 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             Codesum = Code1 + Code2 + Code3 + Code4 + Code5 + Code6;
             if (CodeSum()==true)
             {
-                if (ServiceHelper.Usergout(Codesum) == "200")
+                string code = ServiceHelper.Usergout(Codesum);
+                if (code == "200")
                 {
                     Settings.Default.AppProperties.LoginToken = "";
                     App.IsLogin = false;
@@ -294,7 +295,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                 else
                 {
                     EnableNextStep = false;
-                    UserCodemsg = ErrorCodeHelper.Ercode(ServiceHelper.Usergout(Codesum));
+                    UserCodemsg = ErrorCodeHelper.Ercode(code);
                     UserCodemsgVis = Visibility.Visible;
                 }
                
@@ -313,8 +314,8 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
             if (CodeSum() == true)
             {
 
-
-                if (ServiceHelper.Ok_code(UserDialogViewModel.UserEmail, Codesum, "user_log_off") == "200")
+                string code = ServiceHelper.Ok_code(UserDialogViewModel.UserEmail, Codesum, "user_log_off");
+                if ( code== "200")
                 {
 
                  
@@ -325,7 +326,7 @@ namespace PDF_Master.ViewModels.Dialog.ServiceDialog
                 else
                 {
                     EnableNextStep = false;
-                    UserCodemsg = ErrorCodeHelper.Ercode(ServiceHelper.Ok_code(UserDialogViewModel.UserEmail, Codesum, "user_log_off"));
+                    UserCodemsg = ErrorCodeHelper.Ercode(code);
                     UserCodemsgVis = Visibility.Visible;
                 }