叉叉逻辑

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHOtherLoginViewController.swift

@@ -57,6 +57,19 @@ class YHOtherLoginViewController: YHBaseViewController {
             make.height.equalTo(300)
         }
         
+        closeButton = {
+            let button = UIButton(type: .custom)
+            button.setImage(UIImage(named: "phone_login_close"), for: .normal)
+            button.addTarget(self, action: #selector(close), for: .touchUpInside)
+            return button
+        }()
+        view.addSubview(closeButton)
+        closeButton.snp.makeConstraints { make in
+            make.left.equalTo(13)
+            make.top.equalTo(51)
+            make.width.height.equalTo(30)
+        }
+        
         loginTitleLabel = {
             let label = UILabel()
             label.text = "欢迎来到银河港生活"
@@ -168,6 +181,12 @@ class YHOtherLoginViewController: YHBaseViewController {
         }
     }
     
+    @objc func close() {
+        YHLoginManager.shared.loginSuccessActionBlock = nil
+        IQKeyboardManager.shared.enable = true
+        dismiss(animated: true)
+    }
+    
     func updateData(_ type: YHLoginType) {
         switch type {
         case .normal: break
@@ -185,6 +204,14 @@ class YHOtherLoginViewController: YHBaseViewController {
             wechatButton.isHidden = true
             privacyView.isHidden = true
         }
+        
+        if self.navigationController?.viewControllers.count == 1 {
+            closeButton.isHidden = false
+            gk_navigationBar.isHidden = true
+        } else {
+            closeButton.isHidden = true
+            gk_navigationBar.isHidden = false
+        }
     }
     
     @objc func getCode() {

galaxy/galaxy/Res/Assets.xcassets/Login/phone_login_close.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "phone_login_close@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "phone_login_close@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}