iOS Team / CNLiveBalanceModule · Commits

Commit bd9c9ff296f981c28a64e1ab7d61e91e7c101006

Authored by zhangxiaowen
1 parent 7565adb1

no message

Inline Side-by-side
Showing 5 changed files with 33 additions and 14 deletions
CNLiveBalanceModule.podspec
  View file @bd9c9ff
... ... @@ -57,31 +57,33 @@ TODO: 网家家-余额模块.
57 57 ss.source_files = 'CNLiveBalanceModule/Classes/Model/*.{h,m}'
58 58 end
59 59  
60   - # Detail 群组余额明细
  60 + # Detail 明细
61 61 s.subspec 'Detail' do |ss|
62 62 ss.source_files = 'CNLiveBalanceModule/Classes/Detail/*.{h,m}'
  63 + ss.dependency 'CNLiveBalanceModule/TradingRecord'
63 64 ss.dependency 'CNLiveBalanceModule/View'
64 65 end
65 66  
66 67 # PayCenter 支付中心
67 68 s.subspec 'PayCenter' do |ss|
68 69 ss.source_files = 'CNLiveBalanceModule/Classes/PayCenter/*.{h,m}'
  70 + ss.dependency 'CNLiveBalanceModule/TradingRecord'
69 71 ss.dependency 'CNLiveBalanceModule/View'
70 72 end
71 73  
72   - # 交易记录
  74 + # TradingRecord 交易记录
73 75 s.subspec 'TradingRecord' do |ss|
74 76 ss.source_files = 'CNLiveBalanceModule/Classes/TradingRecord/*.{h,m}'
75 77 ss.dependency 'CNLiveBalanceModule/View'
76 78 end
77 79  
78   - # 支付管理
  80 + # PayManager 支付管理
79 81 s.subspec 'PayManager' do |ss|
80 82 ss.source_files = 'CNLiveBalanceModule/Classes/PayManager/*.{h,m}'
81 83 ss.dependency 'CNLiveBalanceModule/View'
82 84 end
83 85  
84   - # 月账单
  86 + # MonthBill 月账单
85 87 s.subspec 'MonthBill' do |ss|
86 88 ss.source_files = 'CNLiveBalanceModule/Classes/MonthBill/*.{h,m}'
87 89 ss.dependency 'CNLiveBalanceModule/TradingRecord'
... ...
CNLiveBalanceModule/Classes/Model/CNLiveBalanceRequest.m
  View file @bd9c9ff
... ... @@ -222,24 +222,28 @@
222 222 @{
223 223 @"title":@"当前状态",
224 224 @"content":@"已存入余额",
  225 + @"style":@"0",
225 226 @"height":@"40",
226 227 @"lineHeight":@"0"
227 228 },
228 229 @{
229 230 @"title":@"转账说明",
230 231 @"content":model.desc?model.desc:@"未知",
  232 + @"style":@"0",
231 233 @"height":@"40",
232 234 @"lineHeight":@"0"
233 235 },
234 236 @{
235 237 @"title":@"转账时间",
236 238 @"content":model.endTime?model.endTime:@"未知",
  239 + @"style":@"0",
237 240 @"height":@"40",
238 241 @"lineHeight":@"0"
239 242 },
240 243 @{
241 244 @"title":@"转账编号",
242 245 @"content":model.sourceId?model.sourceId:@"未知",
  246 + @"style":@"0",
243 247 @"height":@"40",
244 248 @"lineHeight":@"0"
245 249 }
... ... @@ -257,36 +261,42 @@
257 261 @{
258 262 @"title":@"当前状态",
259 263 @"content":model.state,
  264 + @"style":@"0",
260 265 @"height":@"40",
261 266 @"lineHeight":@"0"
262 267 },
263 268 @{
264 269 @"title":@"商品",
265 270 @"content":model.desc?model.desc:@"未知",
  271 + @"style":@"0",
266 272 @"height":@"40",
267 273 @"lineHeight":@"0"
268 274 },
269 275 @{
270 276 @"title":@"商户全称",
271 277 @"content":name?name:@"未知",
  278 + @"style":@"0",
272 279 @"height":@"40",
273 280 @"lineHeight":@"0"
274 281 },
275 282 @{
276 283 @"title":@"支付时间",
277 284 @"content":model.endTime?model.endTime:@"未知",
  285 + @"style":@"0",
278 286 @"height":@"40",
279 287 @"lineHeight":@"0"
280 288 },
281 289 @{
282 290 @"title":@"支付方式",
283 291 @"content":model.payMethod,
  292 + @"style":@"0",
284 293 @"height":@"40",
285 294 @"lineHeight":@"0"
286 295 },
287 296 @{
288 297 @"title":@"交易单号",
289 298 @"content":model.sourceId?model.sourceId:@"未知",
  299 + @"style":@"0",
290 300 @"height":@"40",
291 301 @"lineHeight":@"0"
292 302 }
... ... @@ -296,6 +306,7 @@
296 306 NSDictionary *dic = @{
297 307 @"title":@"查看与此商户的交易记录",
298 308 @"content":@"",
  309 + @"style":@"1",
299 310 @"height":@"50",
300 311 @"lineHeight":@"10"
301 312 };
... ... @@ -305,6 +316,7 @@
305 316 NSDictionary *dic = @{
306 317 @"title":@"备注",
307 318 @"content":model.remark?model.remark:@"",
  319 + @"style":@"0",
308 320 @"height":@"40",
309 321 @"lineHeight":@"0"
310 322 };
... ...
CNLiveBalanceModule/Classes/Model/CNLiveTradingRecordDetailModel.h
  View file @bd9c9ff
... ... @@ -32,6 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
32 32 // 订单详情
33 33 @property (nonatomic, copy) NSString *title;
34 34 @property (nonatomic, copy) NSString *content;
  35 +@property (nonatomic, copy) NSString *style;
35 36 @property (nonatomic, assign) CGFloat height;
36 37 @property (nonatomic, assign) CGFloat lineHeight;
37 38  
... ...
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordDetailCell.m
  View file @bd9c9ff
... ... @@ -42,7 +42,7 @@ static const NSInteger margin = 15;
42 42 _model = model;
43 43 _title.text = model.title;
44 44 _content.text = model.content;
45   - if([model.title isEqualToString:@"查看与此商户的交易记录"]){
  45 + if([model.style isEqualToString:@"1"]){
46 46 _front.hidden = NO;
47 47 _content.hidden = YES;
48 48  
... ...
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordDetailController.m
  View file @bd9c9ff
... ... @@ -105,15 +105,19 @@ static const CGFloat height = 80;
105 105 }
106 106  
107 107 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
108   - CNLiveTradingRecordController *vc = [[CNLiveTradingRecordController alloc]init];
109   - vc.type = TradingRecordTypeSpecial;
110   - vc.ID = self.model.toId;
111   -
112   - vc.date = self.date;
113   - vc.startTime = self.startTime;
114   - vc.endTime = self.endTime;
115   -
116   - [self.navigationController pushViewController:vc animated:YES];
  108 + CNLiveTradingRecordDetailModel *model = self.data[indexPath.row];
  109 + if([model.style isEqualToString:@"1"]){
  110 + CNLiveTradingRecordController *vc = [[CNLiveTradingRecordController alloc]init];
  111 + vc.type = TradingRecordTypeSpecial;
  112 + vc.ID = self.model.toId;
  113 +
  114 + vc.date = self.date;
  115 + vc.startTime = self.startTime;
  116 + vc.endTime = self.endTime;
  117 +
  118 + [self.navigationController pushViewController:vc animated:YES];
  119 +
  120 + }
117 121 }
118 122  
119 123 #pragma mark - 懒加载
... ...