Merge branch 'iteration-20240520' into jenkins

src/components/card-preview/video-modal/index.module.less

@@ -40,7 +40,7 @@
 
 
   .controls {
-    border-radius: 0 0 16px 16px !important;
+    // border-radius: 0 0 16px 16px !important;
     position: absolute;
     bottom: 0;
     left: 0;
@@ -210,8 +210,8 @@
 .sliderPopup {
   position: absolute;
   z-index: 9999;
-  left: -13px;
-  bottom: 35px;
+  left: -8px;
+  bottom: 55px;
   display: flex;
   align-items: center;
   flex-direction: column;
@@ -245,11 +245,11 @@
     background: #FFFFFF;
     box-shadow: 0 2px 4px 0px rgba(102, 102, 102, 0.77);
     border-radius: 14px;
-    font-size: 14Px;
+    font-size: 13Px;
     font-weight: 500;
     height: 22Px;
     color: #198CFE;
-    min-width: 36px;
+    min-width: 42px;
     text-align: center;
     vertical-align: text-bottom;
 

src/components/card-preview/video-modal/index.tsx

@@ -280,6 +280,8 @@ export default defineComponent({
                   onClick={(e: any) => {
                     e.stopPropagation();
                     videoFroms.speedControl = !videoFroms.speedControl;
+                    clearTimeout(videoFroms.timer);
+                    videoFroms.showBar = true;
                   }}>
                   <img src={iconSpeed} />
 
@@ -315,6 +317,7 @@ export default defineComponent({
                         vertical
                         tooltip={false}
                         onUpdate:value={(val: number) => {
+                          setModelOpen();
                           videoFroms.defaultSpeed = val;
                           if (videoItem.value) {
                             videoItem.value.playbackRate(

src/views/natural-resources/components/share-resources/index.tsx

@@ -155,7 +155,11 @@ export default defineComponent({
         />
 
         {/* 弹窗查看 */}
-        <CardPreview v-model:show={state.show} item={state.item} />
+        <CardPreview
+          v-model:show={state.show}
+          item={state.item}
+          isDownload={false}
+        />
 
         {/* 添加自定义教材 */}
         <NModal