feat: 更新个人信息和打卡功能

- 在个人信息页面中修改用户姓名字段为“name”，并添加注销帐号功能，支持用户删除帐号及相关数据 - 在打卡页面中集成从后端获取当天打卡列表的功能，确保用户数据的实时同步 - 更新 Redux 状态管理，支持打卡记录的同步和更新 - 新增打卡服务，提供创建、更新和删除打卡记录的 API 接口 - 优化样式以适应新功能的展示和交互
2025-08-13 19:24:03 +08:00
parent ebc74eb1c8
commit 7ad26590e5
7 changed files with 225 additions and 22 deletions
--- a/app/(tabs)/personal.tsx
+++ b/app/(tabs)/personal.tsx
@@ -2,7 +2,8 @@ import { Colors } from '@/constants/Colors';
 import { getTabBarBottomPadding } from '@/constants/TabBar';
 import { useAppDispatch, useAppSelector } from '@/hooks/redux';
 import { useColorScheme } from '@/hooks/useColorScheme';
-import { DEFAULT_MEMBER_NAME, fetchMyProfile } from '@/store/userSlice';
+import { api } from '@/services/api';
+import { DEFAULT_MEMBER_NAME, fetchMyProfile, logout } from '@/store/userSlice';
 import { Ionicons } from '@expo/vector-icons';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import { useBottomTabBarHeight } from '@react-navigation/bottom-tabs';
@@ -29,7 +30,7 @@ export default function PersonalScreen() {
  const DEFAULT_AVATAR_URL = 'https://plates-1251306435.cos.ap-guangzhou.myqcloud.com/images/avatar/avatarGirl01.jpeg';

  type UserProfile = {
-    fullName?: string;
+    name?: string;
    email?: string;
    gender?: 'male' | 'female' | '';
    age?: string;
@@ -125,7 +126,34 @@ export default function PersonalScreen() {
  };


-  const displayName = (profile.fullName && profile.fullName.trim()) ? profile.fullName : DEFAULT_MEMBER_NAME;
+  const displayName = (profile.name && profile.name.trim()) ? profile.name : DEFAULT_MEMBER_NAME;
+
+  const handleDeleteAccount = () => {
+    Alert.alert(
+      '确认注销帐号',
+      '此操作不可恢复，将删除您的帐号及相关数据。确定继续吗？',
+      [
+        { text: '取消', style: 'cancel' },
+        {
+          text: '确认注销',
+          style: 'destructive',
+          onPress: async () => {
+            try {
+              await api.delete('/api/users/delete-account');
+              await AsyncStorage.multiRemove(['@user_personal_info']);
+              await dispatch(logout()).unwrap();
+              Alert.alert('帐号已注销', '您的帐号已成功注销');
+              router.replace('/auth/login');
+            } catch (err: any) {
+              const message = err?.message || '注销失败，请稍后重试';
+              Alert.alert('注销失败', message);
+            }
+          },
+        },
+      ],
+      { cancelable: true }
+    );
+  };

  const UserInfoSection = () => (
    <View style={[styles.userInfoCard, { backgroundColor: colorTokens.card }]}>
@@ -282,6 +310,16 @@ export default function PersonalScreen() {
    },
  ];

+  const securityItems = [
+    {
+      icon: 'trash-outline',
+      iconBg: '#FFE8E8',
+      iconColor: '#FF4444',
+      title: '注销帐号',
+      onPress: handleDeleteAccount,
+    },
+  ];
+
  const developerItems = [
    {
      icon: 'refresh-outline',
@@ -306,6 +344,7 @@ export default function PersonalScreen() {
          <MenuSection title="账户" items={accountItems} />
          <MenuSection title="通知" items={notificationItems} />
          <MenuSection title="其他" items={otherItems} />
+          <MenuSection title="账号与安全" items={securityItems} />
          <MenuSection title="开发者" items={developerItems} />

          {/* 底部浮动按钮 */}
--- a/app/checkin/index.tsx
+++ b/app/checkin/index.tsx
@@ -2,8 +2,10 @@ import { HeaderBar } from '@/components/ui/HeaderBar';
 import { Colors } from '@/constants/Colors';
 import { useAppDispatch, useAppSelector } from '@/hooks/redux';
 import { useColorScheme } from '@/hooks/useColorScheme';
-import { removeExercise, setCurrentDate, toggleExerciseCompleted } from '@/store/checkinSlice';
+import type { CheckinExercise } from '@/store/checkinSlice';
+import { getDailyCheckins, removeExercise, setCurrentDate, syncCheckin, toggleExerciseCompleted } from '@/store/checkinSlice';
 import { Ionicons } from '@expo/vector-icons';
+import { useFocusEffect } from '@react-navigation/native';
 import { useRouter } from 'expo-router';
 import React, { useEffect, useMemo } from 'react';
 import { Alert, FlatList, SafeAreaView, StyleSheet, Text, TouchableOpacity, View } from 'react-native';
@@ -26,8 +28,22 @@ export default function CheckinHome() {

  useEffect(() => {
    dispatch(setCurrentDate(today));
+    // 进入页面立即从后端获取当天打卡列表，回填本地
+    dispatch(getDailyCheckins(today)).unwrap().catch((err: any) => {
+      Alert.alert('获取打卡失败', err?.message || '请稍后重试');
+    });
  }, [dispatch, today]);

+  useFocusEffect(
+    React.useCallback(() => {
+      // 返回本页时确保与后端同步（若本地有内容则上报，后台 upsert）
+      if (record?.items && Array.isArray(record.items)) {
+        dispatch(syncCheckin({ date: today, items: record.items as CheckinExercise[], note: record?.note }));
+      }
+      return () => { };
+    }, [dispatch, today, record?.items])
+  );
+
  return (
    <SafeAreaView style={[styles.safeArea, { backgroundColor: theme === 'light' ? colorTokens.pageBackgroundEmphasis : colorTokens.background }]}>
      <View style={[styles.container, { backgroundColor: theme === 'light' ? colorTokens.pageBackgroundEmphasis : colorTokens.background }]}>
@@ -68,7 +84,13 @@ export default function CheckinHome() {
                accessibilityRole="button"
                accessibilityLabel={item.completed ? '已完成，点击取消完成' : '未完成，点击标记完成'}
                style={styles.doneIconBtn}
-                onPress={() => dispatch(toggleExerciseCompleted({ date: today, key: item.key }))}
+                onPress={() => {
+                  dispatch(toggleExerciseCompleted({ date: today, key: item.key }));
+                  const nextItems: CheckinExercise[] = (record?.items || []).map((it: CheckinExercise) =>
+                    it.key === item.key ? { ...it, completed: !it.completed } : it
+                  );
+                  dispatch(syncCheckin({ date: today, items: nextItems, note: record?.note }));
+                }}
                hitSlop={{ top: 6, bottom: 6, left: 6, right: 6 }}
              >
                <Ionicons
@@ -85,7 +107,11 @@ export default function CheckinHome() {
                    {
                      text: '移除',
                      style: 'destructive',
-                      onPress: () => dispatch(removeExercise({ date: today, key: item.key })),
+                      onPress: () => {
+                        dispatch(removeExercise({ date: today, key: item.key }));
+                        const nextItems: CheckinExercise[] = (record?.items || []).filter((it: CheckinExercise) => it.key !== item.key);
+                        dispatch(syncCheckin({ date: today, items: nextItems, note: record?.note }));
+                      },
                    },
                  ])
                }
--- a/app/checkin/select.tsx
+++ b/app/checkin/select.tsx
@@ -2,7 +2,7 @@ import { HeaderBar } from '@/components/ui/HeaderBar';
 import { Colors } from '@/constants/Colors';
 import { useAppDispatch } from '@/hooks/redux';
 import { useColorScheme } from '@/hooks/useColorScheme';
-import { addExercise } from '@/store/checkinSlice';
+import { addExercise, syncCheckin } from '@/store/checkinSlice';
 import { EXERCISE_LIBRARY, getCategories, searchExercises } from '@/utils/exerciseLibrary';
 import { Ionicons } from '@expo/vector-icons';
 import * as Haptics from 'expo-haptics';
@@ -79,6 +79,21 @@ export default function SelectExerciseScreen() {
        reps: reps && reps > 0 ? reps : undefined,
      },
    }));
+    console.log('addExercise', today, selected.key, sets, reps);
+    // 同步到后端（读取最新 store 需要在返回后由首页触发 load，或此处直接上报）
+    // 简单做法：直接上报新增项（其余项由后端合并/覆盖）
+    dispatch(syncCheckin({
+      date: today,
+      items: [
+        {
+          key: selected.key,
+          name: selected.name,
+          category: selected.category,
+          sets: Math.max(1, sets),
+          reps: reps && reps > 0 ? reps : undefined,
+        },
+      ],
+    }));
    router.back();
  };

--- a/app/profile/edit.tsx
+++ b/app/profile/edit.tsx
@@ -26,7 +26,7 @@ type WeightUnit = 'kg' | 'lb';
 type HeightUnit = 'cm' | 'ft';

 interface UserProfile {
-  fullName?: string;
+  name?: string;
  gender?: 'male' | 'female' | '';
  age?: string; // 存储为字符串，方便非必填
  // 以公制为基准存储
@@ -43,7 +43,7 @@ export default function EditProfileScreen() {
  const insets = useSafeAreaInsets();

  const [profile, setProfile] = useState<UserProfile>({
-    fullName: '',
+    name: '',
    gender: '',
    age: '',
    weightKg: undefined,
@@ -66,7 +66,7 @@ export default function EditProfileScreen() {
        ]);

        let next: UserProfile = {
-          fullName: '',
+          name: '',
          gender: '',
          age: '',
          weightKg: undefined,
@@ -179,11 +179,11 @@ export default function EditProfileScreen() {
              style={[styles.textInput, { color: textColor }]}
              placeholder="填写姓名（可选）"
              placeholderTextColor={placeholderColor}
-              value={profile.fullName}
-              onChangeText={(t) => setProfile((p) => ({ ...p, fullName: t }))}
+              value={profile.name}
+              onChangeText={(t) => setProfile((p) => ({ ...p, name: t }))}
            />
            {/* 校验勾无需强制，仅装饰 */}
-            {!!profile.fullName && <Text style={{ color: '#C4C4C4' }}>✓</Text>}
+            {!!profile.name && <Text style={{ color: '#C4C4C4' }}>✓</Text>}
          </View>

          {/* 体重（kg） */}