Merge remote-tracking branch 'yx/20250821-hz' into 104-master-0626

pages/study/courseStudy.vue

@@ -661,6 +661,7 @@ export default {
 
     // 没有写播放时间
     onPlayerPlay() {
+      console.log(`start play`)
       this.playerBoxShow = false;
       this.isAppendTime = true;
       this.appendStudyTime();//启动追加学习时长
@@ -849,7 +850,6 @@ export default {
               $this.curContent = c;
             }
           })
-
         }
         this.contentList = rs.result.contents;//内容列表
         this.totalContent = rs.result.contents.length;//一共有向个可以播放的内容
@@ -1540,16 +1540,20 @@ export default {
       this.appendStartTime = new Date();
       //console.log('开始追加学习时长',this.isAppendTime);
       if (this.studyId == '') {
+        console.warn(`this.studyId == ''`, this.studyId)
         return;
       }
       if (!this.curContent.id) {
+        console.warn(`this.curContent.id`, this.studyId)
         return;
       }
       //清除之前的
       if (this.appendHandle != null) {
+        console.warn(`timer clear`)
         window.clearTimeout(this.appendHandle);
       }
       if (!this.isAppendTime) {
+        console.warn(`this.isAppendTime` , false)
         return;
       }
       //启动下次追加学习时长

pages/study/examDetail.vue

@@ -5,7 +5,7 @@
     <page-title :showBack="true">查看我的答卷</page-title>
     <view style="background-color: #FFFFFF;">
       <u-cell-group>
-				<u-cell title="答卷时间" :value="lastTime"></u-cell>
+        <u-cell title="答卷时间" :value="answerSurveyTime"></u-cell>
         <u-cell title="答卷用时" :value="testDuration+'秒'"></u-cell>
         <u-cell title="本次得分" :value="score"></u-cell>
       </u-cell-group>
@@ -18,7 +18,8 @@
         <view>[{{ getTypeName(curItem.type) }}]{{ curItem.content }}</view>
         <view class="qimg" v-if="curItem.images"><img class="qimg-fit" :src="imageBaseUrl+curItem.images"/></view>
       </view>
-            <view v-for="(opt,optIdx) in curItem.options" :key="optIdx" class="qitem-opt" :class="{'qitem-opt-user':userOptIdxs.indexOf(optIdx)>-1}">
+      <view v-for="(opt,optIdx) in curItem.options" :key="optIdx" class="qitem-opt"
+            :class="{'qitem-opt-user':userOptIdxs.indexOf(optIdx)>-1}">
         <view>
           <view>{{ toLetter(optIdx + 1) }}, {{ opt.content }}</view>
           <view v-if="opt.images" class="qimg">
@@ -26,8 +27,10 @@
           </view>
         </view>
         <view>
-					<text v-if="userOptIdxs.indexOf(optIdx)>-1 && correctOptIdxs.indexOf(optIdx)>-1" style="color: #00aa00; ">√</text>
+          <text v-if="userOptIdxs.indexOf(optIdx)>-1 && correctOptIdxs.indexOf(optIdx)>-1" style="color: #00aa00; ">√
-					<text v-if="userOptIdxs.indexOf(optIdx)>-1 && correctOptIdxs.indexOf(optIdx)==-1" style="color: #ff0000; ">×</text>
+          </text>
+          <text v-if="userOptIdxs.indexOf(optIdx)>-1 && correctOptIdxs.indexOf(optIdx)==-1" style="color: #ff0000; ">×
+          </text>
         </view>
       </view>
     </view>
@@ -56,7 +59,8 @@
     <view class="analysis-con">联言判断就是断定集中事物情况同时存在的判断,因此该判断属于联言判断,答案为A</view> -->
     <view class="bottom-btns">
       <u-button type="info" text="上一题" @click="prevSub" class="next" :disabled="this.curIndex<1"></u-button>
-            <u-button type="info" text="下一题" @click="nextSub" class="next" :disabled="this.curIndex>=(this.total-1)"></u-button>
+      <u-button type="info" text="下一题" @click="nextSub" class="next"
+                :disabled="this.curIndex>=(this.total-1)"></u-button>
     </view>
   </view>
 </template>
@@ -65,6 +69,7 @@
 import config from '@/config/index.js'
 import apiCourseStudy from '@/api/modules/courseStudy.js'
 import {formatDate, getQuestionType, correctJudgment, numberToLetter} from '@/utils/tools.js';
+
 export default {
   data() {
     return {
@@ -90,6 +95,14 @@
       userOptIdxs: [],//用户的答案
     }
   },
+  computed: {
+    answerSurveyTime() {
+      console.log(`answer time: ` , this.lastTime)
+      if (!this.lastTime.length) return "Error Date"
+      const [y, m, d, h, min, s] = this.lastTime
+      return `${y}年${m}月${d}日 ${h}:${min}:${s}`
+    }
+  },
   onLoad(options) {
     //如果id不存在，应该返回错误页面
     this.recordId = options.id;//当前考试记录的id
@@ -179,11 +192,14 @@
   display: flex;
   justify-content: space-around;
 }
+
 .qitem {
   padding: 20upx 40upx;
+
   .qitem-content {
     padding: 20upx 0upx;
   }
+
   .qitem-opt {
     margin-bottom: 20upx;
     min-height: 50upx;
@@ -193,25 +209,31 @@
     justify-content: space-between;
     padding: 30upx 20upx;
   }
+
   .qitem-opt-user {
     background-color: #fff3e5;
   }
+
   .qitem-opt-correct {
     background-color: #5BA2FC;
     color: #FFFFFF;
   }
+
   .qitem-opt-wrong {
     background-color: #EF826B;
     color: #FFFFFF;
   }
 }
+
 .ed-top {
   display: flex;
+
   .preface {
     color: #D5D5D5;
     margin-left: 16px;
     margin-top: 19px;
   }
+
   .mold {
     font-size: 12px;
     color: #C1C1C1;
@@ -219,12 +241,14 @@
     margin-left: 5px;
   }
 }
+
 .ed-center {
   .topic {
     color: #2E2E2E;
     margin-left: 16px;
     margin-top: 10px;
   }
+
   .topic-center {
     &-1 {
       width: 344px;
@@ -235,22 +259,26 @@
       margin-top: 10px;
       display: flex;
       justify-content: space-between;
+
       .topic_left {
         line-height: 64px;
         margin-left: 16px;
         color: #FFFFFF;
         display: flex;
+
         .liany {
           font-size: 12px;
           margin-left: 5px;
         }
       }
+
       .topic_right {
         color: #FFFFFF;
         line-height: 64px;
         margin-right: 13px;
       }
     }
+
     &-2 {
       width: 344px;
       height: 64px;
@@ -260,22 +288,26 @@
       margin-top: 10px;
       display: flex;
       justify-content: space-between;
+
       .topic_left {
         line-height: 64px;
         margin-left: 16px;
         color: #FFFFFF;
         display: flex;
+
         .liany {
           font-size: 12px;
           margin-left: 5px;
         }
       }
+
       .topic_right {
         color: #FFFFFF;
         line-height: 64px;
         margin-right: 13px;
       }
     }
+
     &-3 {
       width: 344px;
       height: 64px;
@@ -285,22 +317,26 @@
       margin-top: 10px;
       display: flex;
       justify-content: space-between;
+
       .topic_left {
         line-height: 64px;
         margin-left: 16px;
         color: #000000;
         display: flex;
+
         .liany {
           font-size: 12px;
           margin-left: 5px;
         }
       }
+
       .topic_right {
         color: #000000;
         line-height: 64px;
         margin-right: 13px;
       }
     }
+
     &-4 {
       width: 344px;
       height: 64px;
@@ -310,16 +346,19 @@
       margin-top: 10px;
       display: flex;
       justify-content: space-between;
+
       .topic_left {
         line-height: 64px;
         margin-left: 16px;
         color: #000000;
         display: flex;
+
         .liany {
           font-size: 12px;
           margin-left: 5px;
         }
       }
+
       .topic_right {
         color: #000000;
         line-height: 64px;
@@ -329,49 +368,59 @@
 
   }
 }
+
 .tit {
   color: #333333;
   margin-left: 14px;
   margin-top: 38px;
 }
+
 .answer {
   width: 346px;
   height: 112px;
   background: #FFFFFF;
   margin-left: 14px;
   margin-top: 18px;
+
   .result {
     font-size: 12px;
     color: #EF826B;
     padding-left: 20px;
     padding-top: 10px;
   }
+
   .wrought {
     display: flex;
+
     .correct-response {
       width: 87px;
       height: 70px;
+
       .response-tit {
         font-size: 14px;
         color: #B3B3B3;
         text-align: center;
         padding-top: 10px;
       }
+
       .response-sels {
         color: #5B5B5B;
         text-align: center;
         padding-top: 8px;
       }
     }
+
     .wrong-response {
       width: 87px;
       height: 70px;
+
       .wrong-tit {
         font-size: 14px;
         color: #B3B3B3;
         text-align: center;
         padding-top: 10px;
       }
+
       .wrong-sels {
         color: #5B5B5B;
         text-align: center;
@@ -380,18 +429,21 @@
     }
   }
 }
+
 .analysis {
   font-size: 14px;
   color: #D3D3D3;
   margin-left: 14px;
   margin-top: 20px;
 }
+
 .analysis-con {
   font-size: 12px;
   color: #000000;
   margin-left: 14px;
   margin-top: 10px;
 }
+
 .question {
   height: 52px;
   background: #EF826B;
@@ -400,10 +452,12 @@
   text-align: center;
   line-height: 52px;
 }
+
 .qimg {
   //padding-left: 30px;
   width: 100%;
   text-align: left;
+
   .qimg-fit {
     width: 100%;