1

1

src/components/timerMeter/components/countdown.tsx

@@ -231,11 +231,6 @@ export default defineComponent({
           }
           flipObjs.value[i].value.flipUp(lastStr[i], str[i]);
         }
-<<<<<<< HEAD
-      }
-      const updateSecond = () => {
-        console.log(mine.value);
-=======
     };
     const updateSecond = (e:any) => {
       let targetCount =parseInt(e.target.value);
@@ -246,7 +241,6 @@ export default defineComponent({
         targetCount = 59
       }
       second.value = targetCount
->>>>>>> 0906online
         const lastStr = getSecond(count.value);
         count.value = mine.value * 60 + second.value;
         const str = getSecond(count.value);
@@ -256,12 +250,6 @@ export default defineComponent({
           }
           flipObjs.value[i].value.flipUp(lastStr[i], str[i]);
         }
-<<<<<<< HEAD
-        flipObjs.value[i].value.flipUp(lastStr[i], str[i]);
-      };
-=======
-
->>>>>>> 0906online
     };
 
     watch(