diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate index 0e47914..a969573 100644 Binary files a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate and b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift index b283b34..a6172b7 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift @@ -46,7 +46,6 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { override func viewDidLoad() { super.viewDidLoad() - navigationBarHeight = self.navigationController?.navigationBar.frame.height titleArr = ["应用","报告"] //设置导航栏标题 self.navigationItem.titleView = titleView @@ -99,6 +98,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { // rightView.addTarget(self, action: #selector(showView), for: UIControlEvents.touchDown) self.rightBtn = UIBarButtonItem.init(customView: rightView) + //设置顶部样式 self.configTheme() } diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift index 1df5efd..19cfed3 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift @@ -17,7 +17,7 @@ class InformationViewController: UIViewController,UISearchBarDelegate { override func viewDidLoad() { super.viewDidLoad() self.configTheme() - + if isFirstviewController{ self.navigationItem.title = "" addLeftBarBtn() diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/main/TabBarController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/main/TabBarController.swift index 2e3acae..31a65f5 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/main/TabBarController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/main/TabBarController.swift @@ -14,7 +14,6 @@ class TabBarController: UITabBarController { super.viewDidLoad() updataVersion() } - override func didReceiveMemoryWarning() { super.didReceiveMemoryWarning() // Dispose of any resources that can be recreated. diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard index e36be9b..71dcff6 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard +++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard @@ -14,257 +14,287 @@ - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - + + - + @@ -342,7 +372,6 @@ - @@ -385,7 +414,6 @@ -