Kaynağa Gözat

Merge branch 'feature-3.8' of http://git.dayaedu.com/liushengqiang/classroom-app into feature-3.8

TIANYONG 1 yıl önce
ebeveyn
işleme
65ecec5d88
1 değiştirilmiş dosya ile 12 ekleme ve 3 silme
  1. 12 3
      src/views/tempo-practice/index.tsx

+ 12 - 3
src/views/tempo-practice/index.tsx

@@ -129,7 +129,10 @@ export default defineComponent({
                 element: setting.element,
                 beat: setting.beat,
                 barLine: setting.barLine,
-                tempo: setting.tempo
+                tempo: setting.tempo,
+                scorePart: setting.scorePart,
+                playType: setting.playType,
+                speed: setting.speed
               },
               coverImg: ''
             })
@@ -154,10 +157,14 @@ export default defineComponent({
           dataJson = JSON.parse(route.query.dataJson as any);
         }
 
+        console.log(dataJson, 'dataJson');
         setting.element = dataJson.element;
         setting.beat = dataJson.beat;
         setting.barLine = dataJson.barLine;
         setting.tempo = dataJson.tempo;
+        setting.scorePart = dataJson.scorePart;
+        setting.playType = dataJson.playType;
+        setting.speed = dataJson.speed;
 
         state.dataJson = dataJson;
       } catch {
@@ -167,7 +174,9 @@ export default defineComponent({
       state.speedList.forEach((item: any) => {
         if (item.value === setting.speed) item.color = '#1CACF1';
       });
-      renderScore();
+      if (setting.scorePart.length <= 0) {
+        renderScore();
+      }
 
       window.addEventListener('message', onIframeHandle);
     });
@@ -180,7 +189,7 @@ export default defineComponent({
         class={[
           styles.tempoPractice,
           state.win === 'pc' ? styles.pc : '',
-          state.win === 'modal' ? styles.modal : ''
+          state.platform === 'modal' ? styles.modal : ''
         ]}>
         <div class={styles.head}>
           {props.modeType !== 'courseware' && (