黄琪勇 1 hónapja
szülő
commit
f4c47dbf25

+ 1 - 1
src/views/components/element/cloudCoachElement/cloudCoachList/cloudCoachList.vue

@@ -178,7 +178,7 @@ const tabData =
     ? [
         {
           label: "共享资源",
-          value: 2
+          value: 1
         }
       ]
     : [

+ 3 - 3
src/views/components/element/enjoyElement/enjoyPlayer.vue

@@ -413,7 +413,7 @@ const handleMousedownPlayBar = () => {
           width: 100%;
           background: #dcdcdc;
           box-shadow: inset 0px 3px 4px 0px #a9a9a9;
-          border-radius: 7px;
+          border-radius: 12px;
           border: 3px solid rgba(255, 255, 255, 0.5);
           .loaded {
             position: absolute;
@@ -424,7 +424,7 @@ const handleMousedownPlayBar = () => {
             height: 14px;
             //transition: all 0.5s ease; //这个和ppt动画效果冲突,见禅道12278
             will-change: width;
-            border-radius: 7px;
+            border-radius: 12px;
           }
           .played {
             position: absolute;
@@ -434,7 +434,7 @@ const handleMousedownPlayBar = () => {
             height: 14px;
             will-change: width;
             background: linear-gradient(270deg, #97d1fd 0%, #0d93ff 100%);
-            border-radius: 7px;
+            border-radius: 12px;
 
             .thumb {
               position: absolute;

+ 14 - 3
src/views/components/element/enjoyElement/resourcesList/resourcesList.vue

@@ -139,8 +139,8 @@
     </div>
     <Modal
       :contentStyle="{
-        width: '800px',
-        height: '600px',
+        width: previewData.type === 'IMG' ? '860px' : '800px',
+        height: previewData.type === 'IMG' ? '700px' : '500px',
         boxShadow: '0px 2px 10px 0px rgba(0,0,0,0.08)',
         borderRadius: '12px',
         padding: '0'
@@ -151,13 +151,14 @@
         <div class="preHeadCon">
           <div class="headTitle">{{ previewData.name }}</div>
           <div class="headright">
-            <img @click="previewData.previewVisible = true" class="closeBtn" src="../../cloudCoachElement/cloudCoachList/imgs/close.png" alt="" />
+            <img @click="previewData.previewVisible = false" class="closeBtn" src="../../cloudCoachElement/cloudCoachList/imgs/close.png" alt="" />
           </div>
         </div>
         <div class="preCon">
           <img v-if="previewData.type === 'IMG'" class="coverImg" :src="previewData.content" />
           <template v-else-if="previewData.type === 'SONG'">
             <img class="coverImg" :src="previewData.coverImg" />
+            <div class="controller-mask"></div>
             <AudioPlayer class="audioPlayer" :src="previewData.content" :loop="false" />
           </template>
           <VideoPlayer v-else-if="previewData.type === 'VIDEO'" class="videoPlayer" :src="previewData.content" :width="100" :height="100" />
@@ -689,6 +690,7 @@ const highlightedText = (text: string, query: string) => {
               display: flex;
               flex-direction: column;
               overflow: hidden;
+              cursor: pointer;
               &:nth-last-child(-n + 3) {
                 margin-bottom: 0;
               }
@@ -833,11 +835,20 @@ const highlightedText = (text: string, query: string) => {
       height: 100%;
       object-fit: contain;
     }
+    .controller-mask {
+      background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAADGCAYAAAAT+OqFAAAAdklEQVQoz42QQQ7AIAgEF/T/D+kbq/RWAlnQyyazA4aoAB4FsBSA/bFjuF1EOL7VbrIrBuusmrt4ZZORfb6ehbWdnRHEIiITaEUKa5EJqUakRSaEYBJSCY2dEstQY7AuxahwXFrvZmWl2rh4JZ07z9dLtesfNj5q0FU3A5ObbwAAAABJRU5ErkJggg==)
+        repeat-x bottom;
+      height: 98px;
+      width: 100%;
+      position: absolute;
+      bottom: 0;
+    }
     .audioPlayer {
       width: 100%;
       position: absolute;
       left: 0;
       bottom: 0;
+      background: transparent;
     }
     .videoPlayer {
       width: 100% !important;