Commit b5e272003e2031fea160b6e8ac02bb65a6ee95fb

Authored by 葛建军
2 parents a414eb79 a367c9ba
Exists in parentassistant

Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan…

…t into parentassistant

* 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistant:
  no message
ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
@@ -172,6 +172,12 @@ class InformationViewController: UIViewController,UISearchBarDelegate { @@ -172,6 +172,12 @@ class InformationViewController: UIViewController,UISearchBarDelegate {
172 override func viewWillAppear(_ animated: Bool) { 172 override func viewWillAppear(_ animated: Bool) {
173 super.viewWillAppear(animated) 173 super.viewWillAppear(animated)
174 getData() 174 getData()
  175 + if isFirstviewController{
  176 + leftLabel.text = AccountManager.shared.address
  177 + }else{
  178 +
  179 + }
  180 +
175 } 181 }
176 override func didReceiveMemoryWarning() { 182 override func didReceiveMemoryWarning() {
177 super.didReceiveMemoryWarning() 183 super.didReceiveMemoryWarning()
ParentAssistant/ParentAssistant/Classes/controllers/evaluation/EvaluationViewController.swift
@@ -219,6 +219,7 @@ class EvaluationViewController: UIViewController,CLLocationManagerDelegate,Selec @@ -219,6 +219,7 @@ class EvaluationViewController: UIViewController,CLLocationManagerDelegate,Selec
219 override func viewWillAppear(_ animated: Bool) { 219 override func viewWillAppear(_ animated: Bool) {
220 super.viewWillAppear(animated) 220 super.viewWillAppear(animated)
221 self.getData() 221 self.getData()
  222 + leftLabel.text = AccountManager.shared.address
222 } 223 }
223 override func didReceiveMemoryWarning() { 224 override func didReceiveMemoryWarning() {
224 super.didReceiveMemoryWarning() 225 super.didReceiveMemoryWarning()
ParentAssistant/ParentAssistant/Classes/controllers/userCenter/BaseCityChooseSchoolViewController.swift
@@ -161,7 +161,10 @@ class BaseCityChooseSchoolViewController: UIViewController,UISearchBarDelegate { @@ -161,7 +161,10 @@ class BaseCityChooseSchoolViewController: UIViewController,UISearchBarDelegate {
161 self.getData() 161 self.getData()
162 } 162 }
163 163
164 - 164 + override func viewWillAppear(_ animated: Bool) {
  165 + super.viewWillAppear(animated)
  166 + citySelectbtn.text = AccountManager.shared.address
  167 + }
165 /* 168 /*
166 // MARK: - Navigation 169 // MARK: - Navigation
167 170