u

code/allapp/allapp-rn/src/app/(tabs)/money/components/TransactionsList.tsx

@@ -1,4 +1,4 @@
-import type { MoneyRecordGroup, MoneyRecordItem } from '@/types/money/record'
+import type { MoneyRecord, MoneyRecordGroup } from '@/types/money/record'
 import React, { useCallback, useState } from 'react'
 import { RefreshControl, SectionList, Text, TouchableHighlight, Vibration, View } from 'react-native'
 import {
@@ -11,11 +11,13 @@ import {
 import { LucideIcon } from '@/components/common/ao'
 import EmptyState from '@/components/common/EmptyStatus'
 import MoneyCategoryIcon from '@/components/common/MoneyCategoryIcon'
+import { useMoneyCategoryStore } from '@/store/moneyCategory'
 import { useUserStore } from '@/store/user'
+import { MoneyCategoryEnum } from '@/types/money/category'
 
 interface StaticTransactionsProps {
   records: MoneyRecordGroup[]
-  onUpdate?: (data: MoneyRecordItem) => void
+  onUpdate?: (data: MoneyRecord) => void
   onDelete?: (id: number) => void
   onDetail?: (id: number) => void
   onRefreshData?: () => void
@@ -30,6 +32,7 @@ export default function StaticTransactions({
   onLoadMore,
   onRefreshData,
 }: StaticTransactionsProps) {
+  const moneyCategoryStore = useMoneyCategoryStore()
   const userID = useUserStore().userInfo?.id
   const [refreshing, setRefreshing] = useState(false)
   const [loadingMore, setLoadingMore] = useState(false)
@@ -119,6 +122,7 @@ export default function StaticTransactions({
       )}
 
       renderItem={({ item }) => {
+        const category = moneyCategoryStore.getCategoryById(item.category_id)
         return (
           <Menu
             renderer={renderers.Popover}
@@ -146,12 +150,12 @@ export default function StaticTransactions({
                 }}
               >
                 <View className="relative w-10 h-10 rounded-full bg-gray-100 items-center justify-center">
-                  <MoneyCategoryIcon name={item.category_icon} size={24} color="#000" />
+                  <MoneyCategoryIcon name={category?.icon} size={24} color="#000" />
                 </View>
 
                 <View className="flex-1">
                   <Text className="text-gray-800 text-base">
-                    {item.remark ? item.remark : item.category_name}
+                    {item.remark ? item.remark : category?.name}
                   </Text>
                   {
                     item.user_id !== userID && (
@@ -166,7 +170,7 @@ export default function StaticTransactions({
                   <Text
                     className="text-sm text-gray-600 text-right"
                   >
-                    {item.category_type === 1 ? '+' : '-'}
+                    {category?.type === MoneyCategoryEnum.Income ? '+' : '-'}
                     {' '}
                     {item.amount}
                   </Text>

code/allapp/allapp-rn/src/app/(tabs)/money/index.tsx

@@ -34,6 +34,7 @@ export default function Money() {
       record_time: searchParams.record_time,
     }).then((res) => {
       if (res.isSuccess) {
+        console.log(res.data.records)
         moneyRecordStore.setRecords(res.data.records, searchParams.record_time)
       }
       else {
@@ -62,7 +63,7 @@ export default function Money() {
       }
     }, []),
   )
-  
+
   return (
     <View
       className="flex-1"

code/allapp/allapp-rn/src/app/money/category/setting/components/EditCategory.tsx

@@ -49,6 +49,12 @@ export default function CreateCategory({
 
   useEffect(() => {
     setIsOpen(open)
+    if (!open) {
+      setForm({
+        icon: '',
+        name: '',
+      })
+    }
   }, [open])
 
   useEffect(() => {
@@ -67,13 +73,12 @@ export default function CreateCategory({
   }, [category])
 
   function handleClose() {
-    setIsOpen(false)
-    onClose && onClose()
-
     setForm({
       icon: '',
       name: '',
     })
+    setIsOpen(false)
+    onClose && onClose()
   }
 
   return (

code/allapp/allapp-rn/src/app/money/category/setting/index.tsx

@@ -99,6 +99,8 @@ export default function MoneyCategorySetting() {
           sort_number: 0,
           type: selectedTab,
         })
+
+        scrollableRef.current?.scrollToEnd({ animated: true })
       }
 
       setshowEditCategory(false)

code/allapp/allapp-rn/src/app/money/record/detail/index.tsx

@@ -4,14 +4,18 @@ import { Text, View } from 'react-native'
 import { AButton, ACell, ACellGroup, AModal } from '@/components/common/ao'
 import MoneyCategoryIcon from '@/components/common/MoneyCategoryIcon'
 import CustomHeader from '@/components/custom/Header'
+import { useMoneyCategoryStore } from '@/store/moneyCategory'
 import { useMoneyRecordStore } from '@/store/moneyRecord'
 import { useUserStore } from '@/store/user'
+import { MoneyCategoryEnum } from '@/types/money/category'
 import { toDateString, toDateTimeString } from '@/utils/time'
 
 export default function MoneyRecordDetail() {
   const router = useRouter()
   const moneyRecordStore = useMoneyRecordStore()
+  const moneyCategoryStore = useMoneyCategoryStore()
   const userStore = useUserStore()
+
   const { id: detailId } = useLocalSearchParams<{ id: string }>()
 
   const moneryRecord = moneyRecordStore.getMoneyRecordById(Number(detailId))
@@ -22,18 +26,20 @@ export default function MoneyRecordDetail() {
     return null
   }
 
+  const moneyCategory = moneyCategoryStore.getCategoryById(moneryRecord.category_id)
+
   return (
     <>
       <View className="flex-1">
         <CustomHeader title="账单详情" />
         <View className="flex-1">
           <View className="flex flex-col items-center">
-            <MoneyCategoryIcon name={moneryRecord.category_icon} size={56} />
-            <Text className="mt-1">{moneryRecord.category_name}</Text>
+            <MoneyCategoryIcon name={moneyCategory?.icon} size={56} />
+            <Text className="mt-1">{moneyCategory?.name}</Text>
           </View>
 
           <ACellGroup showDivider={false} className="mt-4">
-            <ACell title="类别" rightText={moneryRecord.category_type === 0 ? '支出' : '收入'} />
+            <ACell title="类别" rightText={moneyCategory?.type === MoneyCategoryEnum.Expense ? '支出' : '收入'} />
             <ACell title="金额" rightText={moneryRecord.amount} />
             <ACell title="备注" rightText={moneryRecord.remark} />
             <ACell title="日期" rightText={toDateString(moneryRecord.record_time)} />

code/allapp/allapp-rn/src/app/money/record/editor/index.tsx

@@ -1,5 +1,5 @@
 import type { MoneyCategoryItem } from '@/types/money/category'
-import type { MoneyRecordBase, MoneyRecordItem } from '@/types/money/record'
+import type { MoneyRecord } from '@/types/money/record'
 import { useLocalSearchParams, useRouter } from 'expo-router'
 import { useEffect, useState } from 'react'
 import { Text, TouchableOpacity, View } from 'react-native'
@@ -28,21 +28,19 @@ export default function MoenyRecordEditor() {
   // 选中分类
   const [selectedCategory, setSelectedCategory] = useState<MoneyCategoryItem | null>(null)
   // 记账记录
-  const defaultMoneyRecord: MoneyRecordBase = {
+  const defaultMoneyRecord: MoneyRecord = {
     id: -1,
     category_id: -1,
     username: '',
-    category_icon: '',
-    category_name: '',
-    category_type: 0,
     user_id: -1,
     amount: '0.00',
     remark: '',
     record_time: getCurrentDate(),
-    create_time: '',
+    create_time: 0,
+    update_time: 0,
   }
 
-  const [moneyRecord, setMoneyRecord] = useState<MoneyRecordBase>(defaultMoneyRecord)
+  const [moneyRecord, setMoneyRecord] = useState<MoneyRecord>(defaultMoneyRecord)
 
   useEffect(() => {
     if (updateId) {
@@ -90,12 +88,9 @@ export default function MoenyRecordEditor() {
         record_time: moneyRecord.record_time,
       }).then((res) => {
         if (res.isSuccess) {
-          const result: MoneyRecordItem = {
+          const result: MoneyRecord = {
             ...moneyRecord,
             category_id: selectedCategory.id,
-            category_type: selectedCategory.type,
-            category_name: selectedCategory.name,
-            category_icon: selectedCategory.icon,
           }
 
           moneyRecordStore.updateMoneyRecord(result)
@@ -115,12 +110,9 @@ export default function MoenyRecordEditor() {
       })
         .then((res) => {
           if (res.isSuccess) {
-            const result: MoneyRecordItem = {
+            const result: MoneyRecord = {
               ...res.data,
               category_id: selectedCategory.id,
-              category_type: selectedCategory.type,
-              category_name: selectedCategory.name,
-              category_icon: selectedCategory.icon,
             }
 
             moneyRecordStore.addMoneyRecord(result)