diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate
index 832cc74..2d31bd0 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.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index e2573a5..1a0ebde 100644
--- a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -13,5 +13,21 @@
             stopOnStyle = "0">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "ParentAssistant/Classes/controllers/Grow/GrowViewController.swift"
+            timestampString = "545824470.67428"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "72"
+            endingLineNumber = "72"
+            landmarkName = "viewWillAppear(_:)"
+            landmarkType = "7">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift
index 0fe7718..b7ae515 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift
@@ -68,6 +68,9 @@ class GrowViewController: UIViewController,UIScrollViewDelegate {
     
     override func viewWillAppear(_ animated: Bool) {
         
+        
+       let model = AccountManager.shared.getUserInfo()
+        print(model.name)
         var title = String()
         if AccountManager.shared.isOnline() {
             if AccountManager.shared.rawUserInfo!.contentData()["studentClass"].arrayValue.count == 0 {
diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift
index 53e0b2e..71e6f69 100644
--- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift
+++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift
@@ -14,16 +14,16 @@ class ProgramCardViewController: UIViewController,UITextFieldDelegate {
     
     lazy var cardView = { ()-> UIView in
         
-        let view = UIView.init(frame: CGRect.init(x: 10, y: 10, width: screenWidth-20, height: 140))
+        let view = UIView.init(frame: CGRect.init(x: 10, y: 10, width: screenWidth-20, height: 100))
         view.backgroundColor = UIColor.white
         return view
     }()
     lazy var bottomBtn = {()-> UIButton in
-        let btn = UIButton.init(frame: CGRect.init(x: screenWidth/2-100, y: screenHeight-66-60, width: 200, height: 40))
+        let btn = UIButton.init(frame: CGRect.init(x: 20, y: screenHeight-66-60, width: screenWidth-40, height: 40))
         btn.setTitle("申请补卡", for: UIControlState.normal)
         btn.layer.cornerRadius = 5
         btn.clipsToBounds = true
-        btn.setTitleColor(UIColor.black, for: UIControlState.normal)
+        btn.setTitleColor(UIColor.white, for: UIControlState.normal)
         btn.backgroundColor = Theme.topBarColor()
         btn.addTarget(self, action: #selector(applyAction), for: UIControlEvents.touchUpInside)
         return btn
@@ -87,18 +87,10 @@ class ProgramCardViewController: UIViewController,UITextFieldDelegate {
         cardNumberInput.delegate = self
         self.cardInputTextField = cardNumberInput
         
-        let cardDateLab = UILabel.init(frame: CGRect.init(x: 10, y: 90, width: 100, height: 30))
-        cardDateLab.text = "考勤日期:"
-        
-        let cardDateInput = UILabel.init(frame: CGRect.init(x: 110, y: 90, width: screenWidth-120, height: 30))
-        cardDateInput.text = "2018-02-12 09:40"
-        
         self.cardView.addSubview(cardLable)
         self.cardView.addSubview(cardName)
         self.cardView.addSubview(cardNumberLab)
         self.cardView.addSubview(cardNumberInput)
-        self.cardView.addSubview(cardDateLab)
-        self.cardView.addSubview(cardDateInput)
 
     }
     //收回键盘
diff --git a/ParentAssistant/ParentAssistant/Classes/util/account.swift b/ParentAssistant/ParentAssistant/Classes/util/account.swift
index e675a75..b8bbc4c 100644
--- a/ParentAssistant/ParentAssistant/Classes/util/account.swift
+++ b/ParentAssistant/ParentAssistant/Classes/util/account.swift
@@ -20,11 +20,45 @@ class AccountManager: NSObject {
     
     override init(){
         rawUserInfo=Setting.getUserInfo()
-        
         if let info=rawUserInfo{
             userid=info.contentData()["userid"].stringValue
         }
     }
+    
+    //MARK: - 获取个人信息
+    /// 获取用户信息
+    ///
+    /// - Returns: 返回 UserInfoModel
+    func getUserInfo() -> UserInfoModel {
+        
+        var model = UserInfoModel()
+        let dic = Setting.getUserInfo()?.dictionary
+        let data = dic!["data"]?.dictionary
+        if let value = data {
+            model = UserInfoModel.deserialize(from: value)!
+        }
+        return model
+    }
+    //MARK: 获取孩子信息
+    /// 获取用户孩子信息
+    ///
+    /// - Returns: 返回 StudentClassInfoModel
+    func getChildClassInfo()-> Array<StudentClassInfoModel> {
+        var array = Array<StudentClassInfoModel>()
+        let dic = Setting.getUserInfo()?.dictionary
+        let data = dic!["data"]?.dictionary
+        let studentArr = data!["studentClass"]?.arrayValue
+        for i in 0..<studentArr!.count {
+            let studentDic = studentArr![i].dictionary
+            if let value = studentDic {
+                let model = StudentClassInfoModel.deserialize(from: value)
+                array.append(model!)
+            }
+        }
+        return array
+    }
+    
+    
     func setTokenInfo(tokenInfo:JSON?){
         if let info=tokenInfo{
             token="Bearer "+info["access_token"].stringValue
@@ -182,3 +216,40 @@ class AccountManager: NSObject {
         })
     }
 }
+
+import HandyJSON
+class UserInfoModel: HandyJSON {
+    var parentId = Int()
+    var name = String()
+    var bindSchoolFlag = Bool()
+    var mobile = String()
+    var image = String()
+    var userid = String()
+    var sex = Int()
+    required init(){}
+}
+class StudentClassInfoModel: HandyJSON {
+    
+    var photo = String()
+    var cityName = String()
+    var cardNumber = String()
+    var classId = Int()
+    var grade = Int()
+    var studentName = String()
+    var studentCode = String()
+    var parentId = Int()
+    var className = String()
+    var areaName = String()
+    var gradename = String()
+    var count = Int()
+    var schollId = Int()
+    var schoolName = String()
+    var studentUserId = String()
+    var studentId = Int()
+    var parentMobile = Int()
+    var sex = Int()
+    
+    required init(){}
+}
+
+
--
libgit2 0.21.0