Merge branch 'hqyDev' of http://git.dayaedu.com/yonge/mteacher into jenkins

src/views/creation/index.less

@@ -155,14 +155,14 @@
                width: 2.8rem;
                height: 0.55rem;
             }
-            .tyBg{
+            .tyBg {
                width: 1.14rem;
-               height: .43rem;
+               height: 0.43rem;
                position: absolute;
                z-index: 1;
                left: 50%;
                top: 50%;
-               transform: translate(-50%, calc(-50% + .30rem));
+               transform: translate(-50%, calc(-50% + 0.3rem));
             }
             .audioBoxBg {
                position: absolute;
@@ -173,17 +173,18 @@
                width: 0.74rem;
                height: 0.75rem;
                background: url("./img/audio-bg.png") no-repeat center;
-               background-size: contain;
+               background-size: 100% 100%;
 
                .audioPan {
                   position: absolute;
-                  left: 0.08rem;
-                  top: 0.06rem;
+                  left: 50%;
+                  top: 50%;
+                  transform: translate(-50%, -50%);
                   z-index: 8;
                   width: 0.59rem;
                   height: 0.6rem;
                   background: url("./img/audio-pan.png") no-repeat center;
-                  background-size: contain;
+                  background-size: 100% 100%;
                   display: flex;
                   align-items: center;
                   justify-content: center;
@@ -198,8 +199,9 @@
                .audioImg {
                   width: 0.32rem;
                   height: 0.32rem;
-                  border-radius: 50%;
-                  overflow: hidden;
+                  /deep/ img {
+                     border-radius: 50%;
+                  }
                }
 
                .audioPoint {
@@ -269,7 +271,7 @@
             display: flex;
             font-weight: 500;
             font-size: 0.16rem;
-            color: #60FFF5;
+            color: #60fff5;
             line-height: 0.2rem;
             z-index: 10;
             text-shadow: 0 0.01rem 0.01rem rgba(0, 0, 0, 0.5);
@@ -316,10 +318,10 @@
             padding-bottom: 0.12rem;
             box-sizing: border-box;
             .staff {
+               padding-right: 0.1rem;
+               box-sizing: border-box;
                width: 100%;
                height: 100%;
-               box-sizing: border-box;
-               padding-left: 0.1rem;
             }
             .mask {
                position: absolute;
@@ -357,7 +359,7 @@
                   .icon--pressed {
                      width: 100%;
                      height: 100%;
-                     background: url("./img/pause1.png") no-repeat;
+                     background: url("./img/pause2.png") no-repeat;
                      background-size: 100% 100%;
                      use {
                         display: none;
@@ -366,7 +368,7 @@
                   .icon--not-pressed {
                      width: 100%;
                      height: 100%;
-                     background: url("./img/play1.png") no-repeat;
+                     background: url("./img/play2.png") no-repeat;
                      background-size: 100% 100%;
                      use {
                         display: none;
@@ -387,6 +389,7 @@
                      height: 0.12rem;
                      margin-top: -0.04rem;
                      box-shadow: initial;
+                     background-color: #2DC7AA;
                   }
                   .plyr__progress__buffer {
                      height: 0.04rem;
@@ -398,7 +401,7 @@
                .plyr__controls__item.plyr__time {
                   font-weight: 500;
                   font-size: 0.14rem;
-                  color: #ffffff;
+                  color: #131415;
                   display: initial;
                   &.plyr__time--current {
                      margin-left: 0.09rem;
@@ -406,21 +409,57 @@
                }
             }
          }
+         .audioBox{
+            .audioBoxBg,.audioVisualizer{
+               transform: translate(-50%, -50%) scale(1.4);
+            }
+         }
+         &.videoType {
+            &::before {
+               position: absolute;
+               left: 0;
+               top: 0;
+               width: 100%;
+               height: 1.15rem;
+               content: "";
+               background: linear-gradient(0, rgba(255, 255, 255, 0) 0%, rgba(3, 3, 3, 0.2) 45%, rgba(0, 0, 0, 0.7) 100%);
+               z-index: 2;
+            }
+            /deep/ .plyr .plyr__controls {
+               .plyr__controls__item.plyr__time {
+                  color: #ffffff;
+               }
+               .plyr__controls__item.plyr__control {
+                  .icon--pressed {
+                     background: url("./img/pause1.png") no-repeat;
+                     background-size: 100% 100%;
+                  }
+                  .icon--not-pressed {
+                     background: url("./img/play1.png") no-repeat;
+                     background-size: 100% 100%;
+                  }
+               }
+               .plyr__controls__item.plyr__progress__container{
+                  input[type="range"]::-webkit-slider-thumb {
+                     background-color: #ffffff;
+                  }
+               }
+            }
+         }
          .backBox {
             position: absolute;
-            left: 0.3rem;
+            left: 0.2rem;
             top: 0.2rem;
             display: flex;
             z-index: 10;
             .backImg {
-               width: 0.32rem;
-               height: 0.32rem;
+               width: 0.21rem;
+               height: 0.21rem;
             }
             .musicDetail {
-               margin-left: 0.2rem;
+               margin-left: 0.12rem;
                .musicSheetName {
                   width: 3rem;
-                  margin-top: 0.04rem;
                   .van-notice-bar {
                      padding: 0;
                      height: 0.2rem;
@@ -682,7 +721,7 @@
       justify-content: center;
       align-items: center;
       /deep/.icon_nodata {
-         margin-top: 0;
+         margin-top: -0.6rem;
       }
       /deep/.msg {
          color: #fff;

src/views/creation/index.vue

@@ -32,7 +32,7 @@
             >
                <!-- 横屏 -->
                <div v-if="isLandscapeScreen" class="backBox">
-                  <img class="backImg" :src="require('./img/back.png')" @click="handlerBack" />
+                  <img class="backImg" :src="state.playType === 'Video'?require('./img/back1.png'):require('./img/back.png')" @click="handlerBack" />
                   <div class="musicDetail">
                      <div class="musicSheetName">
                         <van-notice-bar :text="state.musicDetail.musicSheetName" background="none" />