From 6027a46ee9d15056ac8793359d9cb49f19821e22 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Thu, 23 Mar 2023 09:15:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B2=E9=9D=96=E8=80=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppLegalLearning/AppLegalLearning.vue     |  5 ++++-
 .../components/GeneralLawExam.vue             | 21 +++++++++++++++++--
 .../qujing/AppLegalLearning/result.vue        |  7 +++++--
 .../qujing/AppLegalLearning/testForm.vue      |  2 +-
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/project/qujing/AppLegalLearning/AppLegalLearning.vue b/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
index d8ddb94..4912d43 100644
--- a/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
+++ b/src/project/qujing/AppLegalLearning/AppLegalLearning.vue
@@ -7,7 +7,7 @@
     </div>
     <div>
       <OnlineClass ref="OnlineClass" :height="height" @to-detail="toDetail" v-show="currIndex == 0"></OnlineClass>
-      <GeneralLawExam ref="GeneralLawExam" :height="height" @to-test="toTest" v-show="currIndex == 1"></GeneralLawExam>
+      <GeneralLawExam ref="GeneralLawExam" :height="height" @to-study="toStudy" @to-test="toTest" v-show="currIndex == 1"></GeneralLawExam>
     </div>
   </div>
 </template>
@@ -77,6 +77,9 @@ export default {
     },
     toDetail(id) {
       uni.navigateTo({url: "./classDetail?id=" + id})
+    },
+    toStudy() {
+      this.currIndex == 1
     }
   }
 }
diff --git a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
index da0bfd1..bfe219e 100644
--- a/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
+++ b/src/project/qujing/AppLegalLearning/components/GeneralLawExam.vue
@@ -110,8 +110,25 @@ export default {
         }
       })
     },
-    handleToTest({id, examination_duration: time }) {
-      console.log(time);
+    handleToTest({id, examination_duration: time, examinationType }) {
+      console.log(time, examinationType);
+      if(examinationType == 1) {
+        if(this.studyDuration && this.studyDuration < time) {
+          uni.showModal({
+            title: '考试说明',
+            content: `「考试认证」类考试，需要在线课堂中学习普法知识满足${time}分钟才能参加，考试通过并审核后可获取知法明理证书。`,
+            confirmText: '去学习',
+            confirmColor: '#2D7DFF',
+            success: (res)=> {
+              if (res.confirm) {
+                this.$emit('toStudy')
+              } else if (res.cancel) {
+                // 停留
+              }
+            }
+          });
+        }
+      }
       if(!this.user.areaId) {
         this.showAuth = true;
         this.testId = id;
diff --git a/src/project/qujing/AppLegalLearning/result.vue b/src/project/qujing/AppLegalLearning/result.vue
index 499f1b7..5a6311a 100644
--- a/src/project/qujing/AppLegalLearning/result.vue
+++ b/src/project/qujing/AppLegalLearning/result.vue
@@ -11,8 +11,11 @@
       <div class="card_list">
         <div class="pass">
           <div>结果</div>
-          <div :class="[data.status==0? 'col_nopass':'col_pass']">
-            <span v-if="data.status==0">未</span><span v-else>已</span>通过
+          <div :class="[data.assessmentType ==3? 'col_nopass':'col_pass']">
+            <span v-if="data.assessmentType==0">学富五车</span>
+            <span v-if="data.assessmentType == 1">才高八斗</span>
+            <span v-if="data.assessmentType == 2">合格</span>
+            <span v-if="data.assessmentType == 3">不合格</span>
           </div>
         </div>
         <div class="time">
diff --git a/src/project/qujing/AppLegalLearning/testForm.vue b/src/project/qujing/AppLegalLearning/testForm.vue
index 2965809..541f456 100644
--- a/src/project/qujing/AppLegalLearning/testForm.vue
+++ b/src/project/qujing/AppLegalLearning/testForm.vue
@@ -190,7 +190,7 @@ export default {
           this.$u.toast('提交成功')
           setTimeout(()=> {
             uni.navigateTo({
-              url: `./result?status=${this.status}&time=${this.studyDuration}&rightCount=${this.rightCount}&examCount=${this.list.length}&score=${this.score}`
+              url: `./result?assessmentType=${this.assessmentType}&time=${this.studyDuration}&rightCount=${this.rightCount}&examCount=${this.list.length}&score=${this.score}`
             })
           }, 600)
         }