Migrate from iOS 17 Observation to iOS 16-compatible Combine architecture.

Lower deployment target to iOS 16, replace @Observable with ObservableObject, add navigation and UI compatibility shims, and include login smoke UI tests.

Co-authored-by: Cursor <cursoragent@cursor.com>

suixinkan/Features/Orders/Views/DepositOrderViews.swift

@@ -9,13 +9,13 @@ import SwiftUI
 
 /// 押金订单入口页，支持订单号查询、列表分页、核销和退款。
 struct DepositOrderEntryView: 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
 
-    @State private var viewModel = DepositOrderListViewModel()
+    @StateObject private var viewModel = DepositOrderListViewModel()
     @State private var orderNumber = ""
     @State private var pendingWriteOff: DepositOrderListItem?
     @State private var pendingRefund: DepositOrderListItem?
@@ -36,7 +36,7 @@ struct DepositOrderEntryView: View {
 
             Section {
                 if viewModel.orders.isEmpty {
-                    ContentUnavailableView("暂无押金订单", systemImage: "doc.text.magnifyingglass")
+                    AppContentUnavailableView("暂无押金订单", systemImage: "doc.text.magnifyingglass")
                         .frame(maxWidth: .infinity, minHeight: 180)
                 } else {
                     ForEach(viewModel.orders) { item in
@@ -239,13 +239,13 @@ private struct DepositOrderRow: View {
 
 /// 押金订单详情页，展示订单基础信息和拍摄点列表。
 struct DepositOrderDetailView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(OrdersAPI.self) private var ordersAPI
-    @Environment(RouterPath.self) private var router
+    @EnvironmentObject private var accountContext: AccountContext
+    @Environment(\.ordersAPI) private var ordersAPI
+    @EnvironmentObject private var router: RouterPath
     @Environment(\.globalLoading) private var globalLoading
 
     let orderNumber: String
-    @State private var viewModel = DepositOrderDetailViewModel()
+    @StateObject private var viewModel = DepositOrderDetailViewModel()
 
     var body: some View {
         List {
@@ -275,7 +275,7 @@ struct DepositOrderDetailView: View {
                 Section("拍摄详情") {
                     let shootingList = detail.multiTravel?.shootingList ?? []
                     if shootingList.isEmpty {
-                        ContentUnavailableView("暂无拍摄记录", systemImage: "photo.stack")
+                        AppContentUnavailableView("暂无拍摄记录", systemImage: "photo.stack")
                     } else {
                         ForEach(shootingList) { item in
                             Button {
@@ -296,7 +296,7 @@ struct DepositOrderDetailView: View {
                 }
             } else {
                 Section {
-                    ContentUnavailableView("暂无订单详情", systemImage: "doc.text.magnifyingglass")
+                    AppContentUnavailableView("暂无订单详情", systemImage: "doc.text.magnifyingglass")
                         .frame(maxWidth: .infinity, minHeight: 220)
                 }
             }
@@ -363,15 +363,15 @@ private struct DepositShootingPointRow: View {
 
 /// 押金拍摄信息页，展示评价、底片和成片。
 struct DepositOrderShootingInfoView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(OrdersAPI.self) private var ordersAPI
+    @EnvironmentObject private var accountContext: AccountContext
+    @Environment(\.ordersAPI) private var ordersAPI
     @Environment(\.globalLoading) private var globalLoading
 
     let orderNumber: String
     let scenicSpotId: Int
     let photogUid: Int
 
-    @State private var viewModel = DepositOrderShootingInfoViewModel()
+    @StateObject private var viewModel = DepositOrderShootingInfoViewModel()
     @State private var selectedTab: DepositShootingMediaTab = .negative
 
     var body: some View {
@@ -393,7 +393,7 @@ struct DepositOrderShootingInfoView: View {
                             .font(.system(size: AppMetrics.FontSize.subheadline))
                             .foregroundStyle(AppDesign.textSecondary)
                     } else {
-                        ContentUnavailableView("暂无评价信息", systemImage: "star")
+                        AppContentUnavailableView("暂无评价信息", systemImage: "star")
                     }
                 }
 
@@ -410,7 +410,7 @@ struct DepositOrderShootingInfoView: View {
                 }
             } else {
                 Section {
-                    ContentUnavailableView("暂无拍摄信息", systemImage: "photo.stack")
+                    AppContentUnavailableView("暂无拍摄信息", systemImage: "photo.stack")
                         .frame(maxWidth: .infinity, minHeight: 220)
                 }
             }
@@ -448,11 +448,11 @@ struct DepositOrderShootingInfoView: View {
 
 /// 历史拍摄信息页，展示多点位拍摄媒体。
 struct HistoricalShootingInfoView: View {
-    @Environment(OrdersAPI.self) private var ordersAPI
+    @Environment(\.ordersAPI) private var ordersAPI
     @Environment(\.globalLoading) private var globalLoading
 
     let orderNumber: String
-    @State private var viewModel = HistoricalShootingInfoViewModel()
+    @StateObject private var viewModel = HistoricalShootingInfoViewModel()
 
     var body: some View {
         List {
@@ -464,7 +464,7 @@ struct HistoricalShootingInfoView: View {
 
             Section("历史拍摄") {
                 if viewModel.spots.isEmpty {
-                    ContentUnavailableView("暂无历史拍摄信息", systemImage: "photo.on.rectangle")
+                    AppContentUnavailableView("暂无历史拍摄信息", systemImage: "photo.on.rectangle")
                         .frame(maxWidth: .infinity, minHeight: 220)
                 } else {
                     ForEach(viewModel.spots) { spot in
@@ -565,7 +565,7 @@ private struct OrderMediaGrid: View {
 
     var body: some View {
         if files.isEmpty {
-            ContentUnavailableView("暂无媒体文件", systemImage: "photo")
+            AppContentUnavailableView("暂无媒体文件", systemImage: "photo")
                 .frame(maxWidth: .infinity, minHeight: 140)
         } else {
             LazyVGrid(columns: columns, spacing: AppMetrics.Spacing.small) {

suixinkan/Features/Orders/Views/OrderDetailViews.swift

@@ -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

suixinkan/Features/Orders/Views/OrderTailUploadViews.swift

@@ -11,21 +11,21 @@ import UniformTypeIdentifiers
 
 /// 多点旅拍任务上传页面，负责选择打卡点和素材后提交到订单接口。
 struct MultiTravelTaskUploadView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(OrdersAPI.self) private var ordersAPI
-    @Environment(OSSUploadService.self) private var uploadService
-    @Environment(ToastCenter.self) private var toastCenter
+    @EnvironmentObject private var accountContext: AccountContext
+    @Environment(\.ordersAPI) private var ordersAPI
+    @Environment(\.ossUploadService) private var uploadService
+    @EnvironmentObject private var toastCenter: ToastCenter
     @Environment(\.dismiss) private var dismiss
     @Environment(\.globalLoading) private var globalLoading
 
-    @State private var viewModel: MultiTravelTaskUploadViewModel
+    @StateObject private var viewModel: MultiTravelTaskUploadViewModel
     @State private var showSpotPicker = false
     @State private var showCloudSelection = false
     @State private var pickerItems: [PhotosPickerItem] = []
 
     /// 使用订单号初始化任务上传页面。
     init(initialOrderNumber: String) {
-        _viewModel = State(initialValue: MultiTravelTaskUploadViewModel(initialOrderNumber: initialOrderNumber))
+        _viewModel = StateObject(wrappedValue: MultiTravelTaskUploadViewModel(initialOrderNumber: initialOrderNumber))
     }
 
     var body: some View {
@@ -61,7 +61,7 @@ struct MultiTravelTaskUploadView: View {
             }
             Button("取消", role: .cancel) {}
         }
-        .onChange(of: pickerItems) { _, items in
+        .onChange(of: pickerItems) { items in
             Task { await importPickerItems(items) }
         }
         .alert("提示", isPresented: errorBinding) {

suixinkan/Features/Orders/Views/OrdersView.swift

@@ -9,16 +9,16 @@ import SwiftUI
 
 /// 订单 Tab 根视图，展示订单管理和核销订单两个业务入口。
 struct OrdersView: View {
-    @Environment(AccountContext.self) private var accountContext
-    @Environment(PermissionContext.self) private var permissionContext
-    @Environment(AppRouter.self) private var appRouter
-    @Environment(RouterPath.self) private var router
-    @Environment(OrdersAPI.self) private var ordersAPI
-    @Environment(ToastCenter.self) private var toastCenter
+    @EnvironmentObject private var accountContext: AccountContext
+    @EnvironmentObject private var permissionContext: PermissionContext
+    @EnvironmentObject private var appRouter: AppRouter
+    @EnvironmentObject private var router: RouterPath
+    @Environment(\.ordersAPI) private var ordersAPI
+    @EnvironmentObject private var toastCenter: ToastCenter
     @Environment(\.globalLoading) private var globalLoading
     @Environment(\.horizontalSizeClass) private var horizontalSizeClass
 
-    @State private var viewModel = OrdersViewModel()
+    @StateObject private var viewModel = OrdersViewModel()
     @State private var manualOrderNumber = ""
     @State private var showDateFilterSheet = false
     @State private var showScanner = false
@@ -62,7 +62,7 @@ struct OrdersView: View {
                     entrySection
 
                     if currentScenicId == nil {
-                        ContentUnavailableView(
+                        AppContentUnavailableView(
                             "缺少经营上下文",
                             systemImage: "mountain.2",
                             description: Text("请先在首页选择景区后查看订单。")
@@ -80,7 +80,7 @@ struct OrdersView: View {
                 .padding(.bottom, AppMetrics.Spacing.pageVertical)
                 .frame(maxWidth: .infinity)
             }
-            .onChange(of: matchedScannedOrderNumber) { _, orderNumber in
+            .onChange(of: matchedScannedOrderNumber) { orderNumber in
                 guard let orderNumber else { return }
                 withAnimation(.easeInOut(duration: 0.25)) {
                     scrollProxy.scrollTo(orderNumber, anchor: .center)
@@ -96,15 +96,15 @@ struct OrdersView: View {
             await reload()
             await consumePendingScanCodeIfNeeded()
         }
-        .onChange(of: appRouter.selectedOrdersEntry) { _, entry in
+        .onChange(of: appRouter.selectedOrdersEntry) { entry in
             guard viewModel.selectedEntry != entry else { return }
             viewModel.selectedEntry = entry
             Task { await reload() }
         }
-        .onChange(of: appRouter.pendingOrderScanCode) { _, _ in
+        .onChange(of: appRouter.pendingOrderScanCode) { _ in
             Task { await consumePendingScanCodeIfNeeded() }
         }
-        .onChange(of: accountContext.currentScenic?.id) { _, _ in
+        .onChange(of: accountContext.currentScenic?.id) { _ in
             Task { await reload() }
         }
         .confirmationDialog("确认核销该订单？", isPresented: $showVerifyConfirmation, titleVisibility: .visible) {
@@ -233,7 +233,7 @@ struct OrdersView: View {
                     .frame(maxWidth: .infinity)
                     .frame(minHeight: 260)
             } else if viewModel.storeOrders.isEmpty {
-                ContentUnavailableView("暂无订单", systemImage: "tray", description: Text("可切换筛选条件或下拉刷新。"))
+                AppContentUnavailableView("暂无订单", systemImage: "tray", description: Text("可切换筛选条件或下拉刷新。"))
                     .frame(minHeight: 260)
             } else {
                 ForEach(viewModel.storeOrders) { item in
@@ -306,7 +306,7 @@ struct OrdersView: View {
                     .frame(maxWidth: .infinity)
                     .frame(minHeight: 260)
             } else if viewModel.writeOffOrders.isEmpty {
-                ContentUnavailableView("暂无核销订单", systemImage: "tray", description: Text("可下拉刷新或切换景区查看。"))
+                AppContentUnavailableView("暂无核销订单", systemImage: "tray", description: Text("可下拉刷新或切换景区查看。"))
                     .frame(minHeight: 260)
             } else {
                 ForEach(viewModel.writeOffOrders) { item in
@@ -735,11 +735,11 @@ private struct OrdersDateFilterSheet: View {
 #Preview {
     NavigationStack {
         OrdersView()
-            .environment(AccountContext())
-            .environment(PermissionContext())
-            .environment(AppRouter())
-            .environment(RouterPath())
-            .environment(OrdersAPI(client: APIClient()))
-            .environment(ToastCenter())
+            .environmentObject(AccountContext())
+            .environmentObject(PermissionContext())
+            .environmentObject(AppRouter())
+            .environmentObject(RouterPath())
+            .environment(\.ordersAPI, OrdersAPI(client: APIClient()))
+            .environmentObject(ToastCenter())
     }
 }