lex-xin 8 hónapja
szülő
commit
9efc18730d

+ 1 - 0
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;

+ 2 - 1
src/views/courseList/index.module.less

@@ -18,7 +18,7 @@
     margin-right: 30px;
     border-radius: 2px;
     overflow: hidden;
-    box-shadow: 0px 2px 6px 0px rgba(221, 168, 133, 0.67);
+    box-shadow: 0px 2px 6px 0px rgba(168, 168, 168, .7);
     overflow: hidden;
     background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAABaCAMAAAAPdrEwAAABOFBMVEUAAAC0tLTT09PU1NTt7e3////T09P////T09P////T09P////X19f////U1NTU1NTT09PT09PU1NTU1NTV1dXT09PU1NTU1NTV1dXZ2dn+/v7R0dH////////KysrIyMjT09O0tLTU1NS0tLTU1NS0tLTT09PT09PT09PU1NTU1NTU1NTT09O2trbU1NTV1dXV1dXW1tbV1dXW1tbV1dXJycm4uLj///+0tLT///+0tLT////p6em0tLT4+Pj///+2trb///+1tbX///+0tLT////T09P5+fn+/v63t7e8vLz8/Pzl5eXW1tbBwcH39/fw8PDs7Ozb29v7+/vg4ODOzs65ubny8vLJycnp6enGxsbFxcW+vr62trb09PTY2NjLy8vCwsLn5+fi4uLS0tLu7u7Q0NDd3d02Mu/gAAAARHRSTlMAnPwvBfv07ODdw5AbGezmyrirl5B4aT0kDZyclTwsIPj48+Ta1tPS0LGhiIaEcGJgV05FNhMS7++8vKyslZRzc1ZWJRSpe/cAAALfSURBVFjD7djXcuIwGAVg1pTQAiT0Ekiy6b1v7whsA6b3EGAJu+//BstaiWNiCYGlXGTG55KBDzH6j2xjMmJET5ZdDivQFavDtTxLXlsCFFlam7HmiUxl49ftApRxYWkHLe3A0lZa2oqlAXUMGk/fHG9vpCnSk/pZNJ18m6aOWELRN1CmtbMI+jjNJH0Evc2GlhD0Bhu6h6DTjPIq6Pqonb8XXoCWmjKSHTCnpccp5ges6bHCZAW2dBc8JcOWLqjoPFu6oqLLr2bVQxX9h/GElBWmKDCmxSKAyXWYt1GE677rLtLGejsLcuOCQMI7lVFlsMjxJJUeW3bP+OSTskBJqcuSFppAFT4vsqMrYDrVAitazMHV8kBJs8WGzsPmNoRCFSj5fcuA7vJKvcQ8UJKrCNT0WH0mdEpASbFOSdfhyClvzagGsSzR0D14LHTSSho1/mkQaw39dB9u2vThCU8KQj1JtFiVt+z5ONSLmnoSaeszuia/+lfzAaGS09STQDum6SH/cOXX5rY9Xz0Rj6Sqy0YmjUzrbp56ah6kIT2AH8Pe4M5TT83jP6ThsnALmq+eiD8tlIt/G8POWU8FVNMNuXc8rnH4epJpOHg1jIivJ5mWcvLg4ZqMryeZhnOLm1hyPfF0C95R9PAcvp4jcSYNL7UDHEWuJ56GO46FyPXE0+/+/7Lhgs+ffU093yPoDwCAEcki1/Mjgv4BQFUkSeR6/jQh8gn0SQy5np9NqFi+CgSDWE9rwmJCJ/X9yxt9iSdisVji2y+TESNGXjiW6LU7FYkkzQ9JRiIp93XUoodyX12cBg/9qyvOHbvXxmUw4Wxe+45zZdV/GDy9uHJbZqPhk7jTjrTI4ezO+EkY8wUBW4Y6tgCSPvNxtDLnOzOhEw2HAvt7Hj2oZ28/EApHyRtpvjwPBY/8B5Ot9O1u2b2eTds6x8nr4tZtmx6vfWvXN9nCA/9RMHR+aZ5sohEji+YfnN0/51L6d+cAAAAASUVORK5CYII=');
     background-repeat: no-repeat;
@@ -202,6 +202,7 @@
 
 .courseDialog {
   width: 315px;
+  border-radius: 20px !important;
 
   :global {
     .van-dialog__header {

+ 2 - 2
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}>

+ 7 - 11
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) => {