公告添加segement

redstar.xcodeproj/project.pbxproj

@@ -52,6 +52,7 @@
 		84A673881C0B50B4000F828E /* OnLineCompleteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84A673871C0B50B4000F828E /* OnLineCompleteViewController.m */; };
 		84A6738B1C0B54A6000F828E /* OnLineCompleteHeadView.m in Sources */ = {isa = PBXBuildFile; fileRef = 84A6738A1C0B54A6000F828E /* OnLineCompleteHeadView.m */; };
 		84A6738E1C0BE2D0000F828E /* OnLineCompleteCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 84A6738D1C0BE2D0000F828E /* OnLineCompleteCell.m */; };
+		84A673911C0C2681000F828E /* FunctionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84A673901C0C2681000F828E /* FunctionViewController.m */; };
 		84AD4F201BF425AC00BFB37C /* InspectDetailView.m in Sources */ = {isa = PBXBuildFile; fileRef = 84AD4F1F1BF425AC00BFB37C /* InspectDetailView.m */; };
 		84AD4F221BF42F8E00BFB37C /* classfiy.plist in Resources */ = {isa = PBXBuildFile; fileRef = 84AD4F211BF42F8E00BFB37C /* classfiy.plist */; };
 		84AD4F261BF4356A00BFB37C /* TaskModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 84AD4F251BF4356A00BFB37C /* TaskModel.m */; };
@@ -109,7 +110,6 @@
 		84F57C9C1BECA73800DDEEB1 /* StarBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 84F57C9B1BECA73800DDEEB1 /* StarBar.m */; };
 		84FAC7611BFF2C6E00FD094D /* NoDataView.m in Sources */ = {isa = PBXBuildFile; fileRef = 84FAC7601BFF2C6E00FD094D /* NoDataView.m */; };
 		84FD89F21BD9FC71006E442A /* HomeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84FD89F11BD9FC71006E442A /* HomeViewController.m */; };
-		84FD8A071BDA01C4006E442A /* ChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84FD8A061BDA01C4006E442A /* ChartViewController.m */; };
 		84FD8A0A1BDA01D1006E442A /* MineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84FD8A091BDA01D1006E442A /* MineViewController.m */; };
 /* End PBXBuildFile section */
 
@@ -225,6 +225,8 @@
 		84A6738A1C0B54A6000F828E /* OnLineCompleteHeadView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OnLineCompleteHeadView.m; sourceTree = "<group>"; };
 		84A6738C1C0BE2D0000F828E /* OnLineCompleteCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OnLineCompleteCell.h; sourceTree = "<group>"; };
 		84A6738D1C0BE2D0000F828E /* OnLineCompleteCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OnLineCompleteCell.m; sourceTree = "<group>"; };
+		84A6738F1C0C2681000F828E /* FunctionViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FunctionViewController.h; sourceTree = "<group>"; };
+		84A673901C0C2681000F828E /* FunctionViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FunctionViewController.m; sourceTree = "<group>"; };
 		84AD4F1E1BF425AC00BFB37C /* InspectDetailView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectDetailView.h; sourceTree = "<group>"; };
 		84AD4F1F1BF425AC00BFB37C /* InspectDetailView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InspectDetailView.m; sourceTree = "<group>"; };
 		84AD4F211BF42F8E00BFB37C /* classfiy.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = classfiy.plist; sourceTree = "<group>"; };
@@ -338,8 +340,6 @@
 		84FAC7601BFF2C6E00FD094D /* NoDataView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NoDataView.m; sourceTree = "<group>"; };
 		84FD89F01BD9FC71006E442A /* HomeViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HomeViewController.h; sourceTree = "<group>"; };
 		84FD89F11BD9FC71006E442A /* HomeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HomeViewController.m; sourceTree = "<group>"; };
-		84FD8A051BDA01C4006E442A /* ChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChartViewController.h; sourceTree = "<group>"; };
-		84FD8A061BDA01C4006E442A /* ChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChartViewController.m; sourceTree = "<group>"; };
 		84FD8A081BDA01D1006E442A /* MineViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MineViewController.h; sourceTree = "<group>"; };
 		84FD8A091BDA01D1006E442A /* MineViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MineViewController.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -467,6 +467,8 @@
 				8426A4AA1BDF0CD600E5FDF5 /* Question */,
 				8426A4AD1BDF0CD600E5FDF5 /* Standard */,
 				8426A4B01BDF0CD600E5FDF5 /* WordOfMouth */,
+				84A6738F1C0C2681000F828E /* FunctionViewController.h */,
+				84A673901C0C2681000F828E /* FunctionViewController.m */,
 			);
 			path = Function;
 			sourceTree = "<group>";
@@ -988,7 +990,6 @@
 				841D24F51BEB473B0005CC9F /* Check */,
 				8426A4A01BDF0CD600E5FDF5 /* Function */,
 				84C957501BDB54BB00083584 /* Announce */,
-				84FD89F31BDA0136006E442A /* Chart */,
 				84FD89F81BDA0136006E442A /* Mine */,
 				84FD89ED1BD9FC5B006E442A /* Home */,
 				84970E2E1BD8E04000C1728A /* Login */,
@@ -1574,31 +1575,6 @@
 			path = ViewController;
 			sourceTree = "<group>";
 		};
-		84FD89F31BDA0136006E442A /* Chart */ = {
-			isa = PBXGroup;
-			children = (
-				84FD89F41BDA0136006E442A /* View */,
-				84FD89F51BDA0136006E442A /* ViewController */,
-			);
-			path = Chart;
-			sourceTree = "<group>";
-		};
-		84FD89F41BDA0136006E442A /* View */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = View;
-			sourceTree = "<group>";
-		};
-		84FD89F51BDA0136006E442A /* ViewController */ = {
-			isa = PBXGroup;
-			children = (
-				84FD8A051BDA01C4006E442A /* ChartViewController.h */,
-				84FD8A061BDA01C4006E442A /* ChartViewController.m */,
-			);
-			path = ViewController;
-			sourceTree = "<group>";
-		};
 		84FD89F81BDA0136006E442A /* Mine */ = {
 			isa = PBXGroup;
 			children = (
@@ -1831,7 +1807,6 @@
 				84AD4F3A1BF4844600BFB37C /* RankDetailHeaderView.m in Sources */,
 				8490C4D41BF9DEF0006B6569 /* PictureViewController.m in Sources */,
 				8474C5951BE78AE1007DCF19 /* QuestionDetailViewController.m in Sources */,
-				84FD8A071BDA01C4006E442A /* ChartViewController.m in Sources */,
 				84970DEF1BD8DD8A00C1728A /* main.m in Sources */,
 				84A6738B1C0B54A6000F828E /* OnLineCompleteHeadView.m in Sources */,
 				8474A01C1BE368D700315F30 /* HomeCellItem.m in Sources */,
@@ -1878,6 +1853,7 @@
 				84ECCF181C01FA2600EA4960 /* QuestionDetailModel.m in Sources */,
 				843D1B9E1C0B3F7600E30002 /* SpotCheckOnLineViewController.m in Sources */,
 				84846E9A1BE07CDF0010550A /* RankingListCell.m in Sources */,
+				84A673911C0C2681000F828E /* FunctionViewController.m in Sources */,
 				848699B61BDF812F00859DFE /* RankingListViewController.m in Sources */,
 				84D825821BDD35E000CC61F7 /* HomeHeaderView.m in Sources */,
 				84FD89F21BD9FC71006E442A /* HomeViewController.m in Sources */,

redstar/Classes/AppDelegate/RootTabBarController.m

@@ -10,7 +10,7 @@
 
 #import "HomeViewController.h"
 #import "AnnounceViewController.h"
-#import "ChartViewController.h"
+#import "FunctionViewController.h"
 #import "MineViewController.h"
 
 #import <AFNetworking.h>
@@ -54,27 +54,27 @@
     [homeNav.navigationBar setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIColor whiteColor],NSForegroundColorAttributeName,nil]];
     
     
-    AnnounceViewController *announce = (AnnounceViewController *)[self setUpOneChildViewController:[[AnnounceViewController alloc] init] title:@"功能" imageName:@"function_uncheck" selImageName:@"function_check"];
-    // 添加nav
-    UINavigationController *announceNav = [[UINavigationController alloc] initWithRootViewController:announce];
-    [announceNav.navigationBar setBarTintColor:kNavigationBarColor];
-    [announceNav.navigationBar setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIColor whiteColor],NSForegroundColorAttributeName,nil]];
+    FunctionViewController *function = (FunctionViewController *)[self setUpOneChildViewController:[[FunctionViewController alloc] init] title:@"功能" imageName:@"function_uncheck" selImageName:@"function_check"];
+    UINavigationController *functionNav = [[UINavigationController alloc] initWithRootViewController:function];
+    [functionNav.navigationBar setBarTintColor:kNavigationBarColor];
+    [functionNav.navigationBar setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIColor whiteColor],NSForegroundColorAttributeName,nil]];
     
-    ChartViewController *chart = (ChartViewController *)[self setUpOneChildViewController:[[ChartViewController alloc] init] title:@"报表查询" imageName:@"report_unchecked" selImageName:@"report_checked"];
-    UINavigationController *chartNav = [[UINavigationController alloc] initWithRootViewController:chart];
-    [chartNav.navigationBar setBarTintColor:kNavigationBarColor];
-    [chartNav.navigationBar setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIColor whiteColor],NSForegroundColorAttributeName,nil]];
+    AnnounceViewController *announce = (AnnounceViewController *)[self setUpOneChildViewController:[[AnnounceViewController alloc] init] title:@"公告" imageName:@"notice_unchecked" selImageName:@"notice_checked"];
+    announce.tabBarItem.tag = 3928;
+//    // 添加nav
+//    UINavigationController *announceNav = [[UINavigationController alloc] initWithRootViewController:announce];
+//    [announceNav.navigationBar setBarTintColor:kNavigationBarColor];
+//    [announceNav.navigationBar setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIColor whiteColor],NSForegroundColorAttributeName,nil]];
     
     MineViewController *mine = (MineViewController *)[self setUpOneChildViewController:[[MineViewController alloc] init] title:@"我的" imageName:@"aboutme_unchecked" selImageName:@"aboutme_checke"];
-    UINavigationController *mineNav = [[UINavigationController alloc] initWithRootViewController:mine];
-    [mineNav.navigationBar setBarTintColor:kNavigationBarColor];
-    [mineNav.navigationBar setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIColor whiteColor],NSForegroundColorAttributeName,nil]];
+    mine.tabBarItem.tag = 18274;
+    
     
     [[UITabBarItem appearance] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:
                                                        kNavigationBarColor, NSForegroundColorAttributeName,
                                                        nil] forState:UIControlStateSelected];
 
-    self.viewControllers = @[homeNav, announceNav, chartNav, mineNav];
+    self.viewControllers = @[homeNav, functionNav, announce, mine];
 }
 
 
@@ -95,26 +95,24 @@
 }
 
 #pragma mark - UITabBarController Delegate
-//
-//- (BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectViewController:(UIViewController *)viewController {
-//    NSLog(@"shouldSelectViewController  %@", tabBarController.selectedViewController);
-//    if (viewController.tabBarItem.tag == 30001) {
-//        [((UINavigationController *)tabBarController.selectedViewController) pushViewController:viewController animated:YES];
-//        return NO;
-//    }
-//    return YES;
-//}
-
-//- (void)tabBarController:(UITabBarController *)tabBarController didSelectViewController:(UIViewController *)viewController
-//{
-//    if ([viewController isKindOfClass:[MineViewController class]]) {
-//        MineViewController *mine = [[MineViewController alloc] init];
-//        mine.tabBarItem.title= @"我的";
-//        mine.tabBarItem.image = [UIImage imageNamed:@"aboutme_unchecked"];
-//        mine.tabBarItem.selectedImage = [[UIImage imageNamed:@"aboutme_checke"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
-//        [((UINavigationController *)tabBarController.selectedViewController) pushViewController:mine animated:YES];
-//    }
-//}
+
+- (BOOL)tabBarController:(UITabBarController *)tabBarController shouldSelectViewController:(UIViewController *)viewController {
+    if (viewController.tabBarItem.tag == 18274) {
+        MineViewController *vc = (MineViewController *)[self setUpOneChildViewController:[[MineViewController alloc] init] title:@"我的" imageName:@"aboutme_unchecked" selImageName:@"aboutme_checke"];
+        vc.hidesBottomBarWhenPushed = YES;
+        [((UINavigationController *)tabBarController.selectedViewController) pushViewController:vc animated:YES];
+        
+        return NO;
+    } else if (viewController.tabBarItem.tag == 3928) {
+        AnnounceViewController *announce = (AnnounceViewController *)[self setUpOneChildViewController:[[AnnounceViewController alloc] init] title:@"公告" imageName:@"notice_unchecked" selImageName:@"notice_checked"];
+        announce.hidesBottomBarWhenPushed = YES;
+        [((UINavigationController *)tabBarController.selectedViewController) pushViewController:announce animated:YES];
+        return NO;
+    }
+    
+    
+    return YES;
+}
 
 
 @end

redstar/Classes/Module/Announce/ViewController/AnnounceViewController.h

@@ -7,14 +7,8 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "FuncItem.h"
 
 @interface AnnounceViewController : UIViewController
-@property (nonatomic, strong) FuncItem *onLineSamplingBtn;  // 在线抽查按钮
-@property (nonatomic, strong) FuncItem *wordOfMouthBtn;  // 口碑按钮
-@property (nonatomic, strong) FuncItem *standardBtn;  // 口碑标准按钮
-@property (nonatomic, strong) FuncItem *pictureBtn;  // 图说口碑按钮
-@property (nonatomic, strong) FuncItem *questionBtn;  // 问题与知识按钮
-@property (nonatomic, strong) FuncItem *rankBtn;  // 口碑排名按钮
+
 
 @end

redstar/Classes/Module/Chart/ViewController/ChartViewController.h

-//
-//  ChartViewController.h
-//  redstar
-//
-//  Created by admin on 15/10/23.
-//  Copyright © 2015年 ZWF. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-@interface ChartViewController : UIViewController
-
-@end

redstar/Classes/Module/Chart/ViewController/ChartViewController.m

-//
-//  ChartViewController.m
-//  redstar
-//
-//  Created by admin on 15/10/23.
-//  Copyright © 2015年 ZWF. All rights reserved.
-//
-
-#import "ChartViewController.h"
-
-@interface ChartViewController ()
-@property (nonatomic, strong) UILabel *remindLabel;
-@end
-
-@implementation ChartViewController
-#pragma mark - ViewDidLoad
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    
-    UILabel *customLab = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 40, 30)];
-    [customLab setTextColor:[UIColor whiteColor]];
-    [customLab setText:@"报表查询"];
-    customLab.font = [UIFont boldSystemFontOfSize:19];
-    self.navigationItem.titleView = customLab;
-    
-    self.remindLabel.text = @"暂不开放该功能，待二期研发";
-}
-
-#pragma mark - lazy Loading
-- (UILabel *)remindLabel
-{
-    if (!_remindLabel) {
-        _remindLabel = [[UILabel alloc] init];
-    }
-    _remindLabel.translatesAutoresizingMaskIntoConstraints = NO;
-    _remindLabel.font = [UIFont systemFontOfSize:40.0];
-    _remindLabel.minimumScaleFactor = .5f;
-    _remindLabel.textAlignment = NSTextAlignmentCenter;
-    _remindLabel.adjustsFontSizeToFitWidth = YES;
-    _remindLabel.textColor = kRemindTextColor;
-    [self.view addSubview:_remindLabel];
-    
-    // 顶端
-    NSLayoutConstraint *remindTop = [NSLayoutConstraint constraintWithItem:_remindLabel attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeTop multiplier:1.0 constant:230];
-    [self.view addConstraint:remindTop];
-    
-    // 左边
-    NSLayoutConstraint *remindLeft = [NSLayoutConstraint constraintWithItem:_remindLabel attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeLeft multiplier:1.0 constant:30];
-    [self.view addConstraint:remindLeft];
-    
-    // 右边
-    NSLayoutConstraint *remindRight = [NSLayoutConstraint constraintWithItem:_remindLabel attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.view attribute:NSLayoutAttributeRight multiplier:1.0 constant:-30];
-    [self.view addConstraint:remindRight];
-    
-    // 高度
-    NSLayoutConstraint *remindHeight = [NSLayoutConstraint constraintWithItem:_remindLabel attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:60];
-    [_remindLabel addConstraint:remindHeight];
-    
-    return _remindLabel;
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-@end

redstar/Classes/Module/Function/FunctionViewController.h

+//
+//  FunctionViewController.h
+//  redstar
+//
+//  Created by admin on 15/11/30.
+//  Copyright © 2015年 ZWF. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "FuncItem.h"
+
+@interface FunctionViewController : UIViewController
+@property (nonatomic, strong) FuncItem *onLineSamplingBtn;  // 在线抽查按钮
+@property (nonatomic, strong) FuncItem *wordOfMouthBtn;  // 口碑按钮
+@property (nonatomic, strong) FuncItem *standardBtn;  // 口碑标准按钮
+@property (nonatomic, strong) FuncItem *pictureBtn;  // 图说口碑按钮
+@property (nonatomic, strong) FuncItem *questionBtn;  // 问题与知识按钮
+@property (nonatomic, strong) FuncItem *rankBtn;  // 口碑排名按钮
+@end

redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectTask/Model/TaskModel.h

@@ -27,7 +27,7 @@
 @property (nonatomic, copy) NSString *uuid;
 @property (nonatomic, copy) NSString *weight;
 @property (nonatomic, copy) NSString *originScore;
-
+@property (nonatomic, copy) NSString *readonlyType;
 + (instancetype)taskModelWithDict:(NSDictionary *)dict;
 - (instancetype)initWithDict:(NSDictionary *)dict;
 @end

redstar/Classes/Module/Home/ViewController/HomeViewController.m

@@ -208,9 +208,9 @@
     // 请求地址
     NSString *urlStr = [NSString stringWithFormat:@"%@%@", kRedStarURL, kQuestionListURL];
     NSString *user_uuid = [[NSUserDefaults standardUserDefaults] objectForKey:@"user_uuid"];
+    NSLog(@"useruuid= %@", user_uuid);
     // 请求参数
-    NSDictionary *parameters = @{
-                                 @"user":user_uuid,
+    NSDictionary *parameters = @{@"user":user_uuid,
                                  @"scope":@"all",
                                  @"pageNumber":@(0),
                                  @"pageSize":@(2)

redstar/Classes/Module/Login/ViewController/LoginViewController.m

@@ -165,8 +165,6 @@
  */
 - (void)loginButtonClick:(UIButton *)sender
 {
-    self.rootTBC = [[RootTabBarController alloc] init];
-    [self presentViewController:_rootTBC animated:YES completion:nil];
     
     if (self.loginView.usernameTextFiled.text.length == 0 || self.loginView.passwordTextFiled.text.length == 0) {
         UIAlertView *alertView = [[UIAlertView alloc] initWithTitle:@"提示" message:@"账号、密码不能为空" delegate:nil cancelButtonTitle:@"确定" otherButtonTitles:nil, nil];

redstar/Classes/Module/Mine/ViewController/MineViewController.m

@@ -33,13 +33,13 @@
     [customLab setText:@"我的"];
     customLab.font = [UIFont boldSystemFontOfSize:19];
     self.navigationItem.titleView = customLab;
-//    
-//    UIButton *backBtn = [UIButton buttonWithType:UIButtonTypeCustom];
-//    backBtn.frame = CGRectMake(0, 0, 30, 44);
-//    [backBtn setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal];
-//    [backBtn addTarget:self action:@selector(doBack:) forControlEvents:UIControlEventTouchUpInside];
-//    UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithCustomView:backBtn];
-//    self.navigationItem.leftBarButtonItem = backItem;
+    
+    UIButton *backBtn = [UIButton buttonWithType:UIButtonTypeCustom];
+    backBtn.frame = CGRectMake(0, 0, 30, 44);
+    [backBtn setImage:[UIImage imageNamed:@"back_btn"] forState:UIControlStateNormal];
+    [backBtn addTarget:self action:@selector(doBack:) forControlEvents:UIControlEventTouchUpInside];
+    UIBarButtonItem *backItem = [[UIBarButtonItem alloc] initWithCustomView:backBtn];
+    self.navigationItem.leftBarButtonItem = backItem;
     
     
     
@@ -57,13 +57,21 @@
     // Dispose of any resources that can be recreated.
 }
 
+- (void)viewWillAppear:(BOOL)animated
+{
+    [super viewWillAppear:animated];
+    
+    self.navigationController.navigationBar.hidden = NO;
+    self.tabBarController.tabBar.hidden = YES;
+    
+}
 
 #pragma mark - Prative Methods
 
 // 返回上一页面
 - (void)doBack:(UIBarButtonItem *)sender
 {
-    [self dismissViewControllerAnimated:YES completion:nil];
+    [self.navigationController popToViewController:[self.navigationController.viewControllers objectAtIndex:0] animated:YES];
 }
 
 - (void)setupTableView