TIANYONG преди 4 месеца
родител
ревизия
ec68a3f162

BIN
src/student/down-load/images/student_bg.png


BIN
src/student/down-load/images/teacher_bg.png


+ 1 - 1
src/student/down-load/index.module.less

@@ -11,7 +11,7 @@
   width: 104px;
   height: 127px;
   margin: 0 auto;
-
+  box-sizing: content-box;
   img {
     width: inherit;
     height: inherit;

BIN
src/views/creation/images/pause2.png


BIN
src/views/creation/images/play2.png


+ 10 - 6
src/views/creation/index-share.tsx

@@ -308,7 +308,11 @@ export default defineComponent({
         shareCall(str)
         setTimeout(() => {
           if(Date.now() - t < 3500){
-            window.location.href = location.origin + '/#/transfer'
+            if (window.location.pathname.includes('teacher')) {
+              window.location.href = location.origin + '/student' + '/#/transfer'
+            } else {
+              window.location.href = location.origin + '/student' + '/#/download'
+            }
           }
         }, 3000)
       }
@@ -423,7 +427,7 @@ export default defineComponent({
           window.location.href = location.origin + '/student' + '/#/transfer'
         } else {
           router.push({
-            path:"/transfer"
+            path:"/download"
           })
         }
       }
@@ -437,8 +441,8 @@ export default defineComponent({
     });
     // 初始化五线谱
     function initStaff(){
-      const src = `/klx-music-score/#/simple-detail?id=${state.musicDetail.musicSheetId}&musicRenderType=${staffState.musicRenderType}&part-index=${staffState.partIndex}&userMusicId=${state.id}`;
-      // const src = `http://192.168.3.68:3000/instrument.html#/simple-detail?id=${state.musicDetail.musicSheetId}&musicRenderType=${staffState.musicRenderType}&part-index=${staffState.partIndex}&userMusicId=${state.id}`;
+      // const src = `/klx-music-score/#/simple-detail?id=${state.musicDetail.musicSheetId}&musicRenderType=${staffState.musicRenderType}&part-index=${staffState.partIndex}&userMusicId=${state.id}`;
+      const src = `http://192.168.3.68:3000/instrument.html#/simple-detail?id=${state.musicDetail.musicSheetId}&musicRenderType=${staffState.musicRenderType}&part-index=${staffState.partIndex}&userMusicId=${state.id}`;
       staffState.staffSrc = src
       window.addEventListener('message', (event) => {
         const { api, height } = event.data;
@@ -621,12 +625,12 @@ export default defineComponent({
               </div>
             </div>
             <Sticky zIndex={1000} offsetTop={state.heightV - 1 + "px"}>
-              <div class={[styles.playSection, plyrState.mediaTimeShow && styles.mediaTimeShow,!plyrState.loaded && styles.notLoaded,isLandscapeScreen.value&&styles.isLandscapeScreen]} id="playMediaSection" onClick={handlerClickPlay}>
+              <div class={[styles.playSection, plyrState.mediaTimeShow && styles.mediaTimeShow,!plyrState.loaded && styles.notLoaded,isLandscapeScreen.value&&styles.isLandscapeScreen, state.playType === 'Audio' && styles.isLandscapeScreen2]} id="playMediaSection" onClick={handlerClickPlay}>
                 {
                   isLandscapeScreen.value &&
                     <div class={styles.backBox}>
                       <img class={styles.backImg} src={backImg} onClick={handlerBack}/>
-                      <div class={styles.musicDetail}>
+                      <div class={[styles.musicDetail, state.playType === 'Audio' && styles.adMusicDetail]}>
                         <div class={styles.musicSheetName}>
                             <NoticeBar
                                 text={state.musicDetail?.musicSheetName}

+ 33 - 2
src/views/creation/index.module.less

@@ -298,7 +298,6 @@
     position: absolute;
     bottom: 0;
     padding-bottom: 12px;
-    background: linear-gradient( 180deg, rgba(0,0,0,0) 0%, rgba(0,0,0,0.7) 100%);
     .staff{
       width: 100%;
       height: 100%;
@@ -985,7 +984,7 @@
               color: #FFFFFF;
               line-height: 20px;
           }
-      }
+        }
       }
       .username{
         margin-top: 2px;
@@ -995,6 +994,16 @@
         line-height: 18px
       }
     }
+    .adMusicDetail {
+      :global{
+        .van-notice-bar{
+            color: #131415 !important;
+        }
+      }
+      .username {
+        color: #333333;
+      }
+    }
   }
   .staffBox{
     height: calc(var(--staffBoxHeight) + 44px);
@@ -1008,4 +1017,26 @@
       }
     }
   }
+  &.isLandscapeScreen2 {
+    :global {
+      .plyr{
+        .plyr__controls{
+          .plyr__controls__item.plyr__control{
+            .icon--pressed{
+                width: 100%;
+                height: 100%;
+                background: url("./images/pause2.png") no-repeat;
+                background-size: 100% 100%;
+            }
+            .icon--not-pressed{
+              width: 100%;
+              height: 100%;
+              background: url("./images/play2.png") no-repeat;
+              background-size: 100% 100%;
+            }
+          }
+        }
+      }
+    }  
+  }
 }

+ 5 - 5
src/views/creation/index.tsx

@@ -424,8 +424,8 @@ export default defineComponent({
     }
     // 初始化五线谱
     function initStaff(){
-      const src = `/klx-music-score/#/simple-detail?id=${state.musicDetail.musicSheetId}&musicRenderType=${staffState.musicRenderType}&part-index=${staffState.partIndex}&userMusicId=${state.id}`;
-      // const src = `http://192.168.3.68:3000/instrument.html#/simple-detail?id=${state.musicDetail.musicSheetId}&musicRenderType=${staffState.musicRenderType}&part-index=${staffState.partIndex}&userMusicId=${state.id}`;
+      // const src = `/klx-music-score/#/simple-detail?id=${state.musicDetail.musicSheetId}&musicRenderType=${staffState.musicRenderType}&part-index=${staffState.partIndex}&userMusicId=${state.id}`;
+      const src = `http://192.168.3.68:3000/instrument.html#/simple-detail?id=${state.musicDetail.musicSheetId}&musicRenderType=${staffState.musicRenderType}&part-index=${staffState.partIndex}&userMusicId=${state.id}`;
       staffState.staffSrc = src
       window.addEventListener('message', (event) => {
         const { api, height } = event.data;
@@ -580,12 +580,12 @@ export default defineComponent({
           演奏:{state.musicDetail?.username}
         </div>        
         <Sticky zIndex={1000} offsetTop={state.heightV - 1 + "px"}>
-          <div class={[styles.playSection, plyrState.mediaTimeShow && styles.mediaTimeShow, isLandscapeScreen.value&&styles.isLandscapeScreen]} id="playMediaSection" onClick={handlerClickPlay}>
+          <div class={[styles.playSection, plyrState.mediaTimeShow && styles.mediaTimeShow, isLandscapeScreen.value&&styles.isLandscapeScreen, state.playType === 'Audio' && styles.isLandscapeScreen2]} id="playMediaSection" onClick={handlerClickPlay}>
             {
               isLandscapeScreen.value &&
                 <div class={styles.backBox}>
                   <img class={[styles.backImg, state.playType === 'Video' && styles.back1Img]} src={state.playType === 'Video' ? back1Img : backImg} onClick={handlerBack}/>
-                  <div class={styles.musicDetail}>
+                  <div class={[styles.musicDetail, state.playType === 'Audio' && styles.adMusicDetail]}>
                     <div class={styles.musicSheetName}>
                         <NoticeBar
                             text={state.musicDetail?.musicSheetName}
@@ -737,7 +737,7 @@ export default defineComponent({
               ))}
             </List>
           ) : (
-            <MEmpty class={styles.mEmpty} tips="暂无点赞记录~" btnStatus={false} />
+            <MEmpty class={styles.mEmpty} tips="暂无内容~" btnStatus={false} />
           )}
         </div>
         {