Commit 9ca80b267349a8934be59b1ac021279dc3deb476

Authored by zhangxiaowen
1 parent 6b1abd82

no message

CNLiveBalanceModule/Classes/Model/CNLiveBalanceRequest.m
... ... @@ -223,28 +223,28 @@
223 223 @"title":@"当前状态",
224 224 @"content":@"已存入余额",
225 225 @"style":@"0",
226   - @"height":@"40",
  226 + @"height":@"45",
227 227 @"lineHeight":@"0"
228 228 },
229 229 @{
230 230 @"title":@"转账说明",
231 231 @"content":model.desc?model.desc:@"未知",
232 232 @"style":@"0",
233   - @"height":@"40",
  233 + @"height":@"45",
234 234 @"lineHeight":@"0"
235 235 },
236 236 @{
237 237 @"title":@"转账时间",
238 238 @"content":model.endTime?model.endTime:@"未知",
239 239 @"style":@"0",
240   - @"height":@"40",
  240 + @"height":@"45",
241 241 @"lineHeight":@"0"
242 242 },
243 243 @{
244 244 @"title":@"转账编号",
245 245 @"content":model.sourceId?model.sourceId:@"未知",
246 246 @"style":@"0",
247   - @"height":@"40",
  247 + @"height":@"45",
248 248 @"lineHeight":@"0"
249 249 }
250 250 ];
... ... @@ -262,42 +262,42 @@
262 262 @"title":@"当前状态",
263 263 @"content":model.state,
264 264 @"style":@"0",
265   - @"height":@"40",
  265 + @"height":@"45",
266 266 @"lineHeight":@"0"
267 267 },
268 268 @{
269 269 @"title":@"商品",
270 270 @"content":model.desc?model.desc:@"未知",
271 271 @"style":@"0",
272   - @"height":@"40",
  272 + @"height":@"45",
273 273 @"lineHeight":@"0"
274 274 },
275 275 @{
276 276 @"title":@"商户全称",
277 277 @"content":name?name:@"未知",
278 278 @"style":@"0",
279   - @"height":@"40",
  279 + @"height":@"45",
280 280 @"lineHeight":@"0"
281 281 },
282 282 @{
283 283 @"title":@"支付时间",
284 284 @"content":model.endTime?model.endTime:@"未知",
285 285 @"style":@"0",
286   - @"height":@"40",
  286 + @"height":@"45",
287 287 @"lineHeight":@"0"
288 288 },
289 289 @{
290 290 @"title":@"支付方式",
291 291 @"content":model.payMethod,
292 292 @"style":@"0",
293   - @"height":@"40",
  293 + @"height":@"45",
294 294 @"lineHeight":@"0"
295 295 },
296 296 @{
297 297 @"title":@"交易单号",
298 298 @"content":model.sourceId?model.sourceId:@"未知",
299 299 @"style":@"0",
300   - @"height":@"40",
  300 + @"height":@"45",
301 301 @"lineHeight":@"0"
302 302 }
303 303 ] mutableCopy];
... ... @@ -307,7 +307,7 @@
307 307 @"title":@"查看与此商户的交易记录",
308 308 @"content":@"",
309 309 @"style":@"1",
310   - @"height":@"50",
  310 + @"height":@"55",
311 311 @"lineHeight":@"10"
312 312 };
313 313 [array addObject:dic];
... ... @@ -317,7 +317,7 @@
317 317 @"title":@"备注",
318 318 @"content":model.remark?model.remark:@"",
319 319 @"style":@"0",
320   - @"height":@"40",
  320 + @"height":@"45",
321 321 @"lineHeight":@"0"
322 322 };
323 323 [array insertObject:dic atIndex:array.count-1];
... ...
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordDetailCell.m
... ... @@ -74,6 +74,7 @@ static const NSInteger margin = 15;
74 74 [_content mas_makeConstraints:^(MASConstraintMaker *make) {
75 75 make.top.equalTo(self.line.mas_bottom);
76 76 make.bottom.equalTo(self.contentView.mas_bottom);
  77 + make.left.equalTo(self.title.mas_right).with.offset(margin);
77 78 make.right.equalTo(self.contentView.mas_right).with.offset(-margin);
78 79  
79 80 }];
... ... @@ -114,9 +115,11 @@ static const NSInteger margin = 15;
114 115 - (UILabel *)content {
115 116 if (!_content) {
116 117 _content = [[UILabel alloc] init];
117   - _content.numberOfLines = 1;
118 118 _content.textColor = [UIColor colorWithRed:51/255.0 green:51/255.0 blue:51/255.0 alpha:1.0];
119 119 _content.font = UIFontCNMake(15.0);
  120 + _content.numberOfLines = 2;
  121 + _content.lineBreakMode = NSLineBreakByTruncatingTail;
  122 + _content.textAlignment = NSTextAlignmentRight;
120 123 }
121 124 return _content;
122 125 }
... ...