默认中国

“张旭”
1 parent b63089ba
Showing 2 changed files with 28 additions and 32 deletions
metaCode/Classes/Main/LoginPage/Controller/CNLiveLoginViewController.swift
metaCode/Classes/Main/MinePage/Controller/CNLiveMineChangePhoneController.swift
@@ -392,38 +392,34 @@ class CNLiveLoginViewController : CNLiveBaseViewController, UITextViewDelegate {
  
     // MARK: - 三方登录
     func thirdPartyLoginWithType(type:CNLiveSendAuthResp,model:CNThreeLoginModel){
-        //test
-        let vc = CNThreeLoginViewController(model: model)
-        self.navigationController?.pushViewController(vc, animated: true)
-        return
  
-//        showLoading(message: "")
-//        CNLiveLoginViewModel.thirdPartyLoginWithType(type: type, model: model) {[weak self] result, status in
-//            hiddenLoading()
-//            if status == .success{
-//                //登录成功
-//                let window = UIApplication.shared.delegate?.window
-//                window??.rootViewController = CNLiveBaseTabBarViewController.init()
-//            }else{
-//                if let res = result as? String{
-//                    if res == "42013"{
-//                        if (type == CNLiveSendAuthRespApple) {
-//                        let window = UIApplication.shared.delegate?.window
-//                        window??.rootViewController = CNLiveBaseTabBarViewController.init()
-//                            return
-//                        }
-//                        
-//                        //未注册,需要绑定手机号
-//                        //跳转绑定手机号页面
-//                        let vc = CNThreeLoginViewController(model: model)
-//                        
-//                        self!.navigationController?.pushViewController(vc, animated: true)
-//                    }
-//                }else{
-//                    
-//                }
-//            }
-//        }
+        showLoading(message: "")
+        CNLiveLoginViewModel.thirdPartyLoginWithType(type: type, model: model) {[weak self] result, status in
+            hiddenLoading()
+            if status == .success{
+                //登录成功
+                let window = UIApplication.shared.delegate?.window
+                window??.rootViewController = CNLiveBaseTabBarViewController.init()
+            }else{
+                if let res = result as? String{
+                    if res == "42013"{
+                        if (type == CNLiveSendAuthRespApple) {
+                        let window = UIApplication.shared.delegate?.window
+                        window??.rootViewController = CNLiveBaseTabBarViewController.init()
+                            return
+                        }
+                        
+                        //未注册,需要绑定手机号
+                        //跳转绑定手机号页面
+                        let vc = CNThreeLoginViewController(model: model)
+                        
+                        self!.navigationController?.pushViewController(vc, animated: true)
+                    }
+                }else{
+                    
+                }
+            }
+        }
     }
  
 }
@@ -22,7 +22,7 @@ class CNLiveMineChangePhoneController:CNLiveBaseViewController{
     lazy var countryLabel: UILabel = {
         let titleLabel = UILabel()
         titleLabel.textColor = HexColor("#333333")
-        titleLabel.text = "国家"
+        titleLabel.text = "中国"
         titleLabel.font = Font_15
         return titleLabel
     }()