From eaa7f7275c4f7bec705f06d969995c30737a9679 Mon Sep 17 00:00:00 2001
From: richarjiang <richarjiang@tencent.com>
Date: Tue, 28 Oct 2025 11:16:32 +0800
Subject: [PATCH] =?UTF-8?q?feat(ui):=20=E8=B0=83=E6=95=B4=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E5=92=8C=E4=BC=9A=E5=91=98=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E7=95=8C=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将推送通知设置移至开发者选项section
- 移除会员购买按钮的协议接受状态限制
- 优化购买按钮的禁用条件逻辑
---
 app/(tabs)/personal.tsx              | 12 ++++++------
 components/model/MembershipModal.tsx | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/(tabs)/personal.tsx b/app/(tabs)/personal.tsx
index 9d8b762..f485680 100644
--- a/app/(tabs)/personal.tsx
+++ b/app/(tabs)/personal.tsx
@@ -347,12 +347,7 @@ export default function PersonalScreen() {
           type: 'switch' as const,
           switchValue: notificationEnabled,
           onSwitchChange: handleNotificationToggle,
-        },
-        {
-          icon: 'settings-outline' as const,
-          title: '推送通知设置',
-          onPress: () => pushIfAuthedElseLogin('/push-notification-settings'),
-        },
+        }
       ],
     },
     // 开发者section（需要连续点击三次用户名激活）
@@ -364,6 +359,11 @@ export default function PersonalScreen() {
           title: '开发者选项',
           onPress: () => pushIfAuthedElseLogin(ROUTES.DEVELOPER),
         },
+        {
+          icon: 'settings-outline' as const,
+          title: '推送通知设置',
+          onPress: () => pushIfAuthedElseLogin('/push-notification-settings'),
+        },
       ],
     }] : []),
     {
diff --git a/components/model/MembershipModal.tsx b/components/model/MembershipModal.tsx
index 57170da..d57f65e 100644
--- a/components/model/MembershipModal.tsx
+++ b/components/model/MembershipModal.tsx
@@ -1082,7 +1082,7 @@ export function MembershipModal({ visible, onClose, onPurchaseSuccess }: Members
               <GlassView
                 style={[
                   styles.purchaseButton,
-                  (loading || products.length === 0 || !agreementAccepted) && styles.disabledButton
+                  (loading || products.length === 0) && styles.disabledButton
                 ]}
                 glassEffectStyle="clear"
                 tintColor="rgba(21, 21, 21, 0.8)"
@@ -1090,7 +1090,7 @@ export function MembershipModal({ visible, onClose, onPurchaseSuccess }: Members
               >
                 <TouchableOpacity
                   onPress={handlePurchase}
-                  disabled={loading || products.length === 0 || !agreementAccepted}
+                  disabled={loading || products.length === 0}
                   accessible={true}
                   accessibilityLabel={loading ? '正在处理购买' : '购买会员'}
                   accessibilityHint={
@@ -1102,7 +1102,7 @@ export function MembershipModal({ visible, onClose, onPurchaseSuccess }: Members
                           ? '请选择会员套餐后再进行购买'
                           : `点击购买${selectedProduct.title || '已选'}会员套餐`
                   }
-                  accessibilityState={{ disabled: loading || products.length === 0 || !agreementAccepted }}
+                  accessibilityState={{ disabled: loading || products.length === 0 }}
                   style={styles.purchaseButtonContent}
                 >
                   {loading ? (
@@ -1120,12 +1120,12 @@ export function MembershipModal({ visible, onClose, onPurchaseSuccess }: Members
                 style={[
                   styles.purchaseButton,
                   styles.fallbackPurchaseButton,
-                  (loading || products.length === 0 || !agreementAccepted) && styles.disabledButton
+                  (loading || products.length === 0) && styles.disabledButton
                 ]}
               >
                 <TouchableOpacity
                   onPress={handlePurchase}
-                  disabled={loading || products.length === 0 || !agreementAccepted}
+                  disabled={loading || products.length === 0}
                   accessible={true}
                   accessibilityLabel={loading ? '正在处理购买' : '购买会员'}
                   accessibilityHint={
@@ -1137,7 +1137,7 @@ export function MembershipModal({ visible, onClose, onPurchaseSuccess }: Members
                           ? '请选择会员套餐后再进行购买'
                           : `点击购买${selectedProduct.title || '已选'}会员套餐`
                   }
-                  accessibilityState={{ disabled: loading || products.length === 0 || !agreementAccepted }}
+                  accessibilityState={{ disabled: loading || products.length === 0 }}
                   style={styles.purchaseButtonContent}
                 >
                   {loading ? (