Commit 545b78fb authored by yqz's avatar yqz

合并代码

parent a5cdb8eb
...@@ -184,12 +184,6 @@ class HomeViewController:BaseViewController { ...@@ -184,12 +184,6 @@ class HomeViewController:BaseViewController {
} }
view.addSubview(homeView!) view.addSubview(homeView!)
} }
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
barHidden = false
}
func loadLaunchView(){ func loadLaunchView(){
...@@ -251,8 +245,6 @@ class HomeViewController:BaseViewController { ...@@ -251,8 +245,6 @@ class HomeViewController:BaseViewController {
} }
>>>>>>> dev_main
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated) super.viewWillAppear(animated)
if !isShowCharge { if !isShowCharge {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment