Commit 868393892adf6d3dbe448c8f5991e8e00c23b1c2
1 parent
62b816d3
Exists in
parentassistant
手动隐藏空白页
Showing
3 changed files
with
14 additions
and
10 deletions
Show diff stats
ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
No preview for this file type
ParentAssistant/ParentAssistant/Classes/controllers/report/ReportViewController.swift
... | ... | @@ -13,14 +13,21 @@ class ReportViewController: UIViewController { |
13 | 13 | @IBOutlet weak var reportTable: UITableView! |
14 | 14 | @IBOutlet var dateViewHeight: NSLayoutConstraint!//顶部固定日期的高度 |
15 | 15 | @IBOutlet var calendarView: UIView! |
16 | + @IBOutlet weak var EmptyView: UIView! | |
16 | 17 | var dateView:LXCalendarView! |
17 | 18 | var dateAry:(weeks:[String],days:[String]) = ([],[]) |
18 | 19 | override func viewDidLoad() { |
19 | 20 | super.viewDidLoad() |
20 | - //设置顶部按钮 | |
21 | - setupNavigationBar() | |
22 | - //设置日期页面 | |
23 | -// setupDateView() | |
21 | + | |
22 | + //MARK: - 空白页面 | |
23 | + self.EmptyView.isHidden = true | |
24 | + | |
25 | + if !self.EmptyView.isHidden { | |
26 | + //设置顶部按钮 | |
27 | + setupNavigationBar() | |
28 | + //设置日期页面 | |
29 | + setupDateView() | |
30 | + } | |
24 | 31 | } |
25 | 32 | // MARK: - 设置顶部按钮 |
26 | 33 | func setupNavigationBar(){ |
... | ... | @@ -29,7 +36,7 @@ class ReportViewController: UIViewController { |
29 | 36 | self.navigationController?.navigationBar.setBackgroundImage(backImage, for: UIBarMetrics.default) |
30 | 37 | self.configTheme() |
31 | 38 | self.navigationItem.title = "报告" |
32 | -// setuptitleView() | |
39 | + setuptitleView() | |
33 | 40 | |
34 | 41 | } |
35 | 42 | func setuptitleView(){ | ... | ... |
ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
... | ... | @@ -886,6 +886,7 @@ |
886 | 886 | </view> |
887 | 887 | <navigationItem key="navigationItem" id="dVv-mJ-714"/> |
888 | 888 | <connections> |
889 | + <outlet property="EmptyView" destination="A43-XP-A41" id="Lox-11-PF1"/> | |
889 | 890 | <outlet property="calendarView" destination="hwJ-Xg-tKm" id="ukq-Ul-bvj"/> |
890 | 891 | <outlet property="dateViewHeight" destination="38f-Kq-3QN" id="gGs-d3-CD2"/> |
891 | 892 | <outlet property="reportTable" destination="EEs-Ae-t7U" id="WCp-ci-zOE"/> |
... | ... | @@ -2162,11 +2163,7 @@ |
2162 | 2163 | <image name="navigationBar_backgrounImage" width="375" height="139"/> |
2163 | 2164 | <image name="report_bar_icon" width="22" height="20"/> |
2164 | 2165 | <image name="report_bar_icon_select" width="22" height="20"/> |
2165 | - <image name="report_teacher" width="130" height="155"/> | |
2166 | 2166 | <image name="report_none_icon" width="250" height="250"/> |
2167 | - <image name="test001" width="540" height="278"/> | |
2168 | - <image name="test002" width="216" height="282"/> | |
2169 | - <image name="test003" width="732" height="388"/> | |
2170 | - | |
2167 | + <image name="report_teacher" width="130" height="155"/> | |
2171 | 2168 | </resources> |
2172 | 2169 | </document> | ... | ... |