Merge branch 'hqyDev' of http://git.dayaedu.com/huangqiyong/pptList into test-online

src/hooks/useCreateElement.ts

@@ -354,7 +354,7 @@ export default () => {
         }
       ],
       id: nanoid(10),
-      width: 670,
+      width: 706,
       height: 102,
       rotate: 0,
       left: 629,

src/views/Editor/CanvasTool/index.vue

@@ -402,9 +402,19 @@ function handleResources(item: Record<string, any>) {
           title: item.name,
           src: item.content
         })
+        ElMessage({
+          showClose: true,
+          message: "已添加到音频列表!",
+          type: "success"
+        })
       }
     } else {
       createEnjoyElement(item.id, item.name, item.content)
+      ElMessage({
+        showClose: true,
+        message: "已添加到音频列表!",
+        type: "success"
+      })
     }
   } else if (item.type === "IMG") {
     createImageElement(item.content)

src/views/components/element/enjoyElement/enjoyPlayer.vue

@@ -339,8 +339,8 @@ const handleMousedownPlayBar = () => {
       inset 0px -6px 6px 0px rgba(0, 0, 0, 0.08);
     border-radius: 112px;
     outline: 2px solid rgba(0, 0, 0, 0.03);
-    padding: 16px 21px;
-    width: 670px;
+    padding: 16px 24px;
+    width: 706px;
     display: flex;
     align-items: center;
     position: relative;
@@ -349,7 +349,7 @@ const handleMousedownPlayBar = () => {
       position: absolute;
       width: 44px;
       height: 12px;
-      right: 47px;
+      right: 36px;
       top: 7px;
     }
     .operateBtn {
@@ -365,7 +365,7 @@ const handleMousedownPlayBar = () => {
       }
     }
     .operateMidCon {
-      margin: 0 21px;
+      margin: 0 30px;
       flex-grow: 1;
       .titleCon {
         display: flex;
@@ -426,9 +426,9 @@ const handleMousedownPlayBar = () => {
             .thumb {
               position: absolute;
               top: -12px;
-              right: -26px;
+              right: -20px;
               cursor: pointer;
-              width: 52px;
+              width: 38px;
               height: 38px;
               background: url("./imgs/td.png") no-repeat;
               background-size: 100% 100%;
@@ -446,7 +446,7 @@ const handleMousedownPlayBar = () => {
         background-size: 100% 100%;
         width: 56px;
         height: 56px;
-        margin-right: 14px;
+        margin-right: 20px;
         cursor: pointer;
       }
       .nextBtn {
@@ -454,7 +454,7 @@ const handleMousedownPlayBar = () => {
         background-size: 100% 100%;
         width: 56px;
         height: 56px;
-        margin-right: 14px;
+        margin-right: 20px;
         cursor: pointer;
       }
       .listBtn {
@@ -468,7 +468,7 @@ const handleMousedownPlayBar = () => {
   }
   .enjoyPlayerList {
     width: 100%;
-    height: 520px;
+    height: 524px;
     position: absolute;
     left: 0;
     bottom: 51px;

src/views/components/element/enjoyElement/resourcesList/resourcesList.vue

@@ -661,8 +661,8 @@ const highlightedText = (text: string, query: string) => {
                 }
                 .jxImg {
                   position: absolute;
-                  left: 0;
-                  top: 0;
+                  left: -1px;
+                  top: -1px;
                   width: 50px;
                   height: 27px;
                 }