From db82f3b7ecdecb4af074c5e45d6b2c4d74fe8873 Mon Sep 17 00:00:00 2001 From: jinyaqiu Date: Mon, 1 Sep 2025 17:27:34 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wake/Theme.swift | 1 + wake/View/Credits/CreditsInfoCard.swift | 2 +- wake/View/Subscribe/Components/PlanCompare.swift | 12 ++++++------ wake/View/Subscribe/Components/PlanSelector.swift | 2 +- wake/View/Subscribe/Components/SubscribeButton.swift | 12 ++++++------ .../Subscribe/Components/SubscriptionStatusBar.swift | 2 +- wake/View/Subscribe/SubscribeView.swift | 3 +++ 7 files changed, 19 insertions(+), 15 deletions(-) diff --git a/wake/Theme.swift b/wake/Theme.swift index 55001e9..4267d73 100644 --- a/wake/Theme.swift +++ b/wake/Theme.swift @@ -26,6 +26,7 @@ struct Theme { static let background = Color(hex: "F8F9FA") // 背景色 static let surface = Color.white // 表面色 static let surfaceSecondary = Color(hex: "F5F5F5") // 次级表面色 + static let surfaceTertiary = Color(hex: "F7F7F7") // 次级表面色 // MARK: - 文本色 static let textPrimary = Color.black // 主文本色 diff --git a/wake/View/Credits/CreditsInfoCard.swift b/wake/View/Credits/CreditsInfoCard.swift index 7b352ec..c6654d2 100644 --- a/wake/View/Credits/CreditsInfoCard.swift +++ b/wake/View/Credits/CreditsInfoCard.swift @@ -34,7 +34,7 @@ struct CreditsInfoCard: View { .buttonStyle(PlainButtonStyle()) .background(Theme.Colors.primaryLight) .cornerRadius(Theme.CornerRadius.extraLarge) - .shadow(color: Theme.Shadows.small, radius: Theme.Shadows.cardShadow.radius, x: Theme.Shadows.cardShadow.x, y: Theme.Shadows.cardShadow.y) + // .shadow(color: Theme.Shadows.small, radius: Theme.Shadows.cardShadow.radius, x: Theme.Shadows.cardShadow.x, y: Theme.Shadows.cardShadow.y) } // MARK: - 主要积分显示区域 diff --git a/wake/View/Subscribe/Components/PlanCompare.swift b/wake/View/Subscribe/Components/PlanCompare.swift index 92b3380..8c4eead 100644 --- a/wake/View/Subscribe/Components/PlanCompare.swift +++ b/wake/View/Subscribe/Components/PlanCompare.swift @@ -60,12 +60,12 @@ struct PlanCompare: View { } .background(Theme.Colors.cardBackground) .cornerRadius(Theme.CornerRadius.medium) - .shadow( - color: Theme.Shadows.small, - radius: Theme.Shadows.cardShadow.radius, - x: Theme.Shadows.cardShadow.x, - y: Theme.Shadows.cardShadow.y - ) + // .shadow( + // color: Theme.Shadows.small, + // radius: Theme.Shadows.cardShadow.radius, + // x: Theme.Shadows.cardShadow.x, + // y: Theme.Shadows.cardShadow.y + // ) } // MARK: - 功能名称列 diff --git a/wake/View/Subscribe/Components/PlanSelector.swift b/wake/View/Subscribe/Components/PlanSelector.swift index d37fe54..227b9c9 100644 --- a/wake/View/Subscribe/Components/PlanSelector.swift +++ b/wake/View/Subscribe/Components/PlanSelector.swift @@ -100,7 +100,7 @@ struct PlanCard: View { .background( plan == .pioneer ? Theme.Colors.primary : - Theme.Colors.surface + Theme.Colors.surfaceTertiary ) .overlay( RoundedRectangle(cornerRadius: Theme.CornerRadius.medium) diff --git a/wake/View/Subscribe/Components/SubscribeButton.swift b/wake/View/Subscribe/Components/SubscribeButton.swift index 15ad9c7..6e7b9f2 100644 --- a/wake/View/Subscribe/Components/SubscribeButton.swift +++ b/wake/View/Subscribe/Components/SubscribeButton.swift @@ -57,12 +57,12 @@ struct SubscribeButton: View { .frame(maxWidth: .infinity) .background(Theme.Colors.primary) // primary color background .clipShape(Capsule()) - .shadow( - color: Theme.Shadows.buttonShadow.color, - radius: Theme.Shadows.buttonShadow.radius, - x: Theme.Shadows.buttonShadow.x, - y: Theme.Shadows.buttonShadow.y - ) + // .shadow( + // color: Theme.Shadows.buttonShadow.color, + // radius: Theme.Shadows.buttonShadow.radius, + // x: Theme.Shadows.buttonShadow.x, + // y: Theme.Shadows.buttonShadow.y + // ) } .buttonStyle(.plain) .disabled(isLoading || subscribed) diff --git a/wake/View/Subscribe/Components/SubscriptionStatusBar.swift b/wake/View/Subscribe/Components/SubscriptionStatusBar.swift index 1a92267..94f8823 100644 --- a/wake/View/Subscribe/Components/SubscriptionStatusBar.swift +++ b/wake/View/Subscribe/Components/SubscriptionStatusBar.swift @@ -109,7 +109,7 @@ struct SubscriptionStatusBar: View { .padding(20) .background(status.backgroundColor) .cornerRadius(20) - .shadow(color: Color.black.opacity(0.1), radius: 4, x: 0, y: 2) + // .shadow(color: Color.black.opacity(0.1), radius: 4, x: 0, y: 2) } // MARK: - 日期格式化 diff --git a/wake/View/Subscribe/SubscribeView.swift b/wake/View/Subscribe/SubscribeView.swift index fb3966b..26e8cb4 100644 --- a/wake/View/Subscribe/SubscribeView.swift +++ b/wake/View/Subscribe/SubscribeView.swift @@ -60,6 +60,8 @@ struct SubscribeView: View { SimpleNaviHeader(title: "Subscription") { dismiss() } + .background(Color.themeTextWhiteSecondary) + .padding(.bottom, Theme.Spacing.lg) ScrollView { VStack(spacing: 0) { @@ -96,6 +98,7 @@ struct SubscribeView: View { } .background(Theme.Colors.background) } + .background(Color.themeTextWhiteSecondary) .navigationBarHidden(true) .task { // Load products and refresh current entitlements on appear