Merge branch 'master' of ssh://10.10.100.21/source/UUEnt

UU_Ent/UU_Ent/Modules/Base/YRBaseNav.m

@@ -18,8 +18,6 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     
-    [self present];
-    
     
 }
 
@@ -30,29 +28,8 @@
     
 }
 
--(void)present{
-    
-    if (self.presentedViewController) {
-        
-        UIBarButtonItem *leftItem = [[UIBarButtonItem alloc]initWithBarButtonSystemItem:UIBarButtonSystemItemStop target:self action:@selector(backAction)];
-        
-        leftItem.tintColor = [UIColor whiteColor];
-        
-        self.navigationItem.leftBarButtonItems = @[leftItem];
-        
-    }
-    
-}
 
--(void)backAction{
-    
-    if (self.presentedViewController) {
-        
-        [self dismissViewControllerAnimated:YES completion:nil];
-        
-    }
-    
-}
+
 
 
 -(void)pushViewController:(UIViewController *)viewController animated:(BOOL)animated{

UU_Ent/UU_Ent/Modules/Base/YRBaseVC.m

@@ -18,14 +18,37 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.view.backgroundColor = RGB(242, 242, 242, 1);
+    //处理present的页面
+    [self present];
     [self setUpUI];
 }
 
 
--(void)setUpUI{
+-(void)setUpUI{}
+
+-(void)present{
+    
+    if (self.presentingViewController) {
+        
+        UIBarButtonItem *leftItem = [[UIBarButtonItem alloc]initWithBarButtonSystemItem:UIBarButtonSystemItemStop target:self action:@selector(backAction)];
+        
+        leftItem.tintColor = [UIColor blueColor];
+        
+        self.navigationItem.leftBarButtonItems = @[leftItem];
+        
+    }
     
 }
 
+-(void)backAction{
+    
+    if (self.presentingViewController) {
+        
+        [self dismissViewControllerAnimated:YES completion:nil];
+        
+    }
+    
+}
 
 -(void)setParamDic:(NSDictionary *)paramDic{
     

UU_Ent/UU_Ent/Modules/Login/Main/Controllers/YRLoginVC.m

@@ -53,7 +53,6 @@
         
         [MBProgressHUD hideHUDForView:self.view animated:YES];
 
-        
         if (response.responseHeader.success) {
 
         [YRUserInfo shareManager].masChanged = YES;

UU_Ent/UU_Ent/Modules/Login/Main/Controllers/YRRegisterVC.m

@@ -27,7 +27,7 @@
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     self.title = @"个人注册";
-    self.view.backgroundColor = [UIColor whiteColor];
+    
 }
 
 #pragma mark --- 注册操作