Merge branch 'iteration-class' into jenkins

src/components/timerMeter/components/countdown.tsx

@@ -159,7 +159,9 @@ export default defineComponent({
       count.value = 0;
       soundVIdeo.currentTime = 0;
       soundVIdeo.pause();
-      init();
+      setTimeout(()=>{
+        init();
+      },600)
     };
     onMounted(() => {
       nextTick(() => {

src/components/timerMeter/modals/flipper.vue

@@ -46,6 +46,7 @@ export default {
       // if (this.isFlipping) {
       //   return false
       // }
+      console.log(type, front, back,'=====>')
       this.frontTextFromData = front
       this.backTextFromData = back
       // 根据传递过来的type设置翻转方向

src/views/login/components/pwdLogin.tsx

@@ -60,8 +60,8 @@ export default defineComponent({
           const params: FormState = {
             username,
             password,
-            loginType: 'password',
-            grant_type: 'PASSWORD',
+            loginType:'PASSWORD',
+            grant_type: 'password',
             client_id: 'cooleshow-teacher',
             client_secret: 'cooleshow-teacher'
           };