Ver Fonte

1.我的界面

time há 6 anos atrás
pai
commit
01e12ade39

+ 4 - 0
UU_Ent/UU_Ent/Modules/Login/Main/Others/YRLoginManager.m

@@ -116,6 +116,8 @@
                 //登录成功之后默认设置为自动登录
                 //登录成功之后默认设置为自动登录
                 [YRUserInfo shareManager].autoLogin = YES;
                 [YRUserInfo shareManager].autoLogin = YES;
                 
                 
+                [YRUserInfo shareManager].userCompanyInfo = resDic;
+                
                 [YRUserInfo shareManager].currCompanyInfo = response.companyArray[0].mj_keyValues;
                 [YRUserInfo shareManager].currCompanyInfo = response.companyArray[0].mj_keyValues;
                 
                 
                 [YRUserInfo shareManager].lastCompanyInfo = response.companyArray[0].mj_keyValues;
                 [YRUserInfo shareManager].lastCompanyInfo = response.companyArray[0].mj_keyValues;
@@ -215,6 +217,8 @@
         
         
         if (response.responseHeader.success) {
         if (response.responseHeader.success) {
             
             
+            [YRUserInfo shareManager].autoLogin = NO;
+            
             if (success) {
             if (success) {
                 
                 
                 success(response);
                 success(response);

+ 2 - 2
UU_Ent/UU_Ent/Modules/Mine/Child/Controllers/YRSettingVC.m

@@ -28,7 +28,7 @@ static NSString *cellID = @"cellID";
 }
 }
 
 
 #pragma mark --- 退出登录
 #pragma mark --- 退出登录
--(void)LoggingOutAction
+-(void)logoutAction
 {
 {
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     [MBProgressHUD showHUDAddedTo:self.view animated:YES];
     
     
@@ -132,7 +132,7 @@ static NSString *cellID = @"cellID";
         
         
         [footerView addSubview:btn];
         [footerView addSubview:btn];
         
         
-        [btn addTarget:self action:@selector(LoggingOutAction) forControlEvents:UIControlEventTouchUpInside];
+        [btn addTarget:self action:@selector(logoutAction) forControlEvents:UIControlEventTouchUpInside];
         
         
         return footerView;
         return footerView;
     }
     }

+ 7 - 1
UU_Ent/UU_Ent/Modules/Work/Main/Controllers/YRWorkVC.m

@@ -130,7 +130,7 @@
 -(void)viewWillAppear:(BOOL)animated{
 -(void)viewWillAppear:(BOOL)animated{
     [super viewWillAppear:animated];
     [super viewWillAppear:animated];
    
    
-  
+    //适应子页侧滑返回效果
     if ([YRUserInfo shareManager].isSubWork) {
     if ([YRUserInfo shareManager].isSubWork) {
         
         
         [self.navigationController setNavigationBarHidden:YES animated:YES];
         [self.navigationController setNavigationBarHidden:YES animated:YES];
@@ -169,6 +169,12 @@
     
     
     if ([YRUserInfo shareManager].masChanged) {
     if ([YRUserInfo shareManager].masChanged) {
         
         
+        NSString *title = [NSString stringWithFormat:@"%@",[YRUserInfo shareManager].lastCompanyInfo[@"name"]];
+        
+        title = title.length != 0?title:@"工作";
+        
+        self.titleLabel.text = title;
+        
         NSDictionary *comDic = [YRUserInfo shareManager].userCompanyInfo;
         NSDictionary *comDic = [YRUserInfo shareManager].userCompanyInfo;
         
         
         if (comDic) {
         if (comDic) {