yangguanglei 5 years ago
parent
commit
a87e65dac9

BIN
ZhongJingLianMeng.xcworkspace/xcuserdata/vindesel.xcuserdatad/UserInterfaceState.xcuserstate


+ 1 - 0
ZhongJingLianMeng/main/activity(活动)/eventActivityVController.m

@@ -317,6 +317,7 @@
         }else if ([response[@"activityOrder"][@"orderStatus"] isEqualToString:@"2"]){
             
             MyActivityController *control = [[MyActivityController alloc] init];
+            control.isType = @"1";
             [self.navigationController pushViewController:control animated:YES];
         }
         

+ 1 - 1
ZhongJingLianMeng/main/me(我的)/controller/MyActivityController.h

@@ -9,5 +9,5 @@
 #import <UIKit/UIKit.h>
 
 @interface MyActivityController : UIViewController
-
+@property(nonatomic,strong)NSString *isType;
 @end

+ 9 - 1
ZhongJingLianMeng/main/me(我的)/controller/MyActivityController.m

@@ -63,7 +63,15 @@
     [self.navigationView setNavigationBackgroundColor:[UIColor colorWithHexValue:0x3C915C]];
     [self.navigationView removeAllLeftButton];
     [self.navigationView addLeftButtonWithImage:[UIImage imageNamed:@"whiteBack"] clickCallBack:^(UIView *view) {
-        [weakSelf.navigationController popViewControllerAnimated:YES];
+        if ([weakSelf.isType isEqualToString:@"1"]) {
+            
+            UIViewController *viewCtl = weakSelf.navigationController.viewControllers[0];
+            
+            [weakSelf.navigationController popToViewController:viewCtl animated:YES];
+        }else{
+            [weakSelf.navigationController popViewControllerAnimated:YES];
+            
+        }
     }];
     [self.navigationView setTitle:@"我的活动"];
     self.navigationView.titleLabel.textColor=[UIColor whiteColor];