Merge branch 'iteration-20241105-courseware'

src/tenant/music/coursewarePlay/component/courseware-tips/index.module.less

@@ -57,6 +57,7 @@
     margin-bottom: 16px;
     font-size: 14px;
     line-height: 1.6;
+    color: #333;
 
     &::-webkit-scrollbar {
       display: none;

src/tenant/music/coursewarePlay/component/courseware-type/index.module.less

@@ -16,6 +16,7 @@
   flex-shrink: 0;
   font-size: 16px;
   font-weight: 500;
+  box-sizing: border-box;
 
   img {
     width: 20px;
@@ -23,7 +24,8 @@
     margin-right: 6px;
   }
   span {
-    line-height: 20px;
+    line-height: 1;
+    padding-top: 1px;
   }
 }
 
@@ -126,7 +128,7 @@
     &::before {
       content: '';
       position: absolute;
-      left: 5px;
+      left: 0px;
       width: 5px;
       height: 100%;
       background: linear-gradient(270deg, rgba(0, 0, 0, 0.25) 0%, rgba(0, 0, 0, 0.03) 100%);

src/tenant/music/coursewarePlay/component/o-guide/index.module.less

@@ -4,10 +4,14 @@
   :global {
     .van-tabs__nav {
       background-color: transparent;
+      --van-tabs-bottom-bar-width: 16px;
       .van-tab {
-        color: #fff;
+        color: rgba(255,255,255,.5);
         font-size: 16px;
       }
+      .van-tab--active {
+        color: #fff;
+      }
     }
     .van-tab__panel {
       height: calc(100vh - var(--van-tabs-line-height));
@@ -20,6 +24,9 @@
     }
     .van-tabs__line{
       bottom: .5rem;
+      background: linear-gradient( 135deg, #FF8BB3 0%, #FF3761 100%);
+      width: 16px;
+      height: 4px;
     }
   }
   .content {

src/tenant/music/coursewarePlay/component/play-loading/index.module.less

@@ -13,7 +13,7 @@
   div {
     width: 2px;
     height: 10px;
-    background: linear-gradient(135deg, #FF6E8E; 0%, #ff6e8e 100%);
+    background: linear-gradient(135deg, #FF6486; 0%, #FF6486 100%);
     transform-origin: bottom;
     border-radius: 5px;
     margin: 0 1px 0;

src/tenant/music/coursewarePlay/component/point.module.less

@@ -23,7 +23,8 @@
     margin-right: 6px;
   }
   span {
-    line-height: 20px;
+    line-height: 1;
+    padding-top: 1px;
   }
 }
 
@@ -150,7 +151,8 @@
 }
 
 .itemActive {
-  background: rgba(255, 255, 225, 0.08);
+  background: rgba(255, 110, 142, 0.15);
+  
   color: #ff6e8e;
 
   :global {

src/tenant/music/coursewarePlay/component/points.tsx

@@ -65,7 +65,7 @@ export default defineComponent({
       <div class={styles.container}>
         <div class={styles.pointHead}>
           <img src={iconMulv} />
-          <span>课程目录</span>
+          <span>知识点目录</span>
         </div>
         <div class={styles.content}>
           <Collapse

src/tenant/music/coursewarePlay/component/tips/index.module.less

@@ -1,14 +1,12 @@
 
 .courseDialog {
   padding: 20px !important;
-  max-width: 310px !important;
+  max-width: 295px !important;
   min-width: 295px !important;
-  // background: url('./top-bg.png') no-repeat top center #fff !important;
-  // background-size: contain !important;
-  overflow: hidden;
   border-radius: 20px !important;
   overflow: hidden;
   background-color: #fff;
+  box-sizing: border-box;
 
   &::before {
     content: '';
@@ -68,6 +66,10 @@
 
     :global {
       --van-button-default-height: 40px;
+      .van-button--primary {
+        background: #FE2451 !important;
+        border-color: #FE2451 !important;
+      }
     }
   }
 }

src/tenant/music/coursewarePlay/component/tools/pen.module.less

@@ -4,7 +4,7 @@
     right: 0;
     bottom: 0;
     top: 0;
-    z-index: 11;
+    z-index: 9999;
 }
 .open{
     display: block;
@@ -23,7 +23,7 @@
 }
 .rightItem{
     position: absolute;
-    right: 15Px;
+    right: 8Px;
     bottom: 0;
     bottom: constant(safe-area-inset-bottom);
     bottom: env(safe-area-inset-bottom);

src/tenant/music/coursewarePlay/component/video.module.less

@@ -65,7 +65,7 @@
     flex-shrink: 0;
     color: #fff;
     font-size: 14px;
-    font-weight: 600;
+    font-weight: 400;
     padding: 4px 0 4px 0;
     width: 96px;
   }

src/tenant/music/coursewarePlay/index.module.less

@@ -127,8 +127,8 @@
     padding: 0 10px;
 
     img {
-      width: 22px;
-      height: 22px;
+      width: 24px;
+      height: 24px;
       display: block;
     }
   }
@@ -340,7 +340,8 @@
 }
 
 .overlayClass {
-  --van-overlay-background: transparent;
+  // --van-overlay-background: transparent;
+  --van-overlay-background-color: transparent;
 }
 
 :global {
@@ -398,6 +399,10 @@
   display: flex;
   justify-content: center;
   align-items: center;
+  & > div {
+    width: 100%;
+    height: 100%;
+  }
 }
 
 .playRecordTime {

src/tenant/music/coursewarePlay/index.tsx

@@ -47,7 +47,7 @@ import Pen from './component/tools/pen'
 // import VideoItem from './component/video-item';
 import VideoPlay from './component/video-play'
 import { musicBuy } from '../music'
-import { penShow, whitePenShow } from '@/components/globalTools/globalTools'
+import { isPlay, penShow, toolOpen, whitePenShow } from '@/components/globalTools/globalTools'
 import CoursewareTips from './component/courseware-tips'
 import GlobalTools from '@/components/globalTools'
 import CoursewareType from './component/courseware-type'
@@ -70,15 +70,6 @@ export default defineComponent({
         }
       }
     )
-    // 白板的批注打开时暂停播放
-    watch(
-      () => [whitePenShow.value, penShow.value],
-      () => {
-        if (whitePenShow.value || penShow.value) {
-          handleStop()
-        }
-      }
-    )
     /** 设置播放容器 16:9 */
     const parentContainer = reactive({
       width: '100vw'
@@ -391,16 +382,16 @@ export default defineComponent({
       }
     }
 
-    const onTitleTip = (type: "phaseGoals" | "checkItem", text: string) => {
-      handleStop()
-      popupData.pointOpen = true
-      popupData.pointContent = text
-      if(type === "checkItem") {
-        popupData.pointTitle = '检查事项'
-      } else if(type === "phaseGoals") {
-        popupData.pointTitle = '阶段目标'
+      const onTitleTip = (type: "phaseGoals" | "checkItem", text: string) => {
+        handleStop()
+        popupData.pointOpen = true
+        popupData.pointContent = text
+        if(type === "checkItem") {
+          popupData.pointTitle = '检查事项'
+        } else if(type === "phaseGoals") {
+          popupData.pointTitle = '阶段目标'
+        }
       }
-    }
 
 
     // ifram事件处理
@@ -825,6 +816,28 @@ export default defineComponent({
       }
     }
 
+     // 白板的批注打开时暂停播放
+     watch(
+      () => [whitePenShow.value, penShow.value],
+      () => {
+        if (whitePenShow.value || penShow.value) {
+          handleStop()
+        }
+      }
+    )
+    // 是否收起
+    watch(
+      () => activeData.model,
+      () => {
+        if (activeData.model) {
+            isPlay.value = false
+        } else {
+            isPlay.value = true
+            toolOpen.value = false
+        }
+      }
+    )
+
     /** 关闭教学工具 */
     const closeStudyTool = () => {
       studyData.type = 'init'