Merge branch 'dev-v1.0.0' of https://git.banshouhui.com/wuzhenzhe/study into dev-v1.0.0

.env.test.js

 const UNI_APP = {
-  apiUrl: 'https://exam.testrest.banshouhui.com',
+  apiUrl: 'https://exam.banshouhui.com',
   qn_base_url: 'https://qn-static.banshouhui.com/study/',
   qn_asset_url: 'https://img2.banshouhui.com/',
   uCenterUrl: 'http://rest-u.test.ibanshou.cn/',

src/pages/learn/answer.vue

@@ -220,6 +220,7 @@ export default {
     if (e?.recordId) this.recordId = e.recordId // 考试ID
     if (e?.passPoint) this.passPoint = parseInt(e.passPoint) // 合格分数
     if (e?.totalPoint) this.totalPoint = parseInt(e.totalPoint) // 考试总分/总条数
+    if (e?.duration) this.timestamp = parseInt(e.duration) * 60 // 考试时间
     switch (this.source) {
       case 1:
       case 2:

src/pages/learn/beginAnswer.vue

@@ -34,7 +34,7 @@
             type="primary"
             shape="circle"
           >
-            开始模拟
+            开始模拟考试
           </u-button>
         </view>
       </view>
@@ -63,6 +63,7 @@ export default {
         kemu: '考试科目',
         tishu: '考试题数',
         biaozhun: '合格标准',
+        duration: '考试时间',
         guize: '出题规则',
       }
     },
@@ -93,6 +94,7 @@ export default {
           tishu: `${res.totalPoint}题`,
           biaozhun: `${res.passPoint}分`,
           passPoint: res.passPoint,
+          duration: `${res.duration}分钟`,
           guize: '根据国家规定比例随机抽取'
         }
       })
@@ -114,7 +116,8 @@ export default {
               recordId: res.id,
               source: 3,
               passPoint: this.info.passPoint,
-              totalPoint: this.info.totalPoint
+              totalPoint: this.info.totalPoint,
+              duration: this.info.duration
             }
           })
         }

src/pages/learn/score.vue

@@ -194,12 +194,12 @@ export default {
       })
     },
     handleClickRecord() {
+      console.log("11", 11)
       this.$u.route({
-        type: 'push',
-        url: '/pages/learn/answer',
+        url: 'pages/learn/answer',
         params: {
           source: 5,
-        },
+        }
       })
     },
     handleClick() {