Merge branch 'startLogin'

src/components/timerMeter/components/countdown.tsx

@@ -134,11 +134,10 @@ export default defineComponent({
     const onReset = () => {
 
       suspendNum()
-      nextTick(() => {
-
-        count.value = 0
+      count.value = 0
+      setTimeout(() => {
         init()
-      })
+      }, 600)
 
     }
     onMounted(() => {

src/components/timerMeter/components/positive.tsx

@@ -127,8 +127,9 @@ export default defineComponent({
       suspendNum()
       count.value = 0
       setTimeout(() => {
+        console.log('初始化')
         init()
-      }, 300)
+      }, 600)
 
     }
     onMounted(() => {

src/components/timerMeter/index.tsx

@@ -7,7 +7,7 @@ import Positive from './components/positive';
 export default defineComponent({
   name: 'data-module',
   setup() {
-    const activeTab = ref('countdown');  //countdown
+    const activeTab = ref('positive');  //countdown
     const route = useRoute();
     // onMounted(() => {
     // })

src/styles/index.less

@@ -5,6 +5,7 @@
   box-sizing: border-box;
 }
 
+
 #app {
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
@@ -178,12 +179,13 @@ body {
 // 给弹窗设置标题的基础样式
 .modalTitle {
   border-radius: 16px;
+
   // overflow: hidden;
 
   &.background {
     .n-card-header {
       background: #f5f6fa;
-
+      font-weight: 600 !important;
       overflow: hidden;
     }
   }