Skip to content

Commit c2eed97

Browse files
liao3841054liao3841054
committed
修改色值
1 parent b78b103 commit c2eed97

6 files changed

Lines changed: 32 additions & 18 deletions

File tree

‎Coding_iOS/Controllers/Shop/ShopOrderViewController.m‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ - (void)viewDidLoad
3636
_myOrder = [[ShopOrderModel alloc] init];
3737
_myOrder.orderType = ShopOrderAll;
3838

39-
[self setUpView];
4039
[self loadData];
40+
41+
[self setUpView];
42+
4143
}
4244

4345
- (void)loadData

‎Coding_iOS/Controllers/Shop/ShopViewController.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ - (void)setUpCollectionView
149149

150150
layout.itemSize = CGSizeMake(itemW, itemH);
151151
layout.minimumInteritemSpacing = 5;
152-
layout.minimumLineSpacing = 5;
153-
152+
layout.minimumLineSpacing = 20;
153+
154154
_collectionView = [[UICollectionView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height - 64) collectionViewLayout:layout];
155155
_collectionView.backgroundColor = [UIColor clearColor];
156156

@@ -230,7 +230,7 @@ - (UIEdgeInsets)collectionView:(UICollectionView *)collectionView layout:(UIColl
230230
height = kMySegmentControl_Height + bannerHeight ;
231231
_collectionHeaderView.frame = CGRectMake(0, 0, kScreen_Width, height);
232232
}
233-
return UIEdgeInsetsMake(5 + height, 10, 10, 10);
233+
return UIEdgeInsetsMake(20 + height, 10, 10, 10);
234234
}
235235

236236
#pragma mark - UICollectionViewDelegate

‎Coding_iOS/Views/CCell/ShopGoodsCCell.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ - (void)setUpContentView
4949
// [superView addSubview:_priceLabel];
5050

5151
_titleLabel = [[UILabel alloc] initWithFrame:CGRectZero];
52-
_titleLabel.font = FONT(15);
52+
_titleLabel.font = FONT(14);
5353
_titleLabel.backgroundColor = [UIColor clearColor];
5454
_titleLabel.textAlignment = NSTextAlignmentCenter;
5555
_titleLabel.textColor = [UIColor colorWithHexString:@"0x222222"];

‎Coding_iOS/Views/Cell/ShopOderCell.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ - (void)setUpContentView
9595
make.top.equalTo(orderLabel.mas_bottom).offset(15);
9696
make.left.equalTo(superView.mas_left).offset(12);
9797
make.right.equalTo(superView.mas_right).offset(-12);
98-
make.height.offset(172/2);
98+
make.height.offset(108/2);
9999
}];
100100

101101
_coverView = [[UIImageView alloc] initWithFrame:CGRectZero];
@@ -383,7 +383,7 @@ - (void)configViewWithModel:(ShopOrder *)order
383383

384384
NSDate *date =[NSDate dateWithTimeIntervalSince1970: ((double)(order.createdAt.longLongValue))/1000.0];
385385
if (date) {
386-
_sendTimeLabel.text = [date stringWithFormat:@"yyyy-MM-dd HH:mm"];
386+
_sendTimeLabel.text = [date stringWithFormat:@"yyyy年MM月dd日 HH:mm"];
387387
}
388388
}
389389
if ([order.expressNo isEmpty]) {

‎Coding_iOS/Views/ShopGoodsInfoView.m‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,12 @@ - (void)setUpContentView
7474
[superView addSubview:_codingCoinView];
7575

7676

77-
float _coverViewHeight = 144/2;
77+
float _coverViewHeight = 90;
7878
NSLog(@"_coverViewHeight %lf",_coverViewHeight);
7979
[_coverView mas_makeConstraints:^(MASConstraintMaker *make) {
8080
make.top.left.equalTo(superView).offset(12);
81-
make.height.width.offset(_coverViewHeight);
81+
make.width.offset(_coverViewHeight);
82+
make.height.offset(108/2);
8283
}];
8384

8485

@@ -122,6 +123,14 @@ - (void)setUpContentView
122123
make.width.offset(kScreen_Width);
123124
}];
124125

126+
UIView *bottomLineView = [[UIView alloc] init];
127+
bottomLineView.backgroundColor = [UIColor colorWithHexString:@"0xC8C8C8"];
128+
[superView addSubview:bottomLineView];
129+
[bottomLineView mas_makeConstraints:^(MASConstraintMaker *make) {
130+
make.height.offset(0.5);
131+
make.left.right.bottom.equalTo(superView);
132+
}];
133+
125134
}
126135

127136
- (void)configViewWithModel:(ShopGoods *)model

‎Coding_iOS/Views/TableListView/ShopOrderListView.m‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
@interface ShopOrderListView ()<UITableViewDataSource,UITableViewDelegate>
1616
{
17-
NSArray *_dataSource;
17+
NSMutableArray *_dataSource;
1818
}
1919
@property (nonatomic, strong) UITableView *myTableView;
2020
@property (nonatomic, strong) ShopOderCell *currentOrderCell;
@@ -32,15 +32,13 @@ - (instancetype)initWithFrame:(CGRect)frame withOder:(ShopOrderModel *)order
3232
_myOrder = order;
3333
_myTableView = ({
3434
UITableView *tableView = [[UITableView alloc] initWithFrame:self.bounds style:UITableViewStyleGrouped];
35-
tableView.backgroundColor = [UIColor clearColor];
35+
tableView.backgroundColor = [UIColor colorWithHexString:@"0xeeeeee"];
3636
tableView.delegate = self;
3737
tableView.dataSource = self;
3838
tableView.estimatedRowHeight = 690/2;
3939
[tableView registerClass:[ShopOderCell class] forCellReuseIdentifier:@"ShopOderCell"];
40-
tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
41-
tableView.separatorColor = [UIColor colorWithHexString:@"0xFFDDDDDD"];
42-
// tableView.contentInset = UIEdgeInsetsMake(6, 0, 0, 0);
43-
// tableView.separatorInset = UIEdgeInsetsMake(0, 12, 0, 12);
40+
tableView.separatorStyle = UITableViewCellSeparatorStyleSingleLine;
41+
tableView.separatorColor = [UIColor colorWithHexString:@"0xC8C8C8"];
4442
[self addSubview:tableView];
4543
[tableView mas_makeConstraints:^(MASConstraintMaker *make) {
4644
make.edges.equalTo(self);
@@ -58,7 +56,10 @@ - (instancetype)initWithFrame:(CGRect)frame withOder:(ShopOrderModel *)order
5856

5957
- (void)reloadData
6058
{
61-
_dataSource = [_myOrder getDataSourceByOrderType];
59+
[_dataSource removeAllObjects];
60+
[_myTableView reloadData];
61+
62+
_dataSource = [NSMutableArray arrayWithArray:[_myOrder getDataSourceByOrderType]];
6263

6364
if (_dataSource.count > 0) {
6465

@@ -86,9 +87,8 @@ - (void)reloadData
8687
//
8788
[self configBlankPage:EaseBlankPageTypeShopOrders hasData:(_dataSource.count > 0) hasError:NO reloadButtonBlock:^(id sender) {
8889
}];
90+
8991
[self.myTableView reloadData];
90-
91-
9292
}
9393

9494
- (void)refresh
@@ -139,6 +139,9 @@ - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPa
139139

140140
- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section
141141
{
142+
if (section == 0) {
143+
return 12;
144+
}
142145
return 6;
143146
}
144147

0 commit comments

Comments
 (0)