diff --git a/keyBoard/Class/Me/VC/KBConsumptionRecordVC.m b/keyBoard/Class/Me/VC/KBConsumptionRecordVC.m index 3267360..8181efa 100644 --- a/keyBoard/Class/Me/VC/KBConsumptionRecordVC.m +++ b/keyBoard/Class/Me/VC/KBConsumptionRecordVC.m @@ -226,6 +226,7 @@ [self.pointsLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.left.equalTo(self.pointsIconView.mas_right).offset(8); make.centerY.equalTo(self.pointsIconView).offset(0); + make.right.lessThanOrEqualTo(self.rechargeButton.mas_left).offset(-12); }]; [self.rechargeButton mas_makeConstraints:^(MASConstraintMaker *make) { @@ -275,6 +276,9 @@ _pointsLabel.text = @"0"; _pointsLabel.font = [KBFont bold:40]; _pointsLabel.textColor = [UIColor colorWithHex:0x02BEAC]; + _pointsLabel.adjustsFontSizeToFitWidth = YES; + _pointsLabel.minimumScaleFactor = 0.6; + _pointsLabel.numberOfLines = 1; } return _pointsLabel; } diff --git a/keyBoard/Class/Shop/V/KBShopHeadView.m b/keyBoard/Class/Shop/V/KBShopHeadView.m index dc71ab6..b6eb22d 100644 --- a/keyBoard/Class/Shop/V/KBShopHeadView.m +++ b/keyBoard/Class/Shop/V/KBShopHeadView.m @@ -139,6 +139,7 @@ [self.amountLabel mas_makeConstraints:^(MASConstraintMaker *make) { make.left.equalTo(self.smallCoinView.mas_right).offset(10); make.centerY.equalTo(self.rechargeButton); + make.right.lessThanOrEqualTo(self.rechargeButton.mas_left).offset(-12); }]; [self.rechargeButton mas_makeConstraints:^(MASConstraintMaker *make) { @@ -303,7 +304,8 @@ _amountLabel.textColor = [UIColor colorWithHex:KBColorValue]; _amountLabel.font = [KBFont bold:40]; _amountLabel.adjustsFontSizeToFitWidth = YES; -// _amountLabel.minimumScaleFactor = 0.7; + _amountLabel.minimumScaleFactor = 0.6; + _amountLabel.numberOfLines = 1; } return _amountLabel; }