从 iOS 17 Observation 迁移至 iOS 16 兼容的 Combine 架构

将最低部署版本降至 iOS 16,以 ObservableObject 替换 @Observable,新增导航与 UI 兼容层,并补充登录冒烟 UI 测试。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-06-26 10:16:35 +08:00
parent 0314033a7f
commit 703078352c
127 changed files with 2320 additions and 1465 deletions

View File

@ -6,7 +6,7 @@
//
import Foundation
import Observation
import Combine
///
enum WithdrawalAuditFilter: String, CaseIterable, Identifiable {
@ -27,20 +27,19 @@ enum WithdrawalAuditFilter: String, CaseIterable, Identifiable {
}
@MainActor
@Observable
/// ViewModel
final class WithdrawalAuditViewModel {
var records: [WalletWithdrawRecord] = []
var selectedFilter: WithdrawalAuditFilter = .all
var isLoading = false
var isLoadingMore = false
var loadFailed = false
var loadFailureReason: String?
var errorMessage: String?
final class WithdrawalAuditViewModel: ObservableObject {
@Published var records: [WalletWithdrawRecord] = []
@Published var selectedFilter: WithdrawalAuditFilter = .all
@Published var isLoading = false
@Published var isLoadingMore = false
@Published var loadFailed = false
@Published var loadFailureReason: String?
@Published var errorMessage: String?
private let pageSize = 10
private var page = 1
private var total = 0
@Published private var page = 1
@Published private var total = 0
///
var filteredRecords: [WalletWithdrawRecord] {

View File

@ -9,9 +9,9 @@ import SwiftUI
///
struct WithdrawalAuditView: View {
@Environment(WalletAPI.self) private var walletAPI
@Environment(ToastCenter.self) private var toastCenter
@State private var viewModel = WithdrawalAuditViewModel()
@Environment(\.walletAPI) private var walletAPI
@EnvironmentObject private var toastCenter: ToastCenter
@StateObject private var viewModel = WithdrawalAuditViewModel()
@State private var selectedRecord: WalletWithdrawRecord?
var body: some View {
@ -37,7 +37,7 @@ struct WithdrawalAuditView: View {
WithdrawalAuditDetailView(record: record)
}
}
.onChange(of: viewModel.errorMessage) { _, message in
.onChange(of: viewModel.errorMessage) { message in
guard let message else { return }
toastCenter.show(message)
viewModel.errorMessage = nil
@ -82,7 +82,7 @@ struct WithdrawalAuditView: View {
.background(.white, in: RoundedRectangle(cornerRadius: 12))
} else if viewModel.loadFailed && viewModel.records.isEmpty {
VStack(spacing: AppMetrics.Spacing.small) {
ContentUnavailableView(
AppContentUnavailableView(
"提现审核记录加载失败",
systemImage: "exclamationmark.triangle",
description: Text(viewModel.loadFailureReason ?? "请检查网络后重试")
@ -100,7 +100,7 @@ struct WithdrawalAuditView: View {
.frame(maxWidth: .infinity, minHeight: 220)
.background(.white, in: RoundedRectangle(cornerRadius: 12))
} else if viewModel.filteredRecords.isEmpty {
ContentUnavailableView("暂无提现审核记录", systemImage: "tray", description: Text("可切换筛选条件或下拉刷新"))
AppContentUnavailableView("暂无提现审核记录", systemImage: "tray", description: Text("可切换筛选条件或下拉刷新"))
.frame(maxWidth: .infinity, minHeight: 220)
.background(.white, in: RoundedRectangle(cornerRadius: 12))
} else {