update

src/features/trackTimeDuration/components/IndexConsoleMuti.tsx

@@ -37,7 +37,6 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
     function confirm() {
         var fast: any = {}
         var sleep: any = {}
-        debugger
         switch (props.event) {
             case 'start_sleep':
                 if (!fastStart) {
@@ -54,10 +53,31 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
                     })
                     return
                 }
-                fast.real_start_time = fastStart.time
-                fast.real_start_date = fastStart.date
-                sleep.real_start_time = sleepStart.time
-                sleep.real_start_date = sleepStart.date
+                // fast.real_start_set_time = fastStart.set_time
+                // fast.real_start_confirm_time = fastStart.confirm_time
+                // fast.real_start_time = fastStart.time
+                // fast.real_start_date = fastStart.date
+                // sleep.real_start_set_time = sleepStart.set_time
+                // sleep.real_start_confirm_time = sleepStart.confirm_time
+                // sleep.real_start_time = sleepStart.time
+                // sleep.real_start_date = sleepStart.date
+
+                fast.real_start ={
+                    time:fastStart.time,
+                    date:fastStart.date,
+                    extra:{
+                        set_time:fastStart.set_time,
+                        confirm_time:fastStart.confirm_time
+                    }
+                }
+                sleep.real_start ={
+                    time:sleepStart.time,
+                    date:sleepStart.date,
+                    extra:{
+                        set_time:sleepStart.set_time,
+                        confirm_time:sleepStart.confirm_time
+                    }
+                }
                 break;
             case 'end_sleep':
                 if (props.status == 'WAIT_FOR_START') {
@@ -68,8 +88,19 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
                         })
                         return
                     }
-                    fast.real_start_time = fastStart.time
-                    fast.real_start_date = fastStart.date
+                    // fast.real_start_set_time = fastStart.set_time
+                    // fast.real_start_confirm_time = fastStart.confirm_time
+                    // fast.real_start_time = fastStart.time
+                    // fast.real_start_date = fastStart.date
+
+                    fast.real_start ={
+                        time:fastStart.time,
+                        date:fastStart.date,
+                        extra:{
+                            set_time:fastStart.set_time,
+                            confirm_time:fastStart.confirm_time
+                        }
+                    }
                 }
                 if (!sleepStart) {
                     Taro.showToast({
@@ -85,10 +116,32 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
                     })
                     return
                 }
-                sleep.real_start_time = sleepStart.time
-                sleep.real_start_date = sleepStart.date
-                sleep.real_end_time = sleepEnd.time
-                sleep.real_end_date = sleepEnd.date
+                // sleep.real_start_set_time = sleepStart.set_time
+                // sleep.real_start_confirm_time = sleepStart.confirm_time
+                // sleep.real_start_time = sleepStart.time
+                // sleep.real_start_date = sleepStart.date
+                // sleep.real_end_set_time = sleepEnd.set_time
+                // sleep.real_end_confirm_time = sleepEnd.confirm_time
+                // sleep.real_end_time = sleepEnd.time
+                // sleep.real_end_date = sleepEnd.date
+
+                sleep.real_start ={
+                    time:sleepStart.time,
+                    date:sleepStart.date,
+                    extra:{
+                        set_time:sleepStart.set_time,
+                        confirm_time:sleepStart.confirm_time
+                    }
+                }
+
+                sleep.real_end ={
+                    time:sleepEnd.time,
+                    date:sleepEnd.date,
+                    extra:{
+                        set_time:sleepEnd.set_time,
+                        confirm_time:sleepEnd.confirm_time
+                    }
+                }
                 break;
             case 'end_fast':
                 if (props.status == 'WAIT_FOR_START') {
@@ -99,7 +152,6 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
                         })
                         return
                     }
-                    debugger
                     if (!sleepStart && props.scenario == 'FAST_SLEEP') {
                         Taro.showToast({
                             icon: 'none',
@@ -107,12 +159,33 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
                         })
                         return
                     }
-                    fast.real_start_time = fastStart.time
-                    fast.real_start_date = fastStart.date
+                    // fast.real_start_set_time = fastStart.set_time
+                    // fast.real_start_confirm_time = fastStart.confirm_time
+                    // fast.real_start_time = fastStart.time
+                    // fast.real_start_date = fastStart.date
+
+                    fast.real_start ={
+                        time:fastStart.time,
+                        date:fastStart.date,
+                        extra:{
+                            set_time:fastStart.set_time,
+                            confirm_time:fastStart.confirm_time
+                        }
+                    }
 
                     if (props.scenario == 'FAST_SLEEP') {
-                        sleep.real_start_time = sleepStart.time
-                        sleep.real_start_date = sleepStart.date
+                        // sleep.real_start_set_time = sleepStart.set_time
+                        // sleep.real_start_confirm_time = sleepStart.confirm_time
+                        // sleep.real_start_time = sleepStart.time
+                        // sleep.real_start_date = sleepStart.date
+                        sleep.real_start ={
+                            time:sleepStart.time,
+                            date:sleepStart.date,
+                            extra:{
+                                set_time:sleepStart.set_time,
+                                confirm_time:sleepStart.confirm_time
+                            }
+                        }
                     }
 
 
@@ -125,8 +198,18 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
                         })
                         return
                     }
-                    sleep.real_start_time = sleepStart.time
-                    sleep.real_start_date = sleepStart.date
+                    // sleep.real_start_set_time = sleepStart.set_time
+                    // sleep.real_start_confirm_time = sleepStart.confirm_time
+                    // sleep.real_start_time = sleepStart.time
+                    // sleep.real_start_date = sleepStart.date
+                    sleep.real_start ={
+                        time:sleepStart.time,
+                        date:sleepStart.date,
+                        extra:{
+                            set_time:sleepStart.set_time,
+                            confirm_time:sleepStart.confirm_time
+                        }
+                    }
                 }
                 if (!sleepEnd && props.scenario == 'FAST_SLEEP') {
                     Taro.showToast({
@@ -144,11 +227,31 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
                 }
 
                 if (props.scenario == 'FAST_SLEEP') {
-                    sleep.real_end_time = sleepEnd.time
-                    sleep.real_end_date = sleepEnd.date
+                    // sleep.real_end_set_time = sleepEnd.set_time
+                    // sleep.real_end_confirm_time = sleepEnd.confirm_time
+                    // sleep.real_end_time = sleepEnd.time
+                    // sleep.real_end_date = sleepEnd.date
+                    sleep.real_end ={
+                        time:sleepEnd.time,
+                        date:sleepEnd.date,
+                        extra:{
+                            set_time:sleepEnd.set_time,
+                            confirm_time:sleepEnd.confirm_time
+                        }
+                    }
+                }
+                // fast.real_end_set_time = fastEnd.set_time
+                // fast.real_end_confirm_time = fastEnd.confirm_time
+                // fast.real_end_time = fastEnd.time
+                // fast.real_end_date = fastEnd.date
+                fast.real_end ={
+                    time:fastEnd.time,
+                    date:fastEnd.date,
+                    extra:{
+                        set_time:fastEnd.set_time,
+                        confirm_time:fastEnd.confirm_time
+                    }
                 }
-                fast.real_end_time = fastEnd.time
-                fast.real_end_date = fastEnd.date
                 break;
         }
         var params: any = {
@@ -170,9 +273,8 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
             global.scrollToLatest()
             global.refrehWeekly()
             global.refreshStreaks()
-            if (props.event == 'end_fast'){
+            if (props.event == 'end_fast')
                 global.checkAccess((res as any).access)
-            }
 
             cancel()
         }).catch(e => {
@@ -303,24 +405,32 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
                     global.pauseIndexTimer = false
                     if (operateType == 'startFast') {
                         setFastStart({
+                            set_time:defaultTimestamp,
+                            confirm_time:new Date().getTime(),
                             time: e,
                             date: dayjs(e).format('YYYYMMDD')
                         })
                     }
                     else if (operateType == 'endFast') {
                         setFastEnd({
+                            set_time:defaultTimestamp,
+                            confirm_time:new Date().getTime(),
                             time: e,
                             date: dayjs(e).format('YYYYMMDD')
                         })
                     }
                     else if (operateType == 'startSleep') {
                         setSleepStart({
+                            set_time:defaultTimestamp,
+                            confirm_time:new Date().getTime(),
                             time: e,
                             date: dayjs(e).format('YYYYMMDD')
                         })
                     }
                     else {
                         setSleepEnd({
+                            set_time:defaultTimestamp,
+                            confirm_time:new Date().getTime(),
                             time: e,
                             date: dayjs(e).format('YYYYMMDD')
                         })