修改快乐八界面选号界面

LotteryTracker/Models/LotteryTicket+Extensions.swift

@@ -32,6 +32,31 @@ enum TicketStatus: String {
     case lost = "未中奖"
 }
 
+// 定义快乐8类型枚举
+enum Happy8Type: Int, CaseIterable, Identifiable {
+    case happy8One = 1
+    case happy8Two = 2
+    case happy8Three = 3
+    case happy8Four = 4
+    case happy8Five = 5
+    case happy8Six = 6
+    case happy8Seven = 7
+    case happy8Eight = 8
+    case happy8Nine = 9
+    case happy8Ten = 10
+    
+    var id: Int { rawValue }
+    
+    var string: String {
+        let chineseNumbers = ["一", "二", "三", "四", "五", "六", "七", "八", "九", "十"]
+        return "选\(chineseNumbers[rawValue - 1])"
+    }
+    
+    var displayName: String {
+        "选\(rawValue)" // 备用显示
+    }
+}
+
 // 扩展 LotteryTicket 类
 extension LotteryTicket {
     // 计算属性：获取彩票类型

LotteryTracker/Views/AddTicket/DoubleColorBallCompoents.swift

@@ -80,12 +80,14 @@ struct DoubleColorBallSection: View {
     
     // MARK: -方法
     private func generateRandomNumbers() {
-        redNumbers = Array(Set((1...33).shuffled().prefix(6))).sorted()
-        blueNumbers = [Int.random(in: 1...16)]
+        withAnimation(.spring(response: 0.4)) {
+            redNumbers = Array(Set((1...33).shuffled().prefix(6))).sorted()
+            blueNumbers = [Int.random(in: 1...16)]
+        }
     }
     
     private func clearAllNumbers() {
-        withAnimation {
+        withAnimation(.spring(response: 0.3)) {
             redNumbers.removeAll()
             blueNumbers.removeAll()
         }
@@ -123,62 +125,64 @@ struct SelectedNumbersViewDoubleColorBall: View {
     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())
+        VStack(alignment: .leading, spacing: 12) {
+            HStack {
+                // 标签
+                Text("双色球")
+                    .font(.subheadline)
+                    .fontWeight(.semibold)
+                    .foregroundColor(.primary)
+                
+            }
+                
+            HStack {
+                // 号码显示
+                ScrollView(.horizontal, showsIndicators: false) {
+                    HStack(spacing: 6) {
+                        ForEach(reds.sorted(), id: \.self) { number in
+                            Text(String(format: "%02d", number))
+                                .font(.system(size: 16, weight: .bold, design: .rounded))
+                                .frame(width: 36, height: 36)
+                                .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: 16, weight: .bold, design: .rounded))
+                                .frame(width: 36, height: 36)
+                                .background(Color(.blue).opacity(0.15))
+                                .foregroundColor(Color(.blue))
+                                .clipShape(Circle())
+                        }
                     }
                 }
-            }
-            
-            Spacer()
-            
-            // 清空按钮
-            if (!reds.isEmpty || !blues.isEmpty) {
-                Button(action: {
-                    withAnimation {
-                        onClear()
+                
+                Spacer()
+                
+                // 清空按钮
+                if (!reds.isEmpty || !blues.isEmpty) {
+                    Button(action: {
+                        withAnimation {
+                            onClear()
+                        }
+                    }) {
+                        Image(systemName: "xmark.circle.fill")
+                            .font(.system(size: 16))
+                            .foregroundColor(.secondary)
+                            .padding(4)
                     }
-                }) {
-                    Image(systemName: "xmark.circle.fill")
-                        .font(.system(size: 16))
-                        .foregroundColor(.secondary)
-                        .padding(4)
                 }
             }
         }
-        .padding(.horizontal, 16)
-        .padding(.vertical, 12)
+        .padding(16)
         .background(Color(.systemBackground))
-        .cornerRadius(10)
-        .shadow(color: Color.black.opacity(0.05), radius: 2, x: 0, y: 1)
+        .cornerRadius(12)
+        .overlay(
+            RoundedRectangle(cornerRadius: 12)
+                .stroke(Color.blue.opacity(0.1), lineWidth: 1)
+        )
     }
 }
 

LotteryTracker/Views/AddTicket/HappyEightCompoents.swift

@@ -10,14 +10,26 @@ import SwiftUI
 struct HappyEightSection: View {
     @Binding var numbers: String
     @State private var selectedNumbers: [Int] = []
+    @State private var selectionType: Happy8Type = .happy8One // 默认为选一
     
-    private let maxSelection = 10
     private let columns = Array(repeating: GridItem(.flexible()), count: 10) // 10列网格
     
     var body: some View {
         VStack(alignment: .leading, spacing: 16) {
             // 头部标题
-            SectionHeader(title: "选择号码", icon: "number.circle")
+            HStack {
+                SectionHeader(title: "选择号码", icon: "number.circle")
+                
+                Picker(selectionType.string, selection: $selectionType) {
+                    ForEach(Happy8Type.allCases) { type in  // ✅ 使用 ForEach 简化
+                        Text(type.string).tag(type)
+                    }
+                }
+                .pickerStyle(.menu)
+            }
+            
+            // 选号类型选择器
+            SelectionTypePicker(selectedType: $selectionType)
             
             // 选择区号码网格（1-80）
             VStack(alignment: .leading, spacing: 12) {
@@ -26,11 +38,11 @@ struct HappyEightSection: View {
                     title: "号码区",
                     color: .primary,
                     range: 1...80,
-                    maxSelection: 10,
+                    maxSelection: selectionType.rawValue,
                     selectedNumbers: $selectedNumbers
                 )
             }
-
+            
             // 快速操作栏
             QuickActionsBar2(
                 maxSelection: 1,
@@ -49,10 +61,8 @@ struct HappyEightSection: View {
         .onChange(of: selectedNumbers) {
             updateNumbers()
         }
-        .onAppear {
-            if numbers.isEmpty {
-                generateRandomNumbers()
-            }
+        .onChange(of: selectionType) {
+            adjustSelectedNumbers()
         }
     }
     
@@ -64,26 +74,26 @@ struct HappyEightSection: View {
                 .font(.caption)
                 .foregroundColor(selectedNumbers.count >= 5 ? .green : .orange)
             
-            Text("\(selectedNumbers.count)/\(maxSelection)")
+            Text("\(selectedNumbers.count)/\(selectionType.rawValue)")
                 .font(.system(size: 14, weight: .bold))
-                .foregroundColor(selectedNumbers.count == maxSelection ? .white : .primary)
+                .foregroundColor(selectedNumbers.count == selectionType.rawValue ? .white : .primary)
         }
         .padding(.horizontal, 12)
         .padding(.vertical, 8)
         .background(
             Capsule()
-                .fill(selectedNumbers.count == maxSelection ?
+                .fill(selectedNumbers.count == selectionType.rawValue ?
                       Color.green.gradient :
-                      Color(.systemGray6).gradient)
+                        Color(.systemGray6).gradient)
         )
         .overlay(
             Capsule()
-                .stroke(selectedNumbers.count == maxSelection ?
+                .stroke(selectedNumbers.count == selectionType.rawValue ?
                         Color.green.opacity(0.5) :
-                        Color.gray.opacity(0.3),
+                            Color.gray.opacity(0.3),
                         lineWidth: 1)
         )
-        .shadow(color: selectedNumbers.count == maxSelection ?
+        .shadow(color: selectedNumbers.count == selectionType.rawValue ?
                 Color.green.opacity(0.3) : Color.clear,
                 radius: 3, x: 0, y: 2)
     }
@@ -91,14 +101,28 @@ struct HappyEightSection: View {
     private func SelectedNumbersDisplay() -> some View {
         VStack(alignment: .leading, spacing: 12) {
             HStack {
-                Text("已选号码")
-                    .font(.subheadline)
-                    .fontWeight(.semibold)
-                    .foregroundColor(.primary)
+                HStack {
+                    Text(" 快乐8")
+                        .font(.subheadline)
+                        .fontWeight(.semibold)
+                        .foregroundColor(.primary)
+                    
+                    Spacer()
+                    
+                    Capsule()
+                        .fill(Color(.gray).opacity(0.2))
+                        .frame(width: 48, height: 28)
+                        .overlay(
+                            Text(selectionType.string)
+                                .font(.subheadline)
+                                .fontWeight(.semibold)
+                                .foregroundColor(Color(.black))
+                        )
+                }
                 
                 Spacer()
                 
-                if selectedNumbers.count == maxSelection {
+                if selectedNumbers.count == selectionType.rawValue {
                     HStack(spacing: 4) {
                         Image(systemName: "checkmark.seal.fill")
                             .font(.caption)
@@ -133,13 +157,13 @@ struct HappyEightSection: View {
             Text(String(format: "%02d", number))
                 .font(.system(size: 16, weight: .bold, design: .rounded))
             
-//            Button {
-//                removeNumber(number)
-//            } label: {
-//                Image(systemName: "xmark.circle.fill")
-//                    .font(.caption)
-//                    .foregroundColor(.red.opacity(0.7))
-//            }
+            //            Button {
+            //                removeNumber(number)
+            //            } label: {
+            //                Image(systemName: "xmark.circle.fill")
+            //                    .font(.caption)
+            //                    .foregroundColor(.red.opacity(0.7))
+            //            }
         }
         .frame(width: 22, height: 22)
         .padding(.horizontal, 10)
@@ -161,16 +185,16 @@ struct HappyEightSection: View {
     
     // MARK: - 功能方法
     
-//    private func removeNumber(_ number: Int) {
-//        withAnimation(.spring(response: 0.3)) {
-//            selectedNumbers.removeAll { $0 == number }
-//        }
-//    }
+    //    private func removeNumber(_ number: Int) {
+    //        withAnimation(.spring(response: 0.3)) {
+    //            selectedNumbers.removeAll { $0 == number }
+    //        }
+    //    }
     
     private func generateRandomNumbers() {
         withAnimation(.spring(response: 0.4)) {
             var numbers = Set<Int>()
-            while numbers.count < maxSelection {
+            while numbers.count < selectionType.rawValue {
                 numbers.insert(Int.random(in: 1...80))
             }
             selectedNumbers = Array(numbers).sorted()
@@ -188,9 +212,10 @@ struct HappyEightSection: View {
         // 确保有5个奇数，5个偶数
         let oddNumbers = (1...80).filter { $0 % 2 == 1 }.shuffled()
         let evenNumbers = (1...80).filter { $0 % 2 == 0 }.shuffled()
+        let odds = selectionType.rawValue / 2
         
-        selected.formUnion(oddNumbers.prefix(5))
-        selected.formUnion(evenNumbers.prefix(5))
+        selected.formUnion(oddNumbers.prefix(odds))
+        selected.formUnion(evenNumbers.prefix(selectionType.rawValue - odds))
         
         withAnimation(.spring(response: 0.4)) {
             selectedNumbers = Array(selected).sorted()
@@ -207,6 +232,73 @@ struct HappyEightSection: View {
         let numberStr = selectedNumbers.sorted().map { String(format: "%02d", $0) }.joined(separator: " ")
         numbers = numberStr
     }
+    
+    private func adjustSelectedNumbers() {
+        clearAllNumbers()
+    }
+}
+
+
+// MARK: - 子视图
+
+// 选号类型选择器
+struct SelectionTypePicker: View {
+    @Binding var selectedType: Happy8Type
+    private let types = Happy8Type.allCases // 使用枚举
+    
+    var body: some View {
+        VStack {
+            ScrollView(.horizontal, showsIndicators: false) {
+                HStack {
+                    ForEach(types) { type in
+                        SelectionTypeButton(
+                            type: type,
+                            isSelected: selectedType == type,
+                            action: { selectedType = type }
+                        )
+                    }
+                }
+                .padding(.horizontal, 2)
+                .padding(.vertical, 2)
+            }
+        }
+        .padding(.horizontal, 4)
+    }
 }
 
+// 选号类型按钮
+struct SelectionTypeButton: View {
+    let type: Happy8Type
+    let isSelected: Bool
+    let action: () -> Void
+    
+    var body: some View {
+        Button(action: {
+            action()
+        }) {
+            Text(type.string)
+                .font(.system(size: 14, weight: .medium))
+                .foregroundColor(isSelected ? .blue : .primary)
+                .frame(width: 52, height: 36)
+                .background(
+                    Capsule()
+                        .fill(isSelected ? Color.blue.opacity(0.1) : Color.clear)
+                )
+                .overlay(
+                    Capsule()
+                        .stroke(isSelected ? Color.blue : Color.gray.opacity(0.2), lineWidth: 1)
+                )
+        }
+        .buttonStyle(SelectionTypeButtonStyle())
+    }
+}
 
+// 自定义按钮样式
+struct SelectionTypeButtonStyle: ButtonStyle {
+    func makeBody(configuration: Configuration) -> some View {
+        configuration.label
+            .scaleEffect(configuration.isPressed ? 0.95 : 1.0)
+            .opacity(configuration.isPressed ? 0.8 : 1.0)
+            .animation(.easeInOut(duration: 0.1), value: configuration.isPressed)
+    }
+}

LotteryTracker/Views/AddTicket/SuperLottoCompoents.swift

@@ -76,15 +76,17 @@ struct SuperLottoSection: View {
     // MARK: - 方法
     
     private func generateRandomNumbers() {
-        // 前区：从1-35中随机选择5个不重复的号码
-        frontNumbers = Array(Set((1...35).shuffled().prefix(5))).sorted()
-        
-        // 后区：从1-12中随机选择2个不重复的号码
-        backNumbers = Array(Set((1...12).shuffled().prefix(2))).sorted()
+        withAnimation(.spring(response: 0.4)) {
+            // 前区：从1-35中随机选择5个不重复的号码
+            frontNumbers = Array(Set((1...35).shuffled().prefix(5))).sorted()
+            
+            // 后区：从1-12中随机选择2个不重复的号码
+            backNumbers = Array(Set((1...12).shuffled().prefix(2))).sorted()
+        }
     }
     
     private func clearAllNumbers() {
-        withAnimation {
+        withAnimation(.spring(response: 0.3)) {
             frontNumbers.removeAll()
             backNumbers.removeAll()
         }
@@ -105,63 +107,65 @@ struct SelectedNumbersViewSuperLotto: View {
     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))
-                )
+        VStack(alignment: .leading, spacing: 12) {
+            HStack {
+                // 标签
+                Text("大乐透")
+                    .font(.subheadline)
+                    .fontWeight(.semibold)
+                    .foregroundColor(.primary)
+            }
             
-            // 号码显示
-            ScrollView(.horizontal, showsIndicators: false) {
-                HStack(spacing: 6) {
-                    // 前区号码
-                    ForEach(fronts.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.orange.opacity(0.15))
-                            .foregroundColor(Color.orange)
-                            .clipShape(Circle())
-                    }
-                    
-                    // 后区号码
-                    ForEach(backs.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())
+            HStack {
+                // 号码显示
+                ScrollView(.horizontal, showsIndicators: false) {
+                    HStack(spacing: 6) {
+                        // 前区号码
+                        ForEach(fronts.sorted(), id: \.self) { number in
+                            Text(String(format: "%02d", number))
+                                .font(.system(size: 16, weight: .bold, design: .rounded))
+                                .frame(width: 36, height: 36)
+                                .background(Color.orange.opacity(0.15))
+                                .foregroundColor(Color.orange)
+                                .clipShape(Circle())
+                        }
+                        
+                        // 后区号码
+                        ForEach(backs.sorted(), id: \.self) { number in
+                            Text(String(format: "%02d", number))
+                                .font(.system(size: 16, weight: .bold, design: .rounded))
+                                .frame(width: 36, height: 36)
+                                .background(Color.blue.opacity(0.15))
+                                .foregroundColor(Color.blue)
+                                .clipShape(Circle())
+                        }
                     }
                 }
-            }
-            
-            Spacer()
-            
-            // 清空按钮
-            if !fronts.isEmpty || !backs.isEmpty {
-                Button(action: {
-                    withAnimation {
-                        onClear()
+                
+                Spacer()
+                
+                // 清空按钮
+                if !fronts.isEmpty || !backs.isEmpty {
+                    Button(action: {
+                        withAnimation {
+                            onClear()
+                        }
+                    }) {
+                        Image(systemName: "xmark.circle.fill")
+                            .font(.system(size: 16))
+                            .foregroundColor(.secondary)
+                            .padding(4)
                     }
-                }) {
-                    Image(systemName: "xmark.circle.fill")
-                        .font(.system(size: 16))
-                        .foregroundColor(.secondary)
-                        .padding(4)
                 }
             }
+            
         }
-        .padding(.horizontal, 16)
-        .padding(.vertical, 12)
+        .padding(16)
         .background(Color(.systemBackground))
-        .cornerRadius(10)
-        .shadow(color: Color.black.opacity(0.05), radius: 2, x: 0, y: 1)
+        .cornerRadius(12)
+        .overlay(
+            RoundedRectangle(cornerRadius: 12)
+                .stroke(Color.blue.opacity(0.1), lineWidth: 1)
+        )
     }
 }