Merge branch 'iteration-20241028-member' into jenkins

src/components/TheVip/index.module.less

@@ -5,6 +5,7 @@
   background: url('./top-bg.png') no-repeat top center #fff !important;
   background-size: contain !important;
   overflow: hidden;
+  border-radius: 20px !important;
 
   .iconClose {
     width: 18px;

src/views/courseList/index.module.less

@@ -202,6 +202,7 @@
 
 .courseDialog {
   width: 315px;
+  border-radius: 20px !important;
 
   :global {
     .van-dialog__header {

src/views/courseList/index.tsx

@@ -426,7 +426,7 @@ export default defineComponent({
               <Button round block type="primary" onClick={() => {
                 handleShowVip(route.query.id as string, "LESSON")
               }}>
-                开通会员即可查看所有课件
+                开通会员即可查看课件
               </Button>
             </div>
           </OSticky>
@@ -442,7 +442,7 @@ export default defineComponent({
           <div class={styles.title}>下载提醒</div>
 
           <div class={styles.content}>
-            您尚未下载课件内容，为了更加流畅的学习体验，推荐您下载后观看课件。
+            您尚未下载课件内容，为了更加流畅的学习体验，推荐您下载后观看。
           </div>
 
           <div class={styles.popupBtnGroup}>

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

@@ -168,7 +168,6 @@ export default defineComponent({
           // 检测是否录屏
           handleLimitScreenRecord();
         }
-        handleExerciseCompleted();
       }
     };
 
@@ -300,6 +299,8 @@ export default defineComponent({
         }
       }
 
+      handleExerciseCompleted();
+
       if (data.disableScreenRecordingFlag === '1') {
         //禁止录屏 ios
         listenerMessage('setVideoPlayer', result => {
@@ -390,13 +391,6 @@ export default defineComponent({
       ) {
         let isLastIndex = false;
         let itemIndex = 0;
-        // console.log(data.isPlayBaseStatus, data.isPlayAll, data.trainings);
-        // if (data.isPlayBaseStatus) {
-        //   itemIndex = data.trainings.findIndex(
-        //     (n: any) => n.id == data.videoData?.id
-        //   );
-        //   isLastIndex = itemIndex === data.trainings.length - 1;
-        // } else {
         let i = -1;
         let status = true;
         data.trainings.forEach((item: any, index: number) => {
@@ -426,7 +420,7 @@ export default defineComponent({
         }
         data.itemList = [nextItem];
         data.videoData = nextItem;
-        if(data.videoData.useStatus === "UNLOCK") {
+        if(data.videoData.useStatus === "LOCK") {
           handleShowVip(data.videoData.lessonCoursewareId, "LESSON", "exercise")
         } else {
           handleExerciseCompleted();
@@ -448,8 +442,8 @@ export default defineComponent({
 
     const reloadPage = async () => {
       if(state.vipShow) return
-      const trainings = await getTrainingRecord(data.videoData.lessonCoursewareId);
-      setRecord(trainings, data.videoData.lessonCoursewareId);
+      const trainings = await getTrainingRecord(data.videoData.id);
+      setRecord(trainings, data.videoData.id);
       // 是否解锁
       if (state.platformType === 'STUDENT') {
         if(data.videoData?.useStatus === "LOCK") {
@@ -466,6 +460,8 @@ export default defineComponent({
           return;
         }
       }
+
+      handleExerciseCompleted();
     }
 
     watch(pageVisibility, (value: any) => {