Commit d158399876d6e8eae015593556b0d48f07cf5198
1 parent
3a94ce5e
no message
Showing
2 changed files
with
3 additions
and
3 deletions
CNLiveBalanceModule.podspec
| @@ -68,6 +68,7 @@ TODO: 网家家-余额模块. | @@ -68,6 +68,7 @@ TODO: 网家家-余额模块. | ||
| 68 | s.subspec 'PayCenter' do |ss| | 68 | s.subspec 'PayCenter' do |ss| |
| 69 | ss.source_files = 'CNLiveBalanceModule/Classes/PayCenter/*.{h,m}' | 69 | ss.source_files = 'CNLiveBalanceModule/Classes/PayCenter/*.{h,m}' |
| 70 | ss.dependency 'CNLiveBalanceModule/TradingRecord' | 70 | ss.dependency 'CNLiveBalanceModule/TradingRecord' |
| 71 | + ss.dependency 'CNLiveBalanceModule/PayManager' | ||
| 71 | ss.dependency 'CNLiveBalanceModule/View' | 72 | ss.dependency 'CNLiveBalanceModule/View' |
| 72 | end | 73 | end |
| 73 | 74 | ||
| @@ -80,7 +81,6 @@ TODO: 网家家-余额模块. | @@ -80,7 +81,6 @@ TODO: 网家家-余额模块. | ||
| 80 | # PayManager 支付管理 | 81 | # PayManager 支付管理 |
| 81 | s.subspec 'PayManager' do |ss| | 82 | s.subspec 'PayManager' do |ss| |
| 82 | ss.source_files = 'CNLiveBalanceModule/Classes/PayManager/*.{h,m}' | 83 | ss.source_files = 'CNLiveBalanceModule/Classes/PayManager/*.{h,m}' |
| 83 | - ss.dependency 'CNLiveBalanceModule/PayCenter' | ||
| 84 | ss.dependency 'CNLiveBalanceModule/View' | 84 | ss.dependency 'CNLiveBalanceModule/View' |
| 85 | end | 85 | end |
| 86 | 86 |
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordController.m
| @@ -146,11 +146,11 @@ static const CGFloat height = 80; | @@ -146,11 +146,11 @@ static const CGFloat height = 80; | ||
| 146 | - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ | 146 | - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{ |
| 147 | if(self.type == TradingRecordTypeSpecial){ | 147 | if(self.type == TradingRecordTypeSpecial){ |
| 148 | CNLiveTradingRecordListModel *model = self.data[indexPath.row]; | 148 | CNLiveTradingRecordListModel *model = self.data[indexPath.row]; |
| 149 | - CNLiveTradingRecordDetailController *vc = [[CNLiveTradingRecordDetailController alloc]initWithType:TradingRecordDetailTypeSpecial model:model date:self.date startTime:self.date endTime:self.date]; | 149 | + CNLiveTradingRecordDetailController *vc = [[CNLiveTradingRecordDetailController alloc]initWithType:TradingRecordDetailTypeSpecial model:model date:self.date startTime:self.startTime endTime:self.endTime]; |
| 150 | [self.navigationController pushViewController:vc animated:YES]; | 150 | [self.navigationController pushViewController:vc animated:YES]; |
| 151 | }else{ | 151 | }else{ |
| 152 | CNLiveTradingRecordListModel *model = self.data[indexPath.row]; | 152 | CNLiveTradingRecordListModel *model = self.data[indexPath.row]; |
| 153 | - CNLiveTradingRecordDetailController *vc = [[CNLiveTradingRecordDetailController alloc]initWithType:TradingRecordDetailTypeDefault model:model date:self.date startTime:self.date endTime:self.date]; | 153 | + CNLiveTradingRecordDetailController *vc = [[CNLiveTradingRecordDetailController alloc]initWithType:TradingRecordDetailTypeDefault model:model date:self.date startTime:self.startTime endTime:self.endTime]; |
| 154 | [self.navigationController pushViewController:vc animated:YES]; | 154 | [self.navigationController pushViewController:vc animated:YES]; |
| 155 | } | 155 | } |
| 156 | 156 |