Merge branch 'iteration-20241018-courseware' into jenkins-main

src/views/coursewarePlay/index.module.less

@@ -414,6 +414,7 @@
   color: #fff;
 
   .timeLoad {
+    flex-shrink: 0;
     width: 4px;
     height: 4px;
     background: #ff4e19;

src/views/coursewarePlay/index.tsx

@@ -1248,9 +1248,9 @@ export default defineComponent({
           <div class={styles.backBtn}>
             <Icon name={iconBack}  onClick={() => goback()} />
             <div class={styles.titleSection}>
-              <div class={styles.title}  onClick={() => goback()}>{popupData.tabName}</div>
+              <div class={styles.title}>{popupData.tabName}</div>
                 <div class={styles.titleContent}>
-                  <p onClick={() => goback()}>{data.itemList[popupData.activeIndex]?.name}</p>
+                  <p>{data.itemList[popupData.activeIndex]?.name}</p>
                   {data.detail?.lessonTargetDesc ? <span onClick={() => onTitleTip('phaseGoals', data.detail?.lessonTargetDesc)}>阶段目标</span>: ""}
                   {data.itemList[popupData.activeIndex]?.checkItem ? <span onClick={() => onTitleTip('checkItem', data.itemList[popupData.activeIndex]?.checkItem)}>检查事项</span> : ""}
                 </div>

src/views/exercise-after-class/index.module.less

@@ -74,11 +74,11 @@
       margin-left: 6px;
       font-size: 11px;
       color: #ffffff;
-      line-height: 1.3;
+      line-height: 1.4;
       background: rgba(0, 0, 0, 0.1);
-      border-radius: 10px;
+      border-radius: 15px;
       border: 1px solid rgba(255, 255, 255, 0.7);
-      padding: 2px 8px;
+      padding: 3px 8px 2px;
       box-sizing: content-box;
     }
   }
@@ -126,12 +126,14 @@
   margin-top: 12px;
 
   .timeLoad {
+    flex-shrink: 0;
     width: 4px;
     height: 4px;
     background: #ff4e19;
-    // border: 0.5px solid #ffffff;
+    border: 0.5px solid #ffffff;
     border-radius: 50%;
     margin-right: 6px;
+    box-sizing: content-box;
     // animation: loadFade 1s ease-in-out infinite;
   }
 }
@@ -289,7 +291,7 @@
     flex-shrink: 0;
     color: #fff;
     font-size: 14px;
-    font-weight: 400;
+    font-weight: 600;
     padding: 4px 0 4px 0;
     width: 96px;
   }

src/views/exercise-after-class/index.tsx

@@ -101,6 +101,7 @@ export default defineComponent({
       item: null as any
     })
     const onTitleTip = (type: "phaseGoals" | "checkItem", text: string) => {
+      console.log(type, text, 'text')
       handleStopVideo()
       popupData.pointOpen = true
       popupData.pointContent = text
@@ -173,9 +174,10 @@ export default defineComponent({
             autoplay: state.user.data?.vipMember ? true : false //自动播放
           }
         })
-        console.log(data.trainings, 'trainings')
+        
         data.itemList = data.trainings.filter((n: any) => n.materialId == route.query.materialId)
         data.videoData = data.itemList[0]
+        console.log(data.trainings, 'trainings', data.itemList)
         handleExerciseCompleted()
       }
     }
@@ -433,7 +435,7 @@ export default defineComponent({
                 <div class={styles.backBtn}>
                   <Icon name={iconBack}  onClick={() => goback()} />
                   <div class={styles.titleSection}>
-                    <div class={styles.title}  onClick={() => goback()}>{popupData.tabName}</div>
+                    <div class={styles.title}>{popupData.tabName}</div>
                       <div class={styles.titleContent}>
                         <p>{data.itemList[0]?.materialName}</p>
                         {/* {data.detail?.lessonTargetDesc ? <span onClick={() => onTitleTip('phaseGoals', data.detail?.lessonTargetDesc)}>阶段目标</span>: ""} */}
@@ -487,7 +489,7 @@ export default defineComponent({
           round
           style={{ background: 'transparent !important' }}
           v-model:show={popupData.pointOpen}>
-          <CoursewareTips onClose={() => {
+          <CoursewareTips show onClose={() => {
             popupData.pointOpen = false
           }} content={popupData.pointContent} titleName={popupData.pointTitle} />
         </Popup>