Leon 2 jaren geleden
bovenliggende
commit
a180eec223

+ 1 - 1
src/components/view/Timeline.tsx

@@ -13,7 +13,7 @@ import CheckBox from '../basic/CheckBox'
 export default function Component(props: { items: any[], title?: string, type?: TimelineType }) {
     return <View className="timeline">
         {
-            props.title && <Text>{props.title}</Text>
+            props.title && <Text className='timeline_title'>{props.title}</Text>
         }
         {props.items.map((item, index) => (
             <View className="timeline-item" style={{ marginBottom: index !== props.items.length - 1 ? 10 : 0 }} key={index}>

+ 2 - 2
src/custom-tab-bar/index.scss

@@ -5,7 +5,7 @@
     bottom: 0;
     left: 0;
     right: 0;
-    height: 104px;
+    height: 103px;
     flex-direction: row;
     justify-content: space-around;
     background-color: #000;
@@ -26,7 +26,7 @@
 .tabbar-item{
     color: rgba($color: #ffffff, $alpha: 0.4);
     font-size: 36px;
-    padding-top: 25px;
+    // padding-top: 25px;
     display: flex;
     flex: 1;
     align-items: center;

+ 1 - 2
src/features/common/RecordItem.scss

@@ -2,5 +2,4 @@
 .recordItem{
     // margin-top: 20px;
     position: relative;
-}
-
+}

+ 8 - 0
src/features/trackSomething/components/ActivityHistory.scss

@@ -0,0 +1,8 @@
+.modalTitle{
+    display: flex;
+    font-size: 36px;
+    font-weight: 500;
+    color: #fff;
+    margin-top: 20px;
+    width: '100%';
+}

+ 6 - 2
src/features/trackSomething/components/ActivityHistory.tsx

@@ -8,6 +8,7 @@ import Modal from "@/components/layout/Modal";
 import { ModalType, TimelineType } from "@/utils/types";
 import Timeline from "@/components/view/Timeline";
 import { TimeFormatter } from "@/utils/time_format";
+import './ActivityHistory.scss'
 
 export default function Component(props: { records: any[] }) {
     const user = useSelector((state: any) => state.user);
@@ -68,8 +69,11 @@ export default function Component(props: { records: any[] }) {
                 }
             )
         }
-        return <View>
-            <Timeline items={timelineItems} title={formateDate(item.date + '')} type={TimelineType.timeSecond}/>
+        return <View style={{ display: 'flex', width: '100%', flexDirection: 'column', alignItems: 'center' }}>
+            <View style={{display:'flex',flexDirection:'row',width:'100%'}}>
+                <Text className="modalTitle">{formateDate(item.date + '')}</Text>
+            </View>
+            <Timeline items={timelineItems} type={TimelineType.timeSecond} />
         </View>
     }
 

+ 12 - 2
src/features/trackTimeDuration/components/RecordFastSleep.scss

@@ -1,3 +1,13 @@
+.fast_sleep_item{
+    // display: 'flex',position:'relative', flex-: 'row', alignItems: 'center'
+    display: flex;
+    position: relative;
+    flex-direction: row;
+    align-items: center;
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+
 .duration_bg {
     margin-left: 50px;
     display: flex;
@@ -31,6 +41,6 @@
     font-size: 24px;
     color: #fff;
     opacity: 0.2;
-    right: 86px;
-    bottom: 60px;
+    right: 0px;
+    bottom: 0px;
 }

+ 3 - 5
src/features/trackTimeDuration/components/RecordFastSleep.tsx

@@ -231,7 +231,7 @@ export default function RecordFastSleep(props: { data: any, type: string, delSuc
             sleepDuration = getDuration(record.sleep)
             showSleep = true
         }
-        return <View style={{ display: 'flex', flexDirection: 'row', alignItems: 'center' }}>
+        return <View className="fast_sleep_item">
             {
                 rings()
             }
@@ -250,12 +250,12 @@ export default function RecordFastSleep(props: { data: any, type: string, delSuc
                 }
             </View>
             <Image className="arrow1" src={require('@/assets/images/arrow.png')} />
+            <Text className='recordTime'>{TimeFormatter.formatTimestamp(props.data.last_real_check_time)}</Text>
         </View>
     }
 
 
-    return <View style={{ position: 'relative' }}>
-        <Box header={header()}>
+    return <Box header={header()}>
             <RecordItem canDel={record.status == 'COMPLETED'} delete={del}
                 onClick={() => { showDetail() }}
             >{recordDetail()}
@@ -268,6 +268,4 @@ export default function RecordFastSleep(props: { data: any, type: string, delSuc
             }
 
         </Box>
-        <Text className='recordTime'>{TimeFormatter.formatTimestamp(props.data.last_real_check_time)}</Text>
-    </View>
 }

+ 1 - 1
src/features/trackTimeDuration/components/StatusIndicator.scss

@@ -1,5 +1,5 @@
 .subcontent{
-    margin-top: 4px;
+    margin-top: 8px;
     height: 48px;
     display: flex;
     flex-direction: row;

+ 8 - 4
src/features/trackTimeDuration/components/TitleView.scss

@@ -1,12 +1,12 @@
 .title_view{
-    height: 192px;
+    height: 172px;
     box-sizing: border-box;
     width: 750px;
     padding-left: 46px;
     padding-right: 46px;
-    // background-color: palegoldenrod;
     display: flex;
     flex-direction: column;
+    background-color: 'pink';
 }
 
 .title {
@@ -15,6 +15,7 @@
     font-size: 72px;
     line-height: 72px;
     font-weight: 500;
+
 }
 
 .title_bg{
@@ -25,13 +26,16 @@
     flex-direction: row;
     align-items: center;
     justify-content: space-between;
+    
 }
 
 .icon {
     width: 44px;
     height: 44px;
-    padding: 10px;
-    margin-right: 10px;
+    padding-top: 12px;
+    padding-bottom: 12px;
+    padding-left: 32px;
+    padding-right: 32px;
 }
 
 

+ 2 - 1
src/pages/clock/Clock.scss

@@ -36,8 +36,9 @@
   }
 
   .console_bg{
-    height: 440px;
+    height: 420px;
     overflow: hidden;
+    // margin-bottom: 40px;
   }
 
   .swiperItem{

+ 1 - 4
src/pages/clock/Clock.tsx

@@ -308,7 +308,7 @@ export default function IndexPage() {
   }
 
   function headerView() {
-    return <TitleView>
+    return <TitleView >
       <StatusIndicator />
     </TitleView>
   }
@@ -354,9 +354,6 @@ export default function IndexPage() {
 
           }
         </View>
-
-        {/* <Console /> */}
-        {/* <More ref={global.moreRef} /> */}
         {
           checkData && schedule()
         }