From d572a4289270bc7250a752345611721da36c5e56 Mon Sep 17 00:00:00 2001
From: Cao yang <caoyang@CaodeMacBook-Pro.local>
Date: Fri, 13 Apr 2018 16:55:52 +0800
Subject: [PATCH] 统一背景色,优化UI

---
 ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj                                                 |  4 ----
 ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate | Bin 185868 -> 0 bytes
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift          | 20 +++++++++++++++-----
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCheckViewController.swift         | 44 ++++++++++++++++++++++++++++++++++++++++++--
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateViewController.swift        |  4 ++--
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.swift                    |  2 ++
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.xib                      |  5 ++---
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.swift                   |  2 ++
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.xib                     |  5 ++---
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.swift            |  1 +
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.xib              |  1 -
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.swift              |  2 ++
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.xib                |  1 -
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.swift                       |  2 ++
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.xib                         |  5 ++---
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralDetailCell.swift                       |  2 ++
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralDetailCell.xib                         |  5 ++---
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.swift                    |  2 ++
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.xib                      |  5 ++---
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.swift        |  2 ++
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.xib          |  1 -
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.swift            |  2 ++
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.xib              |  1 -
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportDateCollectionViewCell.swift          | 21 ---------------------
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.swift                         |  2 ++
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.xib                           |  5 ++---
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.swift                       |  2 ++
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.xib                         |  5 ++---
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.swift                          |  2 ++
 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.xib                            |  5 ++---
 ParentAssistant/ParentAssistant/Classes/util/Macro.swift                                                  |  2 +-
 31 files changed, 99 insertions(+), 63 deletions(-)
 delete mode 100644 ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportDateCollectionViewCell.swift

diff --git a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
index f4337c5..382abea 100644
--- a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
+++ b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
@@ -132,7 +132,6 @@
 		BFCED888205280B700055373 /* MyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFCED887205280B700055373 /* MyViewController.swift */; };
 		BFCED88B20528DE700055373 /* MyViewControllerModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFCED88A20528DE700055373 /* MyViewControllerModel.swift */; };
 		BFEAAAA7205118370072FAAF /* TabBarController.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFEAAAA6205118370072FAAF /* TabBarController.swift */; };
-		BFEAAAAB205249B50072FAAF /* ReportDateCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = BFEAAAAA205249B50072FAAF /* ReportDateCollectionViewCell.swift */; };
 		BFEAAAC1205257460072FAAF /* LXCalendarDayModel.m in Sources */ = {isa = PBXBuildFile; fileRef = BFEAAAAF205257460072FAAF /* LXCalendarDayModel.m */; };
 		BFEAAAC2205257460072FAAF /* LXCalendarHearder.m in Sources */ = {isa = PBXBuildFile; fileRef = BFEAAAB1205257460072FAAF /* LXCalendarHearder.m */; };
 		BFEAAAC3205257460072FAAF /* LXCalendarHearder.xib in Resources */ = {isa = PBXBuildFile; fileRef = BFEAAAB2205257460072FAAF /* LXCalendarHearder.xib */; };
@@ -305,7 +304,6 @@
 		BFCED887205280B700055373 /* MyViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MyViewController.swift; sourceTree = "<group>"; };
 		BFCED88A20528DE700055373 /* MyViewControllerModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyViewControllerModel.swift; sourceTree = "<group>"; };
 		BFEAAAA6205118370072FAAF /* TabBarController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarController.swift; sourceTree = "<group>"; };
-		BFEAAAAA205249B50072FAAF /* ReportDateCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReportDateCollectionViewCell.swift; sourceTree = "<group>"; };
 		BFEAAAAE205257460072FAAF /* LXCalendarDayModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LXCalendarDayModel.h; sourceTree = "<group>"; };
 		BFEAAAAF205257460072FAAF /* LXCalendarDayModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LXCalendarDayModel.m; sourceTree = "<group>"; };
 		BFEAAAB0205257460072FAAF /* LXCalendarHearder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LXCalendarHearder.h; sourceTree = "<group>"; };
@@ -588,7 +586,6 @@
 			children = (
 				BF3B829F2050CC8B002078EA /* ReportHeaderView.swift */,
 				ADF159602069E00000A9485D /* CalendarView.swift */,
-				BFEAAAAA205249B50072FAAF /* ReportDateCollectionViewCell.swift */,
 				ADC9AB75207C65FC00348EF1 /* GrowSubjectCell.swift */,
 				ADC9AB76207C65FC00348EF1 /* GrowSubjectCell.xib */,
 				AD65FB77206354220052415B /* MoralTableViewCell.swift */,
@@ -1098,7 +1095,6 @@
 				BFBC06CC2063AE8900CCFAFF /* ZLaunchAdWindow.swift in Sources */,
 				AD65FB7A20637F110052415B /* MoralViewController.swift in Sources */,
 				AD24AA222065FBC000ECA428 /* SceneMiddleCell.swift in Sources */,
-				BFEAAAAB205249B50072FAAF /* ReportDateCollectionViewCell.swift in Sources */,
 				BFBC06C62063AE8900CCFAFF /* ZLaunchAdAnimation.swift in Sources */,
 				AD34D11E2064C7C300989F8D /* BehaviorDetailCell.swift in Sources */,
 				BFCED888205280B700055373 /* MyViewController.swift in Sources */,
diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
index 5b100fd..201d0dd 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/Program/ProgramCardViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift
index fe47a8a..d29d339 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift
@@ -19,8 +19,8 @@ class ProgramCardViewController: UIViewController,UITextFieldDelegate {
         return view
     }()
     lazy var bottomBtn = {()-> UIButton in
-        let btn = UIButton.init(frame: CGRect.init(x: screenWidth/2-100, y: screenHeight-66-80, width: 200, height: 40))
-        btn.setTitle("补卡申请", for: UIControlState.normal)
+        let btn = UIButton.init(frame: CGRect.init(x: screenWidth/2-100, y: screenHeight-66-60, width: 200, height: 40))
+        btn.setTitle("申请补卡", for: UIControlState.normal)
         btn.layer.cornerRadius = 5
         btn.clipsToBounds = true
         btn.setTitleColor(UIColor.black, for: UIControlState.normal)
@@ -33,11 +33,20 @@ class ProgramCardViewController: UIViewController,UITextFieldDelegate {
         print("补卡申请提交")
     }
     
+    lazy var rootView = {()->UIScrollView in
+        let scroll = UIScrollView.init(frame: self.view.bounds)
+        scroll.backgroundColor = backGroundColor
+        return scroll
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.view.backgroundColor = backGroundColor
-        self.view.addSubview(self.cardView)
-        self.view.addSubview(self.bottomBtn)
+
+        self.view.addSubview(self.rootView)
+
+        self.rootView.addSubview(self.cardView)
+        self.rootView.addSubview(self.bottomBtn)
+        self.rootView.contentSize = CGSize.init(width: 0, height: screenHeight+1)
         setUpContentView()
         // Do any additional setup after loading the view.
         
@@ -47,6 +56,7 @@ class ProgramCardViewController: UIViewController,UITextFieldDelegate {
     
     @objc func handleTap(sender:UITapGestureRecognizer){
         if sender.state == .ended {
+            print("收起键盘")
             self.cardInputTextField.resignFirstResponder()
         }
         sender.cancelsTouchesInView = false
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCheckViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCheckViewController.swift
index d63d91f..766fa03 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCheckViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCheckViewController.swift
@@ -8,14 +8,54 @@
 
 import UIKit
 
-class ProgramCheckViewController: UIViewController {
+class ProgramCheckViewController: UIViewController,UITableViewDelegate,UITableViewDataSource {
 
+    lazy var tableView = {()-> UITableView in
+        let table = UITableView.init(frame: CGRect.init(x: 0, y: 0, width: screenWidth, height: screenHeight-44-22))
+        table.backgroundColor = backGroundColor
+        table.delegate = self
+        table.dataSource = self
+        table.tableFooterView = UIView.init()
+        table.separatorStyle = .none
+        table.register(UINib.init(nibName: "GrowCheckUpTableViewCell", bundle: nil), forCellReuseIdentifier: "GrowCheckUpTableViewCell")
+        table.register(UINib.init(nibName: "GrowCheckDownTableViewCell", bundle: nil), forCellReuseIdentifier: "GrowCheckDownTableViewCell")
+        return table
+    }()
+    
+  
+    
     override func viewDidLoad() {
         super.viewDidLoad()
-
+        self.view.addSubview(self.tableView)
         // Do any additional setup after loading the view.
     }
 
+    
+    //MARK: - TableView Delegate && DataSource
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 1
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 3
+    }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.row == 0 {
+            return 120
+        }else{
+            return 160
+        }
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        if indexPath.row == 0 {
+            let cell = tableView.dequeueReusableCell(withIdentifier: "GrowCheckUpTableViewCell", for: indexPath) as! GrowCheckUpTableViewCell
+            return cell
+        }else{
+            let cell = tableView.dequeueReusableCell(withIdentifier: "GrowCheckDownTableViewCell", for: indexPath) as! GrowCheckDownTableViewCell
+            return cell
+        }
+    }
+    
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
         // Dispose of any resources that can be recreated.
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateViewController.swift
index 4d6d6e0..bcf0532 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramVacateViewController.swift
@@ -11,7 +11,7 @@ import UIKit
 class ProgramVacateViewController: UIViewController,UITableViewDelegate,UITableViewDataSource {
 
     lazy var tableView = {()-> UITableView in
-        let table = UITableView.init(frame: CGRect.init(x: 0, y: 0, width: screenWidth, height: screenHeight-44-22-60))
+        let table = UITableView.init(frame: CGRect.init(x: 0, y: 0, width: screenWidth, height: screenHeight-66-60))
         table.backgroundColor = backGroundColor
         table.delegate = self
         table.dataSource = self
@@ -32,6 +32,7 @@ class ProgramVacateViewController: UIViewController,UITableViewDelegate,UITableV
         return btn
     }()
     
+    
     //data
     
     /// 请假记录
@@ -41,7 +42,6 @@ class ProgramVacateViewController: UIViewController,UITableViewDelegate,UITableV
     override func viewDidLoad() {
         super.viewDidLoad()
         self.view.backgroundColor = backGroundColor
-        
         self.view.addSubview(self.tableView)
         self.view.addSubview(self.bottomBtn)
         self.vacateRecodeArray = ["1","2"]
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.swift
index 9f8fbae..ab16d31 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.swift
@@ -12,6 +12,8 @@ class BehaviorDetailCell: UITableViewCell {
 
     override func awakeFromNib() {
         super.awakeFromNib()
+        self.backgroundColor = backgroundColor
+
         // Initialization code
     }
 
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.xib
index 023ef9b..d5e16be 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.xib
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/BehaviorDetailCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -69,7 +69,6 @@
                         </userDefinedRuntimeAttributes>
                     </view>
                 </subviews>
-                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                 <constraints>
                     <constraint firstAttribute="trailing" secondItem="76r-RZ-tho" secondAttribute="trailing" constant="10" id="fOu-mh-1We"/>
                     <constraint firstItem="76r-RZ-tho" firstAttribute="top" secondItem="Gtu-zB-WzI" secondAttribute="top" constant="10" id="sQm-Xh-jD6"/>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.swift
index 63d24db..aede27c 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.swift
@@ -16,6 +16,8 @@ class EducationDetailCell: UITableViewCell {
     
     override func awakeFromNib() {
         super.awakeFromNib()
+        self.backgroundColor = backgroundColor
+
         let rect = self.lineChartView.bounds
         print(rect)
         customLineChart = LineChartView.init(frame: rect)
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.xib
index 0929670..14adb86 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.xib
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/EducationDetailCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -90,7 +90,6 @@
                         </userDefinedRuntimeAttributes>
                     </view>
                 </subviews>
-                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                 <constraints>
                     <constraint firstItem="8hE-eE-nri" firstAttribute="top" secondItem="pme-x3-3eS" secondAttribute="top" constant="10" id="QbB-5J-7QT"/>
                     <constraint firstAttribute="trailing" secondItem="8hE-eE-nri" secondAttribute="trailing" constant="10" id="UI2-CF-T98"/>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.swift
index 4212c3a..796cddc 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.swift
@@ -16,6 +16,7 @@ class GrowCheckDownTableViewCell: UITableViewCell {
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code
+        self.backgroundColor = backgroundColor
     }
 
     override func setSelected(_ selected: Bool, animated: Bool) {
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.xib
index 7404840..1f2a2c6 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.xib
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckDownTableViewCell.xib
@@ -85,7 +85,6 @@
                         </constraints>
                     </view>
                 </subviews>
-                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                 <constraints>
                     <constraint firstItem="M2G-AT-SGp" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="2DK-lh-wLK"/>
                     <constraint firstItem="M2G-AT-SGp" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="10" id="anD-pN-eZ2"/>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.swift
index d4b4af9..bae915c 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.swift
@@ -15,6 +15,8 @@ class GrowCheckUpTableViewCell: UITableViewCell {
     @IBOutlet weak var checkCount: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
+        self.backgroundColor = backgroundColor
+
         // Initialization code
     }
 
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.xib
index 6cb6088..ec6a157 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.xib
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowCheckUpTableViewCell.xib
@@ -76,7 +76,6 @@
                         </constraints>
                     </view>
                 </subviews>
-                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                 <constraints>
                     <constraint firstItem="4bl-Ug-Jkf" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="10" id="Oj0-RK-tj4"/>
                     <constraint firstAttribute="bottom" secondItem="4bl-Ug-Jkf" secondAttribute="bottom" constant="5" id="RVP-gf-Oys"/>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.swift
index e2f512a..635ec73 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.swift
@@ -12,6 +12,8 @@ class GrowSubjectCell: UITableViewCell {
 
     override func awakeFromNib() {
         super.awakeFromNib()
+        self.backgroundColor = backgroundColor
+
         // Initialization code
     }
 
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.xib
index eb070e2..5fb1895 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.xib
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/GrowSubjectCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -120,7 +120,6 @@
                         </userDefinedRuntimeAttributes>
                     </view>
                 </subviews>
-                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                 <constraints>
                     <constraint firstAttribute="bottom" secondItem="ayX-iZ-W2S" secondAttribute="bottom" id="KPa-3g-LgM"/>
                     <constraint firstAttribute="trailing" secondItem="ayX-iZ-W2S" secondAttribute="trailing" constant="10" id="bCN-qN-yss"/>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralDetailCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralDetailCell.swift
index a8c6367..8ec0f8b 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralDetailCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralDetailCell.swift
@@ -20,6 +20,8 @@ class MoralDetailCell: UITableViewCell {
     @IBOutlet weak var evaluationLab: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
+        self.backgroundColor = backgroundColor
+
         // Initialization code
     }
 
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralDetailCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralDetailCell.xib
index d55dc83..65af097 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralDetailCell.xib
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralDetailCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -116,7 +116,6 @@
                         </userDefinedRuntimeAttributes>
                     </view>
                 </subviews>
-                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                 <constraints>
                     <constraint firstAttribute="trailing" secondItem="UBb-dh-88b" secondAttribute="trailing" constant="10" id="8yJ-jh-3AX"/>
                     <constraint firstAttribute="bottom" secondItem="UBb-dh-88b" secondAttribute="bottom" id="Krl-Qe-GPA"/>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.swift
index adb51c7..ae1eaee 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.swift
@@ -18,6 +18,8 @@ class MoralTableViewCell: UITableViewCell {
     @IBOutlet weak var reportDateLab: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
+        self.backgroundColor = backgroundColor
+
         // Initialization code
     }
 
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.xib
index 9e7a9df..96e535f 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.xib
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/MoralTableViewCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -97,7 +97,6 @@
                         </userDefinedRuntimeAttributes>
                     </view>
                 </subviews>
-                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                 <constraints>
                     <constraint firstAttribute="bottom" secondItem="Vef-nQ-dGv" secondAttribute="bottom" id="6Cr-qJ-0jA"/>
                     <constraint firstItem="Vef-nQ-dGv" firstAttribute="top" secondItem="Hdo-4K-VNc" secondAttribute="top" constant="10" id="7ls-DH-ULi"/>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.swift
index 5a6ff78..9de7f44 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.swift
@@ -19,6 +19,8 @@ class ProgramVacateBodyTableViewCell: UITableViewCell {
     @IBOutlet weak var vacateResult: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
+        self.backgroundColor = backgroundColor
+
         // Initialization code
     }
 
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.xib
index 8a3e22e..962e527 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.xib
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateBodyTableViewCell.xib
@@ -158,7 +158,6 @@
                         </constraints>
                     </view>
                 </subviews>
-                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                 <constraints>
                     <constraint firstAttribute="bottom" secondItem="3iC-h2-GLD" secondAttribute="bottom" constant="10" id="FAV-5i-UxH"/>
                     <constraint firstItem="3iC-h2-GLD" firstAttribute="top" secondItem="yYa-Yh-jMm" secondAttribute="top" id="ObN-MI-Jfr"/>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.swift
index 4596aa3..4bfce70 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.swift
@@ -15,6 +15,8 @@ class ProgramVacateTableViewCell: UITableViewCell {
     @IBOutlet weak var endTime: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
+        self.backgroundColor = backgroundColor
+
         // Initialization code
     }
 
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.xib
index 50968f3..102517d 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.xib
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramVacateTableViewCell.xib
@@ -86,7 +86,6 @@
                         </constraints>
                     </view>
                 </subviews>
-                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                 <constraints>
                     <constraint firstItem="A0K-zH-Rt1" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="10" id="GYT-zJ-fus"/>
                     <constraint firstAttribute="trailing" secondItem="A0K-zH-Rt1" secondAttribute="trailing" constant="10" id="JFC-pM-1F3"/>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportDateCollectionViewCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportDateCollectionViewCell.swift
deleted file mode 100644
index 816d4f4..0000000
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportDateCollectionViewCell.swift
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-//  ReportDateCollectionViewCell.swift
-//  ParentAssistant
-//
-//  Created by 葛建军 on 2018/3/9.
-//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
-//
-
-import UIKit
-class ReportDateCollectionViewCell: UICollectionViewCell {
-    @IBOutlet var weekLabel: UILabel!
-    @IBOutlet var dateLabel: UILabel!
-    func setupWithDate(week:String,date:String){
-        weekLabel.text = week
-        dateLabel.text = date
-        
-        
-        
-    }
-
-}
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.swift
index 72bda50..86aabb6 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.swift
@@ -18,6 +18,8 @@ class SceneDownCell: UITableViewCell {
     @IBOutlet weak var dateLab: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
+        self.backgroundColor = backgroundColor
+
         // Initialization code
     }
 
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.xib
index 4c35d88..c9ee753 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.xib
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneDownCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -86,7 +86,6 @@
                         </userDefinedRuntimeAttributes>
                     </view>
                 </subviews>
-                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                 <constraints>
                     <constraint firstAttribute="bottom" secondItem="ijR-w3-uD6" secondAttribute="bottom" id="HUg-MG-jKb"/>
                     <constraint firstItem="ijR-w3-uD6" firstAttribute="top" secondItem="YfX-AG-wY3" secondAttribute="top" constant="10" id="I6a-Rf-ww6"/>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.swift
index 4badb2f..d88a946 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.swift
@@ -15,6 +15,8 @@ class SceneMiddleCell: UITableViewCell {
     var customLineChart = LineChartView()
     override func awakeFromNib() {
         super.awakeFromNib()
+        self.backgroundColor = backgroundColor
+
         // Initialization code
         let rect = self.lineChartView.bounds
         customLineChart = LineChartView.init(frame: rect)
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.xib
index 52a29d5..4980a09 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.xib
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneMiddleCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Alignment constraints with different attributes" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -126,7 +126,6 @@
                         </userDefinedRuntimeAttributes>
                     </view>
                 </subviews>
-                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                 <constraints>
                     <constraint firstAttribute="trailing" secondItem="UP8-EA-Pvf" secondAttribute="trailing" constant="10" id="7Wz-Op-hRa"/>
                     <constraint firstItem="UP8-EA-Pvf" firstAttribute="top" secondItem="lE4-qW-1H8" secondAttribute="top" constant="10" id="HIh-1Y-xd9"/>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.swift
index 9c2b82a..dcef1d5 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.swift
@@ -16,6 +16,8 @@ class SceneTopCell: UITableViewCell {
     @IBOutlet weak var SuggestLab: UITextView!  //指导意见
     override func awakeFromNib() {
         super.awakeFromNib()
+        self.backgroundColor = backgroundColor
+
         // Initialization code
     }
 
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.xib
index c2e5dcc..b3d9a2d 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.xib
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/SceneTopCell.xib
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -100,7 +100,6 @@
                         </userDefinedRuntimeAttributes>
                     </view>
                 </subviews>
-                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                 <constraints>
                     <constraint firstItem="Qt1-rh-kBe" firstAttribute="leading" secondItem="os2-cK-xHO" secondAttribute="leading" constant="10" id="4YI-b6-zrW"/>
                     <constraint firstAttribute="bottom" secondItem="Qt1-rh-kBe" secondAttribute="bottom" id="TVS-33-w4d"/>
diff --git a/ParentAssistant/ParentAssistant/Classes/util/Macro.swift b/ParentAssistant/ParentAssistant/Classes/util/Macro.swift
index 12bad73..98c5c1f 100644
--- a/ParentAssistant/ParentAssistant/Classes/util/Macro.swift
+++ b/ParentAssistant/ParentAssistant/Classes/util/Macro.swift
@@ -16,7 +16,7 @@ let statusBarHeight = UIApplication.shared.statusBarFrame.height
 var navigationBarHeight : CGFloat?
 let screenWidth = UIScreen.main.bounds.size.width
 let screenHeight = UIScreen.main.bounds.size.height
-let backGroundColor = UIColor.init(red: 235/255, green: 235/255, blue: 241/255, alpha: 1)
+let backGroundColor = UIColor.init(red: 239/255, green: 239/255, blue: 244/255, alpha: 1)
 
 //MARK: -------------------------- 接口地址 ----------------------------
 let appsecret="sincere:3a530f39f99411b454e667d69693c127"
--
libgit2 0.21.0