Merge remote-tracking branch 'origin/master'

ZhongJingLianMeng/main/activity(活动)/activityVController.m

@@ -18,7 +18,8 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     NSMutableArray *viewControllers = [[NSMutableArray alloc] init];
-    
+    [self.navigationView setNavigationBackgroundAlpha:1];
+
     self.view.backgroundColor=[UIColor colorWithHexValue:0x3C915C];
     NSArray *items =[NSArray array];
     items = @[@"活动报名",@"精彩回顾"];

ZhongJingLianMeng/main/alliance(联盟)/allianceVController.m

@@ -71,6 +71,7 @@
     [super viewDidLoad];
     self.view.backgroundColor = [UIColor grayColor];
     [self loadDataAnnotationList];
+    [self.navigationView setNavigationBackgroundAlpha:1];
     [self.navigationView removeAllLeftButton];
     _titleLab = [[UILabel alloc]init];
     _titleLab.frame = CGRectMake(0,0, kGScreenWidth-60, 30);

ZhongJingLianMeng/main/me(我的)/controller/mineViewController.m

@@ -68,6 +68,7 @@
     }else{
         self.scrollViewTop.constant = -20;
     }
+//    [self.navigationView setNavigationBackgroundAlpha:0];
     _headImg.layer.cornerRadius = _headImg.width / 2;
     _headImg.clipsToBounds = YES;
     self.redView.layer.cornerRadius = self.redView.width / 2;