结束

XFFruit/Controllers/HTTPController/ICRHTTPController.m

@@ -1559,7 +1559,7 @@ acceptTypeJson:YES
     };
     NSString *currentTime = [[NSDate date] httpParameterString];
     ICRUserUtil *userUtil = [ICRUserUtil sharedInstance];
-    NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_SurveyFinish] stringByAppendingFormat:@"/%@?version=%@time=%@&operId=%@&operName=%@",uuid,version,currentTime,userUtil.userCode,userUtil.displayName];
+    NSString *urlStr = [[[self class] UrlForPluginHTTPAction:XFFHttp_SurveyFinish] stringByAppendingFormat:@"/%@?version=%@&time=%@&operId=%@&operName=%@",uuid,version,currentTime,userUtil.userCode,userUtil.displayName];
     NSString *encodeUrlStr = [urlStr stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     [self POST:encodeUrlStr
    parameters:nil

XFFruit/ViewControllers/Survey/Views/SurveyResultCell.m

@@ -68,6 +68,7 @@
 }
 
 - (void)setSurveyResult:(SurveyResult *)surveyResult{
+    //
     [self.imageBtn setBackgroundImage:[UIImage imageNamed:@"no_image_default"] forState:UIControlStateNormal];
     self.userNameLabel.text = [NSString stringWithFormat:@"反馈人：%@[%@]",surveyResult.userName,surveyResult.feedbackTime];
     self.placeLabel.text = [NSString stringWithFormat:@"产地：%@",surveyResult.place];

XFFruit/ViewControllers/Survey/controllers/NewSurveyViewController.h

@@ -12,5 +12,5 @@
 
 @interface NewSurveyViewController : ICRBaseViewController
 @property (nonatomic,strong)Survey *survey;
-
+@property (nonatomic,strong)NSString *navTitle;
 @end

XFFruit/ViewControllers/Survey/controllers/NewSurveyViewController.m

@@ -60,7 +60,7 @@ typedef enum : NSUInteger {
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    self.title = @"新建行情调研";
+    self.title = self.navTitle;
     [self initData];
     [self createTableView];    
 }
@@ -144,7 +144,10 @@ typedef enum : NSUInteger {
                 //成功
                 [IBTLoadingView showTips:@"操作成功"];
                 [self clearAllInformation];
-
+                if (self.survey) {
+                    [ICRUserUtil sharedInstance].needFresh = YES;
+                    [self.navigationController popViewControllerAnimated:YES];
+                }
             }else{
                 [IBTLoadingView showTips:message];
             }
@@ -459,9 +462,7 @@ typedef enum : NSUInteger {
 
 - (void)viewWillDisappear:(BOOL)animated{
     [super viewWillDisappear:animated];
-    if (self.survey) {
-        [ICRUserUtil sharedInstance].needFresh = YES;
-    }
+    
 }
 
 - (void)didReceiveMemoryWarning {

XFFruit/ViewControllers/Survey/controllers/SurveyViewController.m

@@ -336,6 +336,7 @@ typedef enum : NSUInteger {
     if ([survey.state isEqualToString:@"initial"]) {
         NewSurveyViewController *nvc = [[NewSurveyViewController alloc]init];
         nvc.survey = survey;
+        nvc.navTitle = @"修改行情调研单";
         [self PushViewController:nvc animated:YES];
         
     }else if([survey.state isEqualToString:@"submitted"] || [survey.state isEqualToString:@"insurvey"]|| [survey.state isEqualToString:@"finished"]){