修改一些显示问题

LotteryTracker/Extensions/Color+Extensions.swift

@@ -16,7 +16,7 @@ extension Color {
         switch type {
         case .doubleColorBall: return .red
         case .superLotto: return .blue
-        case .welfare3D: return .green
+        case .happy8: return .green
         case .sevenStar: return .purple
         case .other: return .gray
         }

LotteryTracker/Models/LotteryTicket+Extensions.swift

@@ -18,7 +18,7 @@ extension Notification.Name {
 enum LotteryType: String, CaseIterable, Identifiable {
     case doubleColorBall = "双色球"
     case superLotto = "大乐透"
-    case welfare3D = "福彩3D"
+    case happy8 = "快乐八"
     case sevenStar = "七星彩"
     case other = "其他"
     

LotteryTracker/Services/DemoDataGenerator.swift

@@ -19,7 +19,7 @@ class DemoDataGenerator {
     func generateDemoData(count: Int = 50) {
         clearAllData()
         
-        let types: [LotteryType] = [.doubleColorBall, .superLotto, .welfare3D, .sevenStar]
+        let types: [LotteryType] = [.doubleColorBall, .superLotto, .happy8, .sevenStar]
         let calendar = Calendar.current
         let now = Date()
         
@@ -91,7 +91,7 @@ class DemoDataGenerator {
             let backBalls = (1...12).shuffled().prefix(2).map { String(format: "%02d", $0) }
             return "\(frontBalls.joined(separator: " ")) + \(backBalls.joined(separator: " "))"
             
-        case .welfare3D:
+        case .happy8:
             let numbers = (0...9).shuffled().prefix(3).map { String($0) }
             return numbers.joined(separator: " ")
             

LotteryTracker/Utils/Formatters.swift

@@ -42,4 +42,9 @@ class Formatters {
         let components = calendar.dateComponents([.day], from: from, to: to)
         return components.day ?? 0
     }
+    
+    // 格式化双色球
+    static func formatDoubleColorBall(_ Numbers: String) -> [Int] {
+        return []
+    }
 }

LotteryTracker/ViewModels/AddTicketViewModel.swift

@@ -14,12 +14,12 @@ class AddTicketViewModel: ObservableObject {
     @Published var selectedType: LotteryType = .doubleColorBall
     @Published var numbers: String = ""
     @Published var betCount: Int = 1
-    @Published var amountPerBet: String = "2"
+    @Published var amountPerBet: Int = 2
     
-    // 修改：改为购买日期（默认今天）
+    // 购买日期（默认今天）
     @Published var purchaseDate: Date = Date()
     
-    // 修改：开奖日期根据彩票类型自动计算
+    // 开奖日期根据彩票类型自动计算
     var drawDate: Date {
         calculateDrawDate()
     }
@@ -30,7 +30,7 @@ class AddTicketViewModel: ObservableObject {
     
     // 计算属性
     var totalAmount: Float {
-        let amount = Int(amountPerBet) ?? 0
+        let amount = amountPerBet
         return Float(amount * betCount)
     }
     
@@ -65,8 +65,8 @@ class AddTicketViewModel: ObservableObject {
             // 大乐透：每周一、三、六开奖
             return nextDrawDate(for: [1, 3, 6], from: purchaseDate)
             
-        case .welfare3D:
-            // 福彩3D：每天开奖
+        case .happy8:
+            // 快乐八：每天开奖
             return calendar.date(byAdding: .day, value: 1, to: purchaseDate) ?? purchaseDate
             
         case .sevenStar:
@@ -99,30 +99,71 @@ class AddTicketViewModel: ObservableObject {
     
     // 设置表单验证
     private func setupValidation() {
-        Publishers.CombineLatest($amountPerBet, $numbers)
-            .map { amount, numbers in
-                // 金额验证
-                guard let amountValue = Double(amount), amountValue > 0 else {
-                    return false
-                }
-                
-                // 注数验证
-                guard self.betCount > 0 && self.betCount <= 100 else {
-                    return false
-                }
-                
-                return true
+        // 只监听 numbers 的变化
+        $numbers
+            .map { numbers in
+                // 验证 numbers 的格式和数量
+                return self.validateNumbers(numbers)
             }
             .assign(to: \.isValid, on: self)
             .store(in: &cancellables)
     }
     
+    private func validateNumbers(_ numbers: String) -> Bool {
+        // 1. 非空检查
+        guard !numbers.isEmpty else {
+            errorMessage = "请填写完整信息"
+            return false
+        }
+        
+        // 2. 根据彩票类型验证
+        switch selectedType {
+        case .doubleColorBall:
+            return validateDoubleColorBall(numbers)
+        case .superLotto:
+            return validateSuperLotto(numbers)
+        default:
+            // 其他彩票类型
+            return !numbers.isEmpty
+        }
+    }
+    
+    // 具体的验证方法
+    private func validateDoubleColorBall(_ numbers: String) -> Bool {
+        // 双色球格式: "01 05 12 23 28 33 + 09"
+        let components = numbers.split(separator: "+")
+        guard components.count == 2 else { return false }
+        
+        let redPart = components[0].trimmingCharacters(in: .whitespaces)
+        let bluePart = components[1].trimmingCharacters(in: .whitespaces)
+        
+        let redNumbers = redPart.split(separator: " ").compactMap { Int($0) }
+        let blueNumbers = bluePart.split(separator: " ").compactMap { Int($0) }
+        
+        // 红球6个，蓝球1个
+        if (redNumbers.count == 6 && blueNumbers.count == 1) {
+            errorMessage = ""
+            return true
+        } else {
+            errorMessage = "双色球个数不正确"
+            return false
+        }
+    }
+    
+    private func validateSuperLotto(_ numbers: String) -> Bool {
+        // 大乐透格式: "01 05 12 23 28 + 03 09"
+        // ... 类似的验证逻辑
+        validateDoubleColorBall(numbers)
+    }
+    
+    // .....
+    
     // 重置表单
     func resetForm() {
         selectedType = .doubleColorBall
         numbers = ""
         betCount = 1
-        amountPerBet = "2.00"
+        amountPerBet = 2
         purchaseDate = Date()
         errorMessage = ""
     }
@@ -130,19 +171,13 @@ class AddTicketViewModel: ObservableObject {
     // 保存彩票记录
     func saveTicket(context: NSManagedObjectContext) -> Bool {
         guard isValid else {
-            errorMessage = "请填写完整信息"
-            return false
-        }
-        
-        guard let amountValue = Double(amountPerBet), amountValue > 0 else {
-            errorMessage = "金额无效"
             return false
         }
         
         let ticket = LotteryTicket(context: context)
         ticket.id = UUID()
         ticket.lotteryType = selectedType
-        ticket.numbers = numbers.isEmpty ? "随机" : numbers
+        ticket.numbers = numbers
         ticket.betCount = Int16(betCount)
         ticket.amount = totalAmount
         ticket.date = purchaseDate  // 使用用户选择的购买日期
@@ -168,27 +203,12 @@ class AddTicketViewModel: ObservableObject {
     }
     
     // 快速填充测试数据
-    func fillSampleData() {
-        selectedType = LotteryType.allCases.randomElement() ?? .doubleColorBall
-        numbers = generateSampleNumbers(for: selectedType)
-        betCount = Int.random(in: 1...5)
-        amountPerBet = String(format: "%.2f", Double.random(in: 2.0...10.0))
-        purchaseDate = Date().addingTimeInterval(Double.random(in: -30...0) * 24 * 3600)
-    }
+//    func fillSampleData() {
+//        selectedType = LotteryType.allCases.randomElement() ?? .doubleColorBall
+//        numbers = generateSampleNumbers(for: selectedType)
+//        betCount = Int.random(in: 1...5)
+//        amountPerBet = String(format: "%.2f", Double.random(in: 2.0...10.0))
+//        purchaseDate = Date().addingTimeInterval(Double.random(in: -30...0) * 24 * 3600)
+//    }
     
-    // 生成示例号码
-    private func generateSampleNumbers(for type: LotteryType) -> String {
-        switch type {
-        case .doubleColorBall:
-            return "01 05 12 23 28 33 + 09"
-        case .superLotto:
-            return "03 07 15 20 28 + 02 09"
-        case .welfare3D:
-            return "1 2 3"
-        case .sevenStar:
-            return "1 3 5 7 9 2 4"
-        case .other:
-            return "随机号码"
-        }
-    }
 }

LotteryTracker/Views/AddTicket/AddTicketView.swift

@@ -14,12 +14,6 @@ struct AddTicketView: View {
     @Environment(\.colorScheme) private var colorScheme
     
     @StateObject private var viewModel = AddTicketViewModel()
-    @FocusState private var focusedField: Field?
-    
-    enum Field {
-        case numbers
-        case amount
-    }
     
     var body: some View {
         NavigationView {
@@ -35,23 +29,21 @@ struct AddTicketView: View {
                             .padding(.horizontal)
                         
                         // 投注号码输入
-                        numbersInputSection
-                            .padding(.horizontal)
-                        
-                        // 金额输入
-                        AmountInputView(
+                        TicketInputView(
+                            selectedType: $viewModel.selectedType,
+                            numbers: $viewModel.numbers,
                             betCount: $viewModel.betCount,
                             amountPerBet: $viewModel.amountPerBet,
                             totalAmount: viewModel.totalAmount
                         )
                         .padding(.horizontal)
                         
-                        // 购买日期选择（替换开奖日期）
+                        // 购买日期选择
                         purchaseDateSection
                             .padding(.horizontal)
                         
                         // 错误提示
-                        if !viewModel.errorMessage.isEmpty {
+                        if (!viewModel.errorMessage.isEmpty) {
                             errorMessageView
                                 .padding(.horizontal)
                         }
@@ -72,18 +64,6 @@ struct AddTicketView: View {
                         dismiss()
                     }
                 }
-                
-                ToolbarItemGroup(placement: .keyboard) {
-                    Spacer()
-                    
-                    Button("完成") {
-                        focusedField = nil
-                    }
-                }
-            }
-            .onTapGesture {
-                // 点击空白处隐藏键盘
-                focusedField = nil
             }
         }
     }
@@ -95,115 +75,84 @@ struct AddTicketView: View {
         colorScheme == .dark ? Color(.systemGray6) : Color(.systemGray6).opacity(0.3)
     }
     
-    // 投注号码输入
-    private var numbersInputSection: some View {
-        VStack(alignment: .leading, spacing: 12) {
-            HStack {
-                Text("投注号码")
-                    .font(.headline)
-                
-                Spacer()
-                
-                Button("随机生成") {
-                    viewModel.numbers = generateSampleNumbers(for: viewModel.selectedType)
-                }
-                .font(.caption)
-                .foregroundColor(.blue)
-            }
-            
-            VStack(alignment: .leading, spacing: 8) {
-                Text("请输入号码，用空格或逗号分隔")
-                    .font(.caption)
-                    .foregroundColor(.secondary)
-                
-                TextEditor(text: $viewModel.numbers)
-                    .font(.system(.body, design: .monospaced))
-                    .frame(minHeight: 80)
-                    .padding(8)
-                    .background(Color(.systemBackground))
-                    .cornerRadius(8)
-                    .overlay(
-                        RoundedRectangle(cornerRadius: 8)
-                            .stroke(focusedField == .numbers ? Color.blue : Color.gray.opacity(0.3), lineWidth: 1)
-                    )
-                    .focused($focusedField, equals: .numbers)
-                
-                Text("例如：01 05 12 23 28 33 + 09")
-                    .font(.caption2)
-                    .foregroundColor(.secondary)
-            }
-        }
-        .padding()
-        .background(Color(.systemBackground))
-        .cornerRadius(12)
-        .shadow(color: Color.black.opacity(0.05), radius: 5, x: 0, y: 2)
-    }
-    
     // 购买日期选择
     private var purchaseDateSection: some View {
         VStack(alignment: .leading, spacing: 12) {
-            HStack {
-                Text("购买日期")
-                    .font(.headline)
-                
-                Spacer()
-                
-                Button("今天") {
-                    viewModel.purchaseDate = Date()
+            Text("购买日期")
+                .font(.headline)
+            VStack {
+                HStack {
+                    Label {
+                        Text("点按日期进行选择")
+                    } icon: {
+                        Image(systemName: "hand.tap")
+                    }
+                    .font(.caption)
+                    .foregroundColor(.blue.opacity(0.7))
+                    
+                    Spacer()
+                    
+                    Button("今天") {
+                        viewModel.purchaseDate = Date()
+                    }
+                    .font(.caption)
+                    .foregroundColor(.blue)
+                    
+                    Button("昨天") {
+                        viewModel.purchaseDate = Calendar.current.date(byAdding: .day, value: -1, to: Date()) ?? Date()
+                    }
+                    .font(.caption)
+                    .foregroundColor(.blue)
                 }
-                .font(.caption)
-                .foregroundColor(.blue)
                 
-                Button("昨天") {
-                    viewModel.purchaseDate = Calendar.current.date(byAdding: .day, value: -1, to: Date()) ?? Date()
+                DatePicker(
+                    "选择购买日期",
+                    selection: $viewModel.purchaseDate,
+                    in: Date().addingTimeInterval(-365 * 24 * 3600)...Date(), // 过去一年到现在
+                    displayedComponents: .date
+                )
+                .datePickerStyle(.graphical)
+                .padding()
+                .cornerRadius(12)
+                .shadow(color: Color.black.opacity(0.05), radius: 5, x: 0, y: 2)
+                .background(
+                    // 日历专用背景色
+                    Color(red: 0.98, green: 0.97, blue: 0.95)
+                )
+                
+                // 开奖信息显示（只读）
+                HStack {
+                    Image(systemName: "calendar.badge.clock")
+                        .foregroundColor(.blue)
+                    
+                    VStack(alignment: .leading, spacing: 4) {
+                        Text("购买时间: \(viewModel.formattedPurchaseDate)")
+                            .font(.subheadline)
+                            .foregroundColor(.secondary)
+                        
+                        Text("预计开奖: \(viewModel.formattedDrawDate)")
+                            .font(.subheadline)
+                            .foregroundColor(.green)
+                    }
+                    
+                    Spacer()
+                    
+                    
+                    Text("\(daysUntilDraw)")
+                        .font(.caption)
+                        .padding(.horizontal, 8)
+                        .padding(.vertical, 4)
+                        .background(Color.blue.opacity(0.1))
+                        .foregroundColor(.blue)
+                        .cornerRadius(6)
                 }
-                .font(.caption)
-                .foregroundColor(.blue)
+                .padding(.horizontal, 4)
             }
-            
-            DatePicker(
-                "选择购买日期",
-                selection: $viewModel.purchaseDate,
-                in: Date().addingTimeInterval(-365 * 24 * 3600)...Date(), // 过去一年到现在
-                displayedComponents: .date
-            )
-            .datePickerStyle(.graphical)
             .padding()
             .background(Color(.systemBackground))
             .cornerRadius(12)
             .shadow(color: Color.black.opacity(0.05), radius: 5, x: 0, y: 2)
-            
-            // 开奖信息显示（只读）
-            HStack {
-                Image(systemName: "calendar.badge.clock")
-                    .foregroundColor(.blue)
-                
-                VStack(alignment: .leading, spacing: 4) {
-                    Text("购买时间: \(viewModel.formattedPurchaseDate)")
-                        .font(.subheadline)
-                        .foregroundColor(.secondary)
-                    
-                    Text("预计开奖: \(viewModel.formattedDrawDate)")
-                        .font(.subheadline)
-                        .foregroundColor(.green)
-                }
-                
-                Spacer()
-                
-                Text("\(daysUntilDraw)天后")
-                    .font(.caption)
-                    .padding(.horizontal, 8)
-                    .padding(.vertical, 4)
-                    .background(Color.blue.opacity(0.1))
-                    .foregroundColor(.blue)
-                    .cornerRadius(6)
-            }
-            .padding(.horizontal, 4)
         }
-        .padding()
-        .background(Color(.systemBackground))
-        .cornerRadius(12)
-        .shadow(color: Color.black.opacity(0.05), radius: 5, x: 0, y: 2)
     }
     
     // 错误提示
@@ -246,24 +195,24 @@ struct AddTicketView: View {
             .disabled(!viewModel.isValid)
             
             // 测试数据按钮
-            Button(action: {
-                viewModel.fillSampleData()
-            }) {
-                HStack {
-                    Spacer()
-                    
-                    Image(systemName: "wand.and.stars")
-                    
-                    Text("填充测试数据")
-                        .font(.subheadline)
-                    
-                    Spacer()
-                }
-                .padding()
-                .background(Color.green.opacity(0.1))
-                .foregroundColor(.green)
-                .cornerRadius(12)
-            }
+//            Button(action: {
+//                viewModel.fillSampleData()
+//            }) {
+//                HStack {
+//                    Spacer()
+//                    
+//                    Image(systemName: "wand.and.stars")
+//                    
+//                    Text("填充测试数据")
+//                        .font(.subheadline)
+//                    
+//                    Spacer()
+//                }
+//                .padding()
+//                .background(Color.green.opacity(0.1))
+//                .foregroundColor(.green)
+//                .cornerRadius(12)
+//            }
             
             // 重置按钮
             Button(action: {
@@ -274,7 +223,7 @@ struct AddTicketView: View {
                     
                     Image(systemName: "arrow.counterclockwise")
                     
-                    Text("重置表单")
+                    Text("重置")
                         .font(.subheadline)
                     
                     Spacer()
@@ -290,10 +239,11 @@ struct AddTicketView: View {
     // MARK: - 计算属性
     
     // 距离开奖天数
-    private var daysUntilDraw: Int {
+    private var daysUntilDraw: String {
         let calendar = Calendar.current
         let components = calendar.dateComponents([.day], from: viewModel.purchaseDate, to: viewModel.drawDate)
-        return max(0, components.day ?? 0)
+        let leftDays = max(0, components.day ?? 0)
+        return leftDays == 0 ? "今天" : String(leftDays) + "天后"
     }
     
     // MARK: - 方法
@@ -311,38 +261,5 @@ struct AddTicketView: View {
             print("❌ 保存失败")
         }
     }
-    
-    // 生成示例号码
-    private func generateSampleNumbers(for type: LotteryType) -> String {
-        switch type {
-        case .doubleColorBall:
-            let redBalls = (1...33).shuffled().prefix(6).map { String(format: "%02d", $0) }
-            let blueBall = String(format: "%02d", Int.random(in: 1...16))
-            return "\(redBalls.joined(separator: " ")) + \(blueBall)"
-            
-        case .superLotto:
-            let frontBalls = (1...35).shuffled().prefix(5).map { String(format: "%02d", $0) }
-            let backBalls = (1...12).shuffled().prefix(2).map { String(format: "%02d", $0) }
-            return "\(frontBalls.joined(separator: " ")) + \(backBalls.joined(separator: " "))"
-            
-        case .welfare3D:
-            let numbers = (0...9).shuffled().prefix(3).map { String($0) }
-            return numbers.joined(separator: " ")
-            
-        case .sevenStar:
-            let numbers = (0...9).shuffled().prefix(7).map { String($0) }
-            return numbers.joined(separator: " ")
-            
-        case .other:
-            return "随机号码"
-        }
-    }
 }
 
-// 预览
-struct AddTicketView_Previews: PreviewProvider {
-    static var previews: some View {
-        AddTicketView()
-            .environment(\.managedObjectContext, PersistenceController.preview.container.viewContext)
-    }
-}

LotteryTracker/Views/AddTicket/AmountInputView.swift

@@ -1,212 +0,0 @@
-//
-//  AmountInputView.swift
-//  LotteryTracker
-//
-//  Created by aaa on 2026/1/22.
-//
-
-import SwiftUI
-
-struct AmountInputView: View {
-    @Binding var betCount: Int
-    @Binding var amountPerBet: String
-    @FocusState private var isAmountFocused: Bool
-    
-    let totalAmount: Float
-    
-    // 常用注数选项
-    private let betCountOptions = [1, 3, 5, 10, 20]
-    
-    // 常用金额选项
-    private let amountOptions = [2.0, 5.0, 10.0, 20.0, 50.0]
-    
-    var body: some View {
-        VStack(alignment: .leading, spacing: 20) {
-            // 注数选择
-            VStack(alignment: .leading, spacing: 12) {
-                Text("注数")
-                    .font(.headline)
-                
-                // 注数选择器
-                HStack {
-                    Stepper(value: $betCount, in: 1...100) {
-                        HStack {
-                            Text("\(betCount) 注")
-                                .font(.body)
-                                .foregroundColor(.primary)
-                            
-                            Spacer()
-                            
-                            Text(Formatters.formatCurrency(totalAmount))
-                                .font(.body.bold())
-                                .foregroundColor(.blue)
-                        }
-                    }
-                }
-                
-                // 快速选择按钮
-                ScrollView(.horizontal, showsIndicators: false) {
-                    HStack(spacing: 10) {
-                        ForEach(betCountOptions, id: \.self) { count in
-                            Button(action: {
-                                withAnimation {
-                                    betCount = count
-                                }
-                            }) {
-                                Text("\(count)注")
-                                    .font(.system(size: 14))
-                                    .padding(.horizontal, 12)
-                                    .padding(.vertical, 6)
-                                    .background(betCount == count ? Color.blue : Color.gray.opacity(0.1))
-                                    .foregroundColor(betCount == count ? .white : .primary)
-                                    .cornerRadius(8)
-                            }
-                        }
-                    }
-                    .padding(.horizontal, 2)
-                }
-            }
-            
-            Divider()
-            
-            // 每注金额
-            VStack(alignment: .leading, spacing: 12) {
-                Text("每注金额")
-                    .font(.headline)
-                
-                // 金额输入
-                HStack {
-                    Text("¥")
-                        .font(.title3)
-                        .foregroundColor(.secondary)
-                    
-                    TextField("0.00", text: $amountPerBet)
-                        .font(.title3)
-                        .keyboardType(.decimalPad)
-                        .focused($isAmountFocused)
-                        .padding(.vertical, 8)
-                        .padding(.horizontal, 12)
-                        .background(Color(.systemGray6))
-                        .cornerRadius(8)
-                        .overlay(
-                            RoundedRectangle(cornerRadius: 8)
-                                .stroke(isAmountFocused ? Color.blue : Color.clear, lineWidth: 1)
-                        )
-                        .onChange(of: amountPerBet) { oldValue, newValue in
-                            // iOS 17 新API：接收 oldValue 和 newValue 两个参数
-                            
-                            // 限制输入为数字和小数点
-                            let filtered = newValue.filter { "0123456789.".contains($0) }
-                            if filtered != newValue {
-                                amountPerBet = filtered
-                            }
-                            
-                            // 限制小数点后最多两位
-                            if let dotIndex = filtered.firstIndex(of: ".") {
-                                let decimalPart = filtered[filtered.index(after: dotIndex)...]
-                                if decimalPart.count > 2 {
-                                    amountPerBet = String(filtered.prefix(upTo: filtered.index(dotIndex, offsetBy: 3)))
-                                }
-                            }
-                        }
-                }
-                
-                // 快速金额按钮
-                ScrollView(.horizontal, showsIndicators: false) {
-                    HStack(spacing: 10) {
-                        ForEach(amountOptions, id: \.self) { amount in
-                            Button(action: {
-                                withAnimation {
-                                    amountPerBet = String(format: "%.2f", amount)
-                                }
-                            }) {
-                                Text(Formatters.formatCurrency(Float(amount)))
-                                    .font(.system(size: 14))
-                                    .padding(.horizontal, 12)
-                                    .padding(.vertical, 6)
-                                    .background(amountPerBet == String(format: "%.2f", amount) ? Color.green : Color.gray.opacity(0.1))
-                                    .foregroundColor(amountPerBet == String(format: "%.2f", amount) ? .white : .primary)
-                                    .cornerRadius(8)
-                            }
-                        }
-                    }
-                    .padding(.horizontal, 2)
-                }
-            }
-            
-            Divider()
-            
-            // 总计显示
-            VStack(alignment: .leading, spacing: 8) {
-                Text("总计")
-                    .font(.headline)
-                
-                HStack {
-                    VStack(alignment: .leading, spacing: 4) {
-                        Text("\(betCount) 注 × ¥\(Double(amountPerBet) ?? 0, specifier: "%.2f")/注")
-                            .font(.subheadline)
-                            .foregroundColor(.secondary)
-                        
-                        Text(Formatters.formatCurrency(totalAmount))
-                            .font(.system(size: 32, weight: .bold))
-                            .foregroundColor(.blue)
-                    }
-                    
-                    Spacer()
-                    
-                    Image(systemName: "creditcard.fill")
-                        .font(.system(size: 36))
-                        .foregroundColor(.green.opacity(0.7))
-                }
-                .padding()
-                .background(
-                    RoundedRectangle(cornerRadius: 12)
-                        .fill(Color.blue.opacity(0.05))
-                        .overlay(
-                            RoundedRectangle(cornerRadius: 12)
-                                .stroke(Color.blue.opacity(0.2), lineWidth: 1)
-                        )
-                )
-            }
-        }
-        .padding(.vertical, 8)
-    }
-}
-
-// 预览
-struct AmountInputView_Previews: PreviewProvider {
-    static var previews: some View {
-        // 方法1：使用简单的 State 包装
-        Group {
-            // 预览1：默认状态
-            AmountInputViewPreviewWrapper()
-            
-            // 预览2：大额状态
-            AmountInputViewPreviewWrapper(betCount: 10, amountPerBet: "50.00")
-            
-            // 预览3：小数金额
-            AmountInputViewPreviewWrapper(betCount: 3, amountPerBet: "2.50")
-        }
-    }
-}
-
-// 预览包装器
-struct AmountInputViewPreviewWrapper: View {
-    @State private var betCount: Int
-    @State private var amountPerBet: String
-    
-    init(betCount: Int = 3, amountPerBet: String = "2.00") {
-        self._betCount = State(initialValue: betCount)
-        self._amountPerBet = State(initialValue: amountPerBet)
-    }
-    
-    var body: some View {
-        AmountInputView(
-            betCount: $betCount,
-            amountPerBet: $amountPerBet,
-            totalAmount: (Float(amountPerBet) ?? 0) * Float(betCount)
-        )
-        .padding()
-        .previewLayout(.sizeThatFits)
-    }
-}

LotteryTracker/Views/AddTicket/DoubleColorBallCompoents.swift

@@ -0,0 +1,416 @@
+//
+//  DoubleColorBallCompoents.swift
+//  LotteryTracker
+//
+//  Created by aaa on 2026/1/25.
+//
+
+import SwiftUI
+
+struct DoubleColorBallSection: View {
+    @Binding var numbers: String
+    
+    @State private var redNumbers: [Int] = []
+    @State private var blueNumbers: [Int] = []
+    @State private var betCount = 1
+    @State private var selectedType = LotteryType.doubleColorBall
+    
+    
+    var body: some View {
+        VStack(alignment: .leading, spacing: 16) {
+            // 头部标题
+            SectionHeader(title: "选择号码", icon: "number.circle")
+            
+            // 红球选择区
+            VStack(alignment: .leading, spacing: 12) {
+                NumberSelectionGrid(
+                    title: "红球区",
+                    color: .red,
+                    range: 1...33,
+                    maxSelection: 6,
+                    selectedNumbers: $redNumbers
+                )
+            }
+            
+            // 蓝球选择区
+            VStack(alignment: .leading, spacing: 12) {
+                NumberSelectionGrid(
+                    title: "蓝球区",
+                    color: .blue,
+                    range: 1...16,
+                    maxSelection: 1,
+                    selectedNumbers: $blueNumbers
+                )
+            }
+            
+            // 快速操作栏
+            QuickActionsBar(
+                onRandom: generateRandomNumbers,
+                onClear: clearAllNumbers
+            )
+            
+            // 红球/蓝球已选显示
+            if (!redNumbers.isEmpty || !blueNumbers.isEmpty) {
+                SelectedNumbersView(
+                    reds: redNumbers,
+                    blues: blueNumbers,
+                    maxCount: 7,
+                    onClear: {
+                        redNumbers.removeAll()
+                        blueNumbers.removeAll()
+                    }
+                )
+                
+            }
+        }
+        .onChange(of: redNumbers) {
+            updateNumbers()
+        }
+        .onChange(of: blueNumbers) {
+            updateNumbers()
+        }
+    }
+    
+    // MARK: -方法
+    private func generateRandomNumbers() {
+        redNumbers = Array(Set((1...33).shuffled().prefix(6))).sorted()
+        blueNumbers = [Int.random(in: 1...16)]
+    }
+    
+    private func clearAllNumbers() {
+        withAnimation {
+            redNumbers.removeAll()
+            blueNumbers.removeAll()
+        }
+    }
+    
+    private func updateNumbers() {
+        let redStr = redNumbers.sorted().map { String(format: "%02d", $0) }.joined(separator: " ")
+        let blueStr = blueNumbers.sorted().map { String(format: "%02d", $0) }.joined(separator: " ")
+        numbers = "\(redStr) + \(blueStr)"
+    }
+}
+
+
+// MARK: - 头部组件
+struct SectionHeader: View {
+    let title: String
+    let icon: String
+    
+    var body: some View {
+        HStack {
+            Label(title, systemImage: icon)
+                .font(.headline)
+                .foregroundColor(.primary)
+            
+            Spacer()
+            
+            // 状态指示器
+            Capsule()
+                .fill(Color.green.opacity(0.1))
+                .frame(width: 80, height: 24)
+                .overlay(
+                    HStack(spacing: 4) {
+                        Circle()
+                            .fill(Color.green)
+                            .frame(width: 8, height: 8)
+                        
+                        Text("可选")
+                            .font(.caption2)
+                            .foregroundColor(.green)
+                    }
+                )
+        }
+    }
+}
+
+
+// MARK: - 数字选择网格
+struct NumberSelectionGrid: View {
+    let title: String
+    let color: Color
+    let range: ClosedRange<Int>
+    let maxSelection: Int
+    @Binding var selectedNumbers: [Int]
+    
+    private let columns = Array(repeating: GridItem(.flexible()), count: 10)
+    
+    var body: some View {
+        VStack(alignment: .leading, spacing: 8) {
+            // 标题和计数
+            HStack {
+                Text(title)
+                    .font(.subheadline)
+                    .fontWeight(.semibold)
+                    .foregroundColor(color)
+                
+                Spacer()
+                
+                Text("\(selectedNumbers.count)/\(maxSelection)")
+                    .font(.caption)
+                    .fontWeight(.medium)
+                    .foregroundColor(.secondary)
+                    .padding(.horizontal, 8)
+                    .padding(.vertical, 2)
+                    .background(
+                        Capsule()
+                            .fill(color.opacity(0.1))
+                    )
+            }
+            .padding(.horizontal, 4)
+            
+            // 数字网格
+            LazyVGrid(columns: columns, spacing: 10) {
+                ForEach(range, id: \.self) { number in
+                    NumberButton(
+                        number: number,
+                        color: color,
+                        isSelected: selectedNumbers.contains(number),
+                        isSelectable: selectedNumbers.count < maxSelection || selectedNumbers.contains(number)
+                    ) {
+                        toggleNumber(number)
+                    }
+                }
+            }
+        }
+        .padding(16)
+        .background(Color(.secondarySystemBackground))
+        .cornerRadius(12)
+        .overlay(
+            RoundedRectangle(cornerRadius: 12)
+                .stroke(color.opacity(0.2), lineWidth: 1)
+        )
+    }
+    
+    private func toggleNumber(_ number: Int) {
+        withAnimation(.spring(response: 0.3)) {
+            if selectedNumbers.contains(number) {
+                selectedNumbers.removeAll { $0 == number }
+            } else if selectedNumbers.count < maxSelection {
+                selectedNumbers.append(number)
+                // 触觉反馈
+                let generator = UIImpactFeedbackGenerator(style: .light)
+                generator.impactOccurred()
+            }
+        }
+    }
+}
+
+// MARK: - 数字按钮
+struct NumberButton: View {
+    let number: Int
+    let color: Color
+    let isSelected: Bool
+    let isSelectable: Bool
+    let action: () -> Void
+    
+    @State private var isPressed = false
+    
+    var body: some View {
+        Button(action: handleAction) {
+            ZStack {
+                // 背景圆圈
+                Circle()
+                    .fill(backgroundColor)
+                    .frame(width: 32, height: 32)
+                
+                // 数字
+                Text(String(format: "%02d", number))
+                    .font(.system(size: 16, weight: .semibold, design: .rounded))
+                    .foregroundColor(textColor)
+                
+                // 选中标记
+                if isSelected {
+                    Circle()
+                        .stroke(color, lineWidth: 2)
+                        .frame(width: 32, height: 32)
+                    
+                    Image(systemName: "checkmark.circle.fill")
+                        .font(.system(size: 12))
+                        .foregroundColor(color)
+                        .background(Color.white)
+                        .clipShape(Circle())
+                        .offset(x: 16, y: -16)
+                }
+            }
+        }
+        .buttonStyle(PressableButtonStyle())
+        .disabled(!isSelectable && !isSelected)
+        .opacity(isSelectable || isSelected ? 1.0 : 0.4)
+    }
+    
+    private func handleAction() {
+        if isSelectable {
+            action()
+        } else {
+            let generator = UINotificationFeedbackGenerator()
+            generator.notificationOccurred(.warning)
+        }
+    }
+    
+    private var backgroundColor: Color {
+        isSelected ? color.opacity(0.15) : Color(.systemBackground)
+    }
+    
+    private var textColor: Color {
+        isSelected ? color : .primary
+    }
+}
+
+struct PressableButtonStyle: ButtonStyle {
+    func makeBody(configuration: Configuration) -> some View {
+        configuration.label
+            .scaleEffect(configuration.isPressed ? 0.95 : 1.0)
+            .opacity(configuration.isPressed ? 0.9 : 1.0)
+            .animation(.easeInOut(duration: 0.1), value: configuration.isPressed)
+    }
+}
+
+// MARK: - 已选号码显示
+struct SelectedNumbersView: View {
+    let reds: [Int]
+    let blues: [Int]
+    let maxCount: Int
+    let onClear: () -> Void
+    
+    var body: some View {
+        HStack(spacing: 8) {
+            // 标签
+            Capsule()
+                .fill(Color(.gray).opacity(0.1))
+                .frame(width: 36, height: 28)
+                .overlay(
+                    Text("已选")
+                        .font(.caption2)
+                        .fontWeight(.medium)
+                        .foregroundColor(Color(.black))
+                )
+            
+            // 号码显示
+            ScrollView(.horizontal, showsIndicators: false) {
+                HStack(spacing: 6) {
+                    ForEach(reds.sorted(), id: \.self) { number in
+                        Text(String(format: "%02d", number))
+                            .font(.system(size: 14, weight: .medium, design: .monospaced))
+                            .frame(width: 28, height: 28)
+                            .background(Color(.red).opacity(0.15))
+                            .foregroundColor(Color(.red))
+                            .clipShape(Circle())
+                    }
+                    
+                    ForEach(blues.sorted(), id: \.self) { number in
+                        Text(String(format: "%02d", number))
+                            .font(.system(size: 14, weight: .medium, design: .monospaced))
+                            .frame(width: 28, height: 28)
+                            .background(Color(.blue).opacity(0.15))
+                            .foregroundColor(Color(.blue))
+                            .clipShape(Circle())
+                    }
+                }
+            }
+            
+            Spacer()
+            
+            // 清空按钮
+            if (!reds.isEmpty || !blues.isEmpty) {
+                Button(action: {
+                    withAnimation {
+                        onClear()
+                    }
+                }) {
+                    Image(systemName: "xmark.circle.fill")
+                        .font(.system(size: 16))
+                        .foregroundColor(.secondary)
+                        .padding(4)
+                }
+            }
+        }
+        .padding(.horizontal, 16)
+        .padding(.vertical, 12)
+        .background(Color(.systemBackground))
+        .cornerRadius(10)
+        .shadow(color: Color.black.opacity(0.05), radius: 2, x: 0, y: 1)
+    }
+}
+
+// MARK: - 快速操作栏
+struct QuickActionsBar: View {
+    let onRandom: () -> Void
+    let onClear: () -> Void
+    
+    var body: some View {
+        HStack(spacing: 12) {
+            // 随机生成
+            ActionButton(
+                title: "随机一注",
+                icon: "dice.fill",
+                color: .purple,
+                action: onRandom
+            )
+            
+            // 清空全部
+            ActionButton(
+                title: "清空重选",
+                icon: "trash",
+                color: .gray,
+                action: onClear
+            )
+        }
+    }
+}
+
+struct ActionButton: View {
+    let title: String
+    let icon: String
+    let color: Color
+    let action: () -> Void
+    
+    var body: some View {
+        Button(action: {
+            action()
+            let generator = UIImpactFeedbackGenerator(style: .light)
+            generator.impactOccurred()
+        }) {
+            HStack(spacing: 6) {
+                Image(systemName: icon)
+                    .font(.system(size: 14))
+                
+                Text(title)
+                    .font(.caption)
+                    .fontWeight(.medium)
+            }
+            .padding(.horizontal, 16)
+            .padding(.vertical, 10)
+            .frame(maxWidth: .infinity)
+            .background(color.opacity(0.1))
+            .foregroundColor(color)
+            .cornerRadius(10)
+        }
+    }
+}
+
+
+struct ChipButton: View {
+    let title: String
+    let isSelected: Bool
+    let action: () -> Void
+    
+    var body: some View {
+        Button(action: action) {
+            Text(title)
+                .font(.system(size: 14, weight: .medium))
+                .padding(.horizontal, 16)
+                .padding(.vertical, 8)
+                .background(
+                    Capsule()
+                        .fill(isSelected ? Color.blue : Color.gray.opacity(0.1))
+                )
+                .foregroundColor(isSelected ? .white : .primary)
+                .overlay(
+                    Capsule()
+                        .stroke(isSelected ? Color.blue : Color.gray.opacity(0.3), lineWidth: 1)
+                )
+        }
+    }
+}
+

LotteryTracker/Views/AddTicket/LotteryTypePicker.swift

@@ -12,10 +12,10 @@ struct LotteryTypePicker: View {
     
     // 彩票类型描述
     private let typeDescriptions: [LotteryType: String] = [
-        .doubleColorBall: "红球6个 + 篮球1个",
-        .superLotto: "前区5个 + 后区2个",
-        .welfare3D: "3位数字，000-999",
-        .sevenStar: "7位数字，每位0-9",
+        .doubleColorBall: "红球6 + 篮球1",
+        .superLotto: "前区5 + 后区2",
+        .happy8: "3位数 每位0-9",
+        .sevenStar: "7位数 每位0-9",
         .other: "其他彩票类型"
     ]
     
@@ -40,6 +40,7 @@ struct LotteryTypePicker: View {
                         }
                     }
                 }
+                .padding(.vertical, 2)
                 .padding(.horizontal, 4)
             }
         }
@@ -59,10 +60,12 @@ struct LotteryTypeCard: View {
                 Circle()
                     .fill(backgroundColor)
                     .frame(width: 60, height: 60)
+                    .scaleEffect(isSelected ? 1.15 : 1.0)
                 
                 Image(systemName: iconName)
                     .font(.system(size: 24))
                     .foregroundColor(iconColor)
+                    .scaleEffect(isSelected ? 1.2 : 1.0)
             }
             
             // 类型名称
@@ -80,8 +83,9 @@ struct LotteryTypeCard: View {
                 .lineLimit(2)
                 .frame(width: 80)
         }
-        .padding(.vertical, 12)
-        .padding(.horizontal, 8)
+        // 放大5%，需要额外padding来补偿
+        .padding(.vertical, isSelected ? 10 : 12)
+        .padding(.horizontal, isSelected ? 6 : 8)
         .background(
             RoundedRectangle(cornerRadius: 12)
                 .fill(isSelected ? Color.blue.opacity(0.05) : Color(.systemBackground))
@@ -97,7 +101,7 @@ struct LotteryTypeCard: View {
         switch type {
         case .doubleColorBall: return "circle.grid.2x2.fill"
         case .superLotto: return "8.circle.fill"
-        case .welfare3D: return "3.circle.fill"
+        case .happy8: return "3.circle.fill"
         case .sevenStar: return "star.fill"
         case .other: return "ticket.fill"
         }
@@ -107,7 +111,7 @@ struct LotteryTypeCard: View {
         switch type {
         case .doubleColorBall: return .red
         case .superLotto: return .blue
-        case .welfare3D: return .green
+        case .happy8: return .green
         case .sevenStar: return .purple
         case .other: return .gray
         }
@@ -117,33 +121,3 @@ struct LotteryTypeCard: View {
         isSelected ? iconColor.opacity(0.1) : Color(.systemGray6)
     }
 }
-
-// 预览
-struct LotteryTypePicker_Previews: PreviewProvider {
-    static var previews: some View {
-        StatefulPreviewWrapper(LotteryType.doubleColorBall) { binding in
-            VStack {
-                LotteryTypePicker(selectedType: binding)
-                    .padding()
-                
-                Text("当前选择: \(binding.wrappedValue.rawValue)")
-                    .padding()
-            }
-        }
-    }
-}
-
-// 用于预览的状态包装器
-struct StatefulPreviewWrapper<T, Content: View>: View where Content: View {
-    @State var value: T
-    let content: (Binding<T>) -> Content
-    
-    var body: some View {
-        content($value)
-    }
-    
-    init(_ value: T, @ViewBuilder content: @escaping (Binding<T>) -> Content) {
-        self._value = State(initialValue: value)
-        self.content = content
-    }
-}

LotteryTracker/Views/AddTicket/TicketInputView.swift

@@ -0,0 +1,251 @@
+//
+//  AmountInputView.swift
+//  LotteryTracker
+//
+//  Created by aaa on 2026/1/22.
+//
+
+import SwiftUI
+
+struct TicketInputView: View {
+    @Binding var selectedType: LotteryType
+    @Binding var numbers: String
+    @Binding var betCount: Int
+    @Binding var amountPerBet: Int
+    
+    @FocusState private var focusedField: Field?
+    
+    enum Field {
+        case numbers
+        case amount
+    }
+    
+    let totalAmount: Float
+    
+    // 常用倍数选项
+    private let betCountOptions = [1, 5, 10, 20]
+    
+    var body: some View {
+        VStack(alignment: .leading, spacing: 20) {
+            // 投注选择
+            if (selectedType == .doubleColorBall) {
+                DoubleColorBallSection(numbers: $numbers)
+            } else if (selectedType == .superLotto) {
+                numbersInputSection
+            } else if (selectedType == .happy8) {
+                numbersInputSection
+            } else if (selectedType == .sevenStar) {
+                numbersInputSection
+            } else {
+                
+            }
+            
+            // 注数选择
+            betCountSection
+            
+            Divider()
+            
+//            // 总计显示 TODO 添加多注时用到
+//            totalAmountSection
+            
+        }
+        .padding(.vertical, 8)
+    }
+    
+    
+    // MARK: - 组件
+    
+    private var numbersInputSection: some View {
+        VStack(alignment: .leading, spacing: 12) {
+            Text("投注号码")
+                .font(.headline)
+            VStack {
+                HStack {
+                    Spacer()
+                    
+                    Button("随机生成") {
+                        numbers = generateSampleNumbers(for: selectedType)
+                    }
+                    .font(.caption)
+                    .foregroundColor(.blue)
+                }
+                
+                VStack(alignment: .leading, spacing: 8) {
+                    Text("请输入号码，用空格或逗号分隔")
+                        .font(.caption)
+                        .foregroundColor(.secondary)
+                    
+                    TextEditor(text: $numbers)
+                        .font(.system(.body, design: .monospaced))
+                        .frame(minHeight: 80)
+                        .padding(8)
+                        .background(Color(.systemBackground))
+                        .cornerRadius(8)
+                        .overlay(
+                            RoundedRectangle(cornerRadius: 8)
+                                .stroke(focusedField == .numbers ? Color.blue : Color.gray.opacity(0.3), lineWidth: 1)
+                        )
+                        .focused($focusedField, equals: .numbers)
+                    
+                    Text("例如：01 05 12 23 28 33 + 09")
+                        .font(.caption2)
+                        .foregroundColor(.secondary)
+                }
+            }
+            .padding()
+            .background(Color(.systemBackground))
+            .cornerRadius(12)
+            .shadow(color: Color.black.opacity(0.05), radius: 5, x: 0, y: 2)
+        }
+    }
+    
+    private var totalAmountSection: some View {
+        VStack(alignment: .leading, spacing: 8) {
+            Text("总计")
+                .font(.headline)
+            
+            HStack {
+                VStack(alignment: .leading, spacing: 4) {
+                    Text("\(betCount) 倍 × ¥\(Double(amountPerBet), specifier: "%.2f")/注")
+                        .font(.subheadline)
+                        .foregroundColor(.secondary)
+                    
+                    Text(Formatters.formatCurrency(totalAmount))
+                        .font(.system(size: 32, weight: .bold))
+                        .foregroundColor(.blue)
+                }
+                
+                Spacer()
+                
+                Image(systemName: "creditcard.fill")
+                    .font(.system(size: 36))
+                    .foregroundColor(.green.opacity(0.7))
+            }
+            .padding()
+            .background(
+                RoundedRectangle(cornerRadius: 12)
+                    .fill(Color.blue.opacity(0.05))
+                    .overlay(
+                        RoundedRectangle(cornerRadius: 12)
+                            .stroke(Color.blue.opacity(0.2), lineWidth: 1)
+                    )
+            )
+        }
+    }
+    
+    private var betCountSection: some View {
+        VStack(alignment: .leading, spacing: 16) {
+            SectionHeader(title: "投注设置", icon: "banknote")
+            
+            // 金额显示卡片
+            VStack(spacing: 12) {
+                HStack {
+                    VStack(alignment: .leading, spacing: 4) {
+                        Text("投注金额")
+                            .font(.caption)
+                            .foregroundColor(.secondary)
+                        
+                        Text(Formatters.formatCurrency(totalAmount))
+                            .font(.system(size: 28, weight: .bold, design: .rounded))
+                            .foregroundColor(.blue)
+                    }
+                    
+                    Spacer()
+                    
+                    VStack(alignment: .trailing, spacing: 4) {
+                        Text("倍数")
+                            .font(.caption)
+                            .foregroundColor(.secondary)
+                        
+                        Text("\(betCount)倍")
+                            .font(.system(size: 20, weight: .semibold, design: .rounded))
+                            .foregroundColor(.primary)
+                    }
+                }
+                
+                // 滑块选择器
+                VStack(spacing: 8) {
+                    HStack {
+                        Text("1倍")
+                            .font(.caption)
+                            .foregroundColor(.secondary)
+                        
+                        Slider(
+                            value: Binding(
+                                get: { Double(betCount) },
+                                set: { betCount = Int($0) }
+                            ),
+                            in: 1...50,
+                            step: 1
+                        )
+                        .accentColor(.blue)
+                        
+                        Text("50倍")
+                            .font(.caption)
+                            .foregroundColor(.secondary)
+                    }
+                    
+                    // 快速倍数
+                    ScrollView(.horizontal, showsIndicators: false) {
+                        HStack(spacing: 10) {
+                            ForEach(betCountOptions, id: \.self) { count in
+                                ChipButton(
+                                    title: "\(count)倍",
+                                    isSelected: betCount == count,
+                                    action: { withAnimation { betCount = count } }
+                                )
+                            }
+                        }
+                        .padding(.horizontal, 2)
+                    }
+                }
+            }
+            .padding(20)
+            .background(
+                LinearGradient(
+                    colors: [
+                        Color.blue.opacity(0.03),
+                        Color.blue.opacity(0.01)
+                    ],
+                    startPoint: .topLeading,
+                    endPoint: .bottomTrailing
+                )
+            )
+            .cornerRadius(16)
+            .overlay(
+                RoundedRectangle(cornerRadius: 16)
+                    .stroke(Color.blue.opacity(0.1), lineWidth: 1)
+            )
+        }
+    }
+    
+    
+    // MARK: - 方法
+    
+    // 生成示例号码
+    private func generateSampleNumbers(for type: LotteryType) -> String {
+        switch type {
+        case .doubleColorBall:
+            let redBalls = (1...33).shuffled().prefix(6).map { String(format: "%02d", $0) }
+            let blueBall = String(format: "%02d", Int.random(in: 1...16))
+            return "\(redBalls.joined(separator: " ")) + \(blueBall)"
+            
+        case .superLotto:
+            let frontBalls = (1...35).shuffled().prefix(5).map { String(format: "%02d", $0) }
+            let backBalls = (1...12).shuffled().prefix(2).map { String(format: "%02d", $0) }
+            return "\(frontBalls.joined(separator: " ")) + \(backBalls.joined(separator: " "))"
+            
+        case .happy8:
+            let numbers = (0...9).shuffled().prefix(3).map { String($0) }
+            return numbers.joined(separator: " ")
+            
+        case .sevenStar:
+            let numbers = (0...9).shuffled().prefix(7).map { String($0) }
+            return numbers.joined(separator: " ")
+            
+        case .other:
+            return "随机号码"
+        }
+    }
+    
+}

LotteryTracker/Views/Home/TicketDetailView.swift

@@ -107,7 +107,7 @@ struct TicketDetailView: View {
         switch ticket.lotteryType {
         case .doubleColorBall: return .red
         case .superLotto: return .blue
-        case .welfare3D: return .purple
+        case .happy8: return .purple
         case .sevenStar: return .green
         case .other: return .pink
         }

LotteryTracker/Views/Home/TicketRow.swift

@@ -87,7 +87,7 @@ struct TicketRow: View {
             return "circle.grid.2x2.fill"
         case .superLotto:
             return "8.circle.fill"
-        case .welfare3D:
+        case .happy8:
             return "3.circle.fill"
         case .sevenStar:
             return "star.fill"
@@ -102,7 +102,7 @@ struct TicketRow: View {
             return .red
         case .superLotto:
             return .blue
-        case .welfare3D:
+        case .happy8:
             return .green
         case .sevenStar:
             return .purple

LotteryTracker/Views/Statistics/StatisticsView.swift

@@ -329,7 +329,7 @@ struct TypeDistributionDetailView: View {
         switch type {
         case .doubleColorBall: return .red
         case .superLotto: return .blue
-        case .welfare3D: return .green
+        case .happy8: return .green
         case .sevenStar: return .purple
         case .other: return .gray
         }