Merge branch 'dev_1_2_1' into xh_test

suixinkan/Features/Auth/AuthSessionHelper.swift

@@ -70,10 +70,10 @@ enum AuthSessionHelper {
         AppStore.shared.session.userId = String(user.businessUserId)
         AppStore.shared.session.accountType = .scenicUser
         AppStore.shared.session.accountDisplayName = firstNonEmpty(
-            user.scenicName, user.nickname, user.realName, user.username
+            user.scenicName, user.nickname, user.realName
         )
-        AppStore.shared.session.userName = firstNonEmpty(user.nickname, user.username, user.realName)
-        AppStore.shared.session.realName = firstNonEmpty(user.realName, user.nickname, user.username)
+        AppStore.shared.session.userName = firstNonEmpty(user.nickname, user.realName)
+        AppStore.shared.session.realName = user.realName
         AppStore.shared.session.phone = user.phone
         AppStore.shared.session.currentScenicId = user.scenicId
         AppStore.shared.session.currentScenicName = user.scenicName
@@ -90,10 +90,10 @@ enum AuthSessionHelper {
         AppStore.shared.session.userId = String(user.businessUserId)
         AppStore.shared.session.accountType = .storeUser
         AppStore.shared.session.accountDisplayName = firstNonEmpty(
-            user.storeName, user.scenicName, user.realName, user.userName, user.username
+            user.storeName, user.scenicName, user.realName
         )
-        AppStore.shared.session.userName = firstNonEmpty(user.userName, user.username, user.realName)
-        AppStore.shared.session.realName = firstNonEmpty(user.realName, user.userName, user.username)
+        AppStore.shared.session.userName = user.realName
+        AppStore.shared.session.realName = user.realName
         AppStore.shared.session.phone = user.phone
         AppStore.shared.session.avatar = user.avatar
         AppStore.shared.session.currentScenicId = user.scenicId

suixinkan/Features/Auth/Models/AuthModels.swift

@@ -196,7 +196,6 @@ struct V9ScenicUser: Decodable, Equatable {
     let userId: Int
     let scenicUserId: Int
     let ssUserId: Int
-    let username: String
     let realName: String
     let nickname: String
     let phone: String
@@ -212,7 +211,7 @@ struct V9ScenicUser: Decodable, Equatable {
     }
 
     var displayName: String {
-        scenicName.nonEmpty ?? nickname.nonEmpty ?? realName.nonEmpty ?? username
+        scenicName.nonEmpty ?? nickname.nonEmpty ?? realName
     }
 
     func toAccountSwitchAccount() -> AccountSwitchAccount {
@@ -238,8 +237,6 @@ struct V9ScenicUser: Decodable, Equatable {
         case userId = "user_id"
         case scenicUserId = "scenic_user_id"
         case ssUserId = "ss_user_id"
-        case username = "user_name"
-        case legacyUsername = "username"
         case realName = "real_name"
         case nickname
         case phone
@@ -258,9 +255,6 @@ struct V9ScenicUser: Decodable, Equatable {
         userId = try container.decodeLossyInt(forKey: .userId) ?? 0
         scenicUserId = try container.decodeLossyInt(forKey: .scenicUserId) ?? 0
         ssUserId = try container.decodeLossyInt(forKey: .ssUserId) ?? 0
-        let preferredUsername = try container.decodeLossyString(forKey: .username)
-        let legacyUsername = try container.decodeLossyString(forKey: .legacyUsername)
-        username = preferredUsername.nonEmpty ?? legacyUsername
         realName = try container.decodeLossyString(forKey: .realName)
         nickname = try container.decodeLossyString(forKey: .nickname)
         phone = try container.decodeLossyString(forKey: .phone)
@@ -281,8 +275,6 @@ struct V9StoreUser: Decodable, Equatable {
     let id: Int
     let userId: Int
     let storeUserId: Int
-    let username: String
-    let userName: String
     let realName: String
     let phone: String
     let avatar: String
@@ -300,14 +292,14 @@ struct V9StoreUser: Decodable, Equatable {
     }
 
     var displayName: String {
-        storeName.nonEmpty ?? scenicName.nonEmpty ?? realName.nonEmpty ?? userName.nonEmpty ?? username
+        storeName.nonEmpty ?? scenicName.nonEmpty ?? realName
     }
 
     func toAccountSwitchAccount() -> AccountSwitchAccount {
         AccountSwitchAccount(
             accountType: accountType.nonEmpty ?? Self.accountTypeValue,
             businessUserId: businessUserId,
-            title: storeName.nonEmpty ?? scenicName.nonEmpty ?? realName.nonEmpty ?? userName.nonEmpty ?? "门店账号",
+            title: storeName.nonEmpty ?? scenicName.nonEmpty ?? realName.nonEmpty ?? "门店账号",
             subtitle: joinAccountSubtitle(scenicName, roleName),
             phone: phone,
             realName: realName,
@@ -325,8 +317,6 @@ struct V9StoreUser: Decodable, Equatable {
         case id
         case userId = "user_id"
         case storeUserId = "store_user_id"
-        case username
-        case userName = "user_name"
         case realName = "real_name"
         case phone
         case avatar
@@ -346,8 +336,6 @@ struct V9StoreUser: Decodable, Equatable {
         id = try container.decodeLossyInt(forKey: .id) ?? 0
         userId = try container.decodeLossyInt(forKey: .userId) ?? 0
         storeUserId = try container.decodeLossyInt(forKey: .storeUserId) ?? 0
-        username = try container.decodeLossyString(forKey: .username)
-        userName = try container.decodeLossyString(forKey: .userName)
         realName = try container.decodeLossyString(forKey: .realName)
         phone = try container.decodeLossyString(forKey: .phone)
         avatar = try container.decodeLossyString(forKey: .avatar)

suixinkan/Features/CooperationOrder/ViewModels/CommissionRateLogViewModel.swift

@@ -0,0 +1,94 @@
+//
+//  CommissionRateLogViewModel.swift
+//  suixinkan
+//
+
+import Foundation
+
+/// 获客员分成比例修改记录 ViewModel，负责刷新、分页与重复项合并。
+final class CommissionRateLogViewModel {
+    private enum Constants {
+        static let pageSize = 10
+    }
+
+    private(set) var items: [CommissionRateLogEntity] = []
+    private(set) var isRefreshing = false
+    private(set) var isLoadingMore = false
+    private(set) var initialLoading = true
+    private(set) var canLoadMore = false
+
+    var onStateChange: (() -> Void)?
+    var onShowMessage: ((String) -> Void)?
+
+    private let saleUserId: Int
+    private var total = 0
+    private var lastLoadedPage = 0
+    private var isLoading = false
+
+    init(saleUserId: Int) {
+        self.saleUserId = saleUserId
+    }
+
+    /// 重新加载第一页修改记录。
+    func refresh(api: OrderAPI) async {
+        await load(api: api, page: 1, append: false)
+    }
+
+    /// 在存在下一页时加载更多修改记录。
+    func loadMore(api: OrderAPI) async {
+        guard canLoadMore, !isRefreshing, !isLoadingMore else { return }
+        await load(api: api, page: lastLoadedPage + 1, append: true)
+    }
+
+    private func load(api: OrderAPI, page: Int, append: Bool) async {
+        guard saleUserId > 0 else {
+            initialLoading = false
+            onShowMessage?("获客员信息无效")
+            notifyStateChange()
+            return
+        }
+        guard !isLoading else { return }
+        isLoading = true
+        if append {
+            isLoadingMore = true
+        } else {
+            isRefreshing = true
+        }
+        notifyStateChange()
+
+        defer {
+            isLoading = false
+            initialLoading = false
+            if append {
+                isLoadingMore = false
+            } else {
+                isRefreshing = false
+            }
+            notifyStateChange()
+        }
+
+        do {
+            let response = try await api.saleUserCommissionRateLogs(
+                saleUserId: saleUserId,
+                page: page,
+                pageSize: Constants.pageSize
+            )
+            if append {
+                let existingIDs = Set(items.map(\.id))
+                items.append(contentsOf: response.list.filter { !existingIDs.contains($0.id) })
+            } else {
+                var seenIDs = Set<Int>()
+                items = response.list.filter { seenIDs.insert($0.id).inserted }
+            }
+            total = max(0, response.total)
+            lastLoadedPage = page
+            canLoadMore = items.count < total && !response.list.isEmpty
+        } catch {
+            onShowMessage?(error.localizedDescription)
+        }
+    }
+
+    private func notifyStateChange() {
+        onStateChange?()
+    }
+}

suixinkan/Features/Home/Services/HomeMenuIconFactory.swift

@@ -16,21 +16,24 @@ enum HomeMenuIconFactory {
 
     private static let imageCache = NSCache<NSString, UIImage>()
 
-    /// 优先加载 Assets 资源图；否则加载 SF Symbol，并统一渲染到固定画布。
+    /// 优先加载 Assets 资源图并归一化画布；SF Symbol 保留系统符号表示与分层渲染。
     static func image(named iconName: String) -> UIImage? {
         let cacheKey = iconName as NSString
         if let cachedImage = imageCache.object(forKey: cacheKey) {
             return cachedImage
         }
 
-        guard let sourceImage = UIImage(named: iconName)
-            ?? UIImage(systemName: iconName, withConfiguration: symbolConfiguration) else {
-            return nil
+        let image: UIImage?
+        if let assetImage = UIImage(named: iconName) {
+            image = renderOnFixedCanvas(assetImage)
+        } else {
+            image = UIImage(systemName: iconName, withConfiguration: symbolConfiguration)
         }
 
-        let normalizedImage = renderOnFixedCanvas(sourceImage)
-        imageCache.setObject(normalizedImage, forKey: cacheKey)
-        return normalizedImage
+        if let image {
+            imageCache.setObject(image, forKey: cacheKey)
+        }
+        return image
     }
 
     private static func renderOnFixedCanvas(_ image: UIImage) -> UIImage {

suixinkan/Features/Location/AMapBootstrap.swift

@@ -20,6 +20,7 @@ enum AMapBootstrap {
         defer { lock.unlock() }
         guard !isConfigured else { return true }
 
+        #if !targetEnvironment(simulator)
         AMapLocationManager.updatePrivacyShow(.didShow, privacyInfo: .didContain)
         AMapLocationManager.updatePrivacyAgree(.didAgree)
         MAMapView.updatePrivacyShow(.didShow, privacyInfo: .didContain)
@@ -29,6 +30,7 @@ enum AMapBootstrap {
 
         AMapServices.shared().apiKey = AMapConfig.apiKey
         AMapServices.shared().enableHTTPS = true
+        #endif
         isConfigured = true
         return true
     }

suixinkan/Features/Location/LocationGeocoder.swift

@@ -3,16 +3,28 @@
 //  suixinkan
 //
 
+import CoreLocation
 import Foundation
 
-/// 高德逆地理编码封装，对齐 Android `GeocodeSearch`。
+/// 地址逆地理编码能力，供平台定位实现注入。
 @MainActor
-final class LocationGeocoder: NSObject, AMapSearchDelegate {
+protocol LocationAddressGeocoding: AnyObject {
+    /// 将坐标解析为可读地址，失败时返回空字符串。
+    func reverseGeocode(latitude: Double, longitude: Double) async -> String
+}
+
+/// 平台逆地理编码封装；真机使用高德，模拟器使用 Core Location。
+@MainActor
+final class LocationGeocoder: NSObject, LocationAddressGeocoding {
 
     nonisolated static let shared = LocationGeocoder()
 
+    #if targetEnvironment(simulator)
+    private let geocoder = CLGeocoder()
+    #else
     private var searchAPI: AMapSearchAPI?
     private var continuation: CheckedContinuation<String, Never>?
+    #endif
 
     nonisolated private override init() {
         super.init()
@@ -20,6 +32,26 @@ final class LocationGeocoder: NSObject, AMapSearchDelegate {
 
     /// 将坐标解析为可读地址。
     func reverseGeocode(latitude: Double, longitude: Double) async -> String {
+        #if targetEnvironment(simulator)
+        let location = CLLocation(latitude: latitude, longitude: longitude)
+        guard let placemark = try? await geocoder.reverseGeocodeLocation(location).first else {
+            return ""
+        }
+        if let name = placemark.name?.trimmingCharacters(in: .whitespacesAndNewlines),
+           !name.isEmpty {
+            return name
+        }
+        return [
+            placemark.administrativeArea,
+            placemark.locality,
+            placemark.subLocality,
+            placemark.thoroughfare,
+            placemark.subThoroughfare,
+        ]
+        .compactMap { $0?.trimmingCharacters(in: .whitespacesAndNewlines) }
+        .filter { !$0.isEmpty }
+        .joined()
+        #else
         do {
             try AMapBootstrap.requireConfigured()
         } catch {
@@ -40,8 +72,10 @@ final class LocationGeocoder: NSObject, AMapSearchDelegate {
             request.radius = 200
             api.aMapReGoecodeSearch(request)
         }
+        #endif
     }
 
+    #if !targetEnvironment(simulator)
     func onReGeocodeSearchDone(_ request: AMapReGeocodeSearchRequest!, response: AMapReGeocodeSearchResponse!) {
         let address = response?.regeocode?.formattedAddress ?? ""
         continuation?.resume(returning: address)
@@ -62,4 +96,9 @@ final class LocationGeocoder: NSObject, AMapSearchDelegate {
         searchAPI = api
         return api
     }
+    #endif
 }
+
+#if !targetEnvironment(simulator)
+extension LocationGeocoder: AMapSearchDelegate {}
+#endif

suixinkan/Features/Location/LocationProvider.swift

@@ -6,7 +6,165 @@
 import CoreLocation
 import Foundation
 
-/// 统一定位服务，封装高德 `AMapLocationManager`，对齐 Android `LocationProvider`。
+/// Core Location 管理器最小接口，便于模拟器定位实现注入测试替身。
+@MainActor
+protocol CoreLocationManaging: AnyObject {
+    var authorizationStatus: CLAuthorizationStatus { get }
+    var desiredAccuracy: CLLocationAccuracy { get set }
+    var delegate: CLLocationManagerDelegate? { get set }
+
+    /// 请求使用期间定位权限。
+    func requestWhenInUseAuthorization()
+    /// 请求一次当前位置。
+    func requestLocation()
+}
+
+extension CLLocationManager: CoreLocationManaging {}
+
+/// Core Location 定位实现，供模拟器运行并支持依赖注入测试。
+@MainActor
+final class CoreLocationProvider: NSObject, LocationProviding, CLLocationManagerDelegate {
+
+    nonisolated static let shared = CoreLocationProvider()
+
+    private var appStore: AppStore = .shared
+    private var manager: any CoreLocationManaging = CLLocationManager()
+    private var geocoder: any LocationAddressGeocoding = LocationGeocoder.shared
+    private var permissionContinuation: CheckedContinuation<Void, Error>?
+    private var locationContinuation: CheckedContinuation<CLLocationCoordinate2D, Error>?
+
+    nonisolated override init() {
+        super.init()
+    }
+
+    /// 使用可控依赖创建 Core Location 定位服务。
+    init(
+        appStore: AppStore,
+        manager: any CoreLocationManaging,
+        geocoder: any LocationAddressGeocoding
+    ) {
+        self.appStore = appStore
+        self.manager = manager
+        self.geocoder = geocoder
+        super.init()
+        manager.delegate = self
+    }
+
+    /// 请求坐标及逆地理编码地址。
+    func requestSnapshot(
+        desiredAccuracy: CLLocationAccuracy = kCLLocationAccuracyBest
+    ) async throws -> HomeLocationSnapshot {
+        let coordinate = try await requestCoordinate(desiredAccuracy: desiredAccuracy)
+        let address = await geocoder.reverseGeocode(
+            latitude: coordinate.latitude,
+            longitude: coordinate.longitude
+        )
+        return HomeLocationSnapshot(
+            latitude: coordinate.latitude,
+            longitude: coordinate.longitude,
+            address: address
+        )
+    }
+
+    /// 请求一次当前位置坐标。
+    func requestCoordinate(
+        desiredAccuracy: CLLocationAccuracy
+    ) async throws -> CLLocationCoordinate2D {
+        try requirePrivacyAgreement()
+        try await ensureLocationPermission()
+        guard locationContinuation == nil else {
+            throw LocationProviderError.locationFailed
+        }
+
+        manager.delegate = self
+        manager.desiredAccuracy = desiredAccuracy
+        return try await withCheckedThrowingContinuation { continuation in
+            locationContinuation = continuation
+            manager.requestLocation()
+        }
+    }
+
+    /// 使用系统服务将坐标解析为地址。
+    func reverseGeocode(latitude: Double, longitude: Double) async -> String {
+        guard appStore.session.privacyAgreementAccepted else { return "" }
+        return await geocoder.reverseGeocode(latitude: latitude, longitude: longitude)
+    }
+
+    /// 请求系统定位权限，等待用户完成首次授权。
+    func ensureLocationPermission() async throws {
+        manager.delegate = self
+        switch manager.authorizationStatus {
+        case .authorizedAlways, .authorizedWhenInUse:
+            return
+        case .denied, .restricted:
+            throw LocationProviderError.permissionDenied
+        case .notDetermined:
+            guard permissionContinuation == nil else {
+                throw LocationProviderError.locationFailed
+            }
+            try await withCheckedThrowingContinuation { continuation in
+                permissionContinuation = continuation
+                manager.requestWhenInUseAuthorization()
+            }
+        @unknown default:
+            throw LocationProviderError.permissionDenied
+        }
+    }
+
+    func locationManagerDidChangeAuthorization(_ manager: CLLocationManager) {
+        resolvePermission(status: self.manager.authorizationStatus)
+    }
+
+    func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
+        guard let continuation = locationContinuation else { return }
+        locationContinuation = nil
+        guard let coordinate = locations.last?.coordinate,
+              CLLocationCoordinate2DIsValid(coordinate),
+              coordinate.latitude != 0 || coordinate.longitude != 0 else {
+            continuation.resume(throwing: LocationProviderError.locationFailed)
+            return
+        }
+        continuation.resume(returning: coordinate)
+    }
+
+    func locationManager(_ manager: CLLocationManager, didFailWithError error: Error) {
+        guard let continuation = locationContinuation else { return }
+        locationContinuation = nil
+        continuation.resume(throwing: LocationProviderError.locationFailed)
+    }
+
+    private func requirePrivacyAgreement() throws {
+        guard appStore.session.privacyAgreementAccepted else {
+            throw LocationProviderError.privacyNotAccepted
+        }
+    }
+
+    private func resolvePermission(status: CLAuthorizationStatus) {
+        guard let continuation = permissionContinuation else { return }
+        switch status {
+        case .authorizedAlways, .authorizedWhenInUse:
+            permissionContinuation = nil
+            continuation.resume()
+        case .denied, .restricted:
+            permissionContinuation = nil
+            continuation.resume(throwing: LocationProviderError.permissionDenied)
+        case .notDetermined:
+            break
+        @unknown default:
+            permissionContinuation = nil
+            continuation.resume(throwing: LocationProviderError.permissionDenied)
+        }
+    }
+}
+
+#if targetEnvironment(simulator)
+
+/// 模拟器默认定位服务，使用 Core Location 与系统逆地理编码。
+typealias LocationProvider = CoreLocationProvider
+
+#else
+
+/// 真机统一定位服务，封装高德 `AMapLocationManager`，对齐 Android `LocationProvider`。
 @MainActor
 final class LocationProvider: NSObject, LocationProviding {
 
@@ -19,7 +177,7 @@ final class LocationProvider: NSObject, LocationProviding {
         super.init()
     }
 
-    @MainActor
+    /// 请求坐标及高德逆地理编码地址。
     func requestSnapshot(desiredAccuracy: CLLocationAccuracy = kCLLocationAccuracyBest) async throws -> HomeLocationSnapshot {
         try AMapBootstrap.requireConfigured()
         try await ensureLocationPermission()
@@ -51,7 +209,7 @@ final class LocationProvider: NSObject, LocationProviding {
         }
     }
 
-    @MainActor
+    /// 请求一次当前位置坐标。
     func requestCoordinate(desiredAccuracy: CLLocationAccuracy) async throws -> CLLocationCoordinate2D {
         try AMapBootstrap.requireConfigured()
         try await ensureLocationPermission()
@@ -78,7 +236,7 @@ final class LocationProvider: NSObject, LocationProviding {
         }
     }
 
-    @MainActor
+    /// 使用高德服务将坐标解析为地址。
     func reverseGeocode(latitude: Double, longitude: Double) async -> String {
         await geocoder.reverseGeocode(latitude: latitude, longitude: longitude)
     }
@@ -110,3 +268,5 @@ final class LocationProvider: NSObject, LocationProviding {
         return manager
     }
 }
+
+#endif

suixinkan/Features/Location/LocationProviding.swift

@@ -16,20 +16,25 @@ struct HomeLocationSnapshot: Sendable, Equatable {
 /// 定位服务协议，便于 ViewModel 注入与单元测试 mock。
 protocol LocationProviding: Sendable {
     /// 按指定精度请求当前坐标与地址。
+    @MainActor
     func requestSnapshot(desiredAccuracy: CLLocationAccuracy) async throws -> HomeLocationSnapshot
     /// 按指定精度请求当前坐标。
+    @MainActor
     func requestCoordinate(desiredAccuracy: CLLocationAccuracy) async throws -> CLLocationCoordinate2D
     /// 逆地理编码。
+    @MainActor
     func reverseGeocode(latitude: Double, longitude: Double) async -> String
 }
 
 extension LocationProviding {
     /// 请求当前坐标与地址，默认使用最高精度以保持既有业务行为。
+    @MainActor
     func requestSnapshot() async throws -> HomeLocationSnapshot {
         try await requestSnapshot(desiredAccuracy: kCLLocationAccuracyBest)
     }
 
     /// 请求当前坐标，默认使用最高精度以保持既有业务行为。
+    @MainActor
     func requestCoordinate() async throws -> CLLocationCoordinate2D {
         try await requestCoordinate(desiredAccuracy: kCLLocationAccuracyBest)
     }

suixinkan/Features/Orders/API/OrderAPI.swift

@@ -293,6 +293,28 @@ final class OrderAPI {
         )
     }
 
+    /// 获取指定获客员的分成比例修改记录。
+    func saleUserCommissionRateLogs(
+        saleUserId: Int,
+        page: Int = 1,
+        pageSize: Int = 10
+    ) async throws -> CommissionRateLogListResponse {
+        guard saleUserId > 0 else {
+            throw APIError.networkFailed("获客员信息无效")
+        }
+        return try await client.send(
+            APIRequest(
+                method: .get,
+                path: "/api/yf-handset-app/photog/sale-user/commission-rate/logs",
+                queryItems: [
+                    URLQueryItem(name: "sale_user_id", value: String(saleUserId)),
+                    URLQueryItem(name: "page", value: String(max(1, page))),
+                    URLQueryItem(name: "page_size", value: String(min(max(1, pageSize), 50))),
+                ]
+            )
+        )
+    }
+
     func shootHistory(orderNumber: String) async throws -> MultiTravelShootHistoryResponse {
         try await client.send(
             APIRequest(

suixinkan/Features/Orders/Models/OrderModels.swift

@@ -875,6 +875,93 @@ struct CooperativeSalerEntity: Decodable, Equatable {
     }
 }
 
+/// 获客员分成比例修改记录分页响应。
+struct CommissionRateLogListResponse: Decodable, Equatable {
+    let list: [CommissionRateLogEntity]
+    let total: Int
+    let page: Int
+    let pageSize: Int
+
+    enum CodingKeys: String, CodingKey {
+        case list
+        case total
+        case page
+        case pageSize = "page_size"
+    }
+}
+
+/// 单条获客员分成比例修改记录。
+struct CommissionRateLogEntity: Decodable, Equatable, Hashable {
+    let id: Int
+    let bindingId: Int
+    let saleUserId: Int
+    let storeUserId: Int
+    let beforeRate: Int
+    let beforeRateLabel: String
+    let afterRate: Int
+    let afterRateLabel: String
+    let operatorType: String
+    let operatorId: Int
+    let operatorName: String
+    let remark: String
+    let createdAt: String
+
+    enum CodingKeys: String, CodingKey {
+        case id
+        case bindingId = "binding_id"
+        case saleUserId = "sale_user_id"
+        case storeUserId = "store_user_id"
+        case beforeRate = "before_rate"
+        case beforeRateLabel = "before_rate_label"
+        case afterRate = "after_rate"
+        case afterRateLabel = "after_rate_label"
+        case operatorType = "operator_type"
+        case operatorId = "operator_id"
+        case operatorName = "operator_name"
+        case remark
+        case createdAt = "created_at"
+    }
+
+    /// 修改前比例展示文本，优先使用服务端 label。
+    var displayBeforeRate: String {
+        let label = beforeRateLabel.trimmingCharacters(in: .whitespacesAndNewlines)
+        return label.isEmpty ? "\(beforeRate)%" : label
+    }
+
+    /// 修改后比例展示文本，优先使用服务端 label。
+    var displayAfterRate: String {
+        let label = afterRateLabel.trimmingCharacters(in: .whitespacesAndNewlines)
+        return label.isEmpty ? "\(afterRate)%" : label
+    }
+
+    /// 修改时间展示文本。
+    var metadataLine: String {
+        formattedCreatedAt
+    }
+
+    /// 去除首尾空白后的备注；空备注不展示。
+    var displayRemark: String? {
+        let value = remark.trimmingCharacters(in: .whitespacesAndNewlines)
+        return value.isEmpty ? nil : value
+    }
+
+    private var formattedCreatedAt: String {
+        let value = createdAt.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard !value.isEmpty else { return "—" }
+        let formatter = DateFormatter()
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        formatter.timeZone = TimeZone(identifier: "Asia/Shanghai")
+        for format in ["yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm"] {
+            formatter.dateFormat = format
+            if let date = formatter.date(from: value) {
+                formatter.dateFormat = "yyyy-MM-dd HH:mm"
+                return formatter.string(from: date)
+            }
+        }
+        return value
+    }
+}
+
 struct ReferralOrderListResponse: Decodable {
     let total: Int
     let list: [ReferralOrderEntity]

suixinkan/Features/Orders/Utils/MainTabScanHandler.swift

@@ -3,6 +3,7 @@
 //  suixinkan
 //
 
+import CoreLocation
 import UIKit
 
 /// 主 Tab 中间扫码按钮结果处理，对齐 Android `MainTabViewModel.signIn`。

suixinkan/Features/Payment/Models/PaymentModels.swift

@@ -69,9 +69,9 @@ enum PayPageBrandingPolicy {
 
 /// 收款页当前账号信息的展示文本格式化规则。
 enum PaymentAccountDisplayFormatter {
-    /// 解析当前登录摄影师名称，昵称为空时使用实名，仍为空时显示占位符。
-    static func photographerName(userName: String, realName: String) -> String {
-        userName.trimmedNonEmpty ?? realName.trimmedNonEmpty ?? "-"
+    /// 解析当前登录摄影师的真实姓名，空值显示占位符。
+    static func photographerName(realName: String) -> String {
+        realName.trimmedNonEmpty ?? "-"
     }
 
     /// 去除空值与重复项后，合并当前账号的全部店铺名称。

suixinkan/Features/Payment/ViewModels/PaymentCollectionDetailsViewModel.swift

@@ -28,6 +28,7 @@ final class PaymentCollectionDetailsViewModel {
 
     private var staticPayURL = ""
     private var dynamicPayURL = ""
+    private var hasCompletedPayCodeRequest = false
     private let appStore: AppStore
     private let payPageConfigCache: PayPageConfigCaching
 
@@ -50,6 +51,11 @@ final class PaymentCollectionDetailsViewModel {
         qrImage != nil && !staticPayURL.isEmpty
     }
 
+    /// 是否应在二维码区域展示加载状态，首次请求开始前也视为加载中，避免短暂闪现错误占位。
+    var isPayCodeLoading: Bool {
+        loading || !hasCompletedPayCodeRequest
+    }
+
     var displayScenicName: String {
         scenicName.isEmpty ? "暂无景区" : scenicName
     }
@@ -60,7 +66,6 @@ final class PaymentCollectionDetailsViewModel {
 
     var displayPhotographerName: String {
         PaymentAccountDisplayFormatter.photographerName(
-            userName: appStore.session.userName,
             realName: appStore.session.realName
         )
     }
@@ -85,11 +90,11 @@ final class PaymentCollectionDetailsViewModel {
 
     func loadPayCode(api: PaymentAPI) async {
         guard !loading else { return }
-        refreshLocalState()
         loading = true
-        notifyStateChange()
+        refreshLocalState()
         defer {
             loading = false
+            hasCompletedPayCodeRequest = true
             notifyStateChange()
         }
 

suixinkan/Features/Profile/ViewModels/ProfileViewModel.swift

@@ -17,11 +17,11 @@ final class ProfileViewModel {
     var onStateChange: (() -> Void)?
 
     var displayNickname: String {
-        nonEmpty(userInfo?.nickname) ?? "未设置昵称"
+        nonEmpty(userInfo?.nickname) ?? AppStore.shared.session.userName.nonEmpty ?? "未设置昵称"
     }
 
     var displayRealName: String {
-        nonEmpty(userInfo?.realName) ?? "--"
+        nonEmpty(userInfo?.realName) ?? AppStore.shared.session.realName.nonEmpty ?? "--"
     }
 
     var displayPhone: String {
@@ -37,6 +37,17 @@ final class ProfileViewModel {
         return uid.isEmpty ? "--" : uid
     }
 
+    /// 本地是否已有可供冷启动首屏展示的基本资料。
+    var hasCachedBasicInfo: Bool {
+        [
+            AppStore.shared.session.userName,
+            AppStore.shared.session.realName,
+            AppStore.shared.session.phone,
+            AppStore.shared.session.avatar,
+            AppStore.shared.session.userId,
+        ].contains { nonEmpty($0) != nil }
+    }
+
     var accountDisplayName: String {
         let name = AppStore.shared.session.accountDisplayName.trimmingCharacters(in: .whitespacesAndNewlines)
         return name.isEmpty ? "--" : name
@@ -112,6 +123,7 @@ final class ProfileViewModel {
         if !info.roleName.isEmpty {
             AppStore.shared.session.roleName = info.roleName
         }
+        notifyStateChange()
 
         if showPhotographerFields {
             async let realName = api.realNameInfo()

suixinkan/SceneDelegate.swift

@@ -8,6 +8,7 @@ import UIKit
 class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
     var window: UIWindow?
+    private var sessionExpiredDialog: SessionExpiredDialogViewController?
 
     func scene(
         _ scene: UIScene,
@@ -86,18 +87,36 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     }
 
     @objc private func handleSessionDidExpire() {
+        guard AppStore.shared.session.isLoggedIn else { return }
+        guard sessionExpiredDialog == nil else { return }
+
+        GlobalLoadingManager.shared.hideAll()
+        let dialog = SessionExpiredDialogViewController { [weak self] in
+            self?.transitionToLogin()
+        }
+        sessionExpiredDialog = dialog
+
+        guard let presenter = topViewController(from: window?.rootViewController) else {
+            sessionExpiredDialog = nil
+            return
+        }
+        presenter.present(dialog, animated: true)
+    }
+
+    private func transitionToLogin() {
+        sessionExpiredDialog = nil
         PushNotificationManager.shared.handleLogout()
         AppStore.shared.logout()
         AppRouter.setRoot(.login, on: window)
     }
 
     @objc private func handleUserDidLogout() {
-        PushNotificationManager.shared.handleLogout()
-        AppStore.shared.logout()
-        AppRouter.setRoot(.login, on: window)
+        transitionToLogin()
     }
 
     @objc private func handleUserDidLogin() {
+        sessionExpiredDialog?.dismiss(animated: false)
+        sessionExpiredDialog = nil
         AppRouter.setRoot(.mainTab, on: window)
         DispatchQueue.main.async {
             PushNotificationManager.shared.handleLoginCompleted()
@@ -108,4 +127,18 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     @objc private func handleAccountDidSwitch() {
         PushNotificationManager.shared.handleAccountSwitched()
     }
+
+    private func topViewController(from viewController: UIViewController?) -> UIViewController? {
+        guard let viewController else { return nil }
+        if let presented = viewController.presentedViewController {
+            return topViewController(from: presented)
+        }
+        if let navigationController = viewController as? UINavigationController {
+            return topViewController(from: navigationController.visibleViewController)
+        }
+        if let tabBarController = viewController as? UITabBarController {
+            return topViewController(from: tabBarController.selectedViewController)
+        }
+        return viewController
+    }
 }

suixinkan/UI/Common/SessionExpiredDialogViewController.swift

@@ -0,0 +1,103 @@
+//
+//  SessionExpiredDialogViewController.swift
+//  suixinkan
+//
+
+import SnapKit
+import UIKit
+
+/// 登录凭证失效时展示的强制确认弹窗，用户确认后由调用方执行退出登录。
+@MainActor
+final class SessionExpiredDialogViewController: UIViewController {
+
+    private let onConfirm: () -> Void
+    private let confirmButton = AppButton(title: "确认并退出登录")
+    private var didConfirm = false
+
+    /// 创建不可通过点击遮罩关闭的登录失效弹窗。
+    init(onConfirm: @escaping () -> Void) {
+        self.onConfirm = onConfirm
+        super.init(nibName: nil, bundle: nil)
+        modalPresentationStyle = .overFullScreen
+        modalTransitionStyle = .crossDissolve
+        isModalInPresentation = true
+    }
+
+    @available(*, unavailable)
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupUI()
+    }
+
+    private func setupUI() {
+        view.backgroundColor = UIColor.black.withAlphaComponent(0.32)
+        view.accessibilityViewIsModal = true
+        view.accessibilityIdentifier = "sessionExpired.dialog"
+
+        let cardView = UIView()
+        cardView.backgroundColor = AppColor.cardBackground
+        cardView.layer.cornerRadius = AppRadius.lg
+        cardView.clipsToBounds = true
+
+        let warningImageView = UIImageView(
+            image: UIImage(systemName: "exclamationmark.circle.fill")
+        )
+        warningImageView.tintColor = UIColor(hex: 0xF05A5A)
+        warningImageView.contentMode = .scaleAspectFit
+        warningImageView.isAccessibilityElement = true
+        warningImageView.accessibilityLabel = "登录状态异常"
+
+        let titleLabel = UILabel()
+        titleLabel.text = "登录提醒"
+        titleLabel.textColor = AppColor.textPrimary
+        titleLabel.font = .systemFont(ofSize: 20, weight: .semibold)
+        titleLabel.textAlignment = .center
+
+        let messageLabel = UILabel()
+        messageLabel.text = "当前用户已在其他设备登录，\n请重新登录"
+        messageLabel.textColor = UIColor(hex: 0x4B5563)
+        messageLabel.font = .systemFont(ofSize: 14)
+        messageLabel.textAlignment = .center
+        messageLabel.numberOfLines = 0
+
+        confirmButton.accessibilityIdentifier = "sessionExpired.confirmButton"
+        confirmButton.addTarget(self, action: #selector(confirmTapped), for: .touchUpInside)
+
+        let contentStack = UIStackView(arrangedSubviews: [
+            warningImageView,
+            titleLabel,
+            messageLabel,
+            confirmButton,
+        ])
+        contentStack.axis = .vertical
+        contentStack.alignment = .fill
+        contentStack.spacing = 16
+        contentStack.setCustomSpacing(4, after: titleLabel)
+        contentStack.setCustomSpacing(20, after: messageLabel)
+
+        view.addSubview(cardView)
+        cardView.addSubview(contentStack)
+
+        cardView.snp.makeConstraints { make in
+            make.center.equalToSuperview()
+            make.leading.trailing.equalToSuperview().inset(32)
+        }
+        contentStack.snp.makeConstraints { make in
+            make.edges.equalToSuperview().inset(24)
+        }
+        warningImageView.snp.makeConstraints { make in
+            make.height.equalTo(64)
+        }
+    }
+
+    @objc private func confirmTapped() {
+        guard !didConfirm else { return }
+        didConfirm = true
+        confirmButton.isEnabled = false
+        onConfirm()
+    }
+}

suixinkan/UI/CooperationOrder/CommissionRateLogViewController.swift

@@ -0,0 +1,284 @@
+//
+//  CommissionRateLogViewController.swift
+//  suixinkan
+//
+
+import SnapKit
+import UIKit
+
+/// 获客员分成比例修改记录页，以时间轴形式展示历史变更。
+final class CommissionRateLogViewController: BaseViewController {
+    private let viewModel: CommissionRateLogViewModel
+    private let orderAPI: OrderAPI
+    private let navigationTitle: String
+
+    private let tableView = UITableView(frame: .zero, style: .plain)
+    private let emptyLabel = UILabel()
+    private let loadingIndicator = UIActivityIndicatorView(style: .medium)
+    private let footerLabel = UILabel()
+    private var dataSource: UITableViewDiffableDataSource<Int, CommissionRateLogEntity>!
+
+    init(saleUserId: Int, acquirerName: String, orderAPI: OrderAPI? = nil) {
+        viewModel = CommissionRateLogViewModel(saleUserId: saleUserId)
+        let trimmedName = acquirerName.trimmingCharacters(in: .whitespacesAndNewlines)
+        navigationTitle = trimmedName.isEmpty ? "修改记录" : "给\(trimmedName)的分成记录"
+        self.orderAPI = orderAPI ?? NetworkServices.shared.orderAPI
+        super.init(nibName: nil, bundle: nil)
+    }
+
+    @available(*, unavailable)
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        Task { await viewModel.refresh(api: orderAPI) }
+    }
+
+    override func setupNavigationBar() {
+        title = navigationTitle
+    }
+
+    override func setupUI() {
+        view.backgroundColor = AppColor.pageBackground
+
+        tableView.backgroundColor = AppColor.pageBackground
+        tableView.separatorStyle = .none
+        tableView.rowHeight = UITableView.automaticDimension
+        tableView.estimatedRowHeight = 132
+        tableView.delegate = self
+        tableView.contentInset.top = AppSpacing.sm
+        tableView.register(
+            CommissionRateLogTimelineCell.self,
+            forCellReuseIdentifier: CommissionRateLogTimelineCell.reuseIdentifier
+        )
+        tableView.refreshControl = UIRefreshControl()
+        tableView.refreshControl?.addTarget(self, action: #selector(refreshPulled), for: .valueChanged)
+
+        dataSource = UITableViewDiffableDataSource<Int, CommissionRateLogEntity>(
+            tableView: tableView
+        ) { tableView, indexPath, item in
+            guard let cell = tableView.dequeueReusableCell(
+                withIdentifier: CommissionRateLogTimelineCell.reuseIdentifier,
+                for: indexPath
+            ) as? CommissionRateLogTimelineCell else {
+                return UITableViewCell()
+            }
+            cell.configure(with: item, isLatest: indexPath.item == 0)
+            return cell
+        }
+
+        emptyLabel.text = "暂无修改记录"
+        emptyLabel.font = .systemFont(ofSize: 14)
+        emptyLabel.textColor = AppColor.textTertiary
+        emptyLabel.textAlignment = .center
+        emptyLabel.isHidden = true
+
+        loadingIndicator.color = AppColor.primary
+
+        footerLabel.font = .systemFont(ofSize: 13)
+        footerLabel.textColor = AppColor.textTertiary
+        footerLabel.textAlignment = .center
+
+        view.addSubview(tableView)
+        view.addSubview(emptyLabel)
+        view.addSubview(loadingIndicator)
+    }
+
+    override func setupConstraints() {
+        tableView.snp.makeConstraints { make in
+            make.edges.equalTo(view.safeAreaLayoutGuide)
+        }
+        emptyLabel.snp.makeConstraints { make in
+            make.center.equalTo(tableView)
+        }
+        loadingIndicator.snp.makeConstraints { make in
+            make.center.equalTo(tableView)
+        }
+    }
+
+    override func bindActions() {
+        viewModel.onStateChange = { [weak self] in
+            Task { @MainActor in self?.applyState() }
+        }
+        viewModel.onShowMessage = { [weak self] message in
+            Task { @MainActor in self?.showToast(message) }
+        }
+    }
+
+    private func applyState() {
+        if !viewModel.isRefreshing {
+            tableView.refreshControl?.endRefreshing()
+        }
+        if viewModel.initialLoading && viewModel.items.isEmpty {
+            loadingIndicator.startAnimating()
+        } else {
+            loadingIndicator.stopAnimating()
+        }
+        emptyLabel.isHidden = viewModel.initialLoading || viewModel.isRefreshing || !viewModel.items.isEmpty
+
+        var snapshot = NSDiffableDataSourceSnapshot<Int, CommissionRateLogEntity>()
+        snapshot.appendSections([0])
+        snapshot.appendItems(viewModel.items)
+        dataSource.apply(snapshot, animatingDifferences: true)
+
+        guard !viewModel.items.isEmpty else {
+            tableView.tableFooterView = UIView()
+            return
+        }
+        footerLabel.text = viewModel.isLoadingMore ? "加载中…" : (viewModel.canLoadMore ? "" : "没有更多")
+        footerLabel.frame = CGRect(x: 0, y: 0, width: view.bounds.width, height: 52)
+        tableView.tableFooterView = footerLabel
+    }
+
+    @objc private func refreshPulled() {
+        Task { await viewModel.refresh(api: orderAPI) }
+    }
+}
+
+extension CommissionRateLogViewController: UITableViewDelegate {
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        guard !viewModel.items.isEmpty,
+              scrollView.contentOffset.y > scrollView.contentSize.height - scrollView.bounds.height - 180 else {
+            return
+        }
+        Task { await viewModel.loadMore(api: orderAPI) }
+    }
+}
+
+/// 分成比例修改记录的时间轴 Cell。
+final class CommissionRateLogTimelineCell: UITableViewCell {
+    static let reuseIdentifier = "CommissionRateLogTimelineCell"
+
+    private let railView = UIView()
+    private let dotView = UIView()
+    private let cardView = UIView()
+    private let metadataLabel = UILabel()
+    private let latestBadgeLabel = UILabel()
+    private let beforeRateLabel = UILabel()
+    private let arrowImageView = UIImageView(image: UIImage(systemName: "arrow.right"))
+    private let afterRateLabel = UILabel()
+    private let remarkLabel = UILabel()
+    private let contentStack = UIStackView()
+
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        selectionStyle = .none
+        backgroundColor = AppColor.pageBackground
+        contentView.backgroundColor = AppColor.pageBackground
+
+        railView.backgroundColor = AppColor.primary.withAlphaComponent(0.16)
+        dotView.backgroundColor = AppColor.primary
+        dotView.layer.cornerRadius = 4
+
+        cardView.backgroundColor = .white
+        cardView.layer.cornerRadius = AppRadius.md
+        cardView.layer.shadowColor = UIColor.black.cgColor
+        cardView.layer.shadowOpacity = 0.04
+        cardView.layer.shadowOffset = CGSize(width: 0, height: 1)
+        cardView.layer.shadowRadius = 2
+
+        metadataLabel.font = .systemFont(ofSize: 12)
+        metadataLabel.textColor = AppColor.textSecondary
+        metadataLabel.numberOfLines = 2
+
+        latestBadgeLabel.text = "最新"
+        latestBadgeLabel.font = .systemFont(ofSize: 11, weight: .semibold)
+        latestBadgeLabel.textColor = AppColor.primary
+        latestBadgeLabel.textAlignment = .center
+        latestBadgeLabel.backgroundColor = AppColor.primary.withAlphaComponent(0.10)
+        latestBadgeLabel.layer.cornerRadius = 9
+        latestBadgeLabel.clipsToBounds = true
+        latestBadgeLabel.isHidden = true
+        latestBadgeLabel.setContentHuggingPriority(.required, for: .horizontal)
+        latestBadgeLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
+        latestBadgeLabel.snp.makeConstraints { make in
+            make.width.equalTo(38)
+            make.height.equalTo(18)
+        }
+
+        let headerStack = UIStackView(arrangedSubviews: [metadataLabel, latestBadgeLabel])
+        headerStack.axis = .horizontal
+        headerStack.alignment = .top
+        headerStack.spacing = AppSpacing.sm
+
+        [beforeRateLabel, afterRateLabel].forEach { label in
+            label.font = .systemFont(ofSize: 17, weight: .semibold)
+            label.textColor = AppColor.textPrimary
+            label.setContentCompressionResistancePriority(.required, for: .horizontal)
+        }
+        afterRateLabel.textColor = AppColor.primary
+        arrowImageView.tintColor = AppColor.textTertiary
+        arrowImageView.contentMode = .scaleAspectFit
+
+        let rateStack = UIStackView(arrangedSubviews: [beforeRateLabel, arrowImageView, afterRateLabel, UIView()])
+        rateStack.axis = .horizontal
+        rateStack.alignment = .center
+        rateStack.spacing = AppSpacing.sm
+        arrowImageView.snp.makeConstraints { make in
+            make.size.equalTo(16)
+        }
+
+        remarkLabel.font = .systemFont(ofSize: 13)
+        remarkLabel.textColor = AppColor.textSecondary
+        remarkLabel.numberOfLines = 0
+
+        contentStack.axis = .vertical
+        contentStack.spacing = AppSpacing.sm
+        contentStack.addArrangedSubview(headerStack)
+        contentStack.addArrangedSubview(rateStack)
+        contentStack.addArrangedSubview(remarkLabel)
+
+        contentView.addSubview(railView)
+        contentView.addSubview(dotView)
+        contentView.addSubview(cardView)
+        cardView.addSubview(contentStack)
+
+        railView.snp.makeConstraints { make in
+            make.leading.equalToSuperview().offset(24)
+            make.top.bottom.equalToSuperview()
+            make.width.equalTo(1.5)
+        }
+        dotView.snp.makeConstraints { make in
+            make.centerX.equalTo(railView)
+            make.top.equalToSuperview().offset(20)
+            make.size.equalTo(8)
+        }
+        cardView.snp.makeConstraints { make in
+            make.leading.equalTo(railView.snp.trailing).offset(16)
+            make.trailing.equalToSuperview().inset(14)
+            make.top.equalToSuperview().offset(4)
+            make.bottom.equalToSuperview().inset(8)
+        }
+        contentStack.snp.makeConstraints { make in
+            make.edges.equalToSuperview().inset(15)
+        }
+    }
+
+    @available(*, unavailable)
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    /// 绑定比例变化、时间及可选备注。
+    func configure(with item: CommissionRateLogEntity, isLatest: Bool) {
+        metadataLabel.text = item.metadataLine
+        latestBadgeLabel.isHidden = !isLatest
+        beforeRateLabel.text = item.displayBeforeRate
+        afterRateLabel.text = item.displayAfterRate
+        if let remark = item.displayRemark {
+            remarkLabel.text = "备注：\(remark)"
+            remarkLabel.isHidden = false
+        } else {
+            remarkLabel.text = nil
+            remarkLabel.isHidden = true
+        }
+        accessibilityLabel = [
+            isLatest ? "最新记录" : nil,
+            item.metadataLine,
+            "\(item.displayBeforeRate)修改为\(item.displayAfterRate)",
+            item.displayRemark.map { "备注\($0)" },
+        ].compactMap { $0 }.joined(separator: "，")
+    }
+}

suixinkan/UI/CooperationOrder/CooperationAcquirerViewController.swift

@@ -31,12 +31,13 @@ final class CooperationAcquirerViewController: BaseViewController, UITableViewDa
     }
 
     override func setupUI() {
+        view.backgroundColor = UIColor(hex: 0xF6F7FA)
         tableView.backgroundColor = .clear
         tableView.separatorStyle = .none
         tableView.rowHeight = UITableView.automaticDimension
-        tableView.estimatedRowHeight = 142
-        tableView.contentInset.top = AppSpacing.sm
-        tableView.verticalScrollIndicatorInsets.top = AppSpacing.sm
+        tableView.estimatedRowHeight = 224
+        tableView.contentInset = UIEdgeInsets(top: AppSpacing.sm, left: 0, bottom: AppSpacing.md, right: 0)
+        tableView.verticalScrollIndicatorInsets = UIEdgeInsets(top: AppSpacing.sm, left: 0, bottom: AppSpacing.md, right: 0)
         tableView.dataSource = self
         tableView.delegate = self
         tableView.register(CooperationAcquirerCell.self, forCellReuseIdentifier: CooperationAcquirerCell.reuseIdentifier)
@@ -245,6 +246,17 @@ final class CooperationAcquirerViewController: BaseViewController, UITableViewDa
         cell.onEditCommission = { [weak self] in
             self?.presentCommissionDialog(for: acquirer)
         }
+        cell.onViewCommissionLogs = { [weak self] in
+            guard acquirer.saleUserId > 0 else {
+                self?.showToast("获客员信息无效")
+                return
+            }
+            let controller = CommissionRateLogViewController(
+                saleUserId: acquirer.saleUserId,
+                acquirerName: acquirer.displayName
+            )
+            self?.navigationController?.pushViewController(controller, animated: true)
+        }
         cell.onCall = {
             let phone = acquirer.displayPhone.trimmingCharacters(in: .whitespacesAndNewlines)
             guard !phone.isEmpty, let url = URL(string: "tel://\(phone)") else { return }

suixinkan/UI/CooperationOrder/Views/CooperationOrderViews.swift

@@ -445,22 +445,25 @@ final class CooperationAcquirerCell: UITableViewCell {
 
     var onEditRemark: (() -> Void)?
     var onEditCommission: (() -> Void)?
+    var onViewCommissionLogs: (() -> Void)?
     var onCall: (() -> Void)?
 
     private let cardView = UIView()
     private let avatarContainer = UIView()
     private let avatarIconView = UIImageView(image: UIImage(systemName: "person.fill"))
-    private let nameTitleLabel = UILabel()
     private let nameValueLabel = UILabel()
-    private let editRemarkButton = UIButton(type: .system)
-    private let phoneTitleLabel = UILabel()
     private let phoneValueLabel = UILabel()
     private let callButton = UIButton(type: .system)
-    private let bindTimeTitleLabel = UILabel()
-    private let bindTimeValueLabel = UILabel()
+    private let commissionContainer = UIView()
     private let commissionTitleLabel = UILabel()
     private let commissionValueLabel = UILabel()
+    private let bindTimeIconView = UIImageView(image: UIImage(systemName: "calendar"))
+    private let bindTimeValueLabel = UILabel()
+    private let dividerView = UIView()
+    private let editRemarkButton = UIButton(type: .system)
     private let editCommissionButton = UIButton(type: .system)
+    private let commissionLogButton = UIButton(type: .system)
+    private let actionStack = UIStackView()
 
     override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
         super.init(style: style, reuseIdentifier: reuseIdentifier)
@@ -469,135 +472,180 @@ final class CooperationAcquirerCell: UITableViewCell {
         contentView.backgroundColor = .clear
 
         cardView.backgroundColor = .white
-        cardView.layer.cornerRadius = AppRadius.md
+        cardView.layer.cornerRadius = AppRadius.xl
+        cardView.layer.borderWidth = 0.5
+        cardView.layer.borderColor = AppColor.cardOutline.cgColor
         cardView.layer.shadowColor = UIColor.black.cgColor
         cardView.layer.shadowOpacity = 0.04
-        cardView.layer.shadowOffset = CGSize(width: 0, height: 1)
-        cardView.layer.shadowRadius = 2
+        cardView.layer.shadowOffset = CGSize(width: 0, height: 3)
+        cardView.layer.shadowRadius = 8
+        cardView.accessibilityIdentifier = "cooperation_acquirer_card"
 
         avatarContainer.backgroundColor = AppColor.primary.withAlphaComponent(0.08)
-        avatarContainer.layer.cornerRadius = AppRadius.sm
+        avatarContainer.layer.cornerRadius = 24
         avatarContainer.clipsToBounds = true
 
         avatarIconView.tintColor = AppColor.primary
         avatarIconView.contentMode = .scaleAspectFit
 
-        configureTitleLabel(nameTitleLabel, text: "获客员名称")
-        configureTitleLabel(phoneTitleLabel, text: "手机号")
-        configureTitleLabel(bindTimeTitleLabel, text: "绑定时间")
-        configureTitleLabel(commissionTitleLabel, text: "分成比例")
-
-        nameValueLabel.font = .systemFont(ofSize: 15, weight: .bold)
+        nameValueLabel.font = .systemFont(ofSize: 17, weight: .semibold)
         nameValueLabel.textColor = AppColor.textPrimary
         nameValueLabel.numberOfLines = 1
         nameValueLabel.lineBreakMode = .byTruncatingTail
+        nameValueLabel.accessibilityIdentifier = "cooperation_acquirer_name"
 
-        [phoneValueLabel, bindTimeValueLabel, commissionValueLabel].forEach { label in
-            label.font = .systemFont(ofSize: 13)
-            label.textColor = AppColor.textSecondary
-            label.numberOfLines = 1
-            label.lineBreakMode = .byTruncatingTail
-        }
-        commissionValueLabel.font = .systemFont(ofSize: 13, weight: .medium)
-
-        editRemarkButton.setTitle("修改备注", for: .normal)
-        editRemarkButton.titleLabel?.font = .systemFont(ofSize: 13)
-        editRemarkButton.setTitleColor(AppColor.primary, for: .normal)
-        editRemarkButton.setConfigurationContentInsets(
-            NSDirectionalEdgeInsets(top: 16, leading: 14, bottom: 16, trailing: 14)
-        )
-        editRemarkButton.addTarget(self, action: #selector(editRemarkTapped), for: .touchUpInside)
+        phoneValueLabel.font = .systemFont(ofSize: 14)
+        phoneValueLabel.textColor = AppColor.textTertiary
+        phoneValueLabel.numberOfLines = 1
+        phoneValueLabel.lineBreakMode = .byTruncatingTail
+        phoneValueLabel.accessibilityIdentifier = "cooperation_acquirer_phone"
 
         callButton.setImage(UIImage(systemName: "phone.fill"), for: .normal)
         callButton.tintColor = AppColor.primary
         callButton.backgroundColor = AppColor.primaryLight
-        callButton.layer.cornerRadius = 15
+        callButton.layer.cornerRadius = AppSpacing.minTouchTarget / 2
+        callButton.layer.borderWidth = 0.5
+        callButton.layer.borderColor = AppColor.primary.withAlphaComponent(0.12).cgColor
         callButton.imageView?.contentMode = .scaleAspectFit
+        callButton.accessibilityLabel = "拨打获客员电话"
+        callButton.accessibilityIdentifier = "cooperation_acquirer_call"
         callButton.addTarget(self, action: #selector(callTapped), for: .touchUpInside)
 
-        editCommissionButton.setTitle("修改比例", for: .normal)
-        editCommissionButton.titleLabel?.font = .systemFont(ofSize: 13)
-        editCommissionButton.setTitleColor(AppColor.primary, for: .normal)
-        editCommissionButton.setConfigurationContentInsets(
-            NSDirectionalEdgeInsets(top: 4, leading: 8, bottom: 4, trailing: 8)
+        commissionContainer.backgroundColor = AppColor.primary.withAlphaComponent(0.06)
+        commissionContainer.layer.cornerRadius = AppRadius.lg
+
+        commissionTitleLabel.text = "分成比例"
+        commissionTitleLabel.font = .systemFont(ofSize: 12)
+        commissionTitleLabel.textColor = AppColor.textTertiary
+
+        commissionValueLabel.font = .systemFont(ofSize: 24, weight: .bold)
+        commissionValueLabel.textColor = AppColor.primary
+        commissionValueLabel.numberOfLines = 1
+        commissionValueLabel.adjustsFontSizeToFitWidth = true
+        commissionValueLabel.minimumScaleFactor = 0.75
+        commissionValueLabel.accessibilityIdentifier = "cooperation_acquirer_commission_rate"
+
+        bindTimeIconView.tintColor = AppColor.textTertiary
+        bindTimeIconView.contentMode = .scaleAspectFit
+
+        bindTimeValueLabel.font = .systemFont(ofSize: 13)
+        bindTimeValueLabel.textColor = AppColor.textTertiary
+        bindTimeValueLabel.numberOfLines = 2
+        bindTimeValueLabel.lineBreakMode = .byTruncatingTail
+        bindTimeValueLabel.accessibilityIdentifier = "cooperation_acquirer_bind_time"
+
+        dividerView.backgroundColor = AppColor.cardOutline
+
+        configureActionButton(
+            editRemarkButton,
+            title: "修改备注",
+            isPrimary: false,
+            accessibilityIdentifier: "cooperation_acquirer_edit_remark"
+        )
+        editRemarkButton.addTarget(self, action: #selector(editRemarkTapped), for: .touchUpInside)
+
+        configureActionButton(
+            commissionLogButton,
+            title: "修改记录",
+            isPrimary: false,
+            accessibilityIdentifier: "cooperation_acquirer_commission_logs"
+        )
+        commissionLogButton.accessibilityLabel = "查看分成比例修改记录"
+        commissionLogButton.addTarget(self, action: #selector(commissionLogTapped), for: .touchUpInside)
+
+        configureActionButton(
+            editCommissionButton,
+            title: "修改比例",
+            isPrimary: true,
+            accessibilityIdentifier: "cooperation_acquirer_edit_commission"
         )
         editCommissionButton.addTarget(self, action: #selector(editCommissionTapped), for: .touchUpInside)
 
+        actionStack.axis = .horizontal
+        actionStack.alignment = .fill
+        actionStack.distribution = .fillEqually
+        actionStack.spacing = AppSpacing.xs
+        actionStack.addArrangedSubview(editRemarkButton)
+        actionStack.addArrangedSubview(commissionLogButton)
+        actionStack.addArrangedSubview(editCommissionButton)
+
         contentView.addSubview(cardView)
         cardView.addSubview(avatarContainer)
         avatarContainer.addSubview(avatarIconView)
-        cardView.addSubview(nameTitleLabel)
         cardView.addSubview(nameValueLabel)
-        cardView.addSubview(editRemarkButton)
-        cardView.addSubview(phoneTitleLabel)
         cardView.addSubview(phoneValueLabel)
         cardView.addSubview(callButton)
-        cardView.addSubview(bindTimeTitleLabel)
+        cardView.addSubview(commissionContainer)
+        commissionContainer.addSubview(commissionTitleLabel)
+        commissionContainer.addSubview(commissionValueLabel)
+        cardView.addSubview(bindTimeIconView)
         cardView.addSubview(bindTimeValueLabel)
-        cardView.addSubview(commissionTitleLabel)
-        cardView.addSubview(commissionValueLabel)
-        cardView.addSubview(editCommissionButton)
+        cardView.addSubview(dividerView)
+        cardView.addSubview(actionStack)
 
         cardView.snp.makeConstraints { make in
-            make.edges.equalToSuperview().inset(UIEdgeInsets(top: 0, left: 14, bottom: AppSpacing.sm, right: 14))
+            make.edges.equalToSuperview().inset(
+                UIEdgeInsets(top: 0, left: AppSpacing.md, bottom: AppSpacing.sm, right: AppSpacing.md)
+            )
         }
         avatarContainer.snp.makeConstraints { make in
-            make.leading.equalToSuperview().offset(14)
-            make.centerY.equalToSuperview()
-            make.size.equalTo(44)
+            make.top.leading.equalToSuperview().inset(AppSpacing.md)
+            make.size.equalTo(48)
         }
         avatarIconView.snp.makeConstraints { make in
             make.center.equalToSuperview()
-            make.size.equalTo(22)
-        }
-        nameTitleLabel.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(AppSpacing.md)
-            make.leading.equalTo(avatarContainer.snp.trailing).offset(AppSpacing.sm)
+            make.size.equalTo(24)
         }
         nameValueLabel.snp.makeConstraints { make in
-            make.centerY.equalTo(nameTitleLabel)
-            make.leading.equalTo(nameTitleLabel.snp.trailing).offset(AppSpacing.sm)
-            make.trailing.lessThanOrEqualTo(editRemarkButton.snp.leading).offset(-AppSpacing.xs)
-        }
-        editRemarkButton.snp.makeConstraints { make in
-            make.top.trailing.equalToSuperview()
-        }
-        phoneTitleLabel.snp.makeConstraints { make in
-            make.top.equalTo(nameTitleLabel.snp.bottom).offset(AppSpacing.xs)
-            make.leading.equalTo(nameTitleLabel)
+            make.top.equalTo(avatarContainer).offset(2)
+            make.leading.equalTo(avatarContainer.snp.trailing).offset(AppSpacing.sm)
+            make.trailing.lessThanOrEqualTo(callButton.snp.leading).offset(-AppSpacing.sm)
         }
         phoneValueLabel.snp.makeConstraints { make in
-            make.centerY.equalTo(phoneTitleLabel)
-            make.leading.equalTo(phoneTitleLabel.snp.trailing).offset(AppSpacing.sm)
-            make.trailing.lessThanOrEqualTo(callButton.snp.leading).offset(-AppSpacing.xs)
+            make.top.equalTo(nameValueLabel.snp.bottom).offset(AppSpacing.xxs)
+            make.leading.equalTo(nameValueLabel)
+            make.trailing.lessThanOrEqualTo(callButton.snp.leading).offset(-AppSpacing.sm)
         }
         callButton.snp.makeConstraints { make in
-            make.trailing.equalToSuperview().inset(14)
-            make.centerY.equalTo(phoneTitleLabel)
-            make.size.equalTo(30)
+            make.top.trailing.equalToSuperview().inset(AppSpacing.md)
+            make.size.equalTo(AppSpacing.minTouchTarget)
         }
-        bindTimeTitleLabel.snp.makeConstraints { make in
-            make.top.equalTo(phoneTitleLabel.snp.bottom).offset(AppSpacing.xs)
-            make.leading.equalTo(nameTitleLabel)
-        }
-        bindTimeValueLabel.snp.makeConstraints { make in
-            make.centerY.equalTo(bindTimeTitleLabel)
-            make.leading.equalTo(bindTimeTitleLabel.snp.trailing).offset(AppSpacing.sm)
-            make.trailing.lessThanOrEqualToSuperview().inset(14)
+        commissionContainer.snp.makeConstraints { make in
+            make.top.equalTo(avatarContainer.snp.bottom).offset(14)
+            make.leading.equalToSuperview().inset(AppSpacing.md)
+            make.width.equalTo(120)
+            make.height.equalTo(64)
         }
         commissionTitleLabel.snp.makeConstraints { make in
-            make.top.equalTo(bindTimeTitleLabel.snp.bottom).offset(AppSpacing.xs)
-            make.leading.equalTo(nameTitleLabel)
-            make.bottom.equalToSuperview().inset(AppSpacing.md)
+            make.top.equalToSuperview().offset(AppSpacing.xs)
+            make.centerX.equalToSuperview()
         }
         commissionValueLabel.snp.makeConstraints { make in
-            make.centerY.equalTo(commissionTitleLabel)
-            make.leading.equalTo(commissionTitleLabel.snp.trailing).offset(AppSpacing.sm)
-            make.trailing.lessThanOrEqualTo(editCommissionButton.snp.leading).offset(-AppSpacing.xs)
+            make.top.equalTo(commissionTitleLabel.snp.bottom).offset(2)
+            make.centerX.equalToSuperview()
+            make.leading.greaterThanOrEqualToSuperview().offset(AppSpacing.xs)
+            make.trailing.lessThanOrEqualToSuperview().inset(AppSpacing.xs)
         }
-        editCommissionButton.snp.makeConstraints { make in
-            make.centerY.equalTo(commissionTitleLabel)
-            make.trailing.equalToSuperview().inset(AppSpacing.xs)
+        bindTimeIconView.snp.makeConstraints { make in
+            make.leading.equalTo(commissionContainer.snp.trailing).offset(AppSpacing.md)
+            make.centerY.equalTo(commissionContainer)
+            make.size.equalTo(18)
+        }
+        bindTimeValueLabel.snp.makeConstraints { make in
+            make.leading.equalTo(bindTimeIconView.snp.trailing).offset(AppSpacing.xs)
+            make.trailing.equalToSuperview().inset(AppSpacing.md)
+            make.centerY.equalTo(bindTimeIconView)
+        }
+        dividerView.snp.makeConstraints { make in
+            make.top.equalTo(commissionContainer.snp.bottom).offset(14)
+            make.leading.trailing.equalToSuperview().inset(AppSpacing.md)
+            make.height.equalTo(0.5)
+        }
+        actionStack.snp.makeConstraints { make in
+            make.top.equalTo(dividerView.snp.bottom).offset(AppSpacing.sm)
+            make.leading.trailing.equalToSuperview().inset(AppSpacing.md)
+            make.height.equalTo(AppSpacing.minTouchTarget)
+            make.bottom.equalToSuperview().inset(14)
         }
     }
 
@@ -610,26 +658,52 @@ final class CooperationAcquirerCell: UITableViewCell {
         super.prepareForReuse()
         onEditRemark = nil
         onEditCommission = nil
+        onViewCommissionLogs = nil
         onCall = nil
     }
 
     func configure(with acquirer: CooperativeSalerEntity) {
         nameValueLabel.text = acquirer.displayName.isEmpty ? "—" : acquirer.displayName
         phoneValueLabel.text = acquirer.displayPhone.isEmpty ? "—" : CooperationOrderPhoneMask.mask(acquirer.displayPhone)
-        bindTimeValueLabel.text = acquirer.displayBindTime.isEmpty ? "—" : acquirer.displayBindTime
+        let bindTime = acquirer.displayBindTime.isEmpty ? "—" : Self.minutePrecisionTime(acquirer.displayBindTime)
+        bindTimeValueLabel.text = "绑定于 \(bindTime)"
         commissionValueLabel.text = acquirer.displayCommissionRate.isEmpty ? "—" : acquirer.displayCommissionRate
     }
 
-    private func configureTitleLabel(_ label: UILabel, text: String) {
-        label.text = text
-        label.font = .systemFont(ofSize: 13)
-        label.textColor = AppColor.textTertiary
-        label.setContentHuggingPriority(.required, for: .horizontal)
-        label.setContentCompressionResistancePriority(.required, for: .horizontal)
+    private func configureActionButton(
+        _ button: UIButton,
+        title: String,
+        isPrimary: Bool,
+        accessibilityIdentifier: String
+    ) {
+        var configuration = UIButton.Configuration.plain()
+        configuration.title = title
+        configuration.baseForegroundColor = isPrimary ? AppColor.primary : UIColor(hex: 0x5F6673)
+        configuration.background.backgroundColor = isPrimary ? AppColor.primaryLight : .white
+        configuration.background.strokeColor = isPrimary
+            ? AppColor.primary.withAlphaComponent(0.35)
+            : UIColor(hex: 0xD9DEE7)
+        configuration.background.strokeWidth = 1
+        configuration.background.cornerRadius = AppRadius.md
+        configuration.contentInsets = NSDirectionalEdgeInsets(top: 0, leading: 6, bottom: 0, trailing: 6)
+        configuration.titleTextAttributesTransformer = UIConfigurationTextAttributesTransformer { attributes in
+            var updated = attributes
+            updated.font = .systemFont(ofSize: 12, weight: .medium)
+            return updated
+        }
+        button.configuration = configuration
+        button.accessibilityIdentifier = accessibilityIdentifier
+    }
+
+    private static func minutePrecisionTime(_ value: String) -> String {
+        let trimmed = value.trimmingCharacters(in: .whitespacesAndNewlines)
+        guard trimmed.count == 19, trimmed.dropFirst(16).first == ":" else { return trimmed }
+        return String(trimmed.prefix(16))
     }
 
     @objc private func editRemarkTapped() { onEditRemark?() }
     @objc private func editCommissionTapped() { onEditCommission?() }
+    @objc private func commissionLogTapped() { onViewCommissionLogs?() }
     @objc private func callTapped() { onCall?() }
 }
 

suixinkan/UI/LocationReport/Views/LocationReportViews.swift

@@ -7,6 +7,10 @@ import CoreLocation
 import SnapKit
 import UIKit
 
+#if targetEnvironment(simulator)
+import MapKit
+#endif
+
 /// 地图缩放/定位控件。
 final class LocationReportMapControlStack: UIView {
 
@@ -295,7 +299,112 @@ final class LocationReportBottomActionView: UIControl {
     }
 }
 
-/// 地图容器，封装高德 `MAMapView`。
+/// 位置上报地图容器，模拟器使用 MapKit。
+#if targetEnvironment(simulator)
+final class LocationReportMapView: UIView, MKMapViewDelegate {
+
+    var onMapTap: ((CLLocationCoordinate2D) -> Void)?
+
+    let mapView: MKMapView
+    private var markerAnnotation: MKPointAnnotation?
+    private var shouldCenterOnNextUserLocation = false
+
+    override init(frame: CGRect) {
+        mapView = MKMapView(frame: .zero)
+        super.init(frame: frame)
+        mapView.delegate = self
+        mapView.showsUserLocation = true
+        mapView.showsCompass = false
+        addSubview(mapView)
+        mapView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+
+        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(mapTapped(_:)))
+        tapGesture.cancelsTouchesInView = false
+        mapView.addGestureRecognizer(tapGesture)
+    }
+
+    @available(*, unavailable)
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    /// 进入页面后，在首次拿到用户位置时将地图居中。
+    func enableInitialUserLocationCentering() {
+        shouldCenterOnNextUserLocation = true
+        centerOnUserLocationIfNeeded()
+    }
+
+    func centerOnUserLocation() {
+        guard let coordinate = validUserCoordinate else { return }
+        setCenter(coordinate)
+    }
+
+    func setCenter(_ coordinate: CLLocationCoordinate2D, animated: Bool = true) {
+        let region = MKCoordinateRegion(
+            center: coordinate,
+            span: MKCoordinateSpan(latitudeDelta: 0.012, longitudeDelta: 0.012)
+        )
+        mapView.setRegion(region, animated: animated)
+    }
+
+    func zoomIn() {
+        updateZoom(scale: 0.5)
+    }
+
+    func zoomOut() {
+        updateZoom(scale: 2)
+    }
+
+    func updateMarker(latitude: Double?, longitude: Double?) {
+        if let markerAnnotation {
+            mapView.removeAnnotation(markerAnnotation)
+            self.markerAnnotation = nil
+        }
+        guard let latitude, let longitude else { return }
+        let annotation = MKPointAnnotation()
+        annotation.coordinate = CLLocationCoordinate2D(latitude: latitude, longitude: longitude)
+        markerAnnotation = annotation
+        mapView.addAnnotation(annotation)
+    }
+
+    func mapView(_ mapView: MKMapView, didUpdate userLocation: MKUserLocation) {
+        centerOnUserLocationIfNeeded()
+    }
+
+    @objc private func mapTapped(_ gesture: UITapGestureRecognizer) {
+        guard gesture.state == .ended else { return }
+        let point = gesture.location(in: mapView)
+        onMapTap?(mapView.convert(point, toCoordinateFrom: mapView))
+    }
+
+    private var validUserCoordinate: CLLocationCoordinate2D? {
+        guard let coordinate = mapView.userLocation.location?.coordinate,
+              CLLocationCoordinate2DIsValid(coordinate),
+              coordinate.latitude != 0 || coordinate.longitude != 0 else {
+            return nil
+        }
+        return coordinate
+    }
+
+    private func centerOnUserLocationIfNeeded() {
+        guard shouldCenterOnNextUserLocation, let coordinate = validUserCoordinate else { return }
+        setCenter(coordinate, animated: false)
+        shouldCenterOnNextUserLocation = false
+    }
+
+    private func updateZoom(scale: Double) {
+        let current = mapView.region
+        let span = MKCoordinateSpan(
+            latitudeDelta: min(max(current.span.latitudeDelta * scale, 0.0005), 120),
+            longitudeDelta: min(max(current.span.longitudeDelta * scale, 0.0005), 120)
+        )
+        mapView.setRegion(MKCoordinateRegion(center: current.center, span: span), animated: true)
+    }
+}
+#else
+/// 位置上报地图容器，真机封装高德 `MAMapView`。
 final class LocationReportMapView: UIView, MAMapViewDelegate {
 
     var onMapTap: ((CLLocationCoordinate2D) -> Void)?
@@ -381,3 +490,4 @@ final class LocationReportMapView: UIView, MAMapViewDelegate {
         shouldCenterOnNextUserLocation = false
     }
 }
+#endif

suixinkan/UI/Payment/PaymentCollectionDetailsViewController.swift

@@ -28,6 +28,7 @@ final class PaymentCollectionDetailsViewController: BaseViewController {
     private let qrContainerView = UIView()
     private let qrImageView = UIImageView()
     private let qrPlaceholderView = UIView()
+    private let qrLoadingIndicator = UIActivityIndicatorView(style: .medium)
     private let qrErrorLabel = UILabel()
     private let refreshButton = UIButton(type: .system)
     private let setAmountButton = UIButton(type: .system)
@@ -127,6 +128,10 @@ final class PaymentCollectionDetailsViewController: BaseViewController {
         qrPlaceholderView.layer.cornerRadius = usesBranding ? 10 : 24
         qrPlaceholderView.isHidden = true
 
+        qrLoadingIndicator.color = AppColor.primary
+        qrLoadingIndicator.hidesWhenStopped = true
+        qrLoadingIndicator.accessibilityLabel = "收款码加载中"
+
         qrErrorLabel.text = "未选景区或网络问题"
         qrErrorLabel.font = .systemFont(ofSize: 14)
         qrErrorLabel.textColor = AppColor.danger
@@ -150,6 +155,9 @@ final class PaymentCollectionDetailsViewController: BaseViewController {
                 trailing: 24
             )
         }
+        actionRow.alpha = 0
+        actionRow.isUserInteractionEnabled = false
+        actionRow.accessibilityElementsHidden = true
 
         configureLinkButton(setAmountButton, title: "设置金额")
         configureLinkButton(saveQRButton, title: "保存二维码")
@@ -206,6 +214,7 @@ final class PaymentCollectionDetailsViewController: BaseViewController {
         qrContentStack.spacing = usesBranding ? brandSectionSpacing : AppSpacing.lg
         qrCardView.addSubview(qrContentStack)
 
+        qrPlaceholderView.addSubview(qrLoadingIndicator)
         qrPlaceholderView.addSubview(qrErrorLabel)
         qrPlaceholderView.addSubview(refreshButton)
 
@@ -275,6 +284,9 @@ final class PaymentCollectionDetailsViewController: BaseViewController {
         qrPlaceholderView.snp.makeConstraints { make in
             make.width.height.equalTo(usesBranding ? brandQRContainerSize : 182)
         }
+        qrLoadingIndicator.snp.makeConstraints { make in
+            make.center.equalToSuperview()
+        }
         qrErrorLabel.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(56)
             make.leading.trailing.equalToSuperview().inset(AppSpacing.sm)
@@ -370,9 +382,7 @@ final class PaymentCollectionDetailsViewController: BaseViewController {
 
     private func loadData() async {
         async let pageConfig: Void = viewModel.loadPayPageConfig(api: paymentAPI)
-        showLoading()
         await viewModel.loadPayCode(api: paymentAPI)
-        hideLoading()
         await pageConfig
     }
 
@@ -387,17 +397,33 @@ final class PaymentCollectionDetailsViewController: BaseViewController {
         voiceSwitch.isOn = viewModel.isVoiceBroadcastOpen
         applyBrandConfigIfNeeded()
 
-        if let image = viewModel.qrImage {
+        if viewModel.isPayCodeLoading {
+            qrImageView.isHidden = true
+            qrContainerView.isHidden = true
+            qrPlaceholderView.backgroundColor = viewModel.usesNalatiBranding
+                ? .white
+                : AppColor.inputBackground
+            qrPlaceholderView.isHidden = false
+            qrErrorLabel.isHidden = true
+            refreshButton.isHidden = true
+            qrLoadingIndicator.startAnimating()
+            setActionRowAvailable(false)
+        } else if let image = viewModel.qrImage {
             qrImageView.image = image
             qrImageView.isHidden = false
             qrContainerView.isHidden = !viewModel.usesNalatiBranding
             qrPlaceholderView.isHidden = true
-            actionRow.isHidden = false
+            qrLoadingIndicator.stopAnimating()
+            setActionRowAvailable(true)
         } else {
             qrImageView.isHidden = true
             qrContainerView.isHidden = true
+            qrPlaceholderView.backgroundColor = AppColor.inputBackground
             qrPlaceholderView.isHidden = false
-            actionRow.isHidden = true
+            qrErrorLabel.isHidden = false
+            refreshButton.isHidden = false
+            qrLoadingIndicator.stopAnimating()
+            setActionRowAvailable(false)
         }
 
         if viewModel.showAmountDialog {
@@ -408,6 +434,12 @@ final class PaymentCollectionDetailsViewController: BaseViewController {
         }
     }
 
+    private func setActionRowAvailable(_ isAvailable: Bool) {
+        actionRow.alpha = isAvailable ? 1 : 0
+        actionRow.isUserInteractionEnabled = isAvailable
+        actionRow.accessibilityElementsHidden = !isAvailable
+    }
+
     private func presentAmountDialogIfNeeded() {
         guard amountDialog == nil else {
             amountDialog?.apply(amount: viewModel.amount, remark: viewModel.remark)
@@ -625,9 +657,7 @@ final class PaymentCollectionDetailsViewController: BaseViewController {
 
     @objc private func refreshTapped() {
         Task {
-            showLoading()
             await viewModel.refresh(api: paymentAPI)
-            hideLoading()
         }
     }
 

suixinkan/UI/Profile/ProfileViewController.swift

@@ -38,6 +38,11 @@ final class ProfileViewController: BaseViewController {
         title = "我的"
     }
 
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        applyViewModel()
+    }
+
     override func setupUI() {
         view.backgroundColor = UIColor(hex: 0xF7FAFF)
 
@@ -104,12 +109,10 @@ final class ProfileViewController: BaseViewController {
 
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        let showLoading = !hasLoadedProfileOnce
+        let showLoading = !hasLoadedProfileOnce && !viewModel.hasCachedBasicInfo
         Task {
             await reloadProfile(showGlobalLoading: showLoading)
-            if showLoading {
-                hasLoadedProfileOnce = true
-            }
+            hasLoadedProfileOnce = true
         }
     }
 

suixinkan/UI/PunchPoint/PunchPointDetailViewController.swift

@@ -3,11 +3,16 @@
 //  suixinkan
 //
 
+import CoreLocation
 import Kingfisher
 import Photos
 import SnapKit
 import UIKit
 
+#if targetEnvironment(simulator)
+import MapKit
+#endif
+
 /// 打卡点详情页，对齐 Android `PunchPointDetailScreen`。
 final class PunchPointDetailViewController: BaseViewController {
     private let viewModel: PunchPointDetailViewModel
@@ -447,7 +452,192 @@ final class PunchPointDetailViewController: BaseViewController {
 }
 
 /// 高德地图容器，供打卡点详情与表单复用。
-/// 打卡点地图视图，封装高德地图 marker、缩放、定位与点击选点行为。
+/// 打卡点地图视图，模拟器使用 MapKit 提供 marker、缩放、定位与点击选点行为。
+#if targetEnvironment(simulator)
+final class PunchPointMapView: UIView, MKMapViewDelegate {
+    var onMapTap: ((CLLocationCoordinate2D) -> Void)?
+
+    private let mapView: MKMapView
+    private var punchPointAnnotation: MKPointAnnotation?
+    private var selectedAnnotation: MKPointAnnotation?
+    private var punchPointImageURL: URL?
+    private var fitWithUserLocation = false
+
+    override init(frame: CGRect) {
+        mapView = MKMapView(frame: .zero)
+        super.init(frame: frame)
+        mapView.delegate = self
+        mapView.showsUserLocation = true
+        mapView.showsCompass = false
+        mapView.showsScale = false
+        mapView.pointOfInterestFilter = .includingAll
+        addSubview(mapView)
+        mapView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+
+        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(mapTapped(_:)))
+        tapGesture.cancelsTouchesInView = false
+        mapView.addGestureRecognizer(tapGesture)
+    }
+
+    @available(*, unavailable)
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    /// 更新原打卡点标记，可使用首张图片作为圆角 Marker。
+    func updatePunchPointMarker(
+        coordinate: CLLocationCoordinate2D?,
+        imageURL: String? = nil,
+        fitWithUserLocation: Bool = false
+    ) {
+        if let punchPointAnnotation {
+            mapView.removeAnnotation(punchPointAnnotation)
+            self.punchPointAnnotation = nil
+        }
+        punchPointImageURL = imageURL.flatMap(URL.init(string:))
+        self.fitWithUserLocation = fitWithUserLocation
+        guard let coordinate, CLLocationCoordinate2DIsValid(coordinate) else { return }
+        let annotation = MKPointAnnotation()
+        annotation.coordinate = coordinate
+        annotation.title = "punch_point_original"
+        punchPointAnnotation = annotation
+        mapView.addAnnotation(annotation)
+        if fitWithUserLocation {
+            fitPunchPointAndUserLocation()
+        }
+    }
+
+    /// 兼容仅需更新普通 Marker 的调用。
+    func updateMarker(coordinate: CLLocationCoordinate2D?) {
+        updatePunchPointMarker(coordinate: coordinate)
+    }
+
+    /// 更新地图点击产生的新位置 Marker。
+    func updateSelectedMarker(coordinate: CLLocationCoordinate2D?) {
+        if let selectedAnnotation {
+            mapView.removeAnnotation(selectedAnnotation)
+            self.selectedAnnotation = nil
+        }
+        guard let coordinate, CLLocationCoordinate2DIsValid(coordinate) else { return }
+        let annotation = MKPointAnnotation()
+        annotation.coordinate = coordinate
+        annotation.title = "punch_point_selected"
+        selectedAnnotation = annotation
+        mapView.addAnnotation(annotation)
+    }
+
+    /// 设置地图中心点。
+    func setCenter(_ coordinate: CLLocationCoordinate2D, zoomLevel: Double = 15, animated: Bool = true) {
+        let delta = min(max(0.012 * pow(2, 15 - zoomLevel), 0.0005), 120)
+        let region = MKCoordinateRegion(
+            center: coordinate,
+            span: MKCoordinateSpan(latitudeDelta: delta, longitudeDelta: delta)
+        )
+        mapView.setRegion(region, animated: animated)
+    }
+
+    /// 放大地图。
+    func zoomIn() {
+        updateZoom(scale: 0.5)
+    }
+
+    /// 缩小地图。
+    func zoomOut() {
+        updateZoom(scale: 2)
+    }
+
+    /// 居中到用户当前位置。
+    func centerOnUserLocation() {
+        guard let coordinate = mapView.userLocation.location?.coordinate,
+              CLLocationCoordinate2DIsValid(coordinate),
+              coordinate.latitude != 0 || coordinate.longitude != 0 else { return }
+        setCenter(coordinate)
+    }
+
+    /// 同时展示原打卡点、用户位置和新选位置。
+    func fitAllMarkers(edgePadding: UIEdgeInsets = UIEdgeInsets(top: 80, left: 56, bottom: 80, right: 56)) {
+        var annotations: [any MKAnnotation] = []
+        if let punchPointAnnotation { annotations.append(punchPointAnnotation) }
+        if let selectedAnnotation { annotations.append(selectedAnnotation) }
+        if mapView.userLocation.location != nil { annotations.append(mapView.userLocation) }
+        guard !annotations.isEmpty else { return }
+        if annotations.count == 1, let annotation = annotations.first {
+            setCenter(annotation.coordinate, zoomLevel: 16)
+        } else {
+            var mapRect = MKMapRect.null
+            for annotation in annotations {
+                let point = MKMapPoint(annotation.coordinate)
+                mapRect = mapRect.union(MKMapRect(
+                    origin: point,
+                    size: MKMapSize(width: 1, height: 1)
+                ))
+            }
+            mapView.setVisibleMapRect(mapRect, edgePadding: edgePadding, animated: true)
+        }
+    }
+
+    func mapView(_ mapView: MKMapView, viewFor annotation: any MKAnnotation) -> MKAnnotationView? {
+        if annotation is MKUserLocation { return nil }
+        let isOriginal = (annotation as AnyObject) === punchPointAnnotation
+        let reuseIdentifier = isOriginal ? "PunchPointImageMarker" : "PunchPointSelectedMarker"
+        let annotationView = mapView.dequeueReusableAnnotationView(withIdentifier: reuseIdentifier)
+            ?? MKAnnotationView(annotation: annotation, reuseIdentifier: reuseIdentifier)
+        annotationView.annotation = annotation
+        annotationView.canShowCallout = false
+        annotationView.centerOffset = CGPoint(x: 0, y: -12)
+
+        if isOriginal, let punchPointImageURL {
+            annotationView.image = UIImage(named: "punch_point_marker")
+            KingfisherManager.shared.retrieveImage(with: punchPointImageURL) { result in
+                guard case let .success(value) = result else { return }
+                Task { @MainActor in
+                    guard annotationView.annotation === annotation else { return }
+                    annotationView.image = Self.roundedMarkerImage(value.image)
+                }
+            }
+        } else {
+            annotationView.image = UIImage(named: "punch_point_marker")
+        }
+        return annotationView
+    }
+
+    func mapView(_ mapView: MKMapView, didUpdate userLocation: MKUserLocation) {
+        guard userLocation.location != nil else { return }
+        fitPunchPointAndUserLocation()
+    }
+
+    private func fitPunchPointAndUserLocation() {
+        guard fitWithUserLocation else { return }
+        fitAllMarkers(edgePadding: UIEdgeInsets(top: 80, left: 50, bottom: 80, right: 50))
+    }
+
+    private static func roundedMarkerImage(_ source: UIImage) -> UIImage {
+        let size = CGSize(width: 40, height: 40)
+        return UIGraphicsImageRenderer(size: size).image { _ in
+            UIBezierPath(roundedRect: CGRect(origin: .zero, size: size), cornerRadius: 6).addClip()
+            source.draw(in: CGRect(origin: .zero, size: size))
+        }
+    }
+
+    @objc private func mapTapped(_ gesture: UITapGestureRecognizer) {
+        guard gesture.state == .ended else { return }
+        let point = gesture.location(in: mapView)
+        onMapTap?(mapView.convert(point, toCoordinateFrom: mapView))
+    }
+
+    private func updateZoom(scale: Double) {
+        let current = mapView.region
+        let span = MKCoordinateSpan(
+            latitudeDelta: min(max(current.span.latitudeDelta * scale, 0.0005), 120),
+            longitudeDelta: min(max(current.span.longitudeDelta * scale, 0.0005), 120)
+        )
+        mapView.setRegion(MKCoordinateRegion(center: current.center, span: span), animated: true)
+    }
+}
+#else
+/// 打卡点地图视图，真机封装高德地图 marker、缩放、定位与点击选点行为。
 final class PunchPointMapView: UIView, MAMapViewDelegate {
     var onMapTap: ((CLLocationCoordinate2D) -> Void)?
 
@@ -614,6 +804,7 @@ final class PunchPointMapView: UIView, MAMapViewDelegate {
         onMapTap?(poi.coordinate)
     }
 }
+#endif
 
 /// 打卡点地图控制按钮。
 /// 地图悬浮控制按钮。

suixinkan/UI/WildPhotographerReport/WildPhotographerReportListViewController.swift

@@ -4,10 +4,15 @@
 //
 
 import Kingfisher
-import MAMapKit
 import SnapKit
 import UIKit
 
+#if targetEnvironment(simulator)
+import MapKit
+#else
+import MAMapKit
+#endif
+
 /// 我的举报列表页，支持按状态筛选并进入举报详情。
 final class WildPhotographerReportListViewController: BaseViewController {
     private let viewModel: WildPhotographerReportListViewModel
@@ -1797,6 +1802,49 @@ private final class WildReportDetailMediaThumbnailView: UIView {
 }
 
 /// 举报详情页地图预览，绘制简化道路、路径和定位点。
+#if targetEnvironment(simulator)
+private final class WildReportDetailMapPreviewView: UIView {
+    private let mapView: MKMapView
+
+    init(scenicName: String, detailAddress: String, coordinate: CLLocationCoordinate2D?) {
+        mapView = MKMapView(frame: .zero)
+        super.init(frame: .zero)
+        backgroundColor = AppColor.pageBackgroundSoft
+        layer.cornerRadius = 10
+        clipsToBounds = true
+
+        mapView.showsCompass = false
+        mapView.showsScale = false
+        mapView.isScrollEnabled = false
+        mapView.isZoomEnabled = false
+        mapView.isRotateEnabled = false
+        mapView.isPitchEnabled = false
+        addSubview(mapView)
+        mapView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+
+        guard let coordinate else { return }
+        let annotation = MKPointAnnotation()
+        annotation.coordinate = coordinate
+        annotation.title = scenicName
+        annotation.subtitle = detailAddress
+        mapView.addAnnotation(annotation)
+        mapView.setRegion(
+            MKCoordinateRegion(
+                center: coordinate,
+                span: MKCoordinateSpan(latitudeDelta: 0.006, longitudeDelta: 0.006)
+            ),
+            animated: false
+        )
+    }
+
+    @available(*, unavailable)
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+}
+#else
 private final class WildReportDetailMapPreviewView: UIView {
     private let mapView: MAMapView
 
@@ -1834,6 +1882,7 @@ private final class WildReportDetailMapPreviewView: UIView {
         fatalError("init(coder:) has not been implemented")
     }
 }
+#endif
 
 /// 举报详情页处理进度时间线单行。
 private final class WildReportDetailTimelineRowView: UIView {

suixinkan/suixinkan-Bridging-Header.h

@@ -3,19 +3,19 @@
 //  suixinkan
 //
 
-#if __has_include(<AMapFoundationKit/AMapFoundationKit.h>)
+#if !TARGET_OS_SIMULATOR && __has_include(<AMapFoundationKit/AMapFoundationKit.h>)
 #import <AMapFoundationKit/AMapFoundationKit.h>
 #endif
 
-#if __has_include(<AMapLocationKit/AMapLocationKit.h>)
+#if !TARGET_OS_SIMULATOR && __has_include(<AMapLocationKit/AMapLocationKit.h>)
 #import <AMapLocationKit/AMapLocationKit.h>
 #endif
 
-#if __has_include(<MAMapKit/MAMapKit.h>)
+#if !TARGET_OS_SIMULATOR && __has_include(<MAMapKit/MAMapKit.h>)
 #import <MAMapKit/MAMapKit.h>
 #endif
 
-#if __has_include(<AMapSearchKit/AMapSearchKit.h>)
+#if !TARGET_OS_SIMULATOR && __has_include(<AMapSearchKit/AMapSearchKit.h>)
 #import <AMapSearchKit/AMapSearchKit.h>
 #endif