Merge branch 'dev-v1.1.0' into test

src/pages/learn/answer.vue

@@ -28,7 +28,6 @@
             >倒计时：<u-count-down
               :timestamp="timestamp"
               bg-color=""
-              :show-hours="false"
               @end="timeEnd"
               @change="timeChange"
             ></u-count-down
@@ -167,7 +166,7 @@ export default {
         visible: false,
         timeout: false,
       },
-      timestamp: 60 * 60,
+      timestamp: 60 * 120,
       currentTime: null,
       list: [],
       // key为currentPage，value为此页list数据
@@ -186,7 +185,7 @@ export default {
       source: 5,
       recordId: 0,
       // 合格分数
-      passPoint: 60,
+      passPoint: 80,
       // 考试题数
       totalPoint: 100,
       // 已做题数
@@ -826,7 +825,7 @@ export default {
         color: #5a6073;
         font-size: 32rpx;
         margin: 10rpx auto;
-        width: 230rpx;
+        width: 290rpx;
       }
     }
     .swiper {

src/pages/learn/score.vue

@@ -135,7 +135,7 @@ export default {
       return this.info.score >= this.info.pageTotalPoint
     },
     isPass() {
-      return this.info.score >= this.info.pageTotalPoint * 0.6
+      return this.info.score >= this.info.passPoint
     },
     resultText() {
       return this.isPass ? '合格' : '不合格'
@@ -234,6 +234,7 @@ export default {
             pageTotalPoint: Number(res.pageTotalPoint) || 0,
             category: echoMap.questionWarehouseId.title,
             type: '模拟考试',
+            passPoint: echoMap?.paperId?.passPoint || 80
           }
         }
       })