优化支付密码设置

ADHTuanCan.xcodeproj/project.pbxproj

@@ -3709,7 +3709,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = TuanCanId.ADHTuanCan;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@@ -3753,7 +3753,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.0.0;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = TuanCanId.ADHTuanCan;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";

ADHTuanCan/AppDelegate.swift

@@ -31,10 +31,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         self.window?.makeKeyAndVisible()
         
         //默认域名
-        Defaults[\.BaseUrl] = "http://47.108.114.127:10888"
+//        Defaults[\.BaseUrl] = "http://47.108.114.127:10888"
 //        Defaults[\.BaseUrl] = "http://www.gzzzyd.com/gm-api"
 //        Defaults[\.BaseUrl] = "http://wine.gzzzyd.com/api"
-//        Defaults[\.BaseUrl] = "https://kcapp.kiansengculinary.com/api"
+        Defaults[\.BaseUrl] = "https://kcapp.kiansengculinary.com/api"
 //        Defaults[\.BaseUrl] = "https://kcapp.gzzzyd.com/api"
 //        Defaults[\.BaseUrl] = "https://kcapp.gzzzyd.com/api"
         
@@ -85,12 +85,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     //MARK: 进入首页
     func setHomeTabBarViewController(){
        
-        if Defaults[\.isSetPayPassword] === 0{
-            let loginVC = EditPayPSWViewController()
-            loginVC.phone =  Defaults[\.UserPhone]
-            self.window?.rootViewController = loginVC
-            return
-        }
+//        if Defaults[\.isSetPayPassword] === 0{
+//            let loginVC = EditPayPSWViewController()
+//            loginVC.phone =  Defaults[\.UserPhone]
+//            self.window?.rootViewController = loginVC
+//            return
+//        }
         
         
         let tabVC = BaseTabbarController()

ADHTuanCan/Class/登录/TCLogingViewController.swift

@@ -163,12 +163,12 @@ class TCLogingViewController: ADHBaseVC {
         
         let keyWindow = UIApplication.shared.keyWindow
         
-        if Defaults[\.isSetPayPassword] === 0{
-            let loginVC = EditPayPSWViewController()
-            loginVC.phone =  Defaults[\.UserPhone]
-            keyWindow?.rootViewController = loginVC
-            return
-        }
+//        if Defaults[\.isSetPayPassword] === 0{
+//            let loginVC = EditPayPSWViewController()
+//            loginVC.phone =  Defaults[\.UserPhone]
+//            keyWindow?.rootViewController = loginVC
+//            return
+//        }
         
         let tabVC = BaseTabbarController()
         tabVC.setupChildControllers()

ADHTuanCan/Class/登录/验证码/CodeViewController.swift

@@ -207,7 +207,7 @@ class CodeViewController: ADHBaseVC {
         self.viewModel.registeredAccountModel.captchaCode = "\(textF1.text ?? "")\(textF2.text ?? "")\(textF3.text ?? "")\(textF4.text ?? "")\(textF5.text ?? "")\(textF6.text ?? "")"
         
         self.viewModel.registeredAccountModel.captchaId = self.codeDetail.id
-        
+        self.hud.showLoading()
         self.viewModel.signalRegisteredAccount()?.on(success: { dd in
             for temp in self.navigationController!.viewControllers {
                 if temp.isKind(of: TCLogingViewController.self){
@@ -229,7 +229,7 @@ class CodeViewController: ADHBaseVC {
         self.viewModel.phoneNumLoginModel.captchaCode = "\(textF1.text ?? "")\(textF2.text ?? "")\(textF3.text ?? "")\(textF4.text ?? "")\(textF5.text ?? "")\(textF6.text ?? "")"
         
         self.viewModel.phoneNumLoginModel.captchaId = self.codeDetail.id
-        
+        self.hud.showLoading()
         self.viewModel.signalPhoneSMSLogin()?.on(success: { dd in
           
             Defaults[\.UserToken] = self.viewModel.UserDetailM?.access_token
@@ -256,12 +256,12 @@ class CodeViewController: ADHBaseVC {
         
         let keyWindow = UIApplication.shared.keyWindow
         
-        if Defaults[\.isSetPayPassword] === 0{
-            let loginVC = EditPayPSWViewController()
-            loginVC.phone =  Defaults[\.UserPhone]
-            keyWindow?.rootViewController = loginVC
-            return
-        }
+//        if Defaults[\.isSetPayPassword] === 0{
+//            let loginVC = EditPayPSWViewController()
+//            loginVC.phone =  Defaults[\.UserPhone]
+//            keyWindow?.rootViewController = loginVC
+//            return
+//        }
         
         let tabVC = BaseTabbarController()
         tabVC.setupChildControllers()