Leon před 2 roky
rodič
revize
34ef484165

+ 14 - 2
src/features/food/FoodJournal.tsx

@@ -100,11 +100,23 @@ export default function Component() {
             setShowError(false)
             setLoaded(true)
             setTotal((res as any).total)
+            var array;
             if (index == 1) {
-                setList((res as any).data)
+                array = (res as any).data
+                // setList((res as any).data)
             } else {
-                setList(list.concat((res as any).data))
+                array = list.concat((res as any).data)
+                // setList(list.concat((res as any).data))
             }
+            var selDate = ''
+            for (var i =0;i<array.length;i++){
+                var obj = array[i]
+                if (obj.start.date!=selDate){
+                    obj.showDate = true
+                    selDate = obj.start.date
+                }
+            }
+            setList(array)
             setIsLoading(false)
         }).catch(e => {
             Taro.stopPullDownRefresh()

+ 1 - 1
src/features/food/FoodTimelineItem.tsx

@@ -308,7 +308,7 @@ export default function Component(props: { data: any, index: number, delete: Fun
         <View style={{ flex: 1 }}>
             {
                 <View className="tags">
-                    <Text className="food_timeline_item_day">{TimeFormatter.getMonthDayByTimestamp(detail.start.timestamp)}</Text>
+                    {detail.showDate && <Text className="food_timeline_item_day">{TimeFormatter.getMonthDayByTimestamp(detail.start.timestamp)}</Text>}
                     {
                         props.index == 0 && !detail.meal_tag && common.meal_tags.map((item, index) => {
                             return index <= 2 ? <View className="tag-item" onClick={() => updateTag(index)}>