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

…t into parentassistant * 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistant: no message

Merge branch 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistan…
…t into parentassistant * 'parentassistant' of http://git.shunzhi.net/iosgroup/parentassistant: no message
葛建军
2 parents a414eb79 a367c9ba
Showing 3 changed files with 11 additions and 1 deletions Show diff stats
ParentAssistant/ParentAssistant/Classes/controllers/Information/InformationViewController.swift
ParentAssistant/ParentAssistant/Classes/controllers/evaluation/EvaluationViewController.swift
ParentAssistant/ParentAssistant/Classes/controllers/userCenter/BaseCityChooseSchoolViewController.swift
@@ -172,6 +172,12 @@ class InformationViewController: UIViewController,UISearchBarDelegate {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         getData()
+        if isFirstviewController{
+            leftLabel.text = AccountManager.shared.address
+        }else{
+            
+        }
+
     }
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
@@ -219,6 +219,7 @@ class EvaluationViewController: UIViewController,CLLocationManagerDelegate,Selec
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         self.getData()
+        leftLabel.text = AccountManager.shared.address
     }
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
@@ -161,7 +161,10 @@ class BaseCityChooseSchoolViewController: UIViewController,UISearchBarDelegate {
         self.getData()
     }
  
-    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        citySelectbtn.text = AccountManager.shared.address
+    }
     /*
     // MARK: - Navigation
...	...	@@ -172,6 +172,12 @@ class InformationViewController: UIViewController,UISearchBarDelegate {
172	172	override func viewWillAppear(_ animated: Bool) {
173	173	super.viewWillAppear(animated)
174	174	getData()
	175	+ if isFirstviewController{
	176	+ leftLabel.text = AccountManager.shared.address
	177	+ }else{
	178	+
	179	+ }
	180	+
175	181	}
176	182	override func didReceiveMemoryWarning() {
177	183	super.didReceiveMemoryWarning()
...	...
...	...	@@ -219,6 +219,7 @@ class EvaluationViewController: UIViewController,CLLocationManagerDelegate,Selec
219	219	override func viewWillAppear(_ animated: Bool) {
220	220	super.viewWillAppear(animated)
221	221	self.getData()
	222	+ leftLabel.text = AccountManager.shared.address
222	223	}
223	224	override func didReceiveMemoryWarning() {
224	225	super.didReceiveMemoryWarning()
...	...
...	...	@@ -161,7 +161,10 @@ class BaseCityChooseSchoolViewController: UIViewController,UISearchBarDelegate {
161	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	169	// MARK: - Navigation
167	170
...	...