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

KuDianProject/TOP/Drawer/Control/KDPCollectHistoryPageVC.m

 - (void)viewDidLoad {
     [super viewDidLoad];
     [self setUpPageVc];
-    self.navigationController.navigationBar.barTintColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:SCREEN_WIDTH];
+        UIButton *returnBtn =[[UIButton alloc]initWithFrame:CGRectMake(0, KDStatusHeight, 0, 0)];
+        [returnBtn setImage:[UIImage imageNamed:@"return_white"] forState:UIControlStateNormal];
+        [returnBtn addTarget:self action:@selector(returnClickBtn) forControlEvents:UIControlEventTouchUpInside];
+        self.navigationItem.leftBarButtonItem=[[UIBarButtonItem alloc]initWithCustomView:returnBtn]; self.navigationController.navigationBar.barTintColor=[UIColor gradientOneColor:[UIColor colorWithHexString:@"#FF235F"] toColor:[UIColor colorWithHexString:@"#FF7676"] Width:SCREEN_WIDTH];
 }
 - (void)setUpPageVc{
     self.navBar.hidden=YES;
-    
     titleArray=@[@"收藏夹",@"浏览记录"];
     [UIApplication sharedApplication].statusBarStyle=UIStatusBarStyleDefault;
     
-    
     XLPageViewControllerConfig *config = [[XLPageViewControllerConfig alloc] init];
     //标题间距
     config.titleSpace = 25;
 }
 
 - (void)pageViewController:(XLPageViewController *)pageViewController didSelectedAtIndex:(NSInteger)index{
-    NSLog(@"%ld",index);
+    NSLog(@"%ld",(long)index);
 }
 
 - (UIViewController *)pageViewController:(XLPageViewController *)pageViewController viewControllerForIndex:(NSInteger)index{

KuDianProject/TOP/Drawer/Control/KDPCollectHistoryVC.m

     [super viewDidLoad];
     self.page_num = 1;
     [self setNavUI];
-    UIButton *returnBtn =[[UIButton alloc]initWithFrame:CGRectMake(0, KDStatusHeight, 0, 0)];
-    [returnBtn setImage:[UIImage imageNamed:@"return_white"] forState:UIControlStateNormal];
-    [returnBtn addTarget:self action:@selector(returnClickBtn) forControlEvents:UIControlEventTouchUpInside];
-    self.navigationItem.leftBarButtonItem=[[UIBarButtonItem alloc]initWithCustomView:returnBtn];
+
     [self reqeustData];
 }
 -(void)reqeustData