no message

zhangxiaowen
1 parent 7565adb1
Showing 5 changed files with 33 additions and 14 deletions
CNLiveBalanceModule.podspec
CNLiveBalanceModule/Classes/Model/CNLiveBalanceRequest.m
CNLiveBalanceModule/Classes/Model/CNLiveTradingRecordDetailModel.h
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordDetailCell.m
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordDetailController.m
@@ -57,31 +57,33 @@ TODO: 网家家-余额模块.
       ss.source_files = 'CNLiveBalanceModule/Classes/Model/*.{h,m}'
   end
-  # Detail 群组余额明细
+  # Detail 明细
   s.subspec 'Detail' do |ss|
       ss.source_files = 'CNLiveBalanceModule/Classes/Detail/*.{h,m}'
+      ss.dependency 'CNLiveBalanceModule/TradingRecord'
       ss.dependency 'CNLiveBalanceModule/View'
   end
   # PayCenter 支付中心
   s.subspec 'PayCenter' do |ss|
       ss.source_files = 'CNLiveBalanceModule/Classes/PayCenter/*.{h,m}'
+      ss.dependency 'CNLiveBalanceModule/TradingRecord'
       ss.dependency 'CNLiveBalanceModule/View'
   end
-  # 交易记录
+  # TradingRecord 交易记录
   s.subspec 'TradingRecord' do |ss|
       ss.source_files = 'CNLiveBalanceModule/Classes/TradingRecord/*.{h,m}'
       ss.dependency 'CNLiveBalanceModule/View'
   end
-  # 支付管理
+  # PayManager 支付管理
   s.subspec 'PayManager' do |ss|
       ss.source_files = 'CNLiveBalanceModule/Classes/PayManager/*.{h,m}'
       ss.dependency 'CNLiveBalanceModule/View'
   end
-  # 月账单
+  # MonthBill 月账单
   s.subspec 'MonthBill' do |ss|
       ss.source_files = 'CNLiveBalanceModule/Classes/MonthBill/*.{h,m}'
       ss.dependency 'CNLiveBalanceModule/TradingRecord'
@@ -222,24 +222,28 @@
                        @{
                            @"title":@"当前状态",
                            @"content":@"已存入余额",
+                           @"style":@"0",
                            @"height":@"40",
                            @"lineHeight":@"0"
                            },
                        @{
                            @"title":@"转账说明",
                            @"content":model.desc?model.desc:@"未知",
+                           @"style":@"0",
                            @"height":@"40",
                            @"lineHeight":@"0"
                            },
                        @{
                            @"title":@"转账时间",
                            @"content":model.endTime?model.endTime:@"未知",
+                           @"style":@"0",
                            @"height":@"40",
                            @"lineHeight":@"0"
                            },
                        @{
                            @"title":@"转账编号",
                            @"content":model.sourceId?model.sourceId:@"未知",
+                           @"style":@"0",
                            @"height":@"40",
                            @"lineHeight":@"0"
                            }
@@ -257,36 +261,42 @@
                        @{
                            @"title":@"当前状态",
                            @"content":model.state,
+                           @"style":@"0",
                            @"height":@"40",
                            @"lineHeight":@"0"
                            },
                        @{
                            @"title":@"商品",
                            @"content":model.desc?model.desc:@"未知",
+                           @"style":@"0",
                            @"height":@"40",
                            @"lineHeight":@"0"
                            },
                        @{
                            @"title":@"商户全称",
                            @"content":name?name:@"未知",
+                           @"style":@"0",
                            @"height":@"40",
                            @"lineHeight":@"0"
                            },
                        @{
                            @"title":@"支付时间",
                            @"content":model.endTime?model.endTime:@"未知",
+                           @"style":@"0",
                            @"height":@"40",
                            @"lineHeight":@"0"
                            },
                        @{
                            @"title":@"支付方式",
                            @"content":model.payMethod,
+                           @"style":@"0",
                            @"height":@"40",
                            @"lineHeight":@"0"
                            },
                        @{
                            @"title":@"交易单号",
                            @"content":model.sourceId?model.sourceId:@"未知",
+                           @"style":@"0",
                            @"height":@"40",
                            @"lineHeight":@"0"
                            }
@@ -296,6 +306,7 @@
         NSDictionary *dic = @{
                             @"title":@"查看与此商户的交易记录",
                             @"content":@"",
+                            @"style":@"1",
                             @"height":@"50",
                             @"lineHeight":@"10"
                             };
@@ -305,6 +316,7 @@
         NSDictionary *dic = @{
                               @"title":@"备注",
                               @"content":model.remark?model.remark:@"",
+                              @"style":@"0",
                               @"height":@"40",
                               @"lineHeight":@"0"
                               };
@@ -32,6 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
 // 订单详情
 @property (nonatomic, copy) NSString *title;
 @property (nonatomic, copy) NSString *content;
+@property (nonatomic, copy) NSString *style;
 @property (nonatomic, assign) CGFloat height;
 @property (nonatomic, assign) CGFloat lineHeight;
@@ -42,7 +42,7 @@ static const NSInteger margin = 15;
     _model = model;
     _title.text = model.title;
     _content.text = model.content;
-    if([model.title isEqualToString:@"查看与此商户的交易记录"]){
+    if([model.style isEqualToString:@"1"]){
         _front.hidden = NO;
         _content.hidden = YES;
@@ -105,15 +105,19 @@ static const CGFloat height = 80;
 }
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
-    CNLiveTradingRecordController *vc = [[CNLiveTradingRecordController alloc]init];
-    vc.type = TradingRecordTypeSpecial;
-    vc.ID = self.model.toId;
-    
-    vc.date = self.date;
-    vc.startTime = self.startTime;
-    vc.endTime = self.endTime;
-    
-    [self.navigationController pushViewController:vc animated:YES];
+    CNLiveTradingRecordDetailModel *model = self.data[indexPath.row];
+    if([model.style isEqualToString:@"1"]){
+        CNLiveTradingRecordController *vc = [[CNLiveTradingRecordController alloc]init];
+        vc.type = TradingRecordTypeSpecial;
+        vc.ID = self.model.toId;
+        
+        vc.date = self.date;
+        vc.startTime = self.startTime;
+        vc.endTime = self.endTime;
+        
+        [self.navigationController pushViewController:vc animated:YES];
+        
+    }
 }
 #pragma mark - 懒加载