Merge commit '6d0c8de5' into xiezhaolin

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHLoginTipsView.swift

@@ -87,7 +87,8 @@ class YHLoginTipsView: UIView {
         }
         
         loginBtn.addTarget(self, action: #selector(clickLoginBtn), for: .touchUpInside)
-        loginBtn.layoutIfNeeded()
+        layoutIfNeeded()
+        loginBtn.backgroundColor = .brandMainColor//for test hjl
         loginBtn.addYinHeGradualLayer()
     }
     

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -102,36 +102,10 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         let img = UIImageView(image: UIImage(named: "mine_header_bg"))
         return img
     }()
-    
-    
-    let bigView : UIView = UIView()
-    let smallButton : UIButton = UIButton(type: .custom)
-    
+        
     override func viewDidLoad() {
         super.viewDidLoad()
         initView()
-        
-        view.addSubview(bigView)
-        bigView.backgroundColor = .green
-        bigView.snp.makeConstraints { make in
-            make.top.equalTo(200)
-            make.width.equalTo(200)
-            make.height.equalTo(200)
-            make.left.equalTo(200)
-        }
-        
-        smallButton.addTarget(self, action: #selector(clickBtn), for: .touchUpInside)
-        smallButton.backgroundColor = .red
-        bigView.addSubview(smallButton)
-        smallButton.snp.makeConstraints { make in
-            make.top.equalTo(100)
-            make.left.equalTo(100)
-            make.width.equalTo(100)
-            make.height.equalTo(100)
-        }
-        view.layoutIfNeeded()
-        
-        let crect = smallButton.convert(smallButton.frame, to: UIApplication.shared.yhKeyWindow())
         return
     }