no message

zhangxiaowen
1 parent 0bd0e249
Showing 4 changed files with 37 additions and 18 deletions
CNLiveBalanceModule/Classes/PayCenter/CNLivePayCenterController.m
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordController.h
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordController.m
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordDetailController.m
@@ -98,9 +98,9 @@
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
     if(indexPath.row == 0){
-        CNLiveTradingRecordController *vc = [[CNLiveTradingRecordController alloc]init];
-        vc.type = TradingRecordTypeDefault;
-        vc.ID = CNUserShareModel.uid;
+        CNLiveTradingRecordController *vc = [[CNLiveTradingRecordController alloc]initWithType:TradingRecordTypeDefault ID:CNUserShareModel.uid date:nil startTime:nil endTime:nil];
+//        vc.type = TradingRecordTypeDefault;
+//        vc.ID = CNUserShareModel.uid;
         [self.navigationController pushViewController:vc animated:YES];
     }else if(indexPath.row == 1){//支付管理
         CNLivePayManagerController *vc = [[CNLivePayManagerController alloc]init];
@@ -17,14 +17,18 @@ typedef enum {
 } TradingRecordType;
 @interface CNLiveTradingRecordController : CNCommonViewController
-//type: 0 -> 个人中心交易记录  1 -> 查看与此商户的交易记录
-@property (nonatomic, assign) TradingRecordType type;
-//ID: 0 -> 用户id  1 -> 查看与此商户的交易记录 toId
-@property (nonatomic, copy) NSString *ID;
+/**
+ * @abstract      初始化配置
+ * @param         type                  type: 0 -> 个人中心交易记录  1 -> 查看与此商户的交易记录
+ * @param         ID                       ID: 0 -> 用户id  1 -> 查看与此商户的交易记录 toId
+ * @param         date                   2019年12月
+ * @param         startTime        开始时间
+ * @param         endTime             结束时间
+*/
+- (instancetype)initWithType:(TradingRecordType)type ID:(NSString *)ID date:(NSString *)date startTime:(NSString *)startTime endTime:(NSString *)endTime;
-@property (nonatomic, copy) NSString *date;
-@property (nonatomic, copy) NSString *startTime;
-@property (nonatomic, copy) NSString *endTime;
+- (instancetype)init NS_UNAVAILABLE;
++ (instancetype)new NS_UNAVAILABLE;
 @end
@@ -36,10 +36,32 @@
 @property (nonatomic, strong) NSMutableArray *data;
 @property (nonatomic, assign) NSInteger pageNo;
+//type: 0 -> 个人中心交易记录  1 -> 查看与此商户的交易记录
+@property (nonatomic, assign) TradingRecordType type;
+
+//ID: 0 -> 用户id  1 -> 查看与此商户的交易记录 toId
+@property (nonatomic, copy) NSString *ID;
+
+@property (nonatomic, copy) NSString *date;
+@property (nonatomic, copy) NSString *startTime;
+@property (nonatomic, copy) NSString *endTime;
+
 @end
 @implementation CNLiveTradingRecordController
 static const CGFloat height = 80;
+#pragma mark - 初始化
+- (instancetype)initWithType:(TradingRecordType)type ID:(NSString *)ID date:(NSString *)date startTime:(NSString *)startTime endTime:(NSString *)endTime{
+    if(self = [super init]){
+        self.type = type;
+        self.ID = ID;
+         
+        self.date = date;
+        self.startTime = startTime;
+        self.endTime = endTime;
+     }
+     return self;
+}
 #pragma mark - 加载数据
 - (void)loadData {
@@ -107,14 +107,7 @@ static const CGFloat height = 80;
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
     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;
-        
+        CNLiveTradingRecordController *vc = [[CNLiveTradingRecordController alloc]initWithType:TradingRecordTypeSpecial ID:self.model.toId date:self.date startTime:self.startTime endTime:self.endTime];
         [self.navigationController pushViewController:vc animated:YES];
     }