update

src/features/trackTimeDuration/actions/TrackTimeActions.tsx

@@ -1,4 +1,4 @@
-import { API_LOCAL_PUSHES } from "@/services/http/api";
+import { API_LOCAL_PUSHES, API_MIX_CLOCKS } from "@/services/http/api";
 import { request } from "@/services/http/request";
 import { recordCheck } from "@/services/trackTimeDuration";
 import trackTimeService from "@/store/trackTimeMachine"
@@ -100,6 +100,24 @@ export const endSleep = (start_time: number) => {
     });
 }
 
+export const batchClocks = (params: any) => {
+    const extra = {
+        set_time: global.set_time,
+        confirm_time: new Date().getTime(),
+    }
+    return new Promise((resolve, reject) => {
+        request({
+            url: API_MIX_CLOCKS, method: 'POST', data: { extra: extra, ...params }
+        }).then(res => {
+            resolve(res);
+        }).catch(e => {
+            if (global.postBtnUpdateStatus)
+                global.postBtnUpdateStatus('idle')
+            reject(e)
+        })
+    })
+}
+
 export const uploadLocalPushInfo = (params) => {
     request({
         url: API_LOCAL_PUSHES, method: 'POST', data: {

src/features/trackTimeDuration/components/CheckAccess.tsx

@@ -301,7 +301,7 @@ export default function CheckAccess(props: { record: any, count: number }) {
         const { start_time, end_time } = global.ring.schedule.fast
         var params: any = {
             scenario: 'FAST',
-            trigger_event: 'POPUP_DISQUALIFIED',
+            trigger_event: 'POPUP_QUALIFIED_DISMISS',//'POPUP_DISQUALIFIED',
             method: 'USER_SET',
             schedule: {
                 fast: {

src/features/trackTimeDuration/components/IndexConsoleMuti.tsx

@@ -99,6 +99,7 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
                         })
                         return
                     }
+                    debugger
                     if (!sleepStart && props.scenario == 'FAST_SLEEP') {
                         Taro.showToast({
                             icon: 'none',
@@ -127,7 +128,7 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
                     sleep.real_start_time = sleepStart.time
                     sleep.real_start_date = sleepStart.date
                 }
-                if (!sleepEnd) {
+                if (!sleepEnd && props.scenario == 'FAST_SLEEP') {
                     Taro.showToast({
                         icon: 'none',
                         title: '请选择结束睡眠时间'
@@ -141,8 +142,11 @@ export default function IndexConsoleMuti(props: { status: string, event: string,
                     })
                     return
                 }
-                sleep.real_end_time = sleepEnd.time
-                sleep.real_end_date = sleepEnd.date
+
+                if (props.scenario == 'FAST_SLEEP') {
+                    sleep.real_end_time = sleepEnd.time
+                    sleep.real_end_date = sleepEnd.date
+                }
                 fast.real_end_time = fastEnd.time
                 fast.real_end_date = fastEnd.date
                 break;