mbhybird
diff --git a/‎Coding_iOS.xcodeproj/project.pbxproj‎
Lines changed: 0 additions & 36 deletions b/‎Coding_iOS.xcodeproj/project.pbxproj‎
Lines changed: 0 additions & 36 deletions
diff --git a/‎Coding_iOS/Controllers/PointRecordsViewController.m‎
Lines changed: 1 addition & 13 deletions b/‎Coding_iOS/Controllers/PointRecordsViewController.m‎
Lines changed: 1 addition & 13 deletions
diff --git a/‎Coding_iOS/Controllers/RootControllers/Project_RootViewController.m‎
Lines changed: 3 additions & 3 deletions b/‎Coding_iOS/Controllers/RootControllers/Project_RootViewController.m‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎Coding_iOS/Images/[email protected]‎
-1.27 KB b/‎Coding_iOS/Images/[email protected]‎
-1.27 KB
diff --git a/‎Coding_iOS/Images/nav_button/[email protected]‎
35 Bytes b/‎Coding_iOS/Images/nav_button/[email protected]‎
35 Bytes
diff --git a/‎Coding_iOS/Images/nav_button/[email protected]‎
-20 Bytes b/‎Coding_iOS/Images/nav_button/[email protected]‎
-20 Bytes
diff --git a/‎Coding_iOS/Images/nav_button/[email protected]‎
618 Bytes b/‎Coding_iOS/Images/nav_button/[email protected]‎
618 Bytes
diff --git a/‎Coding_iOS/Images/nav_button/[email protected]‎
523 Bytes b/‎Coding_iOS/Images/nav_button/[email protected]‎
523 Bytes
diff --git a/‎Coding_iOS/Images/nav_button/[email protected]‎
-502 Bytes b/‎Coding_iOS/Images/nav_button/[email protected]‎
-502 Bytes
diff --git a/‎Coding_iOS/Images/nav_button/[email protected]‎
-885 Bytes b/‎Coding_iOS/Images/nav_button/[email protected]‎
-885 Bytes
@@ -23,7 +23,6 @@ @interface PointRecordsViewController ()<UITableViewDataSource, UITableViewDeleg
 
 @property (nonatomic, strong) UITableView *myTableView;
 @property (nonatomic, strong) ODRefreshControl *refreshControl;
-@property (strong, nonatomic) UIButton *rightNavBtn;
 @property (assign, nonatomic) BOOL isShowingTip;
 @property (strong, nonatomic) UIView *tipContainerV;
 @property (strong, nonatomic) UIImageView *tipBGV;
@@ -56,9 +55,7 @@ - (void)viewDidLoad
     _refreshControl = [[ODRefreshControl alloc] initInScrollView:self.myTableView];
     [_refreshControl addTarget:self action:@selector(refresh) forControlEvents:UIControlEventValueChanged];
 
-    _rightNavBtn = [[UIButton alloc]initWithFrame:CGRectMake(0, 0, 40, 40)];
-    [_rightNavBtn addTarget:self action:@selector(rightNavBtnClicked) forControlEvents:UIControlEventTouchUpInside];
-    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithCustomView:_rightNavBtn];
+    self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"tip_normal_Nav"] style:UIBarButtonItemStylePlain target:self action:@selector(rightNavBtnClicked)];
     self.isShowingTip = NO;
 
     __weak typeof(self) weakSelf = self;
@@ -68,11 +65,6 @@ - (void)viewDidLoad
     [self refresh];
 }
 
-- (void)setIsShowingTip:(BOOL)isShowingTip{
-    _isShowingTip = isShowingTip;
-    [_rightNavBtn setImage:[UIImage imageNamed:_isShowingTip? @"tip_selected_Nav": @"tip_normal_Nav"] forState:UIControlStateNormal];
-}
-
 - (void)refresh{
     if (_curRecords.isLoading) {
         return;
@@ -169,12 +161,8 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     [tableView deselectRowAtIndexPath:indexPath animated:YES];
     if (indexPath.section == 0 && indexPath.row == 1) {
         //商城入口
-//        WebViewController *vc = [WebViewController webVCWithUrlStr:@"/shop/"];
-//        [self.navigationController pushViewController:vc animated:YES];
-        
         ShopViewController *shopvc = [[ShopViewController alloc] init];
         [self.navigationController pushViewController:shopvc animated:YES];
-
     }
 }
 
 
@@ -207,13 +207,13 @@ - (void)setupTitleBtn{
 - (void)setTitleBtnStr:(NSString *)titleStr{
     if (_titleBtn) {
         CGFloat titleWidth = [titleStr getWidthWithFont:_titleBtn.titleLabel.font constrainedToSize:CGSizeMake(kScreen_Width, 30)];
-        CGFloat imageWidth = 20;
+        CGFloat imageWidth = 12;
         CGFloat btnWidth = titleWidth +imageWidth;
         _titleBtn.frame = CGRectMake((kScreen_Width-btnWidth)/2, (44-30)/2, btnWidth, 30);
         _titleBtn.titleEdgeInsets = UIEdgeInsetsMake(0, -imageWidth, 0, imageWidth);
         _titleBtn.imageEdgeInsets = UIEdgeInsetsMake(0, titleWidth, 0, -titleWidth);
         [_titleBtn setTitle:titleStr forState:UIControlStateNormal];
-        [_titleBtn setImage:[UIImage imageNamed:@"nav_arrow_down"] forState:UIControlStateNormal];
+        [_titleBtn setImage:[UIImage imageNamed:@"btn_fliter_down"] forState:UIControlStateNormal];
     }
 }
 
@@ -453,4 +453,4 @@ - (void)dealWithScanResult:(NSString *)resultStr ofVC:(ZXScanCodeViewController
         [alertV show];
     }
 }
-@end
+@end
Original file line number	Diff line number	Diff line change
`@@ -207,13 +207,13 @@ - (void)setupTitleBtn{`
`207`	`207`	`- (void)setTitleBtnStr:(NSString *)titleStr{`
`208`	`208`	`if (_titleBtn) {`
`209`	`209`	`CGFloat titleWidth = [titleStr getWidthWithFont:_titleBtn.titleLabel.font constrainedToSize:CGSizeMake(kScreen_Width, 30)];`
`210`		`- CGFloat imageWidth = 20;`
	`210`	`+ CGFloat imageWidth = 12;`
`211`	`211`	`CGFloat btnWidth = titleWidth +imageWidth;`
`212`	`212`	`_titleBtn.frame = CGRectMake((kScreen_Width-btnWidth)/2, (44-30)/2, btnWidth, 30);`
`213`	`213`	`_titleBtn.titleEdgeInsets = UIEdgeInsetsMake(0, -imageWidth, 0, imageWidth);`
`214`	`214`	`_titleBtn.imageEdgeInsets = UIEdgeInsetsMake(0, titleWidth, 0, -titleWidth);`
`215`	`215`	`[_titleBtn setTitle:titleStr forState:UIControlStateNormal];`
`216`		`- [_titleBtn setImage:[UIImage imageNamed:@"nav_arrow_down"] forState:UIControlStateNormal];`
	`216`	`+ [_titleBtn setImage:[UIImage imageNamed:@"btn_fliter_down"] forState:UIControlStateNormal];`
`217`	`217`	`}`
`218`	`218`	`}`
`219`	`219`
`@@ -453,4 +453,4 @@ - (void)dealWithScanResult:(NSString *)resultStr ofVC:(ZXScanCodeViewController`
`453`	`453`	`[alertV show];`
`454`	`454`	`}`
`455`	`455`	`}`
`456`		`-@end`
	`456`	`+@end`