完善实名认证、钱包与打卡点模块 UI 与业务逻辑。
对齐 Android 实名认证流程与审核页、钱包提现/积分兑换界面，优化打卡点列表与详情交互，并补充相关资源、主题 token 与单元测试。 Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@ -19,6 +19,7 @@ final class PointsRedemptionViewController: BaseViewController, UITableViewDeleg
|
||||
private let contentStack = UIStackView()
|
||||
private let pointsCard = UIView()
|
||||
private let pointsValueLabel = UILabel()
|
||||
private let summaryLoadingIndicator = UIActivityIndicatorView(style: .large)
|
||||
private let inputCard = UIView()
|
||||
private let pointsInputField = UITextField()
|
||||
private let withdrawablePointsLabel = UILabel()
|
||||
@ -29,6 +30,7 @@ final class PointsRedemptionViewController: BaseViewController, UITableViewDeleg
|
||||
private let submitButton = AppButton(title: "立即兑换")
|
||||
|
||||
private var dataSource: UITableViewDiffableDataSource<Section, PointWithdrawItem>!
|
||||
private var tableHeightConstraint: Constraint?
|
||||
private var lastShownMessage: String?
|
||||
|
||||
/// 初始化积分兑现页面。
|
||||
@ -47,13 +49,17 @@ final class PointsRedemptionViewController: BaseViewController, UITableViewDeleg
|
||||
}
|
||||
|
||||
override func setupNavigationBar() {
|
||||
title = "积分兑现"
|
||||
let titleLabel = UILabel()
|
||||
titleLabel.text = "积分兑现"
|
||||
titleLabel.textColor = WalletTokens.text333
|
||||
titleLabel.font = UIFont.systemFont(ofSize: 18)
|
||||
navigationItem.titleView = titleLabel
|
||||
}
|
||||
|
||||
override func setupUI() {
|
||||
view.backgroundColor = UIColor(hex: 0xF5F6F8)
|
||||
view.backgroundColor = WalletTokens.pageBackground
|
||||
contentStack.axis = .vertical
|
||||
contentStack.spacing = 16
|
||||
contentStack.spacing = WalletTokens.cardGap
|
||||
bottomBar.backgroundColor = .white
|
||||
|
||||
view.addSubview(scrollView)
|
||||
@ -72,21 +78,21 @@ final class PointsRedemptionViewController: BaseViewController, UITableViewDeleg
|
||||
make.leading.trailing.bottom.equalToSuperview()
|
||||
}
|
||||
submitButton.snp.makeConstraints { make in
|
||||
make.top.equalToSuperview().offset(16)
|
||||
make.leading.trailing.equalToSuperview().inset(16)
|
||||
make.top.equalToSuperview().offset(WalletTokens.screenInset)
|
||||
make.leading.trailing.equalToSuperview().inset(WalletTokens.screenInset)
|
||||
make.bottom.equalTo(view.safeAreaLayoutGuide).inset(22)
|
||||
}
|
||||
submitButton.layer.cornerRadius = WalletTokens.bottomButtonRadius
|
||||
scrollView.snp.makeConstraints { make in
|
||||
make.top.leading.trailing.equalToSuperview()
|
||||
make.bottom.equalTo(bottomBar.snp.top)
|
||||
}
|
||||
contentStack.snp.makeConstraints { make in
|
||||
make.edges.equalToSuperview().inset(16)
|
||||
make.edges.equalToSuperview().inset(WalletTokens.screenInset)
|
||||
make.width.equalTo(scrollView).offset(-32)
|
||||
}
|
||||
tableView.snp.makeConstraints { make in
|
||||
make.height.greaterThanOrEqualTo(260)
|
||||
make.height.lessThanOrEqualTo(420)
|
||||
tableHeightConstraint = make.height.equalTo(200).constraint
|
||||
}
|
||||
}
|
||||
|
||||
@ -97,7 +103,8 @@ final class PointsRedemptionViewController: BaseViewController, UITableViewDeleg
|
||||
pointsInputField.addTarget(self, action: #selector(pointsInputChanged), for: .editingChanged)
|
||||
refreshControl.addTarget(self, action: #selector(refreshPulled), for: .valueChanged)
|
||||
submitButton.addTarget(self, action: #selector(submitTapped), for: .touchUpInside)
|
||||
Task { await viewModel.loadInitial(api: walletAPI) }
|
||||
Task { await viewModel.refreshOverview(api: walletAPI) }
|
||||
Task { await viewModel.refreshWithdrawList(api: walletAPI) }
|
||||
}
|
||||
|
||||
private func configureTable() {
|
||||
@ -106,7 +113,7 @@ final class PointsRedemptionViewController: BaseViewController, UITableViewDeleg
|
||||
tableView.delegate = self
|
||||
tableView.rowHeight = UITableView.automaticDimension
|
||||
tableView.estimatedRowHeight = 120
|
||||
tableView.refreshControl = refreshControl
|
||||
scrollView.refreshControl = refreshControl
|
||||
tableView.register(PointWithdrawRecordCell.self, forCellReuseIdentifier: PointWithdrawRecordCell.reuseIdentifier)
|
||||
dataSource = UITableViewDiffableDataSource<Section, PointWithdrawItem>(tableView: tableView) { tableView, indexPath, item in
|
||||
let cell = tableView.dequeueReusableCell(
|
||||
@ -121,47 +128,82 @@ final class PointsRedemptionViewController: BaseViewController, UITableViewDeleg
|
||||
private func applyState() {
|
||||
pointsValueLabel.text = "\(viewModel.withdrawnPoints)"
|
||||
withdrawablePointsLabel.text = "\(viewModel.withdrawnPoints)"
|
||||
pointsValueLabel.isHidden = viewModel.overviewLoading
|
||||
if viewModel.overviewLoading {
|
||||
summaryLoadingIndicator.startAnimating()
|
||||
} else {
|
||||
summaryLoadingIndicator.stopAnimating()
|
||||
}
|
||||
pointsInputField.text = viewModel.pointsInput
|
||||
submitButton.isEnabled = (Int(viewModel.pointsInput) ?? 0) > 0
|
||||
refreshControl.endRefreshing()
|
||||
if !viewModel.withdrawRefreshing, !viewModel.overviewLoading {
|
||||
refreshControl.endRefreshing()
|
||||
}
|
||||
var snapshot = NSDiffableDataSourceSnapshot<Section, PointWithdrawItem>()
|
||||
snapshot.appendSections([.main])
|
||||
snapshot.appendItems(viewModel.withdrawRecords, toSection: .main)
|
||||
dataSource.apply(snapshot, animatingDifferences: true)
|
||||
updateEmptyState()
|
||||
dataSource.apply(snapshot, animatingDifferences: true) { [weak self] in
|
||||
self?.updateTablePresentation()
|
||||
}
|
||||
showMessageIfNeeded(viewModel.statusMessage)
|
||||
showMessageIfNeeded(viewModel.errorMessage)
|
||||
}
|
||||
|
||||
private func updateEmptyState() {
|
||||
guard viewModel.withdrawRecords.isEmpty, !viewModel.withdrawLoading else {
|
||||
private func updateTablePresentation() {
|
||||
tableView.layoutIfNeeded()
|
||||
let isEmpty = viewModel.withdrawRecords.isEmpty
|
||||
updateLoadingFooter()
|
||||
guard isEmpty, !viewModel.withdrawLoading else {
|
||||
tableView.backgroundView = nil
|
||||
let minimumHeight: CGFloat = viewModel.withdrawLoading ? 56 : 44
|
||||
let height = max(minimumHeight, min(tableView.contentSize.height, 400))
|
||||
tableHeightConstraint?.update(offset: height)
|
||||
tableView.isScrollEnabled = tableView.contentSize.height > 400
|
||||
return
|
||||
}
|
||||
let label = UILabel()
|
||||
label.text = "暂无提现记录"
|
||||
label.font = .systemFont(ofSize: 14)
|
||||
label.textColor = UIColor(hex: 0xB3B8C2)
|
||||
label.font = WalletTokens.bodyFont
|
||||
label.textColor = WalletTokens.textDisabled
|
||||
label.textAlignment = .center
|
||||
tableView.backgroundView = label
|
||||
tableHeightConstraint?.update(offset: 200)
|
||||
tableView.isScrollEnabled = false
|
||||
}
|
||||
|
||||
private func updateLoadingFooter() {
|
||||
guard viewModel.withdrawLoading else {
|
||||
tableView.tableFooterView = UIView(frame: .zero)
|
||||
return
|
||||
}
|
||||
let footer = UIView(frame: CGRect(x: 0, y: 0, width: tableView.bounds.width, height: 56))
|
||||
let indicator = UIActivityIndicatorView(style: .medium)
|
||||
indicator.color = WalletTokens.primary
|
||||
indicator.startAnimating()
|
||||
footer.addSubview(indicator)
|
||||
indicator.snp.makeConstraints { make in make.center.equalToSuperview() }
|
||||
tableView.tableFooterView = footer
|
||||
}
|
||||
|
||||
private func makeSummaryCard() -> UIView {
|
||||
pointsCard.backgroundColor = UIColor(hex: 0x1677FF)
|
||||
pointsCard.layer.cornerRadius = 16
|
||||
pointsCard.backgroundColor = WalletTokens.summaryBackground
|
||||
pointsCard.layer.cornerRadius = WalletTokens.contentRadius
|
||||
pointsCard.clipsToBounds = true
|
||||
|
||||
let title = UILabel()
|
||||
title.text = "可提现积分"
|
||||
title.font = .systemFont(ofSize: 14)
|
||||
title.font = WalletTokens.bodyFont
|
||||
title.textColor = UIColor.white.withAlphaComponent(0.8)
|
||||
title.textAlignment = .center
|
||||
pointsValueLabel.font = .systemFont(ofSize: 36, weight: .bold)
|
||||
pointsValueLabel.font = WalletTokens.displayFont
|
||||
pointsValueLabel.textColor = .white
|
||||
pointsValueLabel.textAlignment = .center
|
||||
|
||||
pointsCard.addSubview(title)
|
||||
pointsCard.addSubview(pointsValueLabel)
|
||||
summaryLoadingIndicator.color = .white
|
||||
summaryLoadingIndicator.hidesWhenStopped = true
|
||||
pointsCard.addSubview(summaryLoadingIndicator)
|
||||
title.snp.makeConstraints { make in
|
||||
make.top.equalToSuperview().offset(16)
|
||||
make.leading.trailing.equalToSuperview().inset(24)
|
||||
@ -171,35 +213,40 @@ final class PointsRedemptionViewController: BaseViewController, UITableViewDeleg
|
||||
make.leading.trailing.equalToSuperview().inset(24)
|
||||
make.bottom.equalToSuperview().inset(16)
|
||||
}
|
||||
summaryLoadingIndicator.snp.makeConstraints { make in
|
||||
make.center.equalTo(pointsValueLabel)
|
||||
}
|
||||
return pointsCard
|
||||
}
|
||||
|
||||
private func makeInputCard() -> UIView {
|
||||
inputCard.backgroundColor = .white
|
||||
inputCard.layer.cornerRadius = 12
|
||||
inputCard.layer.cornerRadius = WalletTokens.cardRadius
|
||||
inputCard.clipsToBounds = true
|
||||
|
||||
let title = makeTitle("积分提现", size: 18)
|
||||
let titleSpacer = UIView()
|
||||
titleSpacer.snp.makeConstraints { make in make.height.equalTo(WalletTokens.compactGap) }
|
||||
let row = UIStackView()
|
||||
row.axis = .horizontal
|
||||
row.spacing = 16
|
||||
let label = makeBody("可提现积分", color: .black, weight: .medium)
|
||||
withdrawablePointsLabel.font = .systemFont(ofSize: 14, weight: .medium)
|
||||
withdrawablePointsLabel.textColor = UIColor(hex: 0xFF7B00)
|
||||
withdrawablePointsLabel.font = WalletTokens.bodyMediumFont
|
||||
withdrawablePointsLabel.textColor = WalletTokens.points
|
||||
row.addArrangedSubview(label)
|
||||
row.addArrangedSubview(withdrawablePointsLabel)
|
||||
|
||||
let inputContainer = UIView()
|
||||
inputContainer.layer.cornerRadius = 4
|
||||
inputContainer.layer.cornerRadius = WalletTokens.chipRadius
|
||||
inputContainer.layer.borderWidth = 1
|
||||
inputContainer.layer.borderColor = UIColor(hex: 0xEEEEEE).cgColor
|
||||
inputContainer.layer.borderColor = WalletTokens.border.cgColor
|
||||
pointsInputField.placeholder = "请输入积分"
|
||||
pointsInputField.keyboardType = .numberPad
|
||||
pointsInputField.font = .systemFont(ofSize: 14)
|
||||
pointsInputField.font = WalletTokens.bodyFont
|
||||
let allButton = UIButton(type: .system)
|
||||
allButton.setTitle("全部提现", for: .normal)
|
||||
allButton.setTitleColor(UIColor(hex: 0x0073FF), for: .normal)
|
||||
allButton.titleLabel?.font = .systemFont(ofSize: 14)
|
||||
allButton.setTitleColor(WalletTokens.primary, for: .normal)
|
||||
allButton.titleLabel?.font = WalletTokens.bodyFont
|
||||
allButton.addTarget(self, action: #selector(withdrawAllTapped), for: .touchUpInside)
|
||||
inputContainer.addSubview(pointsInputField)
|
||||
inputContainer.addSubview(allButton)
|
||||
@ -212,14 +259,14 @@ final class PointsRedemptionViewController: BaseViewController, UITableViewDeleg
|
||||
make.trailing.equalToSuperview().inset(12)
|
||||
make.centerY.equalToSuperview()
|
||||
}
|
||||
inputContainer.snp.makeConstraints { make in make.height.equalTo(46) }
|
||||
inputContainer.snp.makeConstraints { make in make.height.equalTo(WalletTokens.inputHeight) }
|
||||
|
||||
let ratio = makeBody("积分金额兑换比例12积分=1元人民币", color: UIColor(hex: 0xEF4444))
|
||||
ratio.font = .systemFont(ofSize: 12)
|
||||
let ratio = makeBody("积分金额兑换比例12积分=1元人民币", color: WalletTokens.danger)
|
||||
ratio.font = WalletTokens.captionFont
|
||||
|
||||
let stack = UIStackView(arrangedSubviews: [title, row, inputContainer, ratio])
|
||||
let stack = UIStackView(arrangedSubviews: [title, titleSpacer, row, inputContainer, ratio])
|
||||
stack.axis = .vertical
|
||||
stack.spacing = 12
|
||||
stack.spacing = WalletTokens.compactGap
|
||||
inputCard.addSubview(stack)
|
||||
stack.snp.makeConstraints { make in make.edges.equalToSuperview().inset(16) }
|
||||
return inputCard
|
||||
@ -227,20 +274,21 @@ final class PointsRedemptionViewController: BaseViewController, UITableViewDeleg
|
||||
|
||||
private func makeRecordCard() -> UIView {
|
||||
recordCard.backgroundColor = .white
|
||||
recordCard.layer.cornerRadius = 12
|
||||
recordCard.layer.cornerRadius = WalletTokens.cardRadius
|
||||
recordCard.clipsToBounds = true
|
||||
let title = makeTitle("积分提现记录", size: 14)
|
||||
title.textColor = UIColor(hex: 0x0073FF)
|
||||
title.textColor = WalletTokens.primary
|
||||
title.font = UIFont.systemFont(ofSize: 14, weight: .bold)
|
||||
title.textAlignment = .center
|
||||
recordCard.addSubview(title)
|
||||
recordCard.addSubview(tableView)
|
||||
title.snp.makeConstraints { make in
|
||||
make.top.equalToSuperview().offset(16)
|
||||
make.leading.trailing.equalToSuperview().inset(16)
|
||||
make.top.equalToSuperview().offset(WalletTokens.cardPadding)
|
||||
make.leading.trailing.equalToSuperview().inset(WalletTokens.cardPadding)
|
||||
}
|
||||
tableView.snp.makeConstraints { make in
|
||||
make.top.equalTo(title.snp.bottom).offset(12)
|
||||
make.leading.trailing.bottom.equalToSuperview().inset(16)
|
||||
make.top.equalTo(title.snp.bottom).offset(WalletTokens.rowGap)
|
||||
make.leading.trailing.bottom.equalToSuperview().inset(WalletTokens.cardPadding)
|
||||
}
|
||||
return recordCard
|
||||
}
|
||||
@ -276,7 +324,8 @@ final class PointsRedemptionViewController: BaseViewController, UITableViewDeleg
|
||||
}
|
||||
|
||||
@objc private func refreshPulled() {
|
||||
Task { await viewModel.loadInitial(api: walletAPI) }
|
||||
Task { await viewModel.refreshOverview(api: walletAPI) }
|
||||
Task { await viewModel.refreshWithdrawList(api: walletAPI) }
|
||||
}
|
||||
|
||||
@objc private func submitTapped() {
|
||||
@ -301,9 +350,11 @@ private final class PointWithdrawRecordCell: UITableViewCell {
|
||||
private let amountLabel = UILabel()
|
||||
private let timeLabel = UILabel()
|
||||
private let progressView = UIProgressView(progressViewStyle: .bar)
|
||||
private let percentLabel = UILabel()
|
||||
private let stepsStack = UIStackView()
|
||||
private let infoLabel = UILabel()
|
||||
private let statusLabel = UILabel()
|
||||
private let remarkLabel = UILabel()
|
||||
|
||||
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
|
||||
super.init(style: style, reuseIdentifier: reuseIdentifier)
|
||||
@ -329,41 +380,52 @@ private final class PointWithdrawRecordCell: UITableViewCell {
|
||||
progressView.progress = Float(progress) / 100.0
|
||||
progressView.progressTintColor = style.progress
|
||||
progressView.isHidden = progress == 0
|
||||
percentLabel.isHidden = progress == 0
|
||||
stepsStack.isHidden = progress == 0
|
||||
percentLabel.text = "\(progress)%"
|
||||
configureSteps(progress: progress, tint: style.progress)
|
||||
infoLabel.text = infoText(for: record)
|
||||
remarkLabel.text = record.rejectReason.isEmpty ? "" : "备注信息：\(record.rejectReason)"
|
||||
remarkLabel.isHidden = record.rejectReason.isEmpty
|
||||
updateDynamicConstraints(progress: progress, showsRemark: !record.rejectReason.isEmpty)
|
||||
}
|
||||
|
||||
private func setupUI() {
|
||||
selectionStyle = .none
|
||||
backgroundColor = .white
|
||||
cardView.backgroundColor = .white
|
||||
cardView.layer.cornerRadius = 16
|
||||
cardView.layer.cornerRadius = WalletTokens.contentRadius
|
||||
cardView.layer.borderWidth = 1
|
||||
cardView.layer.borderColor = UIColor(hex: 0xF3F4F6).cgColor
|
||||
cardView.layer.borderColor = WalletTokens.cardBorder.cgColor
|
||||
cardView.clipsToBounds = true
|
||||
pointsLabel.font = .systemFont(ofSize: 18, weight: .medium)
|
||||
pointsLabel.textColor = .black
|
||||
amountLabel.font = .systemFont(ofSize: 18, weight: .medium)
|
||||
amountLabel.textColor = UIColor(hex: 0xEF4444)
|
||||
pointsLabel.font = WalletTokens.metricMediumFont
|
||||
pointsLabel.textColor = WalletTokens.textPrimary
|
||||
amountLabel.font = WalletTokens.metricMediumFont
|
||||
amountLabel.textColor = WalletTokens.danger
|
||||
amountLabel.textAlignment = .right
|
||||
timeLabel.font = .systemFont(ofSize: 14)
|
||||
timeLabel.textColor = UIColor(hex: 0x7B8EAA)
|
||||
progressView.trackTintColor = UIColor(hex: 0xF2F4F8)
|
||||
timeLabel.font = WalletTokens.bodyFont
|
||||
timeLabel.textColor = WalletTokens.textMuted
|
||||
progressView.trackTintColor = WalletTokens.progressTrack
|
||||
progressView.layer.cornerRadius = 3
|
||||
progressView.clipsToBounds = true
|
||||
percentLabel.font = WalletTokens.bodyMediumFont
|
||||
percentLabel.textColor = WalletTokens.textTertiary
|
||||
percentLabel.textAlignment = .right
|
||||
stepsStack.axis = .horizontal
|
||||
stepsStack.distribution = .equalSpacing
|
||||
statusLabel.font = .systemFont(ofSize: 12)
|
||||
statusLabel.font = WalletTokens.captionFont
|
||||
statusLabel.textAlignment = .center
|
||||
statusLabel.layer.cornerRadius = 4
|
||||
statusLabel.layer.cornerRadius = WalletTokens.chipRadius
|
||||
statusLabel.clipsToBounds = true
|
||||
infoLabel.font = .systemFont(ofSize: 14)
|
||||
infoLabel.textColor = UIColor(hex: 0x4B5563)
|
||||
infoLabel.font = WalletTokens.bodyFont
|
||||
infoLabel.textColor = WalletTokens.textSecondary
|
||||
infoLabel.numberOfLines = 0
|
||||
remarkLabel.font = WalletTokens.bodyFont
|
||||
remarkLabel.textColor = WalletTokens.danger
|
||||
remarkLabel.numberOfLines = 0
|
||||
|
||||
contentView.addSubview(cardView)
|
||||
[pointsLabel, amountLabel, timeLabel, progressView, stepsStack, infoLabel, statusLabel].forEach(cardView.addSubview)
|
||||
[pointsLabel, amountLabel, timeLabel, progressView, percentLabel, stepsStack, infoLabel, statusLabel, remarkLabel].forEach(cardView.addSubview)
|
||||
|
||||
cardView.snp.makeConstraints { make in
|
||||
make.edges.equalToSuperview().inset(UIEdgeInsets(top: 6, left: 0, bottom: 6, right: 0))
|
||||
@ -382,25 +444,47 @@ private final class PointWithdrawRecordCell: UITableViewCell {
|
||||
}
|
||||
progressView.snp.makeConstraints { make in
|
||||
make.top.equalTo(timeLabel.snp.bottom).offset(12)
|
||||
make.leading.trailing.equalToSuperview().inset(16)
|
||||
make.height.equalTo(6)
|
||||
make.leading.equalToSuperview().offset(WalletTokens.cardPadding)
|
||||
make.trailing.equalTo(percentLabel.snp.leading).offset(-WalletTokens.rowGap)
|
||||
make.height.equalTo(WalletTokens.progressHeight)
|
||||
}
|
||||
percentLabel.snp.makeConstraints { make in
|
||||
make.centerY.equalTo(progressView)
|
||||
make.trailing.equalToSuperview().inset(WalletTokens.cardPadding)
|
||||
}
|
||||
stepsStack.snp.makeConstraints { make in
|
||||
make.top.equalTo(progressView.snp.bottom).offset(8)
|
||||
make.leading.trailing.equalToSuperview().inset(16)
|
||||
}
|
||||
infoLabel.snp.makeConstraints { make in
|
||||
make.top.equalTo(stepsStack.snp.bottom).offset(10)
|
||||
make.leading.equalToSuperview().offset(16)
|
||||
make.trailing.lessThanOrEqualTo(statusLabel.snp.leading).offset(-8)
|
||||
make.bottom.equalToSuperview().inset(14)
|
||||
}
|
||||
statusLabel.snp.makeConstraints { make in
|
||||
make.centerY.equalTo(infoLabel)
|
||||
make.trailing.equalToSuperview().inset(16)
|
||||
make.height.equalTo(22)
|
||||
make.width.greaterThanOrEqualTo(70)
|
||||
}
|
||||
updateDynamicConstraints(progress: 0, showsRemark: false)
|
||||
}
|
||||
|
||||
private func updateDynamicConstraints(progress: Int, showsRemark: Bool) {
|
||||
infoLabel.snp.remakeConstraints { make in
|
||||
if progress > 0 {
|
||||
make.top.equalTo(stepsStack.snp.bottom).offset(WalletTokens.compactGap)
|
||||
} else {
|
||||
make.top.equalTo(timeLabel.snp.bottom).offset(WalletTokens.compactGap)
|
||||
}
|
||||
make.leading.equalToSuperview().offset(WalletTokens.cardPadding)
|
||||
make.trailing.lessThanOrEqualTo(statusLabel.snp.leading).offset(-WalletTokens.compactGap)
|
||||
if !showsRemark {
|
||||
make.bottom.equalToSuperview().inset(14)
|
||||
}
|
||||
}
|
||||
remarkLabel.snp.remakeConstraints { make in
|
||||
make.top.equalTo(infoLabel.snp.bottom).offset(WalletTokens.tinyGap)
|
||||
make.leading.trailing.equalToSuperview().inset(WalletTokens.cardPadding)
|
||||
if showsRemark {
|
||||
make.bottom.equalToSuperview().inset(14)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func configureSteps(progress: Int, tint: UIColor) {
|
||||
@ -408,15 +492,10 @@ private final class PointWithdrawRecordCell: UITableViewCell {
|
||||
["提交申请", "审核中", "打款中", "已完成"].enumerated().forEach { index, title in
|
||||
let label = UILabel()
|
||||
label.text = title
|
||||
label.font = .systemFont(ofSize: 11)
|
||||
label.textColor = progress >= Int((Float(index) / 3.0) * 100) ? tint : UIColor(hex: 0x7B8EAA)
|
||||
label.font = WalletTokens.stepFont
|
||||
label.textColor = progress >= Int((Float(index) / 3.0) * 100) ? tint : WalletTokens.textMuted
|
||||
stepsStack.addArrangedSubview(label)
|
||||
}
|
||||
let percent = UILabel()
|
||||
percent.text = "\(progress)%"
|
||||
percent.font = .systemFont(ofSize: 12, weight: .medium)
|
||||
percent.textColor = UIColor(hex: 0x9CA3AF)
|
||||
stepsStack.addArrangedSubview(percent)
|
||||
}
|
||||
|
||||
private func statusText(for status: Int) -> String {
|
||||
@ -431,13 +510,13 @@ private final class PointWithdrawRecordCell: UITableViewCell {
|
||||
private func statusStyle(for status: Int) -> (background: UIColor, text: UIColor, progress: UIColor) {
|
||||
switch status {
|
||||
case 2:
|
||||
(UIColor(hex: 0xF0FDF4), UIColor(hex: 0x22C55E), UIColor(hex: 0x1677FF))
|
||||
(WalletTokens.successBackground, WalletTokens.success, WalletTokens.summaryBackground)
|
||||
case 1:
|
||||
(UIColor(hex: 0xFFF0E2), UIColor(hex: 0xFF7B00), UIColor(hex: 0x1677FF))
|
||||
(WalletTokens.pointsPendingBackground, WalletTokens.points, WalletTokens.summaryBackground)
|
||||
case 3:
|
||||
(UIColor(hex: 0xFFE7E7), UIColor(hex: 0xEF4444), UIColor(hex: 0xFF4D4F))
|
||||
(WalletTokens.dangerBackground, WalletTokens.danger, WalletTokens.progressDanger)
|
||||
default:
|
||||
(UIColor(hex: 0xE6F1FF), UIColor(hex: 0x1677FF), UIColor(hex: 0x1677FF))
|
||||
(WalletTokens.infoBackground, WalletTokens.summaryBackground, WalletTokens.summaryBackground)
|
||||
}
|
||||
}
|
||||
|
||||
@ -452,8 +531,7 @@ private final class PointWithdrawRecordCell: UITableViewCell {
|
||||
private func infoText(for record: PointWithdrawItem) -> String {
|
||||
switch record.status {
|
||||
case 3:
|
||||
let remark = record.rejectReason.isEmpty ? "" : "\n备注信息：\(record.rejectReason)"
|
||||
return "审核时间：\(record.reviewedAt.isEmpty ? "暂无" : record.reviewedAt)\(remark)"
|
||||
return "审核时间：\(record.reviewedAt.isEmpty ? "暂无" : record.reviewedAt)"
|
||||
case 2:
|
||||
return "到账时间：\(record.paymentTime.isEmpty ? "暂无" : record.paymentTime)"
|
||||
default:
|
||||
|
||||
@ -41,8 +41,17 @@ final class WalletWithdrawRecordCell: UITableViewCell {
|
||||
configureSteps(progress: progress(for: record.settlementStatus), tint: style.progress)
|
||||
progressView.isHidden = record.settlementStatus == 50
|
||||
stepsStack.isHidden = record.settlementStatus == 50
|
||||
infoLabel.text = infoText(for: record)
|
||||
infoLabel.isHidden = infoLabel.text?.isEmpty ?? true
|
||||
infoLabel.attributedText = infoText(for: record)
|
||||
infoLabel.isHidden = infoLabel.attributedText?.length == 0
|
||||
infoLabel.snp.remakeConstraints { make in
|
||||
if record.settlementStatus == 50 {
|
||||
make.top.equalTo(timeLabel.snp.bottom).offset(WalletTokens.compactGap)
|
||||
} else {
|
||||
make.top.equalTo(stepsStack.snp.bottom).offset(10)
|
||||
}
|
||||
make.leading.trailing.equalToSuperview().inset(WalletTokens.cardPadding)
|
||||
make.bottom.equalToSuperview().inset(14)
|
||||
}
|
||||
}
|
||||
|
||||
private func setupUI() {
|
||||
@ -51,23 +60,23 @@ final class WalletWithdrawRecordCell: UITableViewCell {
|
||||
contentView.backgroundColor = .white
|
||||
|
||||
cardView.backgroundColor = .white
|
||||
cardView.layer.cornerRadius = 16
|
||||
cardView.layer.cornerRadius = WalletTokens.contentRadius
|
||||
cardView.layer.borderWidth = 1
|
||||
cardView.layer.borderColor = UIColor(hex: 0xF3F4F6).cgColor
|
||||
cardView.layer.borderColor = WalletTokens.cardBorder.cgColor
|
||||
cardView.clipsToBounds = true
|
||||
|
||||
amountLabel.font = .systemFont(ofSize: 18, weight: .bold)
|
||||
amountLabel.textColor = .black
|
||||
amountLabel.font = WalletTokens.metricBoldFont
|
||||
amountLabel.textColor = WalletTokens.textPrimary
|
||||
|
||||
statusLabel.font = .systemFont(ofSize: 12, weight: .medium)
|
||||
statusLabel.font = WalletTokens.captionMediumFont
|
||||
statusLabel.textAlignment = .center
|
||||
statusLabel.layer.cornerRadius = 4
|
||||
statusLabel.layer.cornerRadius = WalletTokens.chipRadius
|
||||
statusLabel.clipsToBounds = true
|
||||
|
||||
timeLabel.font = .systemFont(ofSize: 14)
|
||||
timeLabel.textColor = UIColor(hex: 0x7B8EAA)
|
||||
timeLabel.font = WalletTokens.bodyFont
|
||||
timeLabel.textColor = WalletTokens.textMuted
|
||||
|
||||
progressView.trackTintColor = UIColor(hex: 0xF2F4F8)
|
||||
progressView.trackTintColor = WalletTokens.progressTrack
|
||||
progressView.layer.cornerRadius = 3
|
||||
progressView.clipsToBounds = true
|
||||
|
||||
@ -75,8 +84,8 @@ final class WalletWithdrawRecordCell: UITableViewCell {
|
||||
stepsStack.distribution = .equalSpacing
|
||||
stepsStack.alignment = .center
|
||||
|
||||
infoLabel.font = .systemFont(ofSize: 14)
|
||||
infoLabel.textColor = UIColor(hex: 0x4B5563)
|
||||
infoLabel.font = WalletTokens.bodyFont
|
||||
infoLabel.textColor = WalletTokens.textSecondary
|
||||
infoLabel.numberOfLines = 0
|
||||
|
||||
contentView.addSubview(cardView)
|
||||
@ -120,14 +129,14 @@ final class WalletWithdrawRecordCell: UITableViewCell {
|
||||
["提交申请", "审核中", "打款中", "已完成"].enumerated().forEach { index, title in
|
||||
let label = UILabel()
|
||||
label.text = title
|
||||
label.font = .systemFont(ofSize: 11)
|
||||
label.font = WalletTokens.stepFont
|
||||
let threshold = Float(index) / 3.0
|
||||
label.textColor = progress >= threshold ? tint : UIColor(hex: 0xB3B8C2)
|
||||
label.textColor = progress >= threshold ? tint : WalletTokens.textDisabled
|
||||
stepsStack.addArrangedSubview(label)
|
||||
}
|
||||
let percent = UILabel()
|
||||
percent.text = "\(Int(progress * 100))%"
|
||||
percent.font = .systemFont(ofSize: 12, weight: .medium)
|
||||
percent.font = WalletTokens.captionMediumFont
|
||||
percent.textColor = tint
|
||||
stepsStack.addArrangedSubview(percent)
|
||||
}
|
||||
@ -135,13 +144,13 @@ final class WalletWithdrawRecordCell: UITableViewCell {
|
||||
private func statusStyle(for status: Int) -> (background: UIColor, text: UIColor, progress: UIColor) {
|
||||
switch status {
|
||||
case 50, 20:
|
||||
(UIColor(hex: 0xEBFFF5), UIColor(hex: 0x16C26D), UIColor(hex: 0x1677FF))
|
||||
(WalletTokens.settlementSuccessBackground, WalletTokens.settlementSuccess, WalletTokens.summaryBackground)
|
||||
case 60, 30:
|
||||
(UIColor(hex: 0xFFF1F0), UIColor(hex: 0xFF4D4F), UIColor(hex: 0xFF4D4F))
|
||||
(WalletTokens.settlementDangerBackground, WalletTokens.progressDanger, WalletTokens.progressDanger)
|
||||
case 40:
|
||||
(UIColor(hex: 0xFFF3E8), UIColor(hex: 0xFF8A00), UIColor(hex: 0x1677FF))
|
||||
(WalletTokens.warningBackground, WalletTokens.warning, WalletTokens.summaryBackground)
|
||||
default:
|
||||
(UIColor(hex: 0xE6F1FF), UIColor(hex: 0x1677FF), UIColor(hex: 0x1677FF))
|
||||
(WalletTokens.infoBackground, WalletTokens.summaryBackground, WalletTokens.summaryBackground)
|
||||
}
|
||||
}
|
||||
|
||||
@ -156,18 +165,34 @@ final class WalletWithdrawRecordCell: UITableViewCell {
|
||||
}
|
||||
}
|
||||
|
||||
private func infoText(for record: WalletWithdrawItem) -> String {
|
||||
private func infoText(for record: WalletWithdrawItem) -> NSAttributedString {
|
||||
let result = NSMutableAttributedString()
|
||||
let normal: [NSAttributedString.Key: Any] = [
|
||||
.font: WalletTokens.bodyFont,
|
||||
.foregroundColor: WalletTokens.textSecondary,
|
||||
]
|
||||
let success: [NSAttributedString.Key: Any] = [
|
||||
.font: WalletTokens.bodyFont,
|
||||
.foregroundColor: WalletTokens.settlementSuccess,
|
||||
]
|
||||
let danger: [NSAttributedString.Key: Any] = [
|
||||
.font: WalletTokens.bodyFont,
|
||||
.foregroundColor: WalletTokens.progressDanger,
|
||||
]
|
||||
if (record.settlementStatus == 10 || record.settlementStatus == 40), !record.expectedAt.isEmpty {
|
||||
return "预计到账时间：\(record.expectedAt)"
|
||||
result.append(NSAttributedString(string: "预计到账时间：\(record.expectedAt)", attributes: normal))
|
||||
}
|
||||
if (record.settlementStatus == 60 || record.settlementStatus == 30), !record.auditTime.isEmpty {
|
||||
let remark = record.auditRemark.isEmpty ? "" : "\n备注信息：\(record.auditRemark)"
|
||||
return "审核时间：\(record.auditTime)\(remark)"
|
||||
result.append(NSAttributedString(string: "审核时间：\(record.auditTime)", attributes: normal))
|
||||
}
|
||||
if (record.settlementStatus == 60 || record.settlementStatus == 30), !record.auditRemark.isEmpty {
|
||||
if result.length > 0 { result.append(NSAttributedString(string: "\n")) }
|
||||
result.append(NSAttributedString(string: "备注信息：\(record.auditRemark)", attributes: danger))
|
||||
}
|
||||
if record.settlementStatus == 50, !record.expectedAt.isEmpty {
|
||||
return "到账时间：\(record.expectedAt)"
|
||||
result.append(NSAttributedString(string: "到账时间：\(record.expectedAt)", attributes: success))
|
||||
}
|
||||
return ""
|
||||
return result
|
||||
}
|
||||
}
|
||||
|
||||
@ -199,13 +224,13 @@ final class WalletTransactionHeaderCell: UITableViewCell {
|
||||
private func setupUI() {
|
||||
selectionStyle = .none
|
||||
backgroundColor = .white
|
||||
dateLabel.font = .systemFont(ofSize: 14)
|
||||
dateLabel.textColor = UIColor(hex: 0x9CA3AF)
|
||||
incomeLabel.font = .systemFont(ofSize: 14)
|
||||
incomeLabel.textColor = UIColor(hex: 0x4B5563)
|
||||
dateLabel.font = WalletTokens.bodyFont
|
||||
dateLabel.textColor = WalletTokens.textTertiary
|
||||
incomeLabel.font = WalletTokens.bodyFont
|
||||
incomeLabel.textColor = WalletTokens.textSecondary
|
||||
incomeLabel.textAlignment = .right
|
||||
pointsLabel.font = .systemFont(ofSize: 14)
|
||||
pointsLabel.textColor = UIColor(hex: 0xFF7B00)
|
||||
pointsLabel.font = WalletTokens.bodyFont
|
||||
pointsLabel.textColor = WalletTokens.points
|
||||
pointsLabel.textAlignment = .right
|
||||
|
||||
contentView.addSubview(dateLabel)
|
||||
@ -277,27 +302,27 @@ final class WalletTransactionRecordCell: UITableViewCell {
|
||||
selectionStyle = .none
|
||||
backgroundColor = .white
|
||||
cardView.backgroundColor = .white
|
||||
cardView.layer.cornerRadius = 12
|
||||
cardView.layer.cornerRadius = WalletTokens.cardRadius
|
||||
cardView.layer.borderWidth = 1
|
||||
cardView.layer.borderColor = UIColor(hex: 0xF3F4F6).cgColor
|
||||
cardView.layer.borderColor = WalletTokens.cardBorder.cgColor
|
||||
cardView.clipsToBounds = true
|
||||
|
||||
amountLabel.font = .systemFont(ofSize: 18, weight: .medium)
|
||||
amountLabel.textColor = .black
|
||||
pointsLabel.font = .systemFont(ofSize: 18, weight: .medium)
|
||||
pointsLabel.textColor = UIColor(hex: 0xFF7B00)
|
||||
amountLabel.font = WalletTokens.metricMediumFont
|
||||
amountLabel.textColor = WalletTokens.textPrimary
|
||||
pointsLabel.font = WalletTokens.metricMediumFont
|
||||
pointsLabel.textColor = WalletTokens.points
|
||||
pointsLabel.textAlignment = .right
|
||||
typeLabel.font = .systemFont(ofSize: 14)
|
||||
typeLabel.textColor = UIColor(hex: 0x9CA3AF)
|
||||
orderLabel.font = .systemFont(ofSize: 12)
|
||||
typeLabel.font = WalletTokens.bodyFont
|
||||
typeLabel.textColor = WalletTokens.textTertiary
|
||||
orderLabel.font = WalletTokens.captionFont
|
||||
orderLabel.textAlignment = .center
|
||||
orderLabel.layer.cornerRadius = 4
|
||||
orderLabel.layer.cornerRadius = WalletTokens.chipRadius
|
||||
orderLabel.clipsToBounds = true
|
||||
timeLabel.font = .systemFont(ofSize: 14)
|
||||
timeLabel.textColor = UIColor(hex: 0x4B5563)
|
||||
withdrawLabel.font = .systemFont(ofSize: 12)
|
||||
timeLabel.font = WalletTokens.bodyFont
|
||||
timeLabel.textColor = WalletTokens.textSecondary
|
||||
withdrawLabel.font = WalletTokens.captionFont
|
||||
withdrawLabel.textAlignment = .center
|
||||
withdrawLabel.layer.cornerRadius = 4
|
||||
withdrawLabel.layer.cornerRadius = WalletTokens.chipRadius
|
||||
withdrawLabel.clipsToBounds = true
|
||||
|
||||
contentView.addSubview(cardView)
|
||||
@ -340,9 +365,34 @@ final class WalletTransactionRecordCell: UITableViewCell {
|
||||
private func labelStyle(for label: String) -> (background: UIColor, text: UIColor, orderBackground: UIColor, orderText: UIColor) {
|
||||
switch label {
|
||||
case "可提现":
|
||||
return (UIColor(hex: 0xF0FDF4), UIColor(hex: 0x22C55E), UIColor(hex: 0xEFF6FF), UIColor(hex: 0x0073FF))
|
||||
return (WalletTokens.successBackground, WalletTokens.success, WalletTokens.orderBackground, WalletTokens.primary)
|
||||
default:
|
||||
return (UIColor(hex: 0xF4F4F4), UIColor(hex: 0x7B8EAA), UIColor(hex: 0xF4F4F4), UIColor(hex: 0x7B8EAA))
|
||||
return (WalletTokens.neutralChipBackground, WalletTokens.textMuted, WalletTokens.neutralChipBackground, WalletTokens.textMuted)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// 钱包列表分页加载 Cell，展示 Android 同款蓝色加载指示器。
|
||||
final class WalletLoadingCell: UITableViewCell {
|
||||
static let reuseIdentifier = "WalletLoadingCell"
|
||||
|
||||
private let indicator = UIActivityIndicatorView(style: .medium)
|
||||
|
||||
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
|
||||
super.init(style: style, reuseIdentifier: reuseIdentifier)
|
||||
selectionStyle = .none
|
||||
backgroundColor = .white
|
||||
indicator.color = WalletTokens.summaryBackground
|
||||
indicator.startAnimating()
|
||||
contentView.addSubview(indicator)
|
||||
indicator.snp.makeConstraints { make in
|
||||
make.center.equalToSuperview()
|
||||
make.top.bottom.equalToSuperview().inset(WalletTokens.cardPadding)
|
||||
}
|
||||
}
|
||||
|
||||
@available(*, unavailable)
|
||||
required init?(coder: NSCoder) {
|
||||
fatalError("init(coder:) has not been implemented")
|
||||
}
|
||||
}
|
||||
|
||||
@ -16,6 +16,7 @@ final class WalletViewController: BaseViewController, UITableViewDelegate {
|
||||
case withdraw(WalletWithdrawItem)
|
||||
case transactionHeader(EarningDetailGroup)
|
||||
case transaction(EarningDetailItem)
|
||||
case loading
|
||||
}
|
||||
|
||||
private let viewModel: WalletViewModel
|
||||
@ -27,6 +28,7 @@ final class WalletViewController: BaseViewController, UITableViewDelegate {
|
||||
private let tabStack = UIStackView()
|
||||
private let withdrawTabButton = UIButton(type: .system)
|
||||
private let transactionTabButton = UIButton(type: .system)
|
||||
private let tabIndicator = UIView()
|
||||
private let filterPanel = WalletFilterPanelView()
|
||||
private let tableView = UITableView(frame: .zero, style: .plain)
|
||||
private let refreshControl = UIRefreshControl()
|
||||
@ -54,24 +56,30 @@ final class WalletViewController: BaseViewController, UITableViewDelegate {
|
||||
}
|
||||
|
||||
override func setupNavigationBar() {
|
||||
title = "我的钱包"
|
||||
let titleLabel = UILabel()
|
||||
titleLabel.text = "我的钱包"
|
||||
titleLabel.textColor = WalletTokens.text333
|
||||
titleLabel.font = UIFont.systemFont(ofSize: 18)
|
||||
navigationItem.titleView = titleLabel
|
||||
}
|
||||
|
||||
override func setupUI() {
|
||||
view.backgroundColor = UIColor(hex: 0xF5F6F8)
|
||||
view.backgroundColor = WalletTokens.pageBackground
|
||||
contentCard.backgroundColor = .white
|
||||
contentCard.layer.cornerRadius = 16
|
||||
contentCard.layer.cornerRadius = WalletTokens.contentRadius
|
||||
contentCard.clipsToBounds = true
|
||||
|
||||
tabStack.axis = .horizontal
|
||||
tabStack.distribution = .fillEqually
|
||||
[withdrawTabButton, transactionTabButton].forEach {
|
||||
$0.titleLabel?.font = .systemFont(ofSize: 16, weight: .semibold)
|
||||
$0.setTitleColor(UIColor(hex: 0x666666), for: .normal)
|
||||
$0.titleLabel?.font = WalletTokens.tabSelectedFont
|
||||
$0.setTitleColor(WalletTokens.tabNormal, for: .normal)
|
||||
tabStack.addArrangedSubview($0)
|
||||
}
|
||||
withdrawTabButton.setTitle("提现记录", for: .normal)
|
||||
transactionTabButton.setTitle("收益明细", for: .normal)
|
||||
tabIndicator.backgroundColor = WalletTokens.summaryBackground
|
||||
tabIndicator.layer.cornerRadius = 1.5
|
||||
|
||||
tableView.backgroundColor = .white
|
||||
tableView.separatorStyle = .none
|
||||
@ -79,15 +87,19 @@ final class WalletViewController: BaseViewController, UITableViewDelegate {
|
||||
tableView.rowHeight = UITableView.automaticDimension
|
||||
tableView.estimatedRowHeight = 120
|
||||
tableView.refreshControl = refreshControl
|
||||
tableView.contentInset = UIEdgeInsets(top: WalletTokens.rowGap, left: 0, bottom: WalletTokens.rowGap, right: 0)
|
||||
tableView.verticalScrollIndicatorInsets = tableView.contentInset
|
||||
tableView.register(WalletWithdrawRecordCell.self, forCellReuseIdentifier: WalletWithdrawRecordCell.reuseIdentifier)
|
||||
tableView.register(WalletTransactionHeaderCell.self, forCellReuseIdentifier: WalletTransactionHeaderCell.reuseIdentifier)
|
||||
tableView.register(WalletTransactionRecordCell.self, forCellReuseIdentifier: WalletTransactionRecordCell.reuseIdentifier)
|
||||
tableView.register(WalletLoadingCell.self, forCellReuseIdentifier: WalletLoadingCell.reuseIdentifier)
|
||||
|
||||
bottomBar.backgroundColor = .white
|
||||
|
||||
view.addSubview(summaryCard)
|
||||
view.addSubview(contentCard)
|
||||
contentCard.addSubview(tabStack)
|
||||
contentCard.addSubview(tabIndicator)
|
||||
contentCard.addSubview(filterPanel)
|
||||
contentCard.addSubview(tableView)
|
||||
view.addSubview(bottomBar)
|
||||
@ -98,32 +110,41 @@ final class WalletViewController: BaseViewController, UITableViewDelegate {
|
||||
|
||||
override func setupConstraints() {
|
||||
summaryCard.snp.makeConstraints { make in
|
||||
make.top.equalTo(view.safeAreaLayoutGuide).offset(16)
|
||||
make.leading.trailing.equalToSuperview().inset(16)
|
||||
make.top.equalTo(view.safeAreaLayoutGuide).offset(WalletTokens.screenInset)
|
||||
make.leading.trailing.equalToSuperview().inset(WalletTokens.screenInset)
|
||||
}
|
||||
bottomBar.snp.makeConstraints { make in
|
||||
make.leading.trailing.bottom.equalToSuperview()
|
||||
}
|
||||
withdrawButton.snp.makeConstraints { make in
|
||||
make.top.equalToSuperview().offset(16)
|
||||
make.leading.trailing.equalToSuperview().inset(16)
|
||||
make.top.equalToSuperview().offset(WalletTokens.screenInset)
|
||||
make.leading.trailing.equalToSuperview().inset(WalletTokens.screenInset)
|
||||
make.bottom.equalTo(view.safeAreaLayoutGuide).inset(22)
|
||||
}
|
||||
withdrawButton.layer.cornerRadius = WalletTokens.bottomButtonRadius
|
||||
contentCard.snp.makeConstraints { make in
|
||||
make.top.equalTo(summaryCard.snp.bottom).offset(16)
|
||||
make.leading.trailing.equalToSuperview().inset(16)
|
||||
make.bottom.equalTo(bottomBar.snp.top).offset(-16)
|
||||
make.top.equalTo(summaryCard.snp.bottom).offset(WalletTokens.cardGap)
|
||||
make.leading.trailing.equalToSuperview().inset(WalletTokens.screenInset)
|
||||
make.bottom.equalTo(bottomBar.snp.top).offset(-WalletTokens.cardGap)
|
||||
}
|
||||
tabStack.snp.makeConstraints { make in
|
||||
make.top.leading.trailing.equalToSuperview()
|
||||
make.top.equalToSuperview()
|
||||
make.leading.trailing.equalToSuperview().inset(32)
|
||||
make.height.equalTo(50)
|
||||
}
|
||||
tabIndicator.snp.makeConstraints { make in
|
||||
make.width.equalTo(24)
|
||||
make.height.equalTo(3)
|
||||
make.bottom.equalTo(tabStack)
|
||||
make.centerX.equalTo(withdrawTabButton)
|
||||
}
|
||||
filterPanel.snp.makeConstraints { make in
|
||||
make.top.equalTo(tabStack.snp.bottom)
|
||||
make.leading.trailing.equalToSuperview().inset(16)
|
||||
make.leading.trailing.equalToSuperview().inset(WalletTokens.screenInset)
|
||||
make.height.equalTo(0)
|
||||
}
|
||||
tableView.snp.makeConstraints { make in
|
||||
make.top.equalTo(filterPanel.snp.bottom).offset(4)
|
||||
make.top.equalTo(filterPanel.snp.bottom).offset(WalletTokens.rowGap)
|
||||
make.leading.trailing.bottom.equalToSuperview()
|
||||
}
|
||||
}
|
||||
@ -139,13 +160,17 @@ final class WalletViewController: BaseViewController, UITableViewDelegate {
|
||||
}
|
||||
withdrawTabButton.addTarget(self, action: #selector(withdrawTabTapped), for: .touchUpInside)
|
||||
transactionTabButton.addTarget(self, action: #selector(transactionTabTapped), for: .touchUpInside)
|
||||
filterPanel.onFilterTap = { [weak self] in
|
||||
self?.presentFilterMenu()
|
||||
filterPanel.onFilterSelected = { [weak self] filter in
|
||||
guard let self else { return }
|
||||
Task { await self.viewModel.selectFilter(filter, api: self.walletAPI) }
|
||||
}
|
||||
refreshControl.addTarget(self, action: #selector(refreshPulled), for: .valueChanged)
|
||||
withdrawButton.addTarget(self, action: #selector(withdrawTapped), for: .touchUpInside)
|
||||
|
||||
Task { await viewModel.loadInitial(api: walletAPI) }
|
||||
Task { await viewModel.refreshSummary(api: walletAPI) }
|
||||
Task { await viewModel.refreshWithdraw(api: walletAPI) }
|
||||
Task { await viewModel.refreshTransaction(api: walletAPI) }
|
||||
Task { await viewModel.refreshPoints(api: walletAPI) }
|
||||
}
|
||||
|
||||
private func configureDataSource() {
|
||||
@ -172,6 +197,11 @@ final class WalletViewController: BaseViewController, UITableViewDelegate {
|
||||
) as? WalletTransactionRecordCell
|
||||
cell?.apply(record)
|
||||
return cell ?? UITableViewCell()
|
||||
case .loading:
|
||||
return tableView.dequeueReusableCell(
|
||||
withIdentifier: WalletLoadingCell.reuseIdentifier,
|
||||
for: indexPath
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -184,9 +214,15 @@ final class WalletViewController: BaseViewController, UITableViewDelegate {
|
||||
points: viewModel.availablePoints
|
||||
)
|
||||
applyTabAppearance()
|
||||
filterPanel.isHidden = viewModel.selectedTab != .transaction
|
||||
updateContentLayout()
|
||||
filterPanel.apply(filter: viewModel.filter, totalIncome: viewModel.totalIncomeLabel, totalPoints: viewModel.totalPointsLabel)
|
||||
refreshControl.endRefreshing()
|
||||
let isRefreshing = switch viewModel.selectedTab {
|
||||
case .withdraw: viewModel.withdrawRefreshing
|
||||
case .transaction: viewModel.transactionRefreshing
|
||||
}
|
||||
if !isRefreshing {
|
||||
refreshControl.endRefreshing()
|
||||
}
|
||||
applySnapshot()
|
||||
if let message = viewModel.errorMessage, message != lastShownMessage {
|
||||
lastShownMessage = message
|
||||
@ -195,12 +231,35 @@ final class WalletViewController: BaseViewController, UITableViewDelegate {
|
||||
}
|
||||
|
||||
private func applyTabAppearance() {
|
||||
let selectedColor = UIColor(hex: 0x1677FF)
|
||||
let normalColor = UIColor(hex: 0x666666)
|
||||
let selectedColor = WalletTokens.summaryBackground
|
||||
let normalColor = WalletTokens.tabNormal
|
||||
withdrawTabButton.setTitleColor(viewModel.selectedTab == .withdraw ? selectedColor : normalColor, for: .normal)
|
||||
transactionTabButton.setTitleColor(viewModel.selectedTab == .transaction ? selectedColor : normalColor, for: .normal)
|
||||
withdrawTabButton.titleLabel?.font = .systemFont(ofSize: 16, weight: viewModel.selectedTab == .withdraw ? .semibold : .regular)
|
||||
transactionTabButton.titleLabel?.font = .systemFont(ofSize: 16, weight: viewModel.selectedTab == .transaction ? .semibold : .regular)
|
||||
withdrawTabButton.titleLabel?.font = viewModel.selectedTab == .withdraw ? WalletTokens.tabSelectedFont : WalletTokens.tabFont
|
||||
transactionTabButton.titleLabel?.font = viewModel.selectedTab == .transaction ? WalletTokens.tabSelectedFont : WalletTokens.tabFont
|
||||
tabIndicator.snp.remakeConstraints { make in
|
||||
make.width.equalTo(24)
|
||||
make.height.equalTo(3)
|
||||
make.bottom.equalTo(tabStack)
|
||||
make.centerX.equalTo(viewModel.selectedTab == .withdraw ? withdrawTabButton : transactionTabButton)
|
||||
}
|
||||
UIView.animate(withDuration: 0.2) {
|
||||
self.contentCard.layoutIfNeeded()
|
||||
}
|
||||
}
|
||||
|
||||
private func updateContentLayout() {
|
||||
let showsFilter = viewModel.selectedTab == .transaction
|
||||
filterPanel.isHidden = !showsFilter
|
||||
filterPanel.snp.remakeConstraints { make in
|
||||
make.leading.trailing.equalToSuperview().inset(WalletTokens.screenInset)
|
||||
if showsFilter {
|
||||
make.top.equalTo(tabStack.snp.bottom).offset(WalletTokens.rowGap)
|
||||
} else {
|
||||
make.top.equalTo(tabStack.snp.bottom)
|
||||
make.height.equalTo(0)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func applySnapshot() {
|
||||
@ -208,6 +267,9 @@ final class WalletViewController: BaseViewController, UITableViewDelegate {
|
||||
snapshot.appendSections([.main])
|
||||
if viewModel.selectedTab == .withdraw {
|
||||
snapshot.appendItems(viewModel.withdrawRecords.map(Item.withdraw), toSection: .main)
|
||||
if viewModel.withdrawLoading {
|
||||
snapshot.appendItems([.loading], toSection: .main)
|
||||
}
|
||||
} else {
|
||||
let items = viewModel.transactionEntries.map { entry -> Item in
|
||||
switch entry {
|
||||
@ -216,6 +278,9 @@ final class WalletViewController: BaseViewController, UITableViewDelegate {
|
||||
}
|
||||
}
|
||||
snapshot.appendItems(items, toSection: .main)
|
||||
if viewModel.transactionLoading {
|
||||
snapshot.appendItems([.loading], toSection: .main)
|
||||
}
|
||||
}
|
||||
dataSource.apply(snapshot, animatingDifferences: true)
|
||||
updateEmptyState()
|
||||
@ -236,24 +301,12 @@ final class WalletViewController: BaseViewController, UITableViewDelegate {
|
||||
}
|
||||
let label = UILabel()
|
||||
label.text = emptyText
|
||||
label.textColor = UIColor(hex: 0xB3B8C2)
|
||||
label.font = .systemFont(ofSize: 14)
|
||||
label.textColor = WalletTokens.textDisabled
|
||||
label.font = WalletTokens.bodyFont
|
||||
label.textAlignment = .center
|
||||
tableView.backgroundView = label
|
||||
}
|
||||
|
||||
private func presentFilterMenu() {
|
||||
let alert = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet)
|
||||
WalletFilter.allCases.forEach { filter in
|
||||
alert.addAction(UIAlertAction(title: filter.title, style: .default) { [weak self] _ in
|
||||
guard let self else { return }
|
||||
Task { await self.viewModel.selectFilter(filter, api: self.walletAPI) }
|
||||
})
|
||||
}
|
||||
alert.addAction(UIAlertAction(title: "取消", style: .cancel))
|
||||
present(alert, animated: true)
|
||||
}
|
||||
|
||||
private func openPointsRedemption() {
|
||||
navigationController?.pushViewController(PointsRedemptionViewController(), animated: true)
|
||||
}
|
||||
@ -270,9 +323,7 @@ final class WalletViewController: BaseViewController, UITableViewDelegate {
|
||||
Task {
|
||||
switch viewModel.selectedTab {
|
||||
case .withdraw:
|
||||
await viewModel.refreshSummary(api: walletAPI)
|
||||
await viewModel.refreshWithdraw(api: walletAPI)
|
||||
await viewModel.refreshPoints(api: walletAPI)
|
||||
case .transaction:
|
||||
await viewModel.refreshTransaction(api: walletAPI)
|
||||
}
|
||||
@ -363,17 +414,17 @@ private final class WalletSummaryCardView: UIView {
|
||||
}
|
||||
|
||||
private func setupUI() {
|
||||
backgroundColor = UIColor(hex: 0x1677FF)
|
||||
layer.cornerRadius = 24
|
||||
backgroundColor = WalletTokens.summaryBackground
|
||||
layer.cornerRadius = WalletTokens.summaryRadius
|
||||
clipsToBounds = true
|
||||
|
||||
withdrawableTitle.text = "可提现金额"
|
||||
withdrawableTitle.textColor = UIColor.white.withAlphaComponent(0.8)
|
||||
withdrawableTitle.font = .systemFont(ofSize: 14)
|
||||
withdrawableTitle.font = WalletTokens.bodyFont
|
||||
withdrawableTitle.textAlignment = .center
|
||||
|
||||
withdrawableLabel.textColor = .white
|
||||
withdrawableLabel.font = .systemFont(ofSize: 36, weight: .bold)
|
||||
withdrawableLabel.font = WalletTokens.displayFont
|
||||
withdrawableLabel.textAlignment = .center
|
||||
withdrawableLabel.adjustsFontSizeToFitWidth = true
|
||||
withdrawableLabel.minimumScaleFactor = 0.7
|
||||
@ -388,17 +439,17 @@ private final class WalletSummaryCardView: UIView {
|
||||
addSubview(metricsStack)
|
||||
|
||||
withdrawableTitle.snp.makeConstraints { make in
|
||||
make.top.equalToSuperview().offset(16)
|
||||
make.leading.trailing.equalToSuperview().inset(24)
|
||||
make.top.equalToSuperview().offset(WalletTokens.cardPadding)
|
||||
make.leading.trailing.equalToSuperview().inset(WalletTokens.summaryHorizontalPadding)
|
||||
}
|
||||
withdrawableLabel.snp.makeConstraints { make in
|
||||
make.top.equalTo(withdrawableTitle.snp.bottom).offset(4)
|
||||
make.leading.trailing.equalToSuperview().inset(24)
|
||||
make.top.equalTo(withdrawableTitle.snp.bottom).offset(WalletTokens.tinyGap)
|
||||
make.leading.trailing.equalToSuperview().inset(WalletTokens.summaryHorizontalPadding)
|
||||
}
|
||||
metricsStack.snp.makeConstraints { make in
|
||||
make.top.equalTo(withdrawableLabel.snp.bottom).offset(18)
|
||||
make.leading.trailing.equalToSuperview().inset(12)
|
||||
make.bottom.equalToSuperview().inset(16)
|
||||
make.leading.trailing.equalToSuperview().inset(WalletTokens.summaryHorizontalPadding)
|
||||
make.bottom.equalToSuperview().inset(WalletTokens.cardPadding)
|
||||
}
|
||||
}
|
||||
|
||||
@ -432,11 +483,11 @@ private final class WalletSummaryMetricView: UIControl {
|
||||
|
||||
private func setupUI() {
|
||||
titleLabel.textColor = UIColor.white.withAlphaComponent(0.8)
|
||||
titleLabel.font = .systemFont(ofSize: 14)
|
||||
titleLabel.font = WalletTokens.bodyFont
|
||||
titleLabel.textAlignment = .center
|
||||
|
||||
valueLabel.textColor = .white
|
||||
valueLabel.font = .systemFont(ofSize: 14, weight: .medium)
|
||||
valueLabel.font = WalletTokens.bodyMediumFont
|
||||
valueLabel.textAlignment = .center
|
||||
valueLabel.adjustsFontSizeToFitWidth = true
|
||||
valueLabel.minimumScaleFactor = 0.75
|
||||
@ -469,7 +520,7 @@ private final class WalletSummaryMetricView: UIControl {
|
||||
|
||||
/// 收益明细筛选和汇总面板。
|
||||
private final class WalletFilterPanelView: UIView {
|
||||
var onFilterTap: (() -> Void)?
|
||||
var onFilterSelected: ((WalletFilter) -> Void)?
|
||||
|
||||
private let filterButton = UIButton(type: .system)
|
||||
private let totalTitleLabel = UILabel()
|
||||
@ -487,30 +538,40 @@ private final class WalletFilterPanelView: UIView {
|
||||
}
|
||||
|
||||
func apply(filter: WalletFilter, totalIncome: String, totalPoints: Int) {
|
||||
filterButton.setTitle("\(filter.title) ▾", for: .normal)
|
||||
filterButton.configuration?.title = filter.title
|
||||
configureMenu(selected: filter)
|
||||
totalLabel.text = totalIncome.isEmpty ? "¥ 0.00" : totalIncome
|
||||
pointsLabel.text = "积分+\(totalPoints)"
|
||||
}
|
||||
|
||||
private func setupUI() {
|
||||
backgroundColor = UIColor(hex: 0xF6F6F6)
|
||||
layer.cornerRadius = 16
|
||||
backgroundColor = WalletTokens.filterBackground
|
||||
layer.cornerRadius = WalletTokens.contentRadius
|
||||
clipsToBounds = true
|
||||
|
||||
filterButton.setTitleColor(UIColor(hex: 0x111827), for: .normal)
|
||||
filterButton.titleLabel?.font = .systemFont(ofSize: 14)
|
||||
filterButton.titleLabel?.font = WalletTokens.bodyFont
|
||||
filterButton.contentHorizontalAlignment = .left
|
||||
filterButton.addTarget(self, action: #selector(filterTapped), for: .touchUpInside)
|
||||
filterButton.backgroundColor = WalletTokens.inputFocusedBackground
|
||||
filterButton.layer.cornerRadius = WalletTokens.contentRadius
|
||||
filterButton.showsMenuAsPrimaryAction = true
|
||||
filterButton.changesSelectionAsPrimaryAction = false
|
||||
filterButton.configuration = .plain()
|
||||
filterButton.configuration?.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: 16, bottom: 0, trailing: 12)
|
||||
filterButton.configuration?.image = UIImage(systemName: "chevron.down")
|
||||
filterButton.configuration?.imagePlacement = .trailing
|
||||
filterButton.configuration?.imagePadding = 8
|
||||
filterButton.tintColor = WalletTokens.text333
|
||||
|
||||
totalTitleLabel.text = "总收益:"
|
||||
totalTitleLabel.font = .systemFont(ofSize: 14, weight: .medium)
|
||||
totalTitleLabel.font = WalletTokens.bodyMediumFont
|
||||
totalTitleLabel.textColor = .black
|
||||
|
||||
totalLabel.font = .systemFont(ofSize: 14, weight: .medium)
|
||||
totalLabel.textColor = UIColor(hex: 0x0073FF)
|
||||
totalLabel.font = WalletTokens.bodyMediumFont
|
||||
totalLabel.textColor = WalletTokens.primary
|
||||
|
||||
pointsLabel.font = .systemFont(ofSize: 14, weight: .medium)
|
||||
pointsLabel.textColor = UIColor(hex: 0xFF7B00)
|
||||
pointsLabel.font = WalletTokens.bodyMediumFont
|
||||
pointsLabel.textColor = WalletTokens.points
|
||||
pointsLabel.textAlignment = .right
|
||||
|
||||
addSubview(filterButton)
|
||||
@ -519,15 +580,14 @@ private final class WalletFilterPanelView: UIView {
|
||||
addSubview(pointsLabel)
|
||||
|
||||
filterButton.snp.makeConstraints { make in
|
||||
make.top.equalToSuperview().offset(8)
|
||||
make.leading.equalToSuperview().offset(16)
|
||||
make.width.lessThanOrEqualTo(150)
|
||||
make.height.equalTo(32)
|
||||
make.top.leading.equalToSuperview()
|
||||
make.width.lessThanOrEqualTo(WalletTokens.filterFieldMaxWidth)
|
||||
make.height.equalTo(WalletTokens.filterFieldHeight)
|
||||
}
|
||||
totalTitleLabel.snp.makeConstraints { make in
|
||||
make.top.equalTo(filterButton.snp.bottom).offset(4)
|
||||
make.leading.equalToSuperview().offset(16)
|
||||
make.bottom.equalToSuperview().inset(12)
|
||||
make.top.equalTo(filterButton.snp.bottom)
|
||||
make.leading.equalToSuperview().offset(WalletTokens.cardPadding)
|
||||
make.bottom.equalToSuperview().inset(WalletTokens.rowGap)
|
||||
}
|
||||
totalLabel.snp.makeConstraints { make in
|
||||
make.centerY.equalTo(totalTitleLabel)
|
||||
@ -540,7 +600,15 @@ private final class WalletFilterPanelView: UIView {
|
||||
}
|
||||
}
|
||||
|
||||
@objc private func filterTapped() {
|
||||
onFilterTap?()
|
||||
private func configureMenu(selected: WalletFilter) {
|
||||
let actions = WalletFilter.allCases.map { [weak self] filter in
|
||||
UIAction(
|
||||
title: filter.title,
|
||||
state: filter == selected ? .on : .off
|
||||
) { _ in
|
||||
self?.onFilterSelected?(filter)
|
||||
}
|
||||
}
|
||||
filterButton.menu = UIMenu(children: actions)
|
||||
}
|
||||
}
|
||||
|
||||
@ -51,14 +51,22 @@ final class WithdrawViewController: BaseViewController {
|
||||
}
|
||||
|
||||
override func setupNavigationBar() {
|
||||
title = "提现设置"
|
||||
let titleLabel = UILabel()
|
||||
titleLabel.text = "提现设置"
|
||||
titleLabel.textColor = WalletTokens.text333
|
||||
titleLabel.font = UIFont.systemFont(ofSize: 18)
|
||||
navigationItem.titleView = titleLabel
|
||||
}
|
||||
|
||||
override func setupUI() {
|
||||
view.backgroundColor = UIColor(hex: 0xF5F6F8)
|
||||
view.backgroundColor = WalletTokens.withdrawPageBackground
|
||||
contentStack.axis = .vertical
|
||||
contentStack.spacing = 16
|
||||
contentStack.spacing = WalletTokens.cardGap
|
||||
contentStack.backgroundColor = .white
|
||||
contentStack.layer.cornerRadius = WalletTokens.cardRadius
|
||||
contentStack.clipsToBounds = true
|
||||
bottomBar.backgroundColor = .white
|
||||
bottomBar.isHidden = true
|
||||
|
||||
view.addSubview(scrollView)
|
||||
scrollView.addSubview(contentStack)
|
||||
@ -76,16 +84,16 @@ final class WithdrawViewController: BaseViewController {
|
||||
make.leading.trailing.bottom.equalToSuperview()
|
||||
}
|
||||
submitButton.snp.makeConstraints { make in
|
||||
make.top.equalToSuperview().offset(16)
|
||||
make.leading.trailing.equalToSuperview().inset(16)
|
||||
make.bottom.equalTo(view.safeAreaLayoutGuide).inset(16)
|
||||
make.top.equalToSuperview().offset(WalletTokens.screenInset)
|
||||
make.leading.trailing.equalToSuperview().inset(WalletTokens.screenInset)
|
||||
make.bottom.equalTo(view.safeAreaLayoutGuide).inset(WalletTokens.screenInset)
|
||||
}
|
||||
scrollView.snp.makeConstraints { make in
|
||||
make.top.leading.trailing.equalToSuperview()
|
||||
make.bottom.equalTo(bottomBar.snp.top)
|
||||
}
|
||||
contentStack.snp.makeConstraints { make in
|
||||
make.edges.equalToSuperview().inset(16)
|
||||
make.edges.equalToSuperview().inset(WalletTokens.screenInset)
|
||||
make.width.equalTo(scrollView).offset(-32)
|
||||
}
|
||||
}
|
||||
@ -98,7 +106,15 @@ final class WithdrawViewController: BaseViewController {
|
||||
codeField.addTarget(self, action: #selector(codeChanged), for: .editingChanged)
|
||||
codeButton.addTarget(self, action: #selector(sendCodeTapped), for: .touchUpInside)
|
||||
submitButton.addTarget(self, action: #selector(submitTapped), for: .touchUpInside)
|
||||
Task { await viewModel.load(api: walletAPI) }
|
||||
Task {
|
||||
showLoading()
|
||||
await viewModel.load(api: walletAPI)
|
||||
hideLoading()
|
||||
if viewModel.withdrawInfo == nil, let message = viewModel.errorMessage {
|
||||
navigationController?.popViewController(animated: true)
|
||||
(navigationController?.topViewController as? BaseViewController)?.showToast(message)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func applyState() {
|
||||
@ -116,9 +132,24 @@ final class WithdrawViewController: BaseViewController {
|
||||
codeButton.setTitle(viewModel.countdown > 0 ? "\(viewModel.countdown)s" : "获取验证码", for: .normal)
|
||||
codeButton.isEnabled = viewModel.countdown == 0
|
||||
submitButton.isEnabled = viewModel.canSubmit
|
||||
updateBottomBarVisibility(hasContent: viewModel.withdrawInfo != nil && !viewModel.loading)
|
||||
if viewModel.countdown > 0 { startCountdownTimerIfNeeded() }
|
||||
showMessageIfNeeded(viewModel.statusMessage)
|
||||
showMessageIfNeeded(viewModel.errorMessage)
|
||||
if viewModel.withdrawInfo != nil {
|
||||
showMessageIfNeeded(viewModel.errorMessage)
|
||||
}
|
||||
}
|
||||
|
||||
private func updateBottomBarVisibility(hasContent: Bool) {
|
||||
bottomBar.isHidden = !hasContent
|
||||
scrollView.snp.remakeConstraints { make in
|
||||
make.top.leading.trailing.equalToSuperview()
|
||||
if hasContent {
|
||||
make.bottom.equalTo(bottomBar.snp.top)
|
||||
} else {
|
||||
make.bottom.equalToSuperview()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func makeAmountCard() -> UIView {
|
||||
@ -129,19 +160,19 @@ final class WithdrawViewController: BaseViewController {
|
||||
row.alignment = .center
|
||||
row.spacing = 16
|
||||
let withdrawableTitle = makeBodyLabel("可提现金额", color: .black, weight: .medium)
|
||||
withdrawableLabel.font = .systemFont(ofSize: 14, weight: .medium)
|
||||
withdrawableLabel.textColor = UIColor(hex: 0x0073FF)
|
||||
withdrawableLabel.font = WalletTokens.bodyMediumFont
|
||||
withdrawableLabel.textColor = WalletTokens.primary
|
||||
row.addArrangedSubview(withdrawableTitle)
|
||||
row.addArrangedSubview(withdrawableLabel)
|
||||
|
||||
let amountContainer = borderedInputContainer()
|
||||
amountField.placeholder = "请输入金额"
|
||||
amountField.keyboardType = .decimalPad
|
||||
amountField.font = .systemFont(ofSize: 14)
|
||||
amountField.font = WalletTokens.bodyFont
|
||||
let allButton = UIButton(type: .system)
|
||||
allButton.setTitle("全部提现", for: .normal)
|
||||
allButton.setTitleColor(UIColor(hex: 0x0073FF), for: .normal)
|
||||
allButton.titleLabel?.font = .systemFont(ofSize: 14)
|
||||
allButton.setTitleColor(WalletTokens.primary, for: .normal)
|
||||
allButton.titleLabel?.font = WalletTokens.bodyFont
|
||||
allButton.addTarget(self, action: #selector(withdrawAllTapped), for: .touchUpInside)
|
||||
amountContainer.addSubview(amountField)
|
||||
amountContainer.addSubview(allButton)
|
||||
@ -155,10 +186,10 @@ final class WithdrawViewController: BaseViewController {
|
||||
make.centerY.equalToSuperview()
|
||||
}
|
||||
|
||||
limitLabel.font = .systemFont(ofSize: 12)
|
||||
limitLabel.textColor = UIColor(hex: 0x9CA3AF)
|
||||
phoneLabel.font = .systemFont(ofSize: 12)
|
||||
phoneLabel.textColor = UIColor(hex: 0x4B5563)
|
||||
limitLabel.font = WalletTokens.captionFont
|
||||
limitLabel.textColor = WalletTokens.textTertiary
|
||||
phoneLabel.font = WalletTokens.captionFont
|
||||
phoneLabel.textColor = WalletTokens.textSecondary
|
||||
|
||||
let codeRow = UIStackView()
|
||||
codeRow.axis = .horizontal
|
||||
@ -166,18 +197,19 @@ final class WithdrawViewController: BaseViewController {
|
||||
let codeContainer = borderedInputContainer()
|
||||
codeField.placeholder = "请输入验证码"
|
||||
codeField.keyboardType = .numberPad
|
||||
codeField.font = .systemFont(ofSize: 14)
|
||||
codeField.font = WalletTokens.bodyFont
|
||||
codeContainer.addSubview(codeField)
|
||||
codeField.snp.makeConstraints { make in make.edges.equalToSuperview().inset(UIEdgeInsets(top: 0, left: 12, bottom: 0, right: 12)) }
|
||||
codeButton.setTitle("获取验证码", for: .normal)
|
||||
codeButton.setTitleColor(UIColor(hex: 0x0073FF), for: .normal)
|
||||
codeButton.titleLabel?.font = .systemFont(ofSize: 14, weight: .medium)
|
||||
codeButton.setTitleColor(WalletTokens.primary, for: .normal)
|
||||
codeButton.setTitleColor(WalletTokens.textDisabled, for: .disabled)
|
||||
codeButton.titleLabel?.font = WalletTokens.bodyMediumFont
|
||||
codeButton.layer.borderWidth = 1
|
||||
codeButton.layer.borderColor = UIColor(hex: 0xEEEEEE).cgColor
|
||||
codeButton.layer.cornerRadius = 4
|
||||
codeButton.layer.borderColor = WalletTokens.border.cgColor
|
||||
codeButton.layer.cornerRadius = WalletTokens.chipRadius
|
||||
codeRow.addArrangedSubview(codeContainer)
|
||||
codeRow.addArrangedSubview(codeButton)
|
||||
codeContainer.snp.makeConstraints { make in make.height.equalTo(46) }
|
||||
codeContainer.snp.makeConstraints { make in make.height.equalTo(WalletTokens.inputHeight) }
|
||||
codeButton.snp.makeConstraints { make in make.width.equalTo(100) }
|
||||
|
||||
let stack = UIStackView(arrangedSubviews: [title, row, amountContainer, limitLabel, phoneLabel, codeRow])
|
||||
@ -185,23 +217,26 @@ final class WithdrawViewController: BaseViewController {
|
||||
stack.spacing = 12
|
||||
card.addSubview(stack)
|
||||
stack.snp.makeConstraints { make in make.edges.equalToSuperview().inset(16) }
|
||||
amountContainer.snp.makeConstraints { make in make.height.equalTo(46) }
|
||||
amountContainer.snp.makeConstraints { make in make.height.equalTo(WalletTokens.inputHeight) }
|
||||
return card
|
||||
}
|
||||
|
||||
private func makeBankCard() -> UIView {
|
||||
let card = makeCard()
|
||||
let title = makeTitle("银行卡信息")
|
||||
let title = makeTitle("银行卡信息", size: 16)
|
||||
let inner = makeInnerPanel()
|
||||
bankCardLabel.font = .systemFont(ofSize: 14, weight: .medium)
|
||||
bankCardLabel.textColor = UIColor(hex: 0x333333)
|
||||
bankHolderLabel.font = .systemFont(ofSize: 14)
|
||||
bankHolderLabel.textColor = UIColor(hex: 0x4B5563)
|
||||
bankCardLabel.font = WalletTokens.bodyMediumFont
|
||||
bankCardLabel.textColor = WalletTokens.text333
|
||||
bankHolderLabel.font = WalletTokens.bodyFont
|
||||
bankHolderLabel.textColor = WalletTokens.textSecondary
|
||||
let innerStack = UIStackView(arrangedSubviews: [bankCardLabel, bankHolderLabel])
|
||||
innerStack.axis = .vertical
|
||||
innerStack.spacing = 12
|
||||
inner.addSubview(innerStack)
|
||||
innerStack.snp.makeConstraints { make in make.edges.equalToSuperview().inset(16) }
|
||||
innerStack.snp.makeConstraints { make in
|
||||
make.top.bottom.equalToSuperview().inset(WalletTokens.compactGap)
|
||||
make.leading.trailing.equalToSuperview().inset(WalletTokens.cardPadding)
|
||||
}
|
||||
let stack = UIStackView(arrangedSubviews: [title, inner])
|
||||
stack.axis = .vertical
|
||||
stack.spacing = 8
|
||||
@ -212,16 +247,19 @@ final class WithdrawViewController: BaseViewController {
|
||||
|
||||
private func makeSettlementCard() -> UIView {
|
||||
let card = makeCard()
|
||||
let title = makeTitle("预计到账时间")
|
||||
let title = makeTitle("预计到账时间", size: 16)
|
||||
let inner = makeInnerPanel()
|
||||
settlementLabel.font = .systemFont(ofSize: 14)
|
||||
settlementLabel.textColor = UIColor(hex: 0x4B5563)
|
||||
settlementLabel.font = WalletTokens.bodyFont
|
||||
settlementLabel.textColor = WalletTokens.textSecondary
|
||||
settlementLabel.numberOfLines = 0
|
||||
inner.addSubview(settlementLabel)
|
||||
settlementLabel.snp.makeConstraints { make in make.edges.equalToSuperview().inset(16) }
|
||||
settlementLabel.snp.makeConstraints { make in
|
||||
make.top.bottom.equalToSuperview().inset(WalletTokens.compactGap)
|
||||
make.leading.trailing.equalToSuperview().inset(WalletTokens.cardPadding)
|
||||
}
|
||||
let stack = UIStackView(arrangedSubviews: [title, inner])
|
||||
stack.axis = .vertical
|
||||
stack.spacing = 8
|
||||
stack.spacing = WalletTokens.tinyGap
|
||||
card.addSubview(stack)
|
||||
stack.snp.makeConstraints { make in make.edges.equalToSuperview().inset(16) }
|
||||
return card
|
||||
@ -229,15 +267,18 @@ final class WithdrawViewController: BaseViewController {
|
||||
|
||||
private func makeInfoCard() -> UIView {
|
||||
let card = makeCard()
|
||||
let title = makeTitle("提现说明")
|
||||
let title = makeTitle("提现说明", size: 16)
|
||||
let inner = makeInnerPanel()
|
||||
infoStack.axis = .vertical
|
||||
infoStack.spacing = 4
|
||||
inner.addSubview(infoStack)
|
||||
infoStack.snp.makeConstraints { make in make.edges.equalToSuperview().inset(16) }
|
||||
infoStack.snp.makeConstraints { make in
|
||||
make.top.bottom.equalToSuperview().inset(WalletTokens.compactGap)
|
||||
make.leading.trailing.equalToSuperview().inset(WalletTokens.cardPadding)
|
||||
}
|
||||
let stack = UIStackView(arrangedSubviews: [title, inner])
|
||||
stack.axis = .vertical
|
||||
stack.spacing = 8
|
||||
stack.spacing = WalletTokens.rowGap
|
||||
card.addSubview(stack)
|
||||
stack.snp.makeConstraints { make in make.edges.equalToSuperview().inset(16) }
|
||||
return card
|
||||
@ -246,32 +287,32 @@ final class WithdrawViewController: BaseViewController {
|
||||
private func makeCard() -> UIView {
|
||||
let view = UIView()
|
||||
view.backgroundColor = .white
|
||||
view.layer.cornerRadius = 12
|
||||
view.layer.cornerRadius = WalletTokens.cardRadius
|
||||
view.clipsToBounds = true
|
||||
return view
|
||||
}
|
||||
|
||||
private func makeInnerPanel() -> UIView {
|
||||
let view = UIView()
|
||||
view.backgroundColor = UIColor(hex: 0xF4F4F4)
|
||||
view.layer.cornerRadius = 8
|
||||
view.backgroundColor = WalletTokens.inputBackground
|
||||
view.layer.cornerRadius = WalletTokens.innerRadius
|
||||
view.layer.borderWidth = 1
|
||||
view.layer.borderColor = UIColor(hex: 0xEEEEEE).cgColor
|
||||
view.layer.borderColor = WalletTokens.border.cgColor
|
||||
return view
|
||||
}
|
||||
|
||||
private func borderedInputContainer() -> UIView {
|
||||
let view = UIView()
|
||||
view.layer.cornerRadius = 4
|
||||
view.layer.cornerRadius = WalletTokens.chipRadius
|
||||
view.layer.borderWidth = 1
|
||||
view.layer.borderColor = UIColor(hex: 0xEEEEEE).cgColor
|
||||
view.layer.borderColor = WalletTokens.border.cgColor
|
||||
return view
|
||||
}
|
||||
|
||||
private func makeTitle(_ text: String) -> UILabel {
|
||||
private func makeTitle(_ text: String, size: CGFloat = 18) -> UILabel {
|
||||
let label = UILabel()
|
||||
label.text = text
|
||||
label.font = .systemFont(ofSize: 18, weight: .medium)
|
||||
label.font = .systemFont(ofSize: size, weight: .medium)
|
||||
label.textColor = .black
|
||||
return label
|
||||
}
|
||||
@ -287,7 +328,7 @@ final class WithdrawViewController: BaseViewController {
|
||||
private func applyInfoLines(_ lines: [String]) {
|
||||
infoStack.arrangedSubviews.forEach { $0.removeFromSuperview() }
|
||||
lines.forEach { text in
|
||||
let label = makeBodyLabel(text, color: UIColor(hex: 0x4B5563))
|
||||
let label = makeBodyLabel(text, color: WalletTokens.textSecondary)
|
||||
label.numberOfLines = 0
|
||||
infoStack.addArrangedSubview(label)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user