diff --git a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
index 5ae3d76..e5834f3 100644
--- a/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
+++ b/ParentAssistant/ParentAssistant.xcodeproj/project.pbxproj
@@ -471,9 +471,9 @@
 		599364E2204E62E700C8B371 /* my */ = {
 			isa = PBXGroup;
 			children = (
+				BFCED886205280B700055373 /* Controller */,
 				BFCED889205280C900055373 /* Model */,
 				599364E4204E62E700C8B371 /* View */,
-				BFCED886205280B700055373 /* Controller */,
 			);
 			path = my;
 			sourceTree = "<group>";
@@ -505,6 +505,7 @@
 		599364F1204E632600C8B371 /* util */ = {
 			isa = PBXGroup;
 			children = (
+				BF38846A205A57E700A240EF /* NIM */,
 				BFF9B7F02057A27C00F39B3E /* view */,
 				590944E12057DA73004478B5 /* utils.swift */,
 				ADE33B302062202300BEA6E6 /* Macro.swift */,
@@ -657,7 +658,7 @@
 				BF38846B205A58F800A240EF /* YXMessageManager.swift */,
 			);
 			name = NIM;
-			path = ParentAssistant/NIM;
+			path = ParentAssistant/Classes/util/NIM;
 			sourceTree = SOURCE_ROOT;
 		};
 		BF3B829E2050CC7E002078EA /* View */ = {
@@ -728,7 +729,6 @@
 		BF7A4C6B204E320700460463 /* Classes */ = {
 			isa = PBXGroup;
 			children = (
-				BF38846A205A57E700A240EF /* NIM */,
 				599364D9204E62E700C8B371 /* controllers */,
 				599364F1204E632600C8B371 /* util */,
 				BFEAAAAC205257270072FAAF /* libs */,
@@ -777,10 +777,10 @@
 		BFCED886205280B700055373 /* Controller */ = {
 			isa = PBXGroup;
 			children = (
+				BFCED887205280B700055373 /* MyViewController.swift */,
 				BFF9B7E82056852A00F39B3E /* RegisterViewController.swift */,
 				BF621CAD2056663C0040D2C1 /* LoginViewController.swift */,
 				BFF9B7EA205772E100F39B3E /* GetBackPasswordViewController.swift */,
-				BFCED887205280B700055373 /* MyViewController.swift */,
 				BF621CAF2056664C0040D2C1 /* CurrentInfoViewController.swift */,
 				BF406CD52057B03A000A6681 /* MessageViewController.swift */,
 				BF406CDB2057C110000A6681 /* OrderDetailViewController.swift */,
diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
index 5131b06..2fcc234 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 42be16b..b283b34 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift
@@ -38,7 +38,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate {
     lazy var titleLine = {()->CALayer in
         let lineLay = CALayer.init()
         lineLay.frame.size = CGSize.init(width: 50, height: 2)
-        lineLay.backgroundColor = UIColor.blue.cgColor
+        lineLay.backgroundColor = UIColor.white.cgColor
         return lineLay
     }()
     //是否显示右侧按钮
@@ -70,6 +70,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate {
         }
         titleLab.font = UIFont.systemFont(ofSize: 15)
         titleLab.textAlignment = .center
+        titleLab.textColor = .white
         leftView.addSubview(titleLab)
         
         let imageView = UIImageView.init(frame: CGRect.init(x: 50, y: 11, width: 10, height: 22))
@@ -85,6 +86,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate {
         let rightView = UIButton.init(frame: CGRect.init(x: 0, y: 0, width: 50, height: 44))
         let titleRLab = UILabel.init(frame: CGRect.init(x: 0, y: 0, width: 40, height: 44))
         titleRLab.text = "筛选"
+        titleRLab.textColor = .white
         titleRLab.font = UIFont.systemFont(ofSize: 15)
         titleRLab.textAlignment = .center
         rightView.addSubview(titleRLab)
@@ -131,7 +133,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate {
             let btn = UIButton.init()
             btn.setTitle(titleArr[i], for: .normal)
             btn.titleLabel!.font = UIFont.systemFont(ofSize: 17)
-            btn.setTitleColor(UIColor.black, for: .normal)
+            btn.setTitleColor(UIColor.white, for: .normal)
             btn.tag = i
             btn.addTarget(self, action: #selector(clickTitleAction(btn:)), for:UIControlEvents.touchUpInside)
             btn.frame.size = CGSize.init(width: 40, height: ZJBNavH)
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateAddView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateAddView.swift
index a3830e1..aad0f63 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateAddView.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateAddView.swift
@@ -8,11 +8,53 @@
 
 import UIKit
 
-class ProgramVacateAddView: UIView {
+class ProgramVacateAddView: UIView,UITableViewDelegate,UITableViewDataSource {
 
+    lazy var tableView = { ()-> UITableView in
+        
+        let table = UITableView.init(frame: self.bounds)
+        table.delegate = self
+        table.dataSource = self
+        table.register(UINib.init(nibName: "ProgramVacateDetailCell", bundle: nil), forCellReuseIdentifier: "ProgramVacateDetailCell")
+        table.register(UINib.init(nibName: "ProgramVacateTextFieldCell", bundle: nil), forCellReuseIdentifier: "ProgramVacateTextFieldCell")
+        table.register(UINib.init(nibName: "ProgramVacateImageCell", bundle: nil), forCellReuseIdentifier: "ProgramVacateImageCell")
+        return table
+    }()
+    
+    //data
+    var dataArr = Array<String>()
+    
     override init(frame: CGRect) {
         super.init(frame: frame)
+        self.dataArr = ["学生姓名:","班级:","请假场景:","请假类型:","请假时间:","返校时间:","离校原因:","照片:","审核人:"]
+        self.addSubview(self.tableView)
+        
+    }
+    
+    //MARK: - TableView Deleagate && DataSource
+    func numberOfSections(in tableView: UITableView) -> Int {
+        
+        return 1
+    }
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        
+        return self.dataArr.count
     }
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 50
+    }
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        if indexPath.row != 6 || indexPath.row != 7 {
+            
+            let cell = tableView.dequeueReusableCell(withIdentifier: "ProgramVacateDetailCell", for: indexPath) as! ProgramVacateDetailCell
+            cell.titleLab.text = dataArr[indexPath.row]
+            return cell
+        }
+
+        return UITableViewCell.init()
+    }
+
     
     
     required init?(coder aDecoder: NSCoder) {
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateBodyTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateBodyTableViewCell.xib
index 962e527..b1b77bb 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateBodyTableViewCell.xib
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateBodyTableViewCell.xib
@@ -55,7 +55,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张三" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SMb-fO-hlW">
-                                <rect key="frame" x="107" y="12.5" width="35" height="21"/>
+                                <rect key="frame" x="120" y="12.5" width="35" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -67,7 +67,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="事假" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tQ9-wo-yko">
-                                <rect key="frame" x="124" y="43.5" width="35" height="21"/>
+                                <rect key="frame" x="120" y="43.5" width="35" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -79,19 +79,19 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018/04/02 08:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o1S-an-wZs">
-                                <rect key="frame" x="124" y="74.5" width="141" height="21"/>
+                                <rect key="frame" x="120" y="74.5" width="141" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="至" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Q4S-hi-7fU">
-                                <rect key="frame" x="185.5" y="100.5" width="18" height="21"/>
+                                <rect key="frame" x="181.5" y="100.5" width="18" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018/04/02 17:30" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="m2d-nZ-oIw">
-                                <rect key="frame" x="126" y="126.5" width="137" height="21"/>
+                                <rect key="frame" x="122" y="126.5" width="137" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -103,7 +103,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="班主任-李倩" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CmX-ZE-z2v">
-                                <rect key="frame" x="107" y="157.5" width="95" height="21"/>
+                                <rect key="frame" x="120" y="157.5" width="95" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -115,7 +115,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="同意" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="P6F-mV-ell">
-                                <rect key="frame" x="124" y="188.5" width="35" height="21"/>
+                                <rect key="frame" x="120" y="188.5" width="35" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -124,19 +124,19 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <constraints>
                             <constraint firstItem="ptA-gi-ASQ" firstAttribute="centerY" secondItem="184-vm-o8V" secondAttribute="centerY" id="3sf-dz-jdr"/>
-                            <constraint firstItem="o1S-an-wZs" firstAttribute="leading" secondItem="XUE-jH-LMd" secondAttribute="trailing" constant="10" id="45A-cx-9er"/>
+                            <constraint firstItem="o1S-an-wZs" firstAttribute="leading" secondItem="SMb-fO-hlW" secondAttribute="leading" id="45A-cx-9er"/>
                             <constraint firstItem="P6F-mV-ell" firstAttribute="centerY" secondItem="UYo-On-ZLA" secondAttribute="centerY" id="4jj-Yv-FyP"/>
                             <constraint firstItem="184-vm-o8V" firstAttribute="bottom" secondItem="zCX-fI-ung" secondAttribute="bottom" id="7Qo-Zx-DAx"/>
                             <constraint firstItem="CmX-ZE-z2v" firstAttribute="centerY" secondItem="XmD-SZ-8bL" secondAttribute="centerY" id="9d8-Eh-bXG"/>
                             <constraint firstItem="XUE-jH-LMd" firstAttribute="leading" secondItem="ptA-gi-ASQ" secondAttribute="leading" id="Egr-sG-T07"/>
                             <constraint firstItem="Q4S-hi-7fU" firstAttribute="centerX" secondItem="o1S-an-wZs" secondAttribute="centerX" id="HXy-Rc-qfD"/>
-                            <constraint firstItem="P6F-mV-ell" firstAttribute="leading" secondItem="UYo-On-ZLA" secondAttribute="trailing" constant="10" id="IOH-oF-TIq"/>
+                            <constraint firstItem="P6F-mV-ell" firstAttribute="leading" secondItem="SMb-fO-hlW" secondAttribute="leading" id="IOH-oF-TIq"/>
                             <constraint firstItem="SMb-fO-hlW" firstAttribute="centerY" secondItem="ptA-gi-ASQ" secondAttribute="centerY" id="IjA-7L-kXF"/>
                             <constraint firstItem="gay-8r-CB4" firstAttribute="top" secondItem="184-vm-o8V" secondAttribute="bottom" id="Ilk-EK-SMV"/>
                             <constraint firstItem="184-vm-o8V" firstAttribute="leading" secondItem="3iC-h2-GLD" secondAttribute="leading" constant="10.5" id="KES-Nk-NQi"/>
                             <constraint firstAttribute="bottom" secondItem="gay-8r-CB4" secondAttribute="bottom" id="KoQ-MH-wGN"/>
                             <constraint firstItem="gay-8r-CB4" firstAttribute="leading" secondItem="3iC-h2-GLD" secondAttribute="leading" constant="15" id="QYv-CA-Chf"/>
-                            <constraint firstItem="CmX-ZE-z2v" firstAttribute="leading" secondItem="XmD-SZ-8bL" secondAttribute="trailing" constant="10" id="Sa6-He-Zw1"/>
+                            <constraint firstItem="CmX-ZE-z2v" firstAttribute="leading" secondItem="SMb-fO-hlW" secondAttribute="leading" id="Sa6-He-Zw1"/>
                             <constraint firstItem="XmD-SZ-8bL" firstAttribute="leading" secondItem="XUE-jH-LMd" secondAttribute="leading" id="XkB-Ka-XYp"/>
                             <constraint firstItem="zCX-fI-ung" firstAttribute="leading" secondItem="3iC-h2-GLD" secondAttribute="leading" constant="15" id="aTH-2y-tFi"/>
                             <constraint firstItem="I23-J8-cbV" firstAttribute="leading" secondItem="ptA-gi-ASQ" secondAttribute="leading" id="bPl-LK-op9"/>
@@ -147,14 +147,14 @@
                             <constraint firstItem="184-vm-o8V" firstAttribute="top" secondItem="3iC-h2-GLD" secondAttribute="top" constant="18" id="hCe-rk-8Rh"/>
                             <constraint firstItem="tQ9-wo-yko" firstAttribute="centerY" secondItem="I23-J8-cbV" secondAttribute="centerY" id="iaq-Pt-N0v"/>
                             <constraint firstItem="XUE-jH-LMd" firstAttribute="top" secondItem="I23-J8-cbV" secondAttribute="bottom" constant="10" id="kFN-pq-rFH"/>
-                            <constraint firstItem="tQ9-wo-yko" firstAttribute="leading" secondItem="I23-J8-cbV" secondAttribute="trailing" constant="10" id="lkm-Pa-khY"/>
+                            <constraint firstItem="tQ9-wo-yko" firstAttribute="leading" secondItem="SMb-fO-hlW" secondAttribute="leading" id="lkm-Pa-khY"/>
                             <constraint firstItem="m2d-nZ-oIw" firstAttribute="centerX" secondItem="o1S-an-wZs" secondAttribute="centerX" id="osq-5I-jbe"/>
                             <constraint firstItem="o1S-an-wZs" firstAttribute="centerY" secondItem="XUE-jH-LMd" secondAttribute="centerY" id="p59-e2-LBT"/>
                             <constraint firstItem="ptA-gi-ASQ" firstAttribute="leading" secondItem="184-vm-o8V" secondAttribute="trailing" constant="20" id="pGi-jU-OcT"/>
                             <constraint firstItem="zCX-fI-ung" firstAttribute="top" secondItem="3iC-h2-GLD" secondAttribute="top" id="pYa-T9-TGa"/>
                             <constraint firstItem="I23-J8-cbV" firstAttribute="top" secondItem="ptA-gi-ASQ" secondAttribute="bottom" constant="10" id="sP9-y8-kI3"/>
                             <constraint firstItem="UYo-On-ZLA" firstAttribute="top" secondItem="XmD-SZ-8bL" secondAttribute="bottom" constant="10" id="tkO-jd-7ez"/>
-                            <constraint firstItem="SMb-fO-hlW" firstAttribute="leading" secondItem="ptA-gi-ASQ" secondAttribute="trailing" constant="10" id="uGY-Th-x4A"/>
+                            <constraint firstItem="SMb-fO-hlW" firstAttribute="leading" secondItem="184-vm-o8V" secondAttribute="trailing" constant="100" id="uGY-Th-x4A"/>
                         </constraints>
                     </view>
                 </subviews>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailCell.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailCell.swift
index a88a854..230802c 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailCell.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailCell.swift
@@ -10,7 +10,7 @@ import UIKit
 
 class ProgramVacateDetailCell: UITableViewCell {
 
-    @IBOutlet weak var titileLab: UILabel!
+    @IBOutlet weak var titleLab: UILabel!
     @IBOutlet weak var contentLab: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailCell.xib
index 673bdc1..f5e2e02 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailCell.xib
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailCell.xib
@@ -42,7 +42,7 @@
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
                 <outlet property="contentLab" destination="eTH-2V-g25" id="pLy-g6-civ"/>
-                <outlet property="titileLab" destination="SSR-6D-Og1" id="fjT-XO-XM8"/>
+                <outlet property="titleLab" destination="SSR-6D-Og1" id="Mhi-xj-7nL"/>
             </connections>
             <point key="canvasLocation" x="-151" y="-31"/>
         </tableViewCell>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailView.swift
index 5295b37..f81810c 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailView.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateDetailView.swift
@@ -51,7 +51,7 @@ class ProgramVacateDetailView: UIView,UITableViewDelegate,UITableViewDataSource 
         
         if indexPath.row != 6 && indexPath.row != 7 {
             let cell = tableView.dequeueReusableCell(withIdentifier: "ProgramVacateDetailCell", for: indexPath) as! ProgramVacateDetailCell
-            cell.titileLab.text = dataArr[indexPath.row]
+            cell.titleLab.text = dataArr[indexPath.row]
             cell.contentLab.text = "张三"
             return cell
         }else if indexPath.row == 6 {
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTableViewCell.xib b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTableViewCell.xib
index 102517d..3c1d1df 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTableViewCell.xib
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ProgramView/ProgramVacateTableViewCell.xib
@@ -23,7 +23,7 @@
                         <rect key="frame" x="10" y="10" width="369" height="72"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="H0L-Bl-DnY">
-                                <rect key="frame" x="207" y="41.5" width="8" height="20.5"/>
+                                <rect key="frame" x="213" y="41.5" width="8" height="20.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -35,7 +35,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="张三" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vif-Lw-a1X">
-                                <rect key="frame" x="77" y="10" width="35" height="21"/>
+                                <rect key="frame" x="100" y="10" width="35" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -47,22 +47,22 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018/04/02" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rel-Qy-6VP">
-                                <rect key="frame" x="94" y="41" width="90" height="21"/>
+                                <rect key="frame" x="100" y="41" width="90" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2018/04/02" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gIK-21-Af2">
-                                <rect key="frame" x="220" y="41" width="90" height="21"/>
+                                <rect key="frame" x="226" y="41" width="90" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="grow_calendar" translatesAutoresizingMaskIntoConstraints="NO" id="B3i-HY-f54">
-                                <rect key="frame" x="189" y="45.5" width="13" height="12"/>
+                                <rect key="frame" x="195" y="45.5" width="13" height="12"/>
                             </imageView>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="grow_calendar" translatesAutoresizingMaskIntoConstraints="NO" id="ilp-az-hgB">
-                                <rect key="frame" x="315" y="45.5" width="13" height="12"/>
+                                <rect key="frame" x="321" y="45.5" width="13" height="12"/>
                             </imageView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -78,8 +78,8 @@
                             <constraint firstItem="6Tv-CA-ehv" firstAttribute="leading" secondItem="A0K-zH-Rt1" secondAttribute="leading" constant="10" id="bMD-p2-wnP"/>
                             <constraint firstItem="bJt-wD-aUL" firstAttribute="leading" secondItem="6Tv-CA-ehv" secondAttribute="leading" id="mK7-vI-tFc"/>
                             <constraint firstItem="gIK-21-Af2" firstAttribute="centerY" secondItem="bJt-wD-aUL" secondAttribute="centerY" id="peU-cr-ev1"/>
-                            <constraint firstItem="vif-Lw-a1X" firstAttribute="leading" secondItem="6Tv-CA-ehv" secondAttribute="trailing" constant="10" id="pnQ-fK-xwq"/>
-                            <constraint firstItem="Rel-Qy-6VP" firstAttribute="leading" secondItem="bJt-wD-aUL" secondAttribute="trailing" constant="10" id="sGH-i2-tjB"/>
+                            <constraint firstItem="vif-Lw-a1X" firstAttribute="leading" secondItem="A0K-zH-Rt1" secondAttribute="leading" constant="100" id="pnQ-fK-xwq"/>
+                            <constraint firstItem="Rel-Qy-6VP" firstAttribute="leading" secondItem="vif-Lw-a1X" secondAttribute="leading" id="sGH-i2-tjB"/>
                             <constraint firstItem="6Tv-CA-ehv" firstAttribute="top" secondItem="A0K-zH-Rt1" secondAttribute="top" constant="10" id="sXD-DY-NqG"/>
                             <constraint firstItem="gIK-21-Af2" firstAttribute="leading" secondItem="H0L-Bl-DnY" secondAttribute="trailing" constant="5" id="vcT-Nz-jpC"/>
                             <constraint firstItem="B3i-HY-f54" firstAttribute="leading" secondItem="Rel-Qy-6VP" secondAttribute="trailing" constant="5" id="x47-0x-gfz"/>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/ReportHeaderView.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/ReportHeaderView.swift
index fd4392c..46fbd05 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/ReportHeaderView.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/View/ReportView/ReportHeaderView.swift
@@ -97,8 +97,8 @@ class CalendarDateManager: NSObject {
     
     static let shared = CalendarDateManager()
     
-    private var date = Date.init(timeInterval: 150*86400, since: Date())
-//    private var date = Date()
+//    private var date = Date.init(timeInterval: 150*86400, since: Date())
+    private var date = Date()
     override init() {}
     
     /// 获取当前周ofMonth
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
index 0aa7a1d..1df5efd 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
@@ -16,10 +16,8 @@ class InformationViewController: UIViewController,UISearchBarDelegate {
     var channel:Int=0
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.navigationController?.navigationBar.barStyle = UIBarStyle.default// UIColorFromRGB(0xC5DAFF)
-        let backImage = UIImage(named: "navigationBar_backgrounImage")
-        self.navigationController?.navigationBar.setBackgroundImage(backImage, for: UIBarMetrics.default)
-        // Do any additional setup after loading the view.
+        self.configTheme()
+        
         if isFirstviewController{
             self.navigationItem.title = ""
             addLeftBarBtn()
@@ -135,7 +133,6 @@ class InformationViewController: UIViewController,UISearchBarDelegate {
         }) {
             tap.view?.isUserInteractionEnabled = true
         }
-
     }
     
     //完成选择城市
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/ActivationSchoolCardViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/ActivationSchoolCardViewController.swift
index 0982f1f..f40e976 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/ActivationSchoolCardViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/ActivationSchoolCardViewController.swift
@@ -8,22 +8,78 @@
 
 import UIKit
 //校卡激活页面
-class ActivationSchoolCardViewController: UINavigationController {
+class ActivationSchoolCardViewController: UIViewController,UITextFieldDelegate {
     var info:StudentClassInfo!//孩子信息
-    @IBOutlet var nameLabel: UILabel!//孩子姓名
-    @IBOutlet var cardNumberTextField: UITextField!//卡号
+    
+    lazy var showView = {()-> UIView in
+        let view = UIView.init(frame: CGRect.init(x: 10, y: 10, width: screenWidth-20, height: 110))
+        view.backgroundColor = UIColor.white
+       
+        return view
+    }()
+    lazy var nameLable = {()-> UILabel in
+        let label = UILabel.init(frame: CGRect.init(x: 100, y: 20, width: 180, height: 30))
+        label.text = info.studentName
+        label.textAlignment = .center
+        return label
+    }()
+    lazy var cardNumberTextField = {()->UITextField in
+        let field = UITextField.init(frame: CGRect.init(x: 100, y: 70, width:180, height: 30))
+        field.delegate = self
+        field.textAlignment = .center
+        field.placeholder = "请输入卡号"
+        return field
+    }()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
-        nameLabel.text = info.studentName
+        self.view.backgroundColor = backGroundColor
+        self.view.addSubview(self.showView)
+        
+        drawUI()
+    }
+    
+    func drawUI(){
+        
+        let nameTitle = UILabel.init(frame: CGRect.init(x: 20, y: 20, width: 100, height: 30))
+        nameTitle.text = "持卡人:"
+        
+        let cardTitle = UILabel.init(frame: CGRect.init(x: 20, y: 70, width: 100, height: 30))
+        cardTitle.text = "卡号:"
+        
+        let btn = UIButton.init(frame: CGRect.init(x: 10, y: screenHeight-66-80, width: screenWidth-20, height: 40))
+        btn.setTitle("确定", for: UIControlState.normal)
+        btn.backgroundColor = Theme.topBarColor()
+        btn.layer.cornerRadius = 5
+        btn.clipsToBounds = true
+        btn.addTarget(self, action: #selector(activationAction(_:)), for: .touchUpInside)
+        
+        showView.addSubview(nameTitle)
+        showView.addSubview(self.nameLable)
+        showView.addSubview(cardTitle)
+        showView.addSubview(self.cardNumberTextField)
+        
+        self.view.addSubview(btn)
+    }
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        return cardNumberTextField.resignFirstResponder()
     }
+    
     // MARK: - 确定按钮
-    @IBAction func activationAction(_ sender: UIButton) {
+    @objc func activationAction(_ sender: UIButton) {
         if cardNumberTextField.text == "" {
             self.view.makeToast("卡号不能为空")
         }
         
+        let alert = UIAlertController.init(title: "卡号:\(cardNumberTextField.text!)", message: "已成功激活!", preferredStyle: UIAlertControllerStyle.alert)
+        let action = UIAlertAction.init(title: "返回", style: UIAlertActionStyle.default) { (action) in
+            self.dismiss(animated: true, completion: nil)
+        }
+        alert.addAction(action)
+        self.present(alert, animated: true, completion: nil)
     }
     
+    
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
         // Dispose of any resources that can be recreated.
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/ChildrenDetailViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/ChildrenDetailViewController.swift
index 2a5aef0..138a225 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/ChildrenDetailViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/ChildrenDetailViewController.swift
@@ -18,6 +18,7 @@ class ChildrenDetailViewController: UIViewController {
     var info:StudentClassInfo!//孩子信息
     override func viewDidLoad() {
         super.viewDidLoad()
+
         setUpWithInfo()
     }
     func setUpWithInfo() {
@@ -29,8 +30,9 @@ class ChildrenDetailViewController: UIViewController {
     }
     // MARK: - 校卡激活
     @IBAction func activationSchoolCardAction(_ sender: UIButton) {
-        let vc = Story.instantiateViewControllerWithIdentifier("ActivationSchoolCardViewController", storyName: "My") as! ActivationSchoolCardViewController
+        let vc =  ActivationSchoolCardViewController()
         vc.info = info
+        vc.title = "校卡激活"
         self.navigationController?.pushViewController(vc, animated: true)
     }
     // MARK: - 解除绑定
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/CurrentInfoViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/CurrentInfoViewController.swift
index 48f0dd8..6dd2c21 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/CurrentInfoViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/CurrentInfoViewController.swift
@@ -23,7 +23,7 @@ class CurrentInfoViewController: UIViewController,UIImagePickerControllerDelegat
     }
     // MARK: - 设置控件属性
     func layoutSubViews(){
-        self.navigationController?.isNavigationBarHidden = true
+//        self.navigationController?.isNavigationBarHidden = true
         personIconImageView.layer.borderWidth = 1.0
         personIconImageView.layer.borderColor = UIColor.white.cgColor
         boyBtn.setImage(UIImage(named: "my_currentInf_genderselected"), for: UIControlState.selected)
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard
index 8c20141..8fae4db 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/My.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.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.Storyboard.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="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
@@ -821,10 +821,10 @@
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Uth-8y-Dh9">
-                                <rect key="frame" x="8" y="280" width="359" height="70"/>
+                                <rect key="frame" x="8" y="280" width="359" height="80"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ihB-8i-MWP">
-                                        <rect key="frame" x="8" y="35" width="343" height="1"/>
+                                        <rect key="frame" x="8" y="40" width="343" height="1"/>
                                         <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="1" id="VD3-nv-neo"/>
@@ -840,7 +840,7 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="性别" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="y6m-lj-t2V">
-                                        <rect key="frame" x="8" y="44" width="31" height="18"/>
+                                        <rect key="frame" x="8" y="54" width="31" height="18"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -849,19 +849,22 @@
                                         <rect key="frame" x="62" y="8" width="289" height="18"/>
                                         <nil key="textColor"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                        <textInputTraits key="textInputTraits"/>
+                                        <textInputTraits key="textInputTraits" returnKeyType="done"/>
+                                        <connections>
+                                            <outlet property="delegate" destination="izC-aW-wN3" id="hbx-jD-Mit"/>
+                                        </connections>
                                     </textField>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="女" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="a0P-5N-IiP">
-                                        <rect key="frame" x="314.5" y="44" width="15.5" height="18"/>
+                                        <rect key="frame" x="304.5" y="54" width="15.5" height="18"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="WZc-Xr-O2X">
-                                        <rect key="frame" x="330" y="43" width="21" height="21"/>
+                                        <rect key="frame" x="325" y="50" width="24" height="24"/>
                                         <constraints>
                                             <constraint firstAttribute="width" secondItem="WZc-Xr-O2X" secondAttribute="height" multiplier="1:1" id="fe9-zN-kOK"/>
-                                            <constraint firstAttribute="width" constant="21" id="iBQ-AE-XtE"/>
+                                            <constraint firstAttribute="width" constant="24" id="iBQ-AE-XtE"/>
                                         </constraints>
                                         <state key="normal" image="my_currentInf_gendernoselected"/>
                                         <connections>
@@ -869,10 +872,10 @@
                                         </connections>
                                     </button>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dwh-Ac-2Me">
-                                        <rect key="frame" x="285" y="43" width="21" height="21"/>
+                                        <rect key="frame" x="265.5" y="50" width="24" height="24"/>
                                         <constraints>
                                             <constraint firstAttribute="width" secondItem="dwh-Ac-2Me" secondAttribute="height" multiplier="1:1" id="05m-7S-UJX"/>
-                                            <constraint firstAttribute="width" constant="21" id="QjG-x1-3VV"/>
+                                            <constraint firstAttribute="width" constant="24" id="QjG-x1-3VV"/>
                                         </constraints>
                                         <state key="normal" image="my_currentInf_gendernoselected"/>
                                         <connections>
@@ -880,7 +883,7 @@
                                         </connections>
                                     </button>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="男" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="12a-FL-Ibf">
-                                        <rect key="frame" x="269.5" y="44" width="15.5" height="18"/>
+                                        <rect key="frame" x="245" y="54" width="15.5" height="18"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <nil key="textColor"/>
                                         <nil key="highlightedColor"/>
@@ -889,17 +892,17 @@
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstAttribute="trailing" secondItem="IMI-JO-boC" secondAttribute="trailing" constant="8" id="37N-xB-Mt3"/>
-                                    <constraint firstItem="dwh-Ac-2Me" firstAttribute="leading" secondItem="12a-FL-Ibf" secondAttribute="trailing" id="5Ba-Me-Bon"/>
-                                    <constraint firstItem="a0P-5N-IiP" firstAttribute="leading" secondItem="dwh-Ac-2Me" secondAttribute="trailing" constant="8" id="A4J-Jt-vSg"/>
+                                    <constraint firstItem="dwh-Ac-2Me" firstAttribute="leading" secondItem="12a-FL-Ibf" secondAttribute="trailing" constant="5" id="5Ba-Me-Bon"/>
+                                    <constraint firstItem="a0P-5N-IiP" firstAttribute="leading" secondItem="dwh-Ac-2Me" secondAttribute="trailing" constant="15" id="A4J-Jt-vSg"/>
                                     <constraint firstAttribute="trailing" secondItem="ihB-8i-MWP" secondAttribute="trailing" constant="8" id="CA5-e0-Qt8"/>
                                     <constraint firstAttribute="bottom" secondItem="WZc-Xr-O2X" secondAttribute="bottom" constant="6" id="CFs-Hx-0M5"/>
                                     <constraint firstItem="IMI-JO-boC" firstAttribute="top" secondItem="Uth-8y-Dh9" secondAttribute="top" constant="8" id="FfE-Fp-ZKM"/>
                                     <constraint firstAttribute="bottom" secondItem="12a-FL-Ibf" secondAttribute="bottom" constant="8" id="WL8-z6-nWt"/>
-                                    <constraint firstAttribute="height" constant="70" id="bAI-JN-7AY"/>
-                                    <constraint firstAttribute="trailing" secondItem="WZc-Xr-O2X" secondAttribute="trailing" constant="8" id="cWg-To-gWg"/>
+                                    <constraint firstAttribute="height" constant="80" id="bAI-JN-7AY"/>
+                                    <constraint firstAttribute="trailing" secondItem="WZc-Xr-O2X" secondAttribute="trailing" constant="10" id="cWg-To-gWg"/>
                                     <constraint firstItem="y6m-lj-t2V" firstAttribute="leading" secondItem="Uth-8y-Dh9" secondAttribute="leading" constant="8" id="ebc-qf-TI2"/>
                                     <constraint firstItem="GyV-YU-DoH" firstAttribute="leading" secondItem="Uth-8y-Dh9" secondAttribute="leading" constant="8" id="f8g-CU-aMV"/>
-                                    <constraint firstItem="WZc-Xr-O2X" firstAttribute="leading" secondItem="a0P-5N-IiP" secondAttribute="trailing" id="h0f-qb-svC"/>
+                                    <constraint firstItem="WZc-Xr-O2X" firstAttribute="leading" secondItem="a0P-5N-IiP" secondAttribute="trailing" constant="5" id="h0f-qb-svC"/>
                                     <constraint firstAttribute="bottom" secondItem="a0P-5N-IiP" secondAttribute="bottom" constant="8" id="ifX-Hr-13T"/>
                                     <constraint firstItem="ihB-8i-MWP" firstAttribute="centerY" secondItem="Uth-8y-Dh9" secondAttribute="centerY" id="jWx-kK-Lof"/>
                                     <constraint firstItem="IMI-JO-boC" firstAttribute="leading" secondItem="GyV-YU-DoH" secondAttribute="trailing" constant="8" id="kTr-BS-8wC"/>
@@ -917,10 +920,10 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="BJp-u6-ttX">
-                                <rect key="frame" x="8" y="621" width="359" height="30"/>
-                                <color key="backgroundColor" red="0.7725490196" green="0.85490196080000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <rect key="frame" x="8" y="611" width="359" height="40"/>
+                                <color key="backgroundColor" red="0.42745098039215684" green="0.60784313725490191" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="30" id="0f5-sE-CbZ"/>
+                                    <constraint firstAttribute="height" constant="40" id="0f5-sE-CbZ"/>
                                 </constraints>
                                 <state key="normal" title="确认">
                                     <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -1291,7 +1294,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="by8-8x-HbM">
-                                <rect key="frame" x="0.0" y="64" width="375" height="549"/>
+                                <rect key="frame" x="0.0" y="64" width="375" height="553"/>
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="MyChildrenTableViewCell" rowHeight="70" id="AsM-fi-1E0" customClass="MyChildrenTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
@@ -1317,16 +1320,16 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AOx-bl-8U0">
-                                                            <rect key="frame" x="317" y="21" width="50" height="20"/>
+                                                            <rect key="frame" x="297" y="16" width="70" height="30"/>
                                                             <constraints>
-                                                                <constraint firstAttribute="height" constant="20" id="CG4-9A-01l"/>
-                                                                <constraint firstAttribute="width" constant="50" id="tlY-GL-P0q"/>
+                                                                <constraint firstAttribute="height" constant="30" id="CG4-9A-01l"/>
+                                                                <constraint firstAttribute="width" constant="70" id="tlY-GL-P0q"/>
                                                             </constraints>
                                                             <state key="normal" title="去订购"/>
                                                             <userDefinedRuntimeAttributes>
                                                                 <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
                                                                 <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
-                                                                    <integer key="value" value="5"/>
+                                                                    <integer key="value" value="15"/>
                                                                 </userDefinedRuntimeAttribute>
                                                             </userDefinedRuntimeAttributes>
                                                             <connections>
@@ -1366,8 +1369,11 @@
                                 </connections>
                             </tableView>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="um9-GN-HgW">
-                                <rect key="frame" x="8" y="621" width="359" height="30"/>
-                                <color key="backgroundColor" red="0.7725490196" green="0.85490196080000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <rect key="frame" x="8" y="617" width="359" height="40"/>
+                                <color key="backgroundColor" red="0.42745098039215684" green="0.60784313725490191" blue="0.99215686274509807" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="40" id="k20-dz-daj"/>
+                                </constraints>
                                 <state key="normal" title="添加绑定账号">
                                     <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
@@ -1386,10 +1392,10 @@
                         <constraints>
                             <constraint firstItem="by8-8x-HbM" firstAttribute="leading" secondItem="IF8-NC-RgQ" secondAttribute="leading" id="9HL-cF-clD"/>
                             <constraint firstItem="by8-8x-HbM" firstAttribute="top" secondItem="IF8-NC-RgQ" secondAttribute="top" id="FKk-ev-gxD"/>
-                            <constraint firstItem="um9-GN-HgW" firstAttribute="top" secondItem="by8-8x-HbM" secondAttribute="bottom" constant="8" id="Y9e-RN-i9M"/>
+                            <constraint firstItem="um9-GN-HgW" firstAttribute="top" secondItem="by8-8x-HbM" secondAttribute="bottom" id="Y9e-RN-i9M"/>
                             <constraint firstItem="um9-GN-HgW" firstAttribute="leading" secondItem="IF8-NC-RgQ" secondAttribute="leading" constant="8" id="d96-0Q-uan"/>
                             <constraint firstItem="by8-8x-HbM" firstAttribute="trailing" secondItem="IF8-NC-RgQ" secondAttribute="trailing" id="dQq-IL-sWY"/>
-                            <constraint firstItem="IF8-NC-RgQ" firstAttribute="bottom" secondItem="um9-GN-HgW" secondAttribute="bottom" constant="16" id="q7h-cW-Cap"/>
+                            <constraint firstItem="IF8-NC-RgQ" firstAttribute="bottom" secondItem="um9-GN-HgW" secondAttribute="bottom" constant="10" id="q7h-cW-Cap"/>
                             <constraint firstItem="IF8-NC-RgQ" firstAttribute="trailing" secondItem="um9-GN-HgW" secondAttribute="trailing" constant="8" id="xJI-Pc-8Pr"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="IF8-NC-RgQ"/>
@@ -1568,10 +1574,10 @@
                                 </constraints>
                             </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jmq-mD-M7V">
-                                <rect key="frame" x="8" y="583" width="359" height="30"/>
+                                <rect key="frame" x="8" y="563" width="359" height="40"/>
                                 <color key="backgroundColor" red="0.26289805769920349" green="0.83853167295455933" blue="0.5797455906867981" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="30" id="TDs-w3-m8B"/>
+                                    <constraint firstAttribute="height" constant="40" id="TDs-w3-m8B"/>
                                 </constraints>
                                 <state key="normal" title="校卡激活">
                                     <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -1587,10 +1593,10 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eob-2f-LHk">
-                                <rect key="frame" x="8" y="621" width="359" height="30"/>
+                                <rect key="frame" x="8" y="611" width="359" height="40"/>
                                 <color key="backgroundColor" red="0.99277454614639282" green="0.58486777544021606" blue="0.58350682258605957" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="30" id="4TM-cx-grP"/>
+                                    <constraint firstAttribute="height" constant="40" id="4TM-cx-grP"/>
                                 </constraints>
                                 <state key="normal" title="解除绑定">
                                     <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -1646,119 +1652,6 @@
             </objects>
             <point key="canvasLocation" x="910" y="606"/>
         </scene>
-        <!--校卡激活-->
-        <scene sceneID="ife-4P-5ZO">
-            <objects>
-                <viewController storyboardIdentifier="ActivationSchoolCardViewController" id="PmZ-B7-NJl" customClass="ActivationSchoolCardViewController" customModule="ParentAssistant" customModuleProvider="target" sceneMemberID="viewController">
-                    <view key="view" contentMode="scaleToFill" id="7qg-B6-foy">
-                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b7a-Ma-IMT">
-                                <rect key="frame" x="16" y="265.5" width="343" height="200"/>
-                                <subviews>
-                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hqJ-dt-VX1">
-                                        <rect key="frame" x="8" y="162" width="327" height="30"/>
-                                        <color key="backgroundColor" red="0.7725490196" green="0.85490196080000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="30" id="Q7U-19-vsq"/>
-                                        </constraints>
-                                        <state key="normal" title="确定">
-                                            <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                        </state>
-                                        <userDefinedRuntimeAttributes>
-                                            <userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
-                                            <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
-                                                <integer key="value" value="5"/>
-                                            </userDefinedRuntimeAttribute>
-                                        </userDefinedRuntimeAttributes>
-                                        <connections>
-                                            <action selector="activationAction:" destination="PmZ-B7-NJl" eventType="touchUpInside" id="Ksh-r0-pNC"/>
-                                        </connections>
-                                    </button>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="卡号：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6Nq-Xv-dmq">
-                                        <rect key="frame" x="30" y="89" width="70" height="21"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="70" id="F0z-oJ-wvJ"/>
-                                        </constraints>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <nil key="textColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="持卡人：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I1Y-8N-EP4">
-                                        <rect key="frame" x="30" y="60" width="69.5" height="21"/>
-                                        <constraints>
-                                            <constraint firstAttribute="width" constant="70" id="oEu-tI-1vf"/>
-                                        </constraints>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <nil key="textColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入卡号" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ydQ-Nw-taF">
-                                        <rect key="frame" x="108" y="91.5" width="227" height="17"/>
-                                        <nil key="textColor"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                        <textInputTraits key="textInputTraits"/>
-                                    </textField>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xV0-Xz-JLq">
-                                        <rect key="frame" x="108" y="87.5" width="227" height="0.0"/>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <nil key="textColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tBg-aB-jbG">
-                                        <rect key="frame" x="108" y="108.5" width="227" height="1"/>
-                                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
-                                        <constraints>
-                                            <constraint firstAttribute="height" constant="1" id="0ep-an-Xnu"/>
-                                        </constraints>
-                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                        <nil key="textColor"/>
-                                        <nil key="highlightedColor"/>
-                                    </label>
-                                </subviews>
-                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <constraints>
-                                    <constraint firstItem="ydQ-Nw-taF" firstAttribute="leading" secondItem="6Nq-Xv-dmq" secondAttribute="trailing" constant="8" id="0PR-YB-H1K"/>
-                                    <constraint firstItem="6Nq-Xv-dmq" firstAttribute="centerY" secondItem="b7a-Ma-IMT" secondAttribute="centerY" id="0qf-xz-Xc2"/>
-                                    <constraint firstAttribute="trailing" secondItem="hqJ-dt-VX1" secondAttribute="trailing" constant="8" id="CMh-Kx-Bat"/>
-                                    <constraint firstAttribute="trailing" secondItem="xV0-Xz-JLq" secondAttribute="trailing" constant="8" id="Fkz-pa-chm"/>
-                                    <constraint firstItem="I1Y-8N-EP4" firstAttribute="leading" secondItem="b7a-Ma-IMT" secondAttribute="leading" constant="30" id="KQp-Ie-CkZ"/>
-                                    <constraint firstAttribute="height" constant="200" id="QLR-Wj-mRw"/>
-                                    <constraint firstItem="6Nq-Xv-dmq" firstAttribute="top" secondItem="I1Y-8N-EP4" secondAttribute="bottom" constant="8" id="W5O-rZ-VTK"/>
-                                    <constraint firstItem="tBg-aB-jbG" firstAttribute="leading" secondItem="6Nq-Xv-dmq" secondAttribute="trailing" constant="8" id="c8H-IA-Ktj"/>
-                                    <constraint firstAttribute="trailing" secondItem="tBg-aB-jbG" secondAttribute="trailing" constant="8" id="k2l-hw-vNO"/>
-                                    <constraint firstItem="ydQ-Nw-taF" firstAttribute="centerY" secondItem="b7a-Ma-IMT" secondAttribute="centerY" id="kdg-98-Ff8"/>
-                                    <constraint firstAttribute="bottom" secondItem="hqJ-dt-VX1" secondAttribute="bottom" constant="8" id="mrd-tC-O3U"/>
-                                    <constraint firstItem="6Nq-Xv-dmq" firstAttribute="leading" secondItem="b7a-Ma-IMT" secondAttribute="leading" constant="30" id="rJM-mi-fV3"/>
-                                    <constraint firstItem="hqJ-dt-VX1" firstAttribute="leading" secondItem="b7a-Ma-IMT" secondAttribute="leading" constant="8" id="sYo-om-3Tu"/>
-                                    <constraint firstAttribute="trailing" secondItem="ydQ-Nw-taF" secondAttribute="trailing" constant="8" id="xMF-Z6-xjU"/>
-                                    <constraint firstItem="ydQ-Nw-taF" firstAttribute="top" secondItem="xV0-Xz-JLq" secondAttribute="bottom" constant="4" id="xTh-T1-fNQ"/>
-                                    <constraint firstItem="tBg-aB-jbG" firstAttribute="top" secondItem="ydQ-Nw-taF" secondAttribute="bottom" id="xpy-QI-qcy"/>
-                                    <constraint firstItem="xV0-Xz-JLq" firstAttribute="leading" secondItem="I1Y-8N-EP4" secondAttribute="trailing" constant="8" id="yTS-Dn-AB2"/>
-                                </constraints>
-                            </view>
-                        </subviews>
-                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
-                        <constraints>
-                            <constraint firstItem="b7a-Ma-IMT" firstAttribute="leading" secondItem="ZrG-k7-97i" secondAttribute="leading" constant="16" id="K9c-89-uSQ"/>
-                            <constraint firstItem="ZrG-k7-97i" firstAttribute="trailing" secondItem="b7a-Ma-IMT" secondAttribute="trailing" constant="16" id="St5-Nd-paj"/>
-                            <constraint firstItem="b7a-Ma-IMT" firstAttribute="centerX" secondItem="ZrG-k7-97i" secondAttribute="centerX" id="Z0U-Sc-Zuc"/>
-                            <constraint firstItem="b7a-Ma-IMT" firstAttribute="centerY" secondItem="ZrG-k7-97i" secondAttribute="centerY" id="v0s-4b-Pg0"/>
-                        </constraints>
-                        <viewLayoutGuide key="safeArea" id="ZrG-k7-97i"/>
-                    </view>
-                    <navigationItem key="navigationItem" title="校卡激活" id="GXY-kd-xer"/>
-                    <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
-                    <connections>
-                        <outlet property="cardNumberTextField" destination="ydQ-Nw-taF" id="fs1-fT-56C"/>
-                        <outlet property="nameLabel" destination="xV0-Xz-JLq" id="Oii-qf-u8T"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="pcB-ds-46z" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1605.5999999999999" y="605.84707646176912"/>
-        </scene>
     </scenes>
     <resources>
         <image name="defphoto" width="128" height="128"/>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift
index 0a5a0fa..12c07f2 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyChildrenViewController.swift
@@ -21,6 +21,7 @@ class MyChildrenViewController: UIViewController{
         //防止tabbar隐藏导致页面跳一下
         self.tabBarController?.tabBar.isHidden = true
         self.navigationController?.setNavigationBarHidden(false, animated: true)
+        
     }
     // MARK: - 设置控件属性
     func layoutSubViews(){
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
index f9aca43..3349649 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift
@@ -27,8 +27,9 @@ class MyViewController: UIViewController {
     }
     // MARK: - 设置控件属性
     func layoutSubViews(){
-        let backImage = UIImage(named: "navigationBar_backgrounImage")
-        self.navigationController?.navigationBar.setBackgroundImage(backImage, for: UIBarMetrics.default)
+//        let backImage = UIImage(named: "navigationBar_backgrounImage")
+//        self.navigationController?.navigationBar.setBackgroundImage(backImage, for: UIBarMetrics.default)
+        self.configTheme()
         // MARK: - 是否是iPhoneX顶部刘海
         if UIApplication.shared.statusBarFrame.size.height>20 {
             titleViewHeight.constant = 88
@@ -41,7 +42,7 @@ class MyViewController: UIViewController {
         let backButton = UIBarButtonItem()
         backButton.title = "个人中心"
         self.navigationItem.backBarButtonItem = backButton
-        self.configTheme()
+        
         //添加退出登录的通知，防止在本页面时账号被顶 不能及时刷新页面
         NotificationCenter.default.addObserver(self, selector: #selector(MyViewController.loginOutNotificationAction), name: NSNotification.Name(rawValue: "loginOutSuccess"), object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(MyViewController.receivedNewNotificationAction), name: NSNotification.Name(rawValue: MessageNotification.receiveMessage), object: nil)
diff --git a/ParentAssistant/ParentAssistant/Classes/util/Macro.swift b/ParentAssistant/ParentAssistant/Classes/util/Macro.swift
index 98c5c1f..ccd4a06 100644
--- a/ParentAssistant/ParentAssistant/Classes/util/Macro.swift
+++ b/ParentAssistant/ParentAssistant/Classes/util/Macro.swift
@@ -17,7 +17,7 @@ var navigationBarHeight : CGFloat?
 let screenWidth = UIScreen.main.bounds.size.width
 let screenHeight = UIScreen.main.bounds.size.height
 let backGroundColor = UIColor.init(red: 239/255, green: 239/255, blue: 244/255, alpha: 1)
-
+let navigationColor = UIColorWithRGB(R: 109, G: 155, B: 255)
 //MARK: -------------------------- 接口地址 ----------------------------
 let appsecret="sincere:3a530f39f99411b454e667d69693c127"
 var ReleaseHOST:String!="http://campus.myjxt.com"//正式网址
diff --git a/ParentAssistant/ParentAssistant/Classes/util/NIM/YXMessageManager.swift b/ParentAssistant/ParentAssistant/Classes/util/NIM/YXMessageManager.swift
new file mode 100644
index 0000000..3d0d92d
--- /dev/null
+++ b/ParentAssistant/ParentAssistant/Classes/util/NIM/YXMessageManager.swift
@@ -0,0 +1,124 @@
+//
+//  YXMessageManager.swift
+//  ParentAssistant
+//
+//  Created by 葛建军 on 2018/3/15.
+//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
+//
+
+import UIKit
+import CoreData
+class YXMessageManager: NSObject,NIMLoginManagerDelegate,NIMSystemNotificationManagerDelegate {
+    static let share=YXMessageManager()
+    private override init() {}
+    func addYXDelegate(){
+        //添加云信代理
+        NIMSDK.shared().loginManager.add(YXMessageManager.share as NIMLoginManagerDelegate)
+        NIMSDK.shared().systemNotificationManager.add(YXMessageManager.share as NIMSystemNotificationManagerDelegate)
+    }
+    //登录云信
+    func loginWithYX(account:String,token:String,completion:((Bool)->Void)?){
+        NIMSDK.shared().loginManager.login(account, token: token) { (error) in
+            var b:Bool
+            if error==nil {
+                //登录成功
+                b=true
+            }else{
+                //登录失败
+                b=false
+            }
+            completion?(b)
+        }
+    }
+    func autoLogin(account:String,token:String){
+        NIMSDK.shared().loginManager.autoLogin(account, token: token)
+    }
+    //退出登录
+    func loginOut(completion:((Bool)->Void)?){
+        NIMSDK.shared().loginManager.logout { (error) in
+            var b:Bool
+            if error==nil {
+                //退出成功
+                b=true
+            }else{
+                //退出失败
+                b=false
+            }
+            completion?(b)
+        }
+    }
+    /**
+     *  被踢(服务器/其他端)回调
+     *
+     *  @param code        被踢原因
+     *  @param clientType  发起踢出的客户端类型
+     */
+    func onKick(_ code: NIMKickReason, clientType: NIMLoginClientType) {
+        var reason="您的帐号已在别处登录"
+        switch (code) {
+        case NIMKickReason.byClient:
+            var clientName=""
+            switch (clientType) {
+            case NIMLoginClientType.typeAOS:
+                clientName="Android";
+            case NIMLoginClientType.typeiOS:
+                clientName="iOS";
+            case NIMLoginClientType.typePC:
+                clientName="电脑";
+            case NIMLoginClientType.typeWeb:
+                clientName="网页";
+            default:
+                clientName="";
+            }
+            reason = clientName == "" ? "你的帐号在其他设备上登录，请注意帐号信息安全，若非本人操作请及时修改密码或联系客服人员" : "你的帐号在\(clientName)端登录，请注意帐号信息安全，若非本人操作请及时修改密码或联系客服人员"
+            break
+        case NIMKickReason.byClientManually:
+            break
+        default: //code=NIMKickReason.ByServer:
+            reason="你被服务器踢下线"
+            
+            break;
+        }
+        appDelegate.window!.makeToast("下线通知:\(reason)", duration: 3, position: CSToastPositionCenter)
+        AccountManager.shared.logOut(auto: true)
+    }
+    /**
+     *  登录回调
+     *
+     *  @param step 登录步骤
+     *  @discussion 这个回调主要用于客户端UI的刷新
+     */
+    func onLogin(_ step: NIMLoginStep) {
+        
+    }
+    /**
+     *  自动登录失败回调
+     *
+     *  @param error 失败原因
+     *  @discussion 自动重连不需要上层开发关心，但是如果发生一些需要上层开发处理的错误，SDK 会通过这个方法回调
+     *              用户需要处理的情况包括：AppKey 未被设置，参数错误，密码错误，多端登录冲突，账号被封禁，操作过于频繁等
+     */
+    func onAutoLoginFailed(_ error: Error) {
+        AccountManager.shared.logOut()
+    }
+    func onReceive(_ notification: NIMCustomSystemNotification) {
+        if let info=JSON.fromString(notification.content) {
+            if info["type"].stringValue=="attach"{//群发通知
+                let attachItem = NSManagedObject.creatWith(identifier: "Message") as! Message
+                attachItem.date=Date(timeIntervalSince1970: notification.timestamp)
+                attachItem.content = info["content"].stringValue
+                attachItem.ownId = AccountManager.shared.userid
+                attachItem.save()
+                NotificationCenter.default.post(name: Notification.Name(rawValue: MessageNotification.receiveMessage), object: nil, userInfo: nil)
+            }else if info["type"].stringValue=="ordermess"{//订购通知
+                let attachItem = NSManagedObject.creatWith(identifier: "Message") as! Message
+                attachItem.date=Date(timeIntervalSince1970: notification.timestamp)
+                attachItem.type = "ordermess"
+                attachItem.content = info["content"].stringValue
+                attachItem.ownId = AccountManager.shared.userid
+                attachItem.save()
+                NotificationCenter.default.post(name: Notification.Name(rawValue: MessageNotification.receiveMessage), object: nil, userInfo: nil)
+            }
+        }
+    }
+}
diff --git a/ParentAssistant/ParentAssistant/Classes/util/utils.swift b/ParentAssistant/ParentAssistant/Classes/util/utils.swift
index e287a4b..47395cb 100644
--- a/ParentAssistant/ParentAssistant/Classes/util/utils.swift
+++ b/ParentAssistant/ParentAssistant/Classes/util/utils.swift
@@ -315,7 +315,7 @@ extension UIApplication {
 }
 class Theme{
     static func topBarColor()->UIColor{
-        return UIColorFromRGB(0xC5DAFF)//UIColorFromRGB(0xff9b34)f6595f
+        return UIColorWithRGB(R: 109, G: 155, B: 255)
     }
     ///按钮样式
     static func configButton(_ button:UIButton){
@@ -573,11 +573,11 @@ extension UIViewController{
     ///设置顶栏的各种显示属性
     func configTheme(){
         self.navigationItem.title=self.navigationController?.title
-        self.navigationController?.navigationBar.barTintColor=Theme.topBarColor()
-        self.navigationController?.navigationBar.tintColor=UIColor.black
+        self.navigationController?.navigationBar.barTintColor = navigationColor
+        self.navigationController?.navigationBar.tintColor = UIColor.white
         self.navigationController?.navigationBar.isTranslucent=false
         let textAttributes = NSMutableDictionary(capacity:1)
-        textAttributes.setObject(UIColor.black, forKey: NSAttributedStringKey.foregroundColor as NSCopying)
+        textAttributes.setObject(UIColor.white, forKey: NSAttributedStringKey.foregroundColor as NSCopying)
         self.navigationController?.navigationBar.titleTextAttributes=textAttributes as! [AnyHashable: Any] as? [NSAttributedStringKey : Any]
     }
     ///套上UINavigationController
diff --git a/ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift b/ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift
deleted file mode 100644
index 3d0d92d..0000000
--- a/ParentAssistant/ParentAssistant/NIM/YXMessageManager.swift
+++ /dev/null
@@ -1,124 +0,0 @@
-//
-//  YXMessageManager.swift
-//  ParentAssistant
-//
-//  Created by 葛建军 on 2018/3/15.
-//  Copyright © 2018年 HANGZHOUTEAM. All rights reserved.
-//
-
-import UIKit
-import CoreData
-class YXMessageManager: NSObject,NIMLoginManagerDelegate,NIMSystemNotificationManagerDelegate {
-    static let share=YXMessageManager()
-    private override init() {}
-    func addYXDelegate(){
-        //添加云信代理
-        NIMSDK.shared().loginManager.add(YXMessageManager.share as NIMLoginManagerDelegate)
-        NIMSDK.shared().systemNotificationManager.add(YXMessageManager.share as NIMSystemNotificationManagerDelegate)
-    }
-    //登录云信
-    func loginWithYX(account:String,token:String,completion:((Bool)->Void)?){
-        NIMSDK.shared().loginManager.login(account, token: token) { (error) in
-            var b:Bool
-            if error==nil {
-                //登录成功
-                b=true
-            }else{
-                //登录失败
-                b=false
-            }
-            completion?(b)
-        }
-    }
-    func autoLogin(account:String,token:String){
-        NIMSDK.shared().loginManager.autoLogin(account, token: token)
-    }
-    //退出登录
-    func loginOut(completion:((Bool)->Void)?){
-        NIMSDK.shared().loginManager.logout { (error) in
-            var b:Bool
-            if error==nil {
-                //退出成功
-                b=true
-            }else{
-                //退出失败
-                b=false
-            }
-            completion?(b)
-        }
-    }
-    /**
-     *  被踢(服务器/其他端)回调
-     *
-     *  @param code        被踢原因
-     *  @param clientType  发起踢出的客户端类型
-     */
-    func onKick(_ code: NIMKickReason, clientType: NIMLoginClientType) {
-        var reason="您的帐号已在别处登录"
-        switch (code) {
-        case NIMKickReason.byClient:
-            var clientName=""
-            switch (clientType) {
-            case NIMLoginClientType.typeAOS:
-                clientName="Android";
-            case NIMLoginClientType.typeiOS:
-                clientName="iOS";
-            case NIMLoginClientType.typePC:
-                clientName="电脑";
-            case NIMLoginClientType.typeWeb:
-                clientName="网页";
-            default:
-                clientName="";
-            }
-            reason = clientName == "" ? "你的帐号在其他设备上登录，请注意帐号信息安全，若非本人操作请及时修改密码或联系客服人员" : "你的帐号在\(clientName)端登录，请注意帐号信息安全，若非本人操作请及时修改密码或联系客服人员"
-            break
-        case NIMKickReason.byClientManually:
-            break
-        default: //code=NIMKickReason.ByServer:
-            reason="你被服务器踢下线"
-            
-            break;
-        }
-        appDelegate.window!.makeToast("下线通知:\(reason)", duration: 3, position: CSToastPositionCenter)
-        AccountManager.shared.logOut(auto: true)
-    }
-    /**
-     *  登录回调
-     *
-     *  @param step 登录步骤
-     *  @discussion 这个回调主要用于客户端UI的刷新
-     */
-    func onLogin(_ step: NIMLoginStep) {
-        
-    }
-    /**
-     *  自动登录失败回调
-     *
-     *  @param error 失败原因
-     *  @discussion 自动重连不需要上层开发关心，但是如果发生一些需要上层开发处理的错误，SDK 会通过这个方法回调
-     *              用户需要处理的情况包括：AppKey 未被设置，参数错误，密码错误，多端登录冲突，账号被封禁，操作过于频繁等
-     */
-    func onAutoLoginFailed(_ error: Error) {
-        AccountManager.shared.logOut()
-    }
-    func onReceive(_ notification: NIMCustomSystemNotification) {
-        if let info=JSON.fromString(notification.content) {
-            if info["type"].stringValue=="attach"{//群发通知
-                let attachItem = NSManagedObject.creatWith(identifier: "Message") as! Message
-                attachItem.date=Date(timeIntervalSince1970: notification.timestamp)
-                attachItem.content = info["content"].stringValue
-                attachItem.ownId = AccountManager.shared.userid
-                attachItem.save()
-                NotificationCenter.default.post(name: Notification.Name(rawValue: MessageNotification.receiveMessage), object: nil, userInfo: nil)
-            }else if info["type"].stringValue=="ordermess"{//订购通知
-                let attachItem = NSManagedObject.creatWith(identifier: "Message") as! Message
-                attachItem.date=Date(timeIntervalSince1970: notification.timestamp)
-                attachItem.type = "ordermess"
-                attachItem.content = info["content"].stringValue
-                attachItem.ownId = AccountManager.shared.userid
-                attachItem.save()
-                NotificationCenter.default.post(name: Notification.Name(rawValue: MessageNotification.receiveMessage), object: nil, userInfo: nil)
-            }
-        }
-    }
-}
diff --git a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
index 9e769f0..3085ae2 100644
--- a/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
+++ b/ParentAssistant/ParentAssistant/Supporting Files/Base.lproj/Main.storyboard
@@ -514,6 +514,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="1000" height="1000"/>
                         <autoresizingMask key="autoresizingMask"/>
                         <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        <color key="tintColor" red="0.42745098039215684" green="0.54509803921568623" blue="0.99215686274509807" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     </tabBar>
                     <connections>
                         <segue destination="40K-Kv-ipy" kind="relationship" relationship="viewControllers" id="Fx5-1K-8RV"/>
@@ -707,10 +708,10 @@
                                 <rect key="frame" x="0.0" y="192" width="375" height="426"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b1H-Ru-LCm">
-                                        <rect key="frame" x="16" y="386" width="351" height="30"/>
-                                        <color key="backgroundColor" red="0.65884900089999998" green="0.7812994123" blue="0.99654072520000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        <rect key="frame" x="10" y="376" width="355" height="40"/>
+                                        <color key="backgroundColor" red="0.42745098039215684" green="0.60784313725490191" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <constraints>
-                                            <constraint firstAttribute="height" constant="30" id="Siu-uN-x5b"/>
+                                            <constraint firstAttribute="height" constant="40" id="Siu-uN-x5b"/>
                                         </constraints>
                                         <state key="normal" title="退出登录">
                                             <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -729,25 +730,25 @@
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                 <constraints>
                                     <constraint firstAttribute="bottom" secondItem="b1H-Ru-LCm" secondAttribute="bottom" constant="10" id="CNc-iw-Nuh"/>
-                                    <constraint firstAttribute="trailing" secondItem="b1H-Ru-LCm" secondAttribute="trailing" constant="8" id="FPX-uT-Dca"/>
-                                    <constraint firstItem="b1H-Ru-LCm" firstAttribute="leading" secondItem="vZR-tF-hRq" secondAttribute="leading" constant="16" id="lif-j8-7oK"/>
+                                    <constraint firstAttribute="trailing" secondItem="b1H-Ru-LCm" secondAttribute="trailing" constant="10" id="FPX-uT-Dca"/>
+                                    <constraint firstItem="b1H-Ru-LCm" firstAttribute="leading" secondItem="vZR-tF-hRq" secondAttribute="leading" constant="10" id="lif-j8-7oK"/>
                                 </constraints>
                             </view>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="a1N-wB-mTL">
-                                <rect key="frame" x="16" y="200" width="343" height="368"/>
+                                <rect key="frame" x="10" y="200" width="355" height="368"/>
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                 <color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <view key="tableFooterView" contentMode="scaleToFill" id="3Fn-Rv-e1i">
-                                    <rect key="frame" x="0.0" y="102" width="343" height="1"/>
+                                    <rect key="frame" x="0.0" y="102" width="355" height="1"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 </view>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="MyTableViewCell" id="Mmu-jR-2O0" customClass="MyTableViewCell" customModule="ParentAssistant" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="28" width="343" height="44"/>
+                                        <rect key="frame" x="0.0" y="28" width="355" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="Mmu-jR-2O0" id="I0U-qy-hxi">
-                                            <rect key="frame" x="0.0" y="0.0" width="343" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="355" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="my_icon_orderMessage" translatesAutoresizingMaskIntoConstraints="NO" id="sh9-9Q-Xco">
@@ -792,10 +793,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="cell" rowHeight="30" id="IIk-oR-zC0">
-                                        <rect key="frame" x="0.0" y="72" width="343" height="30"/>
+                                        <rect key="frame" x="0.0" y="72" width="355" height="30"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="IIk-oR-zC0" id="iIe-NI-d4g">
-                                            <rect key="frame" x="0.0" y="0.0" width="343" height="29.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="355" height="29.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                         <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
@@ -817,10 +818,10 @@
                             <constraint firstItem="a1N-wB-mTL" firstAttribute="top" secondItem="Rmi-WH-7xV" secondAttribute="bottom" constant="8" id="dKW-8l-Tht"/>
                             <constraint firstItem="Rmi-WH-7xV" firstAttribute="leading" secondItem="EYK-6R-gmX" secondAttribute="leading" id="pZd-mJ-ACf"/>
                             <constraint firstItem="vZR-tF-hRq" firstAttribute="trailing" secondItem="EYK-6R-gmX" secondAttribute="trailing" id="qCq-PT-dV3"/>
-                            <constraint firstItem="EYK-6R-gmX" firstAttribute="trailing" secondItem="a1N-wB-mTL" secondAttribute="trailing" constant="16" id="qtY-RT-AYd"/>
+                            <constraint firstItem="EYK-6R-gmX" firstAttribute="trailing" secondItem="a1N-wB-mTL" secondAttribute="trailing" constant="10" id="qtY-RT-AYd"/>
                             <constraint firstItem="vZR-tF-hRq" firstAttribute="leading" secondItem="EYK-6R-gmX" secondAttribute="leading" id="wvd-Qr-ft1"/>
                             <constraint firstItem="Rmi-WH-7xV" firstAttribute="trailing" secondItem="EYK-6R-gmX" secondAttribute="trailing" id="yZK-hv-21o"/>
-                            <constraint firstItem="a1N-wB-mTL" firstAttribute="leading" secondItem="EYK-6R-gmX" secondAttribute="leading" constant="16" id="zCA-1V-skA"/>
+                            <constraint firstItem="a1N-wB-mTL" firstAttribute="leading" secondItem="EYK-6R-gmX" secondAttribute="leading" constant="10" id="zCA-1V-skA"/>
                         </constraints>
                         <viewLayoutGuide key="safeArea" id="EYK-6R-gmX"/>
                     </view>
@@ -1107,7 +1108,9 @@
         <scene sceneID="k70-QL-d6T">
             <objects>
                 <navigationController automaticallyAdjustsScrollViewInsets="NO" id="eER-h6-27H" customClass="MainViewController" customModule="ParentAssistant" customModuleProvider="target" sceneMemberID="viewController">
-                    <tabBarItem key="tabBarItem" title="个人中心" image="my_bar_icon" selectedImage="my_bar_icon_select" id="Rn5-qq-H6e"/>
+                    <tabBarItem key="tabBarItem" title="个人中心" image="my_bar_icon" selectedImage="my_bar_icon_select" id="Rn5-qq-H6e">
+                        <color key="badgeColor" red="0.42745098039215684" green="0.54509803921568623" blue="0.99215686274509807" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    </tabBarItem>
                     <toolbarItems/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="faE-a1-9KB">
                         <rect key="frame" x="0.0" y="20" width="375" height="44"/>
@@ -1149,4 +1152,5 @@
         <image name="report_bar_icon" width="22" height="20"/>
         <image name="report_bar_icon_select" width="22" height="20"/>
     </resources>
+    <color key="tintColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
 </document>
--
libgit2 0.21.0