Przeglądaj źródła

Merge branch 'master' of http://101.200.220.49:8001/liuxueli/KDProject

jikaipeng 5 lat temu
rodzic
commit
efd6f48b70

+ 5 - 4
KuDianProject/TOP/Drawer/Control/KDPCollectHistoryPageVC.m

@@ -22,15 +22,16 @@
22 22
 - (void)viewDidLoad {
23 23
     [super viewDidLoad];
24 24
     [self setUpPageVc];
25
-    self.navigationController.navigationBar.barTintColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:SCREEN_WIDTH];
25
+        UIButton *returnBtn =[[UIButton alloc]initWithFrame:CGRectMake(0, KDStatusHeight, 0, 0)];
26
+        [returnBtn setImage:[UIImage imageNamed:@"return_white"] forState:UIControlStateNormal];
27
+        [returnBtn addTarget:self action:@selector(returnClickBtn) forControlEvents:UIControlEventTouchUpInside];
28
+        self.navigationItem.leftBarButtonItem=[[UIBarButtonItem alloc]initWithCustomView:returnBtn]; self.navigationController.navigationBar.barTintColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:SCREEN_WIDTH];
26 29
 }
27 30
 - (void)setUpPageVc{
28 31
     self.navBar.hidden=YES;
29
-    
30 32
     titleArray=@[@"收藏夹",@"浏览记录"];
31 33
     [UIApplication sharedApplication].statusBarStyle=UIStatusBarStyleDefault;
32 34
     
33
-    
34 35
     XLPageViewControllerConfig *config = [[XLPageViewControllerConfig alloc] init];
35 36
     //标题间距
36 37
     config.titleSpace = 25;
@@ -88,7 +89,7 @@
88 89
 }
89 90
 
90 91
 - (void)pageViewController:(XLPageViewController *)pageViewController didSelectedAtIndex:(NSInteger)index{
91
-    NSLog(@"%ld",index);
92
+    NSLog(@"%ld",(long)index);
92 93
 }
93 94
 
94 95
 - (UIViewController *)pageViewController:(XLPageViewController *)pageViewController viewControllerForIndex:(NSInteger)index{

+ 1 - 4
KuDianProject/TOP/Drawer/Control/KDPCollectHistoryVC.m

@@ -22,10 +22,7 @@
22 22
     [super viewDidLoad];
23 23
     self.page_num = 1;
24 24
     [self setNavUI];
25
-    UIButton *returnBtn =[[UIButton alloc]initWithFrame:CGRectMake(0, KDStatusHeight, 0, 0)];
26
-    [returnBtn setImage:[UIImage imageNamed:@"return_white"] forState:UIControlStateNormal];
27
-    [returnBtn addTarget:self action:@selector(returnClickBtn) forControlEvents:UIControlEventTouchUpInside];
28
-    self.navigationItem.leftBarButtonItem=[[UIBarButtonItem alloc]initWithCustomView:returnBtn];
25
+
29 26
     [self reqeustData];
30 27
 }
31 28
 -(void)reqeustData