lujiuyin/suixinkan_ios_new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
将最低部署版本降至 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
Download Patch File Download Diff File Expand all files Collapse all files

22
suixinkan/Features/Orders/Views/OrderDetailViews.swift
View File

@ -9,21 +9,21 @@ import SwiftUI
/// 门店订单详情页，展示订单接口补全后的支付、客户、项目和拍摄点信息。
struct StoreOrderDetailView: View {
@Environment(AccountContext.self) private var accountContext
@Environment(OrdersAPI.self) private var ordersAPI
@Environment(RouterPath.self) private var router
@Environment(ToastCenter.self) private var toastCenter
@EnvironmentObject private var accountContext: AccountContext
@Environment(\.ordersAPI) private var ordersAPI
@EnvironmentObject private var router: RouterPath
@EnvironmentObject private var toastCenter: ToastCenter
@Environment(\.globalLoading) private var globalLoading
let item: OrderEntity
@State private var viewModel: OrderDetailViewModel
@State private var refundViewModel = OrderRefundViewModel()
@StateObject private var viewModel: OrderDetailViewModel
@StateObject private var refundViewModel = OrderRefundViewModel()
@State private var showRefundSheet = false
/// 使用列表订单初始化详情页，并创建详情 ViewModel。
init(item: OrderEntity) {
self.item = item
_viewModel = State(initialValue: OrderDetailViewModel(item: item))
_viewModel = StateObject(wrappedValue: OrderDetailViewModel(item: item))
}
var body: some View {
@ -204,7 +204,7 @@ struct StoreOrderDetailView: View {
/// 普通订单退款表单，负责收集退款模式、金额和原因。
private struct OrderRefundSheet: View {
let item: OrderEntity
@Bindable var viewModel: OrderRefundViewModel
@ObservedObject var viewModel: OrderRefundViewModel
let onCancel: () -> Void
let onSubmit: () -> Void
@FocusState private var focusedField: RefundInputField?
@ -276,9 +276,9 @@ private enum RefundInputField: Hashable {
/// 核销订单详情页，展示核销列表项信息并支持再次发起核销。
struct WriteOffOrderDetailView: View {
@Environment(AccountContext.self) private var accountContext
@Environment(OrdersAPI.self) private var ordersAPI
@Environment(ToastCenter.self) private var toastCenter
@EnvironmentObject private var accountContext: AccountContext
@Environment(\.ordersAPI) private var ordersAPI
@EnvironmentObject private var toastCenter: ToastCenter
let item: WriteOffOrderItem
@State private var verifying = false