diff --git a/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate b/ParentAssistant/ParentAssistant.xcworkspace/xcuserdata/caoyang.xcuserdatad/UserInterfaceState.xcuserstate index 30a48ac..f1ae25c 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..e3aef6e 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,69 @@ stopOnStyle = "0"> + + + + + + + + + + + + + + diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift index 4082d4d..fb0f750 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/GrowViewController.swift @@ -117,10 +117,11 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { if array.isEmpty { title = "未绑定" }else{ - title = array[0].studentName let index = UserDefaults.standard.value(forKey: "SELECT_CHILDREN") as? Int if index == nil { UserDefaults.standard.set(0, forKey: "SELECT_CHILDREN") + }else{ + title = array[index!].studentName } } }else{ @@ -184,6 +185,7 @@ class GrowViewController: UIViewController,UIScrollViewDelegate { view.AlertBlock = { index in //MARK:缓存孩子索引 UserDefaults.standard.set(index, forKey: "SELECT_CHILDREN") + self.titleLeftLab.text = arr[index].studentName } }else{ let alertView = UIAlertController.init(title: "提示", message: "您尚未绑定孩子信息,是否前往绑定?", preferredStyle: UIAlertControllerStyle.alert) diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift index 77d27ad..51a2799 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/Grow/Program/ProgramCardViewController.swift @@ -51,6 +51,10 @@ class ProgramCardViewController: UIViewController,UITextFieldDelegate { let isSuccess = JSON.fromString(backData)!["data"].boolValue if isSuccess{ self.view.makeToast("补卡成功!", duration: 2, position: self.view.center) + let mobile = UserDefaults.standard.value(forKey: "user_phone") as! String + AccountManager.shared.refreshUserInfo(mobile, completionHandler: { (isScess) in + + }) }else{ self.view.makeToast("补卡失败!", duration: 2, position: self.view.center) } diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/Login/LoginViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/Login/LoginViewController.swift index 7ca044e..5188a96 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/Login/LoginViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/Login/LoginViewController.swift @@ -123,9 +123,6 @@ class LoginViewController: UITableViewController,UITextFieldDelegate { self.gotoLoginAction() }else{ appDelegate.window?.makeToast("账号未注册") -// if let message = JSON.fromString(backData)!["message"].string{ -// appDelegate.window?.makeToast(message, duration: 1, position: nil) -// } } } } diff --git a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift index a6e0e85..f1c524f 100644 --- a/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift +++ b/ParentAssistant/ParentAssistant/Classes/controllers/my/Controller/MyViewController.swift @@ -224,17 +224,13 @@ extension MyViewController: UITableViewDelegate,UITableViewDataSource{ }else{ appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter) } - case 3://我的孩子 - - let vc = BindlingSuccessViewController() - self.navigationController?.pushViewController(vc, animated: true) - -// if AccountManager.shared.isOnline() { -// let vc = Story.instantiateViewControllerWithIdentifier("MyChildrenViewController", storyName: "My") as! MyChildrenViewController -// self.navigationController?.pushViewController(vc, animated: true) -// }else{ -// appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter) -// } + case 3://我的孩子 + if AccountManager.shared.isOnline() { + let vc = Story.instantiateViewControllerWithIdentifier("MyChildrenViewController", storyName: "My") as! MyChildrenViewController + self.navigationController?.pushViewController(vc, animated: true) + }else{ + appDelegate.window!.makeToast("请先登录", duration: 1, position: CSToastPositionCenter) + } case 5://意见与反馈 let vcs = Story.instantiateViewControllerWithIdentifier("JSViewController", storyName: "JS") as! JSViewController vcs.webURL = HOSTWAP+"/FeedBack.aspx?userid=\(AccountManager.shared.userid)" -- libgit2 0.21.0