Commit 7565adb13fabda94bb31324e1569f78c1cd356c9

Authored by zhangxiaowen
1 parent d526ea37

no message

CNLiveBalanceModule.podspec
@@ -41,6 +41,8 @@ TODO: 网家家-余额模块. @@ -41,6 +41,8 @@ TODO: 网家家-余额模块.
41 # Controller 41 # Controller
42 s.subspec 'Controller' do |ss| 42 s.subspec 'Controller' do |ss|
43 ss.source_files = 'CNLiveBalanceModule/Classes/Controller/*.{h,m}' 43 ss.source_files = 'CNLiveBalanceModule/Classes/Controller/*.{h,m}'
  44 + ss.dependency 'CNLiveBalanceModule/PayCenter'
  45 + ss.dependency 'CNLiveBalanceModule/Detail'
44 ss.dependency 'CNLiveBalanceModule/View' 46 ss.dependency 'CNLiveBalanceModule/View'
45 end 47 end
46 48
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordDetailController.m
@@ -154,7 +154,7 @@ static const CGFloat height = 80; @@ -154,7 +154,7 @@ static const CGFloat height = 80;
154 } 154 }
155 - (CNLiveTradingRecordDetailHeaderView *)headerView { 155 - (CNLiveTradingRecordDetailHeaderView *)headerView {
156 if (!_headerView) { 156 if (!_headerView) {
157 - _headerView = [[CNLiveTradingRecordDetailHeaderView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 150)]; 157 + _headerView = [[CNLiveTradingRecordDetailHeaderView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 160)];
158 } 158 }
159 return _headerView; 159 return _headerView;
160 } 160 }
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordDetailHeaderView.m
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 25
26 @implementation CNLiveTradingRecordDetailHeaderView 26 @implementation CNLiveTradingRecordDetailHeaderView
27 static const NSInteger margin = 10; 27 static const NSInteger margin = 10;
28 -static const NSInteger height = 50; 28 +static const NSInteger height = 40;
29 29
30 - (instancetype)initWithFrame:(CGRect)frame{ 30 - (instancetype)initWithFrame:(CGRect)frame{
31 self = [super initWithFrame:frame]; 31 self = [super initWithFrame:frame];
@@ -49,7 +49,7 @@ static const NSInteger height = 50; @@ -49,7 +49,7 @@ static const NSInteger height = 50;
49 [self.tips mas_makeConstraints:^(MASConstraintMaker *make) { 49 [self.tips mas_makeConstraints:^(MASConstraintMaker *make) {
50 make.bottom.equalTo(self.mas_bottom).offset(-margin); 50 make.bottom.equalTo(self.mas_bottom).offset(-margin);
51 make.centerX.equalTo(self); 51 make.centerX.equalTo(self);
52 - make.height.offset(40); 52 + make.height.offset(height);
53 }]; 53 }];
54 } 54 }
55 55
@@ -99,7 +99,7 @@ static const NSInteger height = 50; @@ -99,7 +99,7 @@ static const NSInteger height = 50;
99 make.right.mas_lessThanOrEqualTo(self.mas_right).with.offset(-margin); 99 make.right.mas_lessThanOrEqualTo(self.mas_right).with.offset(-margin);
100 make.top.equalTo(self.mas_top).with.offset(margin); 100 make.top.equalTo(self.mas_top).with.offset(margin);
101 make.width.offset(width); 101 make.width.offset(width);
102 - make.height.offset(40); 102 + make.height.offset(height);
103 103
104 }]; 104 }];
105 105
@@ -116,7 +116,8 @@ static const NSInteger height = 50; @@ -116,7 +116,8 @@ static const NSInteger height = 50;
116 _shopIcon = [[UIImageView alloc] init]; 116 _shopIcon = [[UIImageView alloc] init];
117 _shopIcon.contentMode = UIViewContentModeScaleAspectFill; 117 _shopIcon.contentMode = UIViewContentModeScaleAspectFill;
118 _shopIcon.backgroundColor = [UIColor whiteColor]; 118 _shopIcon.backgroundColor = [UIColor whiteColor];
119 - _shopIcon.image = [UIImage imageNamed:@"ye_wxzffs"]; //fenlei_touxiang2 119 + UIImage *xw_image = [self getImageWithImageName:@"default_avatar_y" bundleName:@"CNLiveBalanceModule" targetClass:[self class]];
  120 + _shopIcon.image = xw_image;
120 } 121 }
121 return _shopIcon; 122 return _shopIcon;
122 } 123 }