iOS Team / CNLiveBalanceModule · Commits

Commit 099e5b1c7a4c4b97bd97b4b7051592790b2f2289

Authored by zhangxiaowen
1 parent aa637921

no message

Inline Side-by-side
Showing 5 changed files with 7 additions and 7 deletions
CNLiveBalanceModule/Classes/Model/CNLiveTradingRecordModel.h
  View file @099e5b1
... ... @@ -39,8 +39,8 @@ NS_ASSUME_NONNULL_BEGIN
39 39 @end
40 40  
41 41 @interface CNLiveTradingRecordModel : NSObject
42   -@property (nonatomic, copy) NSString *defray;
43   -@property (nonatomic, copy) NSString *income;
  42 +@property (nonatomic, assign) CGFloat defray;
  43 +@property (nonatomic, assign) CGFloat income;
44 44 @property (nonatomic, copy) NSString *lastPage;
45 45 @property (nonatomic, strong) NSArray *list;
46 46 @property (nonatomic, strong) NSArray *transferRecordList;
... ...
CNLiveBalanceModule/Classes/PayManager/CNLiveChangePayPasswordController.m
  View file @099e5b1
... ... @@ -18,7 +18,6 @@
18 18  
19 19 #import "CNLiveBalanceRequest.h"
20 20 #import "CNLiveBalanceNavigationBar.h"
21   -#import "CNLivePayCenterController.h"
22 21  
23 22 @interface CNLiveChangePayPasswordController ()<CNLiveBalanceNavigationBarDelegate>
24 23 @property (nonatomic, strong) CNLiveBalanceNavigationBar *navigationBar;
... ...
CNLiveBalanceModule/Classes/TradingRecord/CNLiveMonthBillView.h
  View file @099e5b1
... ... @@ -21,6 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
21 21 @property (nonatomic, weak) id<CNLiveMonthBillViewDelegate> delegate;
22 22 @property (nonatomic, copy) NSString *date;
23 23 @property (nonatomic, assign) BOOL interactionEnabled;
  24 +
24 25 @end
25 26  
26 27 NS_ASSUME_NONNULL_END
... ...
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordDetailHeaderView.m
  View file @099e5b1
... ... @@ -58,7 +58,7 @@ static const NSInteger height = 40;
58 58 if (![model.sum containsString:@"-"]) {
59 59 self.money.text = [NSString stringWithFormat:@"+%@",model.sum];
60 60 } else {
61   - self.money.text = model.sum;//[NSString stringWithFormat:@"%.2f",model.money];
  61 + self.money.text = model.sum;
62 62 }
63 63 if ([model.sourceType containsString:@"refill"] || [model.sourceType isEqualToString:@"group_vote"] || [model.sourceType containsString:@"refund"]) {
64 64 // 收入
... ... @@ -126,7 +126,7 @@ static const NSInteger height = 40;
126 126 if (!_shopName) {
127 127 _shopName = [[UILabel alloc] init];
128 128 _shopName.textColor = [UIColor blackColor];
129   - _shopName.font = UIFontCNMake(16);//[UIFont fontWithName:@"PingFangSC-Regular" size:16.0f];
  129 + _shopName.font = UIFontCNMake(16);
130 130 }
131 131 return _shopName;
132 132 }
... ... @@ -135,7 +135,7 @@ static const NSInteger height = 40;
135 135 if (!_money) {
136 136 _money = [[UILabel alloc] init];
137 137 _money.textColor = RGB(34, 34, 34);
138   - _money.font = UIFontCNMake(36);//[UIFont fontWithName:@"PingFangSC-Regular" size:36];
  138 + _money.font = UIFontCNMake(36);
139 139 _money.textAlignment = NSTextAlignmentCenter;
140 140 }
141 141 return _money;
... ...
CNLiveBalanceModule/Classes/TradingRecord/CNLiveTradingRecordView.m
  View file @099e5b1
... ... @@ -67,7 +67,7 @@ static const NSInteger height = 30;
67 67  
68 68 - (void)setModel:(CNLiveTradingRecordModel *)model{
69 69 _model = model;
70   - _paymentsAmount.text = [NSString stringWithFormat:@"支出 ¥%@ 收入 ¥%@",model.defray,model.income];
  70 + _paymentsAmount.text = [NSString stringWithFormat:@"支出 ¥%.2f 收入 ¥%.2f",model.defray,model.income];
71 71 }
72 72  
73 73 - (void)setIsShow:(BOOL)isShow{
... ...