diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate index b0ebeb9..f16de1b 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 696c98b..ce7f559 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift @@ -52,6 +52,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { self.navigationItem.titleView = titleView self.view.addSubview(contentScrollView) + self.title = "成长" setUpTitle() setChildViewContent() diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/MoralViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/MoralViewController.swift index 6f4c51f..37d5fbc 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/MoralViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/MoralViewController.swift @@ -16,6 +16,7 @@ class MoralViewController: UIViewController,UITableViewDelegate,UITableViewDataS table.backgroundColor = UIColor.init(red: 235/255, green: 235/255, blue: 241/255, alpha: 1) table.delegate = self table.dataSource = self + table.separatorStyle = UITableViewCellSeparatorStyle.none table.register(UINib.init(nibName: "MoralDetailCell", bundle: nil), forCellReuseIdentifier: "moralDetail") table.register(UINib.init(nibName: "EducationDetailCell", bundle: nil), forCellReuseIdentifier: "educationDetail") table.register(UINib.init(nibName: "BehaviorDetailCell", bundle: nil), forCellReuseIdentifier: "behaviorDetail") diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/ReportViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/ReportViewController.swift index e20cae2..61b98f2 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/ReportViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/ReportViewController.swift @@ -21,6 +21,7 @@ class ReportViewController: UIViewController,UITableViewDelegate,UITableViewData table.delegate = self table.dataSource = self table.backgroundColor = backGroundColor + table.separatorStyle = UITableViewCellSeparatorStyle.none table.register(UINib.init(nibName: "MoralTableViewCell", bundle: nil), forCellReuseIdentifier: "MoralTableViewCell") table.register(UINib.init(nibName: "GrowSubjectCell", bundle: nil), forCellReuseIdentifier: "GrowSubjectCell") return table diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/SceneDetailViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/SceneDetailViewController.swift index bb65f98..b082bfc 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/SceneDetailViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Report/SceneDetailViewController.swift @@ -15,6 +15,7 @@ class SceneDetailViewController: UIViewController,UITableViewDataSource,UITableV table.backgroundColor = backGroundColor table.delegate = self table.dataSource = self + table.separatorStyle = UITableViewCellSeparatorStyle.none table.register(UINib.init(nibName: "SceneTopCell", bundle: nil), forCellReuseIdentifier: "cultureCell") table.register(UINib.init(nibName: "SceneMiddleCell", bundle: nil), forCellReuseIdentifier: "scoreCell") table.register(UINib.init(nibName: "SceneDownCell", bundle: nil), forCellReuseIdentifier: "disciplineCell") diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard index e4567a7..a8f9911 100644 --- a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard +++ b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard @@ -1,11 +1,11 @@ - + - + @@ -21,16 +21,16 @@ - + - + - + - + @@ -48,20 +48,20 @@ - + - + - + - + @@ -122,7 +122,7 @@ - + @@ -215,10 +215,10 @@ - + - + - + - +